Commit 6045415a by xue_wengang

人员标签修改

parent f129e16d
...@@ -1762,37 +1762,6 @@ ...@@ -1762,37 +1762,6 @@
"webpack-merge": "^4.2.2" "webpack-merge": "^4.2.2"
}, },
"dependencies": { "dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"debug": { "debug": {
"version": "4.2.0", "version": "4.2.0",
"resolved": "https://registry.npm.taobao.org/debug/download/debug-4.2.0.tgz?cache=0&sync_timestamp=1600502871403&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-4.2.0.tgz", "resolved": "https://registry.npm.taobao.org/debug/download/debug-4.2.0.tgz?cache=0&sync_timestamp=1600502871403&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-4.2.0.tgz",
...@@ -1802,35 +1771,11 @@ ...@@ -1802,35 +1771,11 @@
"ms": "2.1.2" "ms": "2.1.2"
} }
}, },
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"ms": { "ms": {
"version": "2.1.2", "version": "2.1.2",
"resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz", "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz",
"integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=", "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
"dev": true "dev": true
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.5.0",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.5.0.tgz",
"integrity": "sha512-WXh+7AgFxGTgb5QAkQtFeUcHNIEq3PGVQ8WskY5ZiFbWBkOwcCPRs4w/2tVyTbh2q6TVRlO3xfvIukUtjsu62A==",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
}
} }
} }
}, },
...@@ -11950,6 +11895,63 @@ ...@@ -11950,6 +11895,63 @@
} }
} }
}, },
"vue-loader-v16": {
"version": "npm:vue-loader@16.5.0",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.5.0.tgz",
"integrity": "sha512-WXh+7AgFxGTgb5QAkQtFeUcHNIEq3PGVQ8WskY5ZiFbWBkOwcCPRs4w/2tVyTbh2q6TVRlO3xfvIukUtjsu62A==",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
}
}
},
"vue-router": { "vue-router": {
"version": "3.4.6", "version": "3.4.6",
"resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.4.6.tgz?cache=0&sync_timestamp=1602077426782&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.4.6.tgz", "resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.4.6.tgz?cache=0&sync_timestamp=1602077426782&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.4.6.tgz",
......
...@@ -37,6 +37,11 @@ export const getZtDetail = params => ...@@ -37,6 +37,11 @@ export const getZtDetail = params =>
export const getXdryDetail = params => export const getXdryDetail = params =>
post(`${base.alyIP}/zdGzry/getXdryDetail`, params); post(`${base.alyIP}/zdGzry/getXdryDetail`, params);
//自定义人员标签修改
export const updateZdyCode = params =>
post(`${base.alyIP}/zdGzry/updateZdyCode`, params);
export const insertZdry = params => export const insertZdry = params =>
postform(`${base.alyIP}/zdGzry/insertRybz`, params); postform(`${base.alyIP}/zdGzry/insertRybz`, params);
......
...@@ -144,10 +144,10 @@ ...@@ -144,10 +144,10 @@
<div class="zdyInputW" v-else-if="item.type == 'checkbox'"> <div class="zdyInputW" v-else-if="item.type == 'checkbox'">
<el-checkbox-group v-model="formData[item.id]" size="small"> <el-checkbox-group v-model="formData[item.id]" size="small">
<el-checkbox <el-checkbox
v-for="city in item.checkList" v-for="subitem in item.checkList"
:label="city" :label="subitem"
:key="city.val" :key="subitem.val"
>{{ city.label }}</el-checkbox >{{ subitem.label }}</el-checkbox
> >
</el-checkbox-group> </el-checkbox-group>
</div> </div>
...@@ -567,6 +567,32 @@ ...@@ -567,6 +567,32 @@
</div> </div>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog
title="详情信息"
:visible.sync="dialogTableVisibleEdit"
width="35%"
>
<div style="padding: 15px; display: flex">
<div style="padding: 15px; padding-right: 30px">人员标签</div>
<el-checkbox-group
v-model="zdyCodeEdit"
size="small"
>
<el-checkbox
style="width: 150px"
v-for="item in allZdyCode"
:label="item.value"
:key="item.value"
:disabled="item.disabled"
>{{ item.name }}</el-checkbox
>
</el-checkbox-group>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogTableVisibleEdit = false">取 消</el-button>
<el-button type="primary" @click="EditCode">确 定</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
...@@ -585,6 +611,7 @@ import { ...@@ -585,6 +611,7 @@ import {
getDrDetail, getDrDetail,
getZtDetail, getZtDetail,
getXdryDetail, getXdryDetail,
updateZdyCode,
} from "@/api/zdry/zdryGl.js"; } from "@/api/zdry/zdryGl.js";
export default { export default {
...@@ -688,9 +715,35 @@ export default { ...@@ -688,9 +715,35 @@ export default {
col: 1, col: 1,
}, },
], ],
zdyCodeEdit: [], //自定义字典编辑
dialogTableVisibleEdit: false, //自定义字典弹框
allZdyCode: this.cxQueryField[9].selectData,
zjhm:''
}; };
}, },
methods: { methods: {
EditCode() {
var self = this;
if (this.zdyCodeEdit.length > 0) {
var str = "";
var str2 = "";
this.zdyCodeEdit.forEach((subitem) => {
str = str ? `${str}#${subitem}` : `#${subitem}`;
let index = self.allZdyCode.findIndex(item=> item.value == subitem)
str2 = str2 ? `${str2}#${self.allZdyCode[index].name}` : `#${self.allZdyCode[index].name}`;
});
updateZdyCode({
zjhm: this.zjhm,
zdyCode: str,
zdyCodeTxt: str2,
}).then((res) => {
self.$message.success("修改成功");
self.dialogTableVisibleEdit = false;
});
} else {
self.$message.error("请选择");
}
},
bqDetail(item, zjhm) { bqDetail(item, zjhm) {
console.log(item, zjhm); console.log(item, zjhm);
if (item == "团伙作案" || item == "结伙作案") { if (item == "团伙作案" || item == "结伙作案") {
...@@ -759,7 +812,23 @@ export default { ...@@ -759,7 +812,23 @@ export default {
} }
}, },
edit(scope) { edit(scope) {
this.$emit("edit", scope); var self = this
if (self.pageBs != "zdryGl") {
self.$emit("edit", scope);
} else {
self.zdyCodeEdit = [];
self.dialogTableVisibleEdit = true;
let arr = [];
if (scope.row.zdyCode.length > 0) {
arr = scope.row.code.split("#").splice(1);
arr.forEach((subitem) => {
self.zdyCodeEdit.push(subitem);
let index = self.allZdyCode.findIndex(item=> item.value == subitem)
self.$set(self.allZdyCode[index],'disabled',true)
});
}
this.zjhm = scope.row.zjhm
}
}, },
gz(scope) { gz(scope) {
if (scope.row.policeId != "") { if (scope.row.policeId != "") {
...@@ -966,7 +1035,15 @@ export default { ...@@ -966,7 +1035,15 @@ export default {
let self = this, let self = this,
json = {}; json = {};
for (let i in self.formData) { for (let i in self.formData) {
if (i != "cxSj") { if (i == "zdyCode") {
var str = "";
self.formData[i].forEach((item) => {
str = str ? `${str},${item.val}` : `${item.val}`;
});
json[i] = self.formData.zdyCodeTxt
? `${str},${self.formData.zdyCodeTxt}`
: `${str}`;
} else if (i != "cxSj") {
json[i] = self.formData[i]; json[i] = self.formData[i];
} else { } else {
json[i] = json[i] =
...@@ -976,7 +1053,7 @@ export default { ...@@ -976,7 +1053,7 @@ export default {
} }
} }
if (flag) { if (flag) {
self.doQueryRequest(self.formData).then((response) => { self.doQueryRequest(json).then((response) => {
if (response.success === true) { if (response.success === true) {
let list = []; let list = [];
response.data.rows.forEach((item) => { response.data.rows.forEach((item) => {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div> <div>
<div class="headerTitle"> <div class="headerTitle">
<img src="../assets/img/login/jinhui.png" alt="" /><span <img src="../assets/img/login/jinhui.png" alt="" /><span
>刑嫌调控工作管理</span >未成年人犯罪管理</span
> >
</div> </div>
<div style="display: flex" class="queryContent"> <div style="display: flex" class="queryContent">
......
...@@ -34,7 +34,7 @@ export default { ...@@ -34,7 +34,7 @@ export default {
xalbdmbcms: "", xalbdmbcms: "",
ajlbCode: "", ajlbCode: "",
zdyCodeTxt: "", zdyCodeTxt: "",
zdyCode: "", zdyCode: [],
xbdm: "", xbdm: "",
mzdm: "", mzdm: "",
grade: "", grade: "",
...@@ -241,6 +241,7 @@ export default { ...@@ -241,6 +241,7 @@ export default {
arr.push({ arr.push({
value: item.code, value: item.code,
name: item.name, name: item.name,
disabled: false
}); });
}); });
}); });
......
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