Commit 1c121bc3 by liupeng

Merge branch 'dev_xzeq' of http://47.92.108.28/changchao/founder_vue into dev_xzeq

parents 94e64adf d15aaf42
......@@ -23,3 +23,12 @@ export const selectJcgz = params =>
//新删除检查规则
export const delJcgzById = params =>
post(`${base.alyIP}/zjclGz/delJcgzById`, params);
//新检查规则新增
export const addJcgz = params =>
postform(`${base.alyIP}/zjclGz/addJcgz`, params);
//新检查规则信息回显
export const getJcgzById = params =>
post(`${base.alyIP}/zjclGz/getJcgzById`, params);
//新检查规则修改
export const updateJcgz = params =>
postform(`${base.alyIP}/zjclGz/updateJcgz`, params);
......@@ -17,7 +17,7 @@
v-for="groupItem in propFormField"
:key="groupItem.index"
>
<div v-if="(groupItem.title != '法律文书') || (groupItem.title == '法律文书' && groupItem.showPage == true)">
<div v-if="(groupItem.title != '法律文书') || (groupItem.title == '法律文书' && groupItem.showPage == true)">
<div class="subTitle" v-if="groupItem.title">
<div>{{ groupItem.title }}</div>
</div>
......@@ -253,6 +253,19 @@
>
</el-checkbox-group>
</div>
<div class="zdyInputW" v-else-if="item.type == 'checkboxList'">
<el-checkbox-group
v-model="formLabelAlign[item.id]"
size="small"
>
<el-checkbox
v-for="(item2, index2) in item.checkboxData"
:label="item2.val"
:key="index2"
>{{ item2.label }}</el-checkbox
>
</el-checkbox-group>
</div>
<div
class="zdyInputW"
v-else-if="item.type == 'checkboxBotton'"
......
......@@ -929,7 +929,8 @@
pageBs == 'queryDx' ||
pageBs == 'bxqjsdzczl' ||
pageBs == 'queryZjcl'||
pageBs == 'queryJcgz'
pageBs == 'queryJcgz' ||
pageBs == 'queryZjclLb'
)
"
>
......
......@@ -43,6 +43,14 @@ const menuLayouts = [
component: () => import("@/views/zjcl/jcgz/queryJcgz.vue")
},
{
path: "/queryZjclLb",
name: "queryZjclLb",
meta: {
title: '检查规则管理'
},
component: () => import("@/views/zjcl/jcgz/queryZjclLb.vue")
},
{
path: "/zjclrz",
name: "zjclrz",
meta: {
......
......@@ -12,8 +12,8 @@
<script>
import formCompontent from "@c/form.vue";
import { insertJcgz, updateJcgzById, selectJcgz } from "@/api/zjcl/jcgz.js";
import { zjcljcgz } from "@/utils/params.js";
import { getJcgzById,addJcgz,updateJcgz } from "@/api/zjcl/jcgz.js";
import {getZjclLb } from "@/api/zjcl/zjcl.js";
export default {
name: "insertJcgz",
components: {
......@@ -29,10 +29,35 @@ export default {
id: 1,
objStr: "",
index: 0,
data: zjcljcgz,
data: [
{
name: "案事件类型:",
id: "ajlbdm",
type: "codeTree",
codeTree: "CODE_AJLB",
codeOptions: [],
value: "",
placeholder: "请输入",
col: "2",
prop:'checkEmpty'
},
{
name: "证件分类:",
id: "zjcldm",
type: "checkboxList",
value: "01",
placeholder: "",
col: "22",
checkboxData: [],
prop:'checkEmpty'
},
],
},
],
formLabelAlign: {},
formLabelAlign: {
zjcldm: [],
},
zjclmc:[],
breadcrumbList: [
{
name: "检查规则管理",
......@@ -45,7 +70,7 @@ export default {
isActive: false,
},
{
name: this.$route.query.xxzjbh
name: this.$route.query.ruleid
? "修改检查规则信息"
: "新增检查规则信息",
to: "/insertJcgz",
......@@ -56,20 +81,30 @@ export default {
},
methods: {
submit(params) {
this.zjclmc = []
for(let i of this.formLabelAlign.zjcldm){
for(let j of this.propFormField[0]['data'][1]['checkboxData']){
if(i==j.val){
this.zjclmc.push(j.label)
}
}
}
let loading = this.$loading({
lock: true,
text: "正在保存...",
spinner: "el-icon-loading",
background: "rgba(255, 255, 255, 0.7)",
});
if (!this.xxzjbh) {
params.append('zjclmc',this.zjclmc)
if (!this.ruleid) {
this.addSubmit(params, loading);
} else {
this.editSubmit(params, loading);
}
},
addSubmit(params, loading) {
insertJcgz(params).then((res) => {
addJcgz(params).then((res) => {
if (res.success && res.code == 200) {
this.$alert("保存成功!", "提示", {
confirmButtonText: "确定",
......@@ -81,13 +116,13 @@ export default {
});
} else {
loading.close();
this.$message.error("添加失败,请检查数据格式是否正确");
this.$message.error(res.message);
}
});
},
editSubmit(params, loading) {
params.append("xxzjbh", this.xxzjbh);
updateJcgzById(params).then((res) => {
params.append("ruleid", this.ruleid);
updateJcgz(params).then((res) => {
if (res.success && res.code == 200) {
this.$alert("保存成功!", "提示", {
confirmButtonText: "确定",
......@@ -99,7 +134,7 @@ export default {
});
} else {
loading.close();
this.$message.error("添加失败,请检查数据格式是否正确");
this.$message.error(res.message);
}
});
},
......@@ -111,30 +146,39 @@ export default {
background: "rgba(255, 255, 255, 0.7)",
});
var self = this;
selectJcgz({
xxzjbh: this.xxzjbh,
getJcgzById({
ruleid: this.ruleid,
}).then((res) => {
var result = res.data.jcgz;
self.propFormField.forEach((fieldItem) => {
if (fieldItem.data && fieldItem.data.length > 0) {
fieldItem.data.forEach((i) => {
this.$set(this.formLabelAlign, i.id, result[i.id]);
});
}
this.$forceUpdate();
});
self.$set(self.formLabelAlign, "editing", true);
let zjcldm = res.data.jcgz.zjcldm;
self.formLabelAlign.zjcldm = zjcldm.split(',')
let ajlbdm = res.data.jcgz.ajlbdm;
self.formLabelAlign.ajlbdm = ajlbdm
self.$forceUpdate();
loading.close();
});
},
},
created() {
getZjclLb().then(res=>{
if(res.code === 200) {
let list = res.data.list
let objs = []
for(let i of list) {
objs.push({
label:i.name,
val:i.code
})
}
this.propFormField[0]['data'][1]['checkboxData'] = objs
}
else {
this.$message({type: "warning", message: res.msg,});
}
})
this.$store.commit("user/SET_Breadcrumb", this.breadcrumbList);
if (this.$route.query.xxzjbh) {
// this.$set(this.propFormField[0], "title", "修改检查规则信息");
if (this.$route.query.ruleid) {
this.title = "修改检查规则信息"
this.xxzjbh = this.$route.query.xxzjbh;
this.ruleid = this.$route.query.ruleid;
this.getshuju();
}
},
......@@ -142,4 +186,4 @@ export default {
</script>
<style scoped lang="scss">
</style>
\ No newline at end of file
</style>
......@@ -33,7 +33,7 @@ export default {
data() {
return {
tableOperation:true,
header: "检查规则信息",
header: "证据材料检查规则管理",
pageBs: "queryJcgz",
cxFormData: {
limit: 10,
......@@ -107,7 +107,7 @@ export default {
Menu: [
{
id: "queryJcgz",
label: "检查规则信息",
label: "证据材料检查规则管理",
index: "queryJcgz",
auth: "M0101",
className: "iconfont iconrizhi",
......@@ -163,7 +163,7 @@ export default {
this.$router.push({
path: "/insertJcgz",
query: {
xxzjbh: obj.row.xxzjbh,
ruleid: obj.row.ruleid,
},
});
},
......
<template>
<div>12</div>
</template>
<script>
export default {
name: "queryZjclLb"
}
</script>
<style scoped>
</style>
......@@ -210,7 +210,7 @@ export default {
Menu: [
{
id: "queryZjcl",
label: "证据材料信息",
label: "证据材料检查规则管理",
index: "queryZjcl",
auth: "M0101",
className: "iconfont iconrizhi",
......@@ -221,7 +221,7 @@ export default {
//左侧导航(模块第一个页面需要)
{
id: "queryZjcl",
label: "证据材料管理",
label: "案件证据材料检查",
newAuth: "M01",
index: "queryZjcl",
className: "iconfont icongongnengfuwu",
......@@ -229,13 +229,21 @@ export default {
},
{
id: "queryJcgz",
label: "证据材料检查",
label: "证据材料检查规则管理",
index: "queryJcgz",
auth: "M0102",
className: "iconfont icongongnengfuwu",
hasChildren: false,
},
{
id: "queryZjclLb",
label: "证据类别管理",
index: "queryZjclLb",
auth: "M0102",
className: "iconfont icongongnengfuwu",
hasChildren: false,
},
{
id: "zjclrz",
label: "证据材料日志信息",
index: "zjclrz",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment