From 4badee9c453f7cadf4f93e76f309bd3a283ca1fe Mon Sep 17 00:00:00 2001 From: luyan Date: Tue, 24 Oct 2023 10:18:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D12345=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E8=8B=A5=E5=B9=B2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/base/huji/immigration/edit.vue | 1345 ++++++++--------- .../modules/shequzhili/event/cpts/add.vue | 2 +- .../shequzhili/event/cpts/event-detail.vue | 2 +- .../shequzhili/event/cpts/myCascader.vue | 4 +- .../event/cpts/process-form-designate.vue | 11 +- .../event/cpts/process-form-replay-end.vue | 19 +- .../event/cpts/process-form-replay.vue | 6 +- .../modules/shequzhili/event/eventList.vue | 23 +- 8 files changed, 643 insertions(+), 769 deletions(-) diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue index 89efb44f5..10164324a 100644 --- a/src/views/modules/base/huji/immigration/edit.vue +++ b/src/views/modules/base/huji/immigration/edit.vue @@ -1,267 +1,139 @@ diff --git a/src/views/modules/shequzhili/event/cpts/add.vue b/src/views/modules/shequzhili/event/cpts/add.vue index 4e063fd7a..1a07f8af0 100644 --- a/src/views/modules/shequzhili/event/cpts/add.vue +++ b/src/views/modules/shequzhili/event/cpts/add.vue @@ -18,7 +18,7 @@ - + 满意 - 基本满意 + 非常满意 不满意 diff --git a/src/views/modules/shequzhili/event/cpts/myCascader.vue b/src/views/modules/shequzhili/event/cpts/myCascader.vue index 278d6a138..6a4a75c29 100644 --- a/src/views/modules/shequzhili/event/cpts/myCascader.vue +++ b/src/views/modules/shequzhili/event/cpts/myCascader.vue @@ -18,8 +18,9 @@ export default { selCategoryArray: {} }, selCateObj: {}, - iscascaderShow: 0 + iscascaderShow: 0, }; + }, props: { casOptions: { @@ -39,7 +40,6 @@ export default { } else { this.selCateObj = {} } - this.$emit('handleChangeCate', this.selCateObj) } }, diff --git a/src/views/modules/shequzhili/event/cpts/process-form-designate.vue b/src/views/modules/shequzhili/event/cpts/process-form-designate.vue index f1ebf59f9..fdd39d220 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form-designate.vue +++ b/src/views/modules/shequzhili/event/cpts/process-form-designate.vue @@ -102,6 +102,9 @@ export default { ], timeLimit: [ { required: true, message: "办结时限不能为空", trigger: "blur" }, + ], + categoryList: [ + { required: true, message: '事件分类不能为空', trigger: 'blur' }, ] }, selCateObj: { @@ -140,9 +143,9 @@ export default { this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData)); // 这一步接收到eventDetailCopy在这里回填 if (this.eventDetailCopy.parentCategoryId && this.eventDetailCopy.categoryId) { - this.selCateObj.id = this.eventDetailCopy.categoryId - this.formData.categoryId = this.eventDetailCopy.categoryId - this.selCategoryArray.push(this.eventDetailCopy.parentCategoryId, this.eventDetailCopy.categoryId) + this.selCategoryArray = this.eventDetailCopy.parentCategoryId.split(","); + this.selCategoryArray.push(this.eventDetailCopy.categoryId); + this.handleChangeCate(this.selCategoryArray) } } }, @@ -189,8 +192,8 @@ export default { handleChangeCate() { if (this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0]) { this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0].data + this.formData.categoryList = this.selCateObj this.formData.categoryId = this.selCateObj.id - console.log(this.formData.categoryId, 'this.formData.categoryId'); } else { this.selCateObj = {} } diff --git a/src/views/modules/shequzhili/event/cpts/process-form-replay-end.vue b/src/views/modules/shequzhili/event/cpts/process-form-replay-end.vue index 9cad30838..570051c5a 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form-replay-end.vue +++ b/src/views/modules/shequzhili/event/cpts/process-form-replay-end.vue @@ -73,7 +73,7 @@ export default { { required: true, message: '回复内容不能为空', trigger: 'blur' }, ], categoryList: [ - // { required: true, message: '事件分类不能为空', trigger: 'blur' }, + { required: true, message: '事件分类不能为空', trigger: 'blur' }, ] } }; @@ -107,8 +107,9 @@ export default { this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData)); // 这一步接收到eventDetailCopy在这里回填 if (this.eventDetailCopy.parentCategoryId && this.eventDetailCopy.categoryId) { - this.formData.categoryId = this.eventDetailCopy.categoryId - this.selCategoryArray.push(this.eventDetailCopy.parentCategoryId, this.eventDetailCopy.categoryId) + this.selCategoryArray = this.eventDetailCopy.parentCategoryId.split(","); + this.selCategoryArray.push(this.eventDetailCopy.categoryId); + this.handleChangeCate(this.selCategoryArray) } } }, @@ -128,9 +129,19 @@ export default { this.$message.error(msg); } }, + buildTree(nodes, treeId) { + nodes.forEach(item => { + if (treeId === item.id) { + return item; + } else { + this.buildTree(item.children, treeId) + } + }) + }, handleChangeCate() { if (this.selCateObj = this.$refs['myCascader'].getCheckedNodes()[0]) { this.selCateObj = this.$refs['myCascader'].getCheckedNodes()[0].data + this.formData.categoryList = this.selCateObj } else { this.selCateObj = {} } @@ -165,7 +176,7 @@ export default { if (!this.formData.categoryId) { this.formData.categoryId = this.selCateObj.id; } - if(this.fileList){ + if (this.fileList) { this.formData.files = this.fileList } this.formData.categoryList = []; diff --git a/src/views/modules/shequzhili/event/cpts/process-form-replay.vue b/src/views/modules/shequzhili/event/cpts/process-form-replay.vue index 2cc36e807..e0b84438c 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form-replay.vue +++ b/src/views/modules/shequzhili/event/cpts/process-form-replay.vue @@ -62,7 +62,7 @@ export default { { required: true, message: '回复内容不能为空', trigger: 'blur' }, ], categoryList: [ - // { required: true, message: '事件分类不能为空', trigger: 'blur' }, + { required: true, message: '事件分类不能为空', trigger: 'blur' }, ], timeLimit: [ { required: true, message: "办结时限不能为空", trigger: "blur" }, @@ -101,7 +101,6 @@ export default { this.getCategoryList(); if (this.eventId) { this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData)); - console.log('this.eventDetailCopy', this.eventDetailCopy); let value = this.eventDetailCopy.parentCategoryId.split(","); value.push(this.eventDetailCopy.categoryId); this.handleChangeCate(value) @@ -131,7 +130,6 @@ export default { }); let node = this.buildTree(this.casOptions, this.eventDetailCopy.categoryId); this.selCategoryArray.push(node); - console.log(this.selCategoryArray); } }, buildTree(nodes, treeId) { @@ -146,6 +144,7 @@ export default { handleChangeCate(value) { if (this.selCateObj = this.$refs['myCascader'].getCheckedNodes()[0]) { this.selCateObj = this.$refs['myCascader'].getCheckedNodes()[0].data + this.formData.categoryList = this.selCateObj } else { this.selCateObj = {} } @@ -181,6 +180,7 @@ export default { } this.formData.categoryList = []; this.formData.categoryList.push(this.selCateObj); + this.formData.categoryId = this.selCateObj.id this.okflag = true; } }); diff --git a/src/views/modules/shequzhili/event/eventList.vue b/src/views/modules/shequzhili/event/eventList.vue index 90aa9c7b3..1e4960e90 100644 --- a/src/views/modules/shequzhili/event/eventList.vue +++ b/src/views/modules/shequzhili/event/eventList.vue @@ -270,26 +270,10 @@ export default { }, ], qudaoArray: [ - // { - // value: "0", - // label: "随手拍/随时讲", - // }, - // { - // value: "1", - // label: "多媒体反应", - // }, - // { - // value: "2", - // label: "社区电话", - // }, { value: "3", label: "12345", - }, - // { - // value: "4", - // label: "网络员手持终端", - // }, + } ], formData: { @@ -538,7 +522,7 @@ export default { } }, handleProgress(event, file, fileList) { - + }, beforeExcelUpload(file) { const isType = file.type === 'application/vnd.ms-excel'; @@ -654,6 +638,9 @@ export default { }, async getTableData() { const url = "/governance/icEvent/list"; + if (this.eventTypeCheck) { + this.formData.secondIdList = this.eventTypeCheck + } const { pageSize, pageNo, formData } = this; const { data, code, msg } = await requestPost(url, { pageSize,