From 2830437b4754600c321b39e1a226064ba55933aa Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 22 Dec 2021 20:13:24 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=BA=93=20-=20=E5=88=97?= =?UTF-8?q?=E8=A1=A8=20-=20=E8=8B=B1=E6=96=87=E5=90=8D=E7=A7=B0=E5=8E=BB?= =?UTF-8?q?=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/EnterpriseStandardDatabase.vue | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index c10eeb8fe..7d050d4e6 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -324,18 +324,18 @@ {{ scope.row.standName }} - - - + + + + + + + + + + + + Date: Wed, 22 Dec 2021 20:50:42 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BA=93=20-=20=E5=88=86?= =?UTF-8?q?=E8=A7=A3=E5=8D=95=20-=20=E6=97=A5=E6=9C=9F=E5=A4=9A=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/otherStandardDetails/index.vue | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 34122febe..c0dd20f61 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -2515,17 +2515,24 @@ export default { if (this.selectedItemList.length>0){ this.editResolveListShowflag = true let editItem = JSON.parse(JSON.stringify(this.selectedItemList[0])) + console.log('2518',editItem) this.resolveListForm = editItem this.resolveListForm.termsConditions = this.resolveListForm.termsConditions?this.resolveListForm.termsConditions.replace(/<.*?>/ig, ' '):'' // this.resolveListForm.readContent = this.readContent?this.readContent.replace(/<.*?>/ig, ' '):'' + this.resolveListForm.xccssrq = this.resolveListForm.xccssrq.split(',') + this.resolveListForm.zccssrq = this.resolveListForm.zccssrq.split(',') }else { this.$message.warning('请选择一条数据') } }, saveEditInfo(){ - console.log('2530',this.resolveListForm) - this.resolveListForm.xccssrq = this.resolveListForm.xccssrq.join(',') - this.resolveListForm.zccssrq = this.resolveListForm.zccssrq.join(',') + console.log('2530',typeof this.resolveListForm.xccssrq) + if (typeof this.resolveListForm.xccssrq !== 'string'){ + this.resolveListForm.xccssrq = this.resolveListForm.xccssrq.join(',') + } + if (typeof this.resolveListForm.zccssrq !== 'string'){ + this.resolveListForm.zccssrq = this.resolveListForm.zccssrq.join(',') + } this.$http.putData( 'SarStandItems/sar-stand-items/updateSarItemAndInterpretation', this.resolveListForm, From 316ffa031bb6dd6b50eb30d8c0c6bd3b4001318f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 22 Dec 2021 19:45:50 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=80=89?= =?UTF-8?q?=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/phone/qbzxdjhgk/step2.vue | 1 + .../pages/phone/qbzxdjhgk/step3.vue | 1 + .../pages/phone/qbzxdjhgk/step4.vue | 1 + .../pages/phone/qbzxdjhgk/step5.vue | 1 + .../processCenter/pages/phone/wbsm/step3.vue | 1 + .../processCenter/pages/phone/wbsm/step4.vue | 1 + .../processCenter/pages/phone/wbsm/step5.vue | 1 + .../processCenter/pages/phone/xmpg/step2.vue | 39 +++++++++++++++++-- .../processCenter/pages/phone/xmpg/step5.vue | 39 +++++++++++++++++-- .../processCenter/pages/phone/xmpg/step6.vue | 39 +++++++++++++++++-- .../processCenter/pages/phone/xmpg/step7.vue | 39 +++++++++++++++++-- .../pages/phone/xmpg2/step10.vue | 39 +++++++++++++++++-- .../processCenter/pages/phone/xmpg2/step2.vue | 39 +++++++++++++++++-- .../processCenter/pages/phone/xmpg2/step7.vue | 39 +++++++++++++++++-- .../processCenter/pages/phone/xmpg2/step8.vue | 39 +++++++++++++++++-- .../processCenter/pages/phone/xmpg2/step9.vue | 38 ++++++++++++++++-- .../pages/phone/xmqdqr/step5.vue | 1 + 17 files changed, 322 insertions(+), 36 deletions(-) diff --git a/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue index eb9ccd5fc..c16b63659 100644 --- a/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue +++ b/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue @@ -233,6 +233,7 @@ + @@ -272,6 +279,9 @@ export default { }, data() { return { + phoneshowflag: false, + phoneRoleList: [], + phoneDrawerTitle: '', //折叠的标志，true为折叠，false为不折叠 foldFormFlag: false, nodeList:[], @@ -393,11 +403,32 @@ export default { this.processStep = window.URL.createObjectURL(res.data) }) }, - //转办事件 + //转办按钮 handleTransfer(){ - this.drawerModal = true - this.drawerTitle = '转办处理人' - this.selectPeople = row + this.phoneshowflag = true + this.phoneRoleList = this.roleTransfer + this.phoneDrawerTitle = '转办处理人' + }, + //确认转办 + drawerCheck (data) { + this.roleTransfer = data + this.phoneRoleList = this.roleTransfer + this.turnLoading = true + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + assignee: data[0].id, // 被委托人 + userId: this.$store.getters.userInfo.userId, // 委托人 + pId: this.$route.query.prcId // 流程实例 + }).then(res =>{ + if (res.success) { + this.turnLoading = false + this.$message.success('调整成功') + this.$router.push("/processCenter") + } else { + this.$message.warning(res.message) + } + }) + this.modalshowflag = false }, processTable () { this.$http.get('lawss/activiti/get_list_by_instance', { diff --git a/src/pages/processCenter/pages/phone/xmpg/step5.vue b/src/pages/processCenter/pages/phone/xmpg/step5.vue index 38d939ab8..433e17aa0 100644 --- a/src/pages/processCenter/pages/phone/xmpg/step5.vue +++ b/src/pages/processCenter/pages/phone/xmpg/step5.vue @@ -321,6 +321,7 @@ + @@ -354,6 +361,9 @@ export default { }, data() { return { + phoneshowflag: false, + phoneRoleList: [], + phoneDrawerTitle: '', //折叠的标志，true为折叠，false为不折叠 foldFormFlag: false, nodeList:[], @@ -475,11 +485,32 @@ export default { this.processStep = window.URL.createObjectURL(res.data) }) }, - //转办事件 + //转办按钮 handleTransfer(){ - this.drawerModal = true - this.drawerTitle = '转办处理人' - this.selectPeople = row + this.phoneshowflag = true + this.phoneRoleList = this.roleTransfer + this.phoneDrawerTitle = '转办处理人' + }, + //确认转办 + drawerCheck (data) { + this.roleTransfer = data + this.phoneRoleList = this.roleTransfer + this.turnLoading = true + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + assignee: data[0].id, // 被委托人 + userId: this.$store.getters.userInfo.userId, // 委托人 + pId: this.$route.query.prcId // 流程实例 + }).then(res =>{ + if (res.success) { + this.turnLoading = false + this.$message.success('调整成功') + this.$router.push("/processCenter") + } else { + this.$message.warning(res.message) + } + }) + this.modalshowflag = false }, processTable () { this.$http.get('lawss/activiti/get_list_by_instance', { diff --git a/src/pages/processCenter/pages/phone/xmpg/step6.vue b/src/pages/processCenter/pages/phone/xmpg/step6.vue index 7740c6277..ff206e681 100644 --- a/src/pages/processCenter/pages/phone/xmpg/step6.vue +++ b/src/pages/processCenter/pages/phone/xmpg/step6.vue @@ -321,6 +321,7 @@ + @@ -354,6 +361,9 @@ export default { }, data() { return { + phoneshowflag: false, + phoneRoleList: [], + phoneDrawerTitle: '', //折叠的标志，true为折叠，false为不折叠 foldFormFlag: false, nodeList:[], @@ -475,11 +485,32 @@ export default { this.processStep = window.URL.createObjectURL(res.data) }) }, - //转办事件 + //转办按钮 handleTransfer(){ - this.drawerModal = true - this.drawerTitle = '转办处理人' - this.selectPeople = row + this.phoneshowflag = true + this.phoneRoleList = this.roleTransfer + this.phoneDrawerTitle = '转办处理人' + }, + //确认转办 + drawerCheck (data) { + this.roleTransfer = data + this.phoneRoleList = this.roleTransfer + this.turnLoading = true + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + assignee: data[0].id, // 被委托人 + userId: this.$store.getters.userInfo.userId, // 委托人 + pId: this.$route.query.prcId // 流程实例 + }).then(res =>{ + if (res.success) { + this.turnLoading = false + this.$message.success('调整成功') + this.$router.push("/processCenter") + } else { + this.$message.warning(res.message) + } + }) + this.modalshowflag = false }, processTable () { this.$http.get('lawss/activiti/get_list_by_instance', { diff --git a/src/pages/processCenter/pages/phone/xmpg/step7.vue b/src/pages/processCenter/pages/phone/xmpg/step7.vue index 95854a4df..671537349 100644 --- a/src/pages/processCenter/pages/phone/xmpg/step7.vue +++ b/src/pages/processCenter/pages/phone/xmpg/step7.vue @@ -321,6 +321,7 @@ + @@ -354,6 +361,9 @@ export default { }, data() { return { + phoneshowflag: false, + phoneRoleList: [], + phoneDrawerTitle: '', //折叠的标志，true为折叠，false为不折叠 foldFormFlag: false, nodeList:[], @@ -475,11 +485,32 @@ export default { this.processStep = window.URL.createObjectURL(res.data) }) }, - //转办事件 + //转办按钮 handleTransfer(){ - this.drawerModal = true - this.drawerTitle = '转办处理人' - this.selectPeople = row + this.phoneshowflag = true + this.phoneRoleList = this.roleTransfer + this.phoneDrawerTitle = '转办处理人' + }, + //确认转办 + drawerCheck (data) { + this.roleTransfer = data + this.phoneRoleList = this.roleTransfer + this.turnLoading = true + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + assignee: data[0].id, // 被委托人 + userId: this.$store.getters.userInfo.userId, // 委托人 + pId: this.$route.query.prcId // 流程实例 + }).then(res =>{ + if (res.success) { + this.turnLoading = false + this.$message.success('调整成功') + this.$router.push("/processCenter") + } else { + this.$message.warning(res.message) + } + }) + this.modalshowflag = false }, processTable () { this.$http.get('lawss/activiti/get_list_by_instance', { diff --git a/src/pages/processCenter/pages/phone/xmpg2/step10.vue b/src/pages/processCenter/pages/phone/xmpg2/step10.vue index d432ec902..54508289a 100644 --- a/src/pages/processCenter/pages/phone/xmpg2/step10.vue +++ b/src/pages/processCenter/pages/phone/xmpg2/step10.vue @@ -253,6 +253,7 @@ + @@ -283,6 +290,9 @@ export default { }, data() { return { + phoneshowflag: false, + phoneRoleList: [], + phoneDrawerTitle: '', tableIndex: 0, itemLists: [], foldFormFlag: false, @@ -366,11 +376,32 @@ export default { this.processStep = window.URL.createObjectURL(res.data) }) }, - //转办事件 + //转办按钮 handleTransfer(){ - this.drawerModal = true - this.drawerTitle = '转办处理人' - this.selectPeople = row + this.phoneshowflag = true + this.phoneRoleList = this.roleTransfer + this.phoneDrawerTitle = '转办处理人' + }, + //确认转办 + drawerCheck (data) { + this.roleTransfer = data + this.phoneRoleList = this.roleTransfer + this.turnLoading = true + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + assignee: data[0].id, // 被委托人 + userId: this.$store.getters.userInfo.userId, // 委托人 + pId: this.$route.query.prcId // 流程实例 + }).then(res =>{ + if (res.success) { + this.turnLoading = false + this.$message.success('调整成功') + this.$router.push("/processCenter") + } else { + this.$message.warning(res.message) + } + }) + this.modalshowflag = false }, // 点击查看 handlePreview(item) { diff --git a/src/pages/processCenter/pages/phone/xmpg2/step2.vue b/src/pages/processCenter/pages/phone/xmpg2/step2.vue index e204a0d68..718cc180c 100644 --- a/src/pages/processCenter/pages/phone/xmpg2/step2.vue +++ b/src/pages/processCenter/pages/phone/xmpg2/step2.vue @@ -222,6 +222,7 @@ + @@ -252,6 +259,9 @@ export default { }, data() { return { + phoneshowflag: false, + phoneRoleList: [], + phoneDrawerTitle: '', //折叠的标志，true为折叠，false为不折叠 foldFormFlag: false, nodeList:[], @@ -321,11 +331,32 @@ export default { this.processStep = window.URL.createObjectURL(res.data) }) }, - //转办事件 + //转办按钮 handleTransfer(){ - this.drawerModal = true - this.drawerTitle = '转办处理人' - this.selectPeople = row + this.phoneshowflag = true + this.phoneRoleList = this.roleTransfer + this.phoneDrawerTitle = '转办处理人' + }, + //确认转办 + drawerCheck (data) { + this.roleTransfer = data + this.phoneRoleList = this.roleTransfer + this.turnLoading = true + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + assignee: data[0].id, // 被委托人 + userId: this.$store.getters.userInfo.userId, // 委托人 + pId: this.$route.query.prcId // 流程实例 + }).then(res =>{ + if (res.success) { + this.turnLoading = false + this.$message.success('调整成功') + this.$router.push("/processCenter") + } else { + this.$message.warning(res.message) + } + }) + this.modalshowflag = false }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { diff --git a/src/pages/processCenter/pages/phone/xmpg2/step7.vue b/src/pages/processCenter/pages/phone/xmpg2/step7.vue index 4b145a6bd..e108ce432 100644 --- a/src/pages/processCenter/pages/phone/xmpg2/step7.vue +++ b/src/pages/processCenter/pages/phone/xmpg2/step7.vue @@ -253,6 +253,7 @@ + @@ -283,6 +290,9 @@ export default { }, data() { return { + phoneshowflag: false, + phoneRoleList: [], + phoneDrawerTitle: '', tableIndex: 0, itemLists: [], foldFormFlag: false, @@ -366,11 +376,32 @@ export default { this.processStep = window.URL.createObjectURL(res.data) }) }, - //转办事件 + //转办按钮 handleTransfer(){ - this.drawerModal = true - this.drawerTitle = '转办处理人' - this.selectPeople = row + this.phoneshowflag = true + this.phoneRoleList = this.roleTransfer + this.phoneDrawerTitle = '转办处理人' + }, + //确认转办 + drawerCheck (data) { + this.roleTransfer = data + this.phoneRoleList = this.roleTransfer + this.turnLoading = true + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + assignee: data[0].id, // 被委托人 + userId: this.$store.getters.userInfo.userId, // 委托人 + pId: this.$route.query.prcId // 流程实例 + }).then(res =>{ + if (res.success) { + this.turnLoading = false + this.$message.success('调整成功') + this.$router.push("/processCenter") + } else { + this.$message.warning(res.message) + } + }) + this.modalshowflag = false }, // 点击查看 handlePreview(item) { diff --git a/src/pages/processCenter/pages/phone/xmpg2/step8.vue b/src/pages/processCenter/pages/phone/xmpg2/step8.vue index 23749e457..dcaa01d54 100644 --- a/src/pages/processCenter/pages/phone/xmpg2/step8.vue +++ b/src/pages/processCenter/pages/phone/xmpg2/step8.vue @@ -253,6 +253,7 @@ + @@ -283,6 +290,9 @@ export default { }, data() { return { + phoneshowflag: false, + phoneRoleList: [], + phoneDrawerTitle: '', tableIndex: 0, itemLists: [], foldFormFlag: false, @@ -366,11 +376,32 @@ export default { this.processStep = window.URL.createObjectURL(res.data) }) }, - //转办事件 + //转办按钮 handleTransfer(){ - this.drawerModal = true - this.drawerTitle = '转办处理人' - this.selectPeople = row + this.phoneshowflag = true + this.phoneRoleList = this.roleTransfer + this.phoneDrawerTitle = '转办处理人' + }, + //确认转办 + drawerCheck (data) { + this.roleTransfer = data + this.phoneRoleList = this.roleTransfer + this.turnLoading = true + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + assignee: data[0].id, // 被委托人 + userId: this.$store.getters.userInfo.userId, // 委托人 + pId: this.$route.query.prcId // 流程实例 + }).then(res =>{ + if (res.success) { + this.turnLoading = false + this.$message.success('调整成功') + this.$router.push("/processCenter") + } else { + this.$message.warning(res.message) + } + }) + this.modalshowflag = false }, // 点击查看 handlePreview(item) { diff --git a/src/pages/processCenter/pages/phone/xmpg2/step9.vue b/src/pages/processCenter/pages/phone/xmpg2/step9.vue index 02ce9a886..74ed2d19f 100644 --- a/src/pages/processCenter/pages/phone/xmpg2/step9.vue +++ b/src/pages/processCenter/pages/phone/xmpg2/step9.vue @@ -262,6 +262,12 @@ @submit="handleSubmit" > + @@ -283,6 +289,9 @@ export default { }, data() { return { + phoneshowflag: false, + phoneRoleList: [], + phoneDrawerTitle: '', tableIndex: 0, itemLists: [], foldFormFlag: false, @@ -366,11 +375,32 @@ export default { this.processStep = window.URL.createObjectURL(res.data) }) }, - //转办事件 + //转办按钮 handleTransfer(){ - this.drawerModal = true - this.drawerTitle = '转办处理人' - this.selectPeople = row + this.phoneshowflag = true + this.phoneRoleList = this.roleTransfer + this.phoneDrawerTitle = '转办处理人' + }, + //确认转办 + drawerCheck (data) { + this.roleTransfer = data + this.phoneRoleList = this.roleTransfer + this.turnLoading = true + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + assignee: data[0].id, // 被委托人 + userId: this.$store.getters.userInfo.userId, // 委托人 + pId: this.$route.query.prcId // 流程实例 + }).then(res =>{ + if (res.success) { + this.turnLoading = false + this.$message.success('调整成功') + this.$router.push("/processCenter") + } else { + this.$message.warning(res.message) + } + }) + this.modalshowflag = false }, // 点击查看 handlePreview(item) { diff --git a/src/pages/processCenter/pages/phone/xmqdqr/step5.vue b/src/pages/processCenter/pages/phone/xmqdqr/step5.vue index 4a5dbcc55..b2f7d9514 100644 --- a/src/pages/processCenter/pages/phone/xmqdqr/step5.vue +++ b/src/pages/processCenter/pages/phone/xmqdqr/step5.vue @@ -251,6 +251,7 @@ Date: Wed, 22 Dec 2021 20:53:20 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=BD=AC?= =?UTF-8?q?=E5=8A=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/phone/xmpg2/step11.vue | 40 ++++++++++++++++--- .../pages/phone/xmpg2/step12.vue | 39 ++++++++++++++++-- 2 files changed, 70 insertions(+), 9 deletions(-) diff --git a/src/pages/processCenter/pages/phone/xmpg2/step11.vue b/src/pages/processCenter/pages/phone/xmpg2/step11.vue index 44cd9f7d0..09769f66a 100644 --- a/src/pages/processCenter/pages/phone/xmpg2/step11.vue +++ b/src/pages/processCenter/pages/phone/xmpg2/step11.vue @@ -252,15 +252,21 @@ + @@ -282,6 +288,9 @@ export default { }, data() { return { + phoneshowflag: false, + phoneRoleList: [], + phoneDrawerTitle: '', tableIndex: 0, itemLists: [], foldFormFlag: false, @@ -365,11 +374,32 @@ export default { this.processStep = window.URL.createObjectURL(res.data) }) }, - //转办事件 + //转办按钮 handleTransfer(){ - this.drawerModal = true - this.drawerTitle = '转办处理人' - this.selectPeople = row + this.phoneshowflag = true + this.phoneRoleList = this.roleTransfer + this.phoneDrawerTitle = '转办处理人' + }, + //确认转办 + drawerCheck (data) { + this.roleTransfer = data + this.phoneRoleList = this.roleTransfer + this.turnLoading = true + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + assignee: data[0].id, // 被委托人 + userId: this.$store.getters.userInfo.userId, // 委托人 + pId: this.$route.query.prcId // 流程实例 + }).then(res =>{ + if (res.success) { + this.turnLoading = false + this.$message.success('调整成功') + this.$router.push("/processCenter") + } else { + this.$message.warning(res.message) + } + }) + this.modalshowflag = false }, // 点击查看 handlePreview(item) { diff --git a/src/pages/processCenter/pages/phone/xmpg2/step12.vue b/src/pages/processCenter/pages/phone/xmpg2/step12.vue index 51ec62dcf..75ade023f 100644 --- a/src/pages/processCenter/pages/phone/xmpg2/step12.vue +++ b/src/pages/processCenter/pages/phone/xmpg2/step12.vue @@ -253,6 +253,7 @@ + @@ -283,6 +290,9 @@ export default { }, data() { return { + phoneshowflag: false, + phoneRoleList: [], + phoneDrawerTitle: '', tableIndex: 0, itemLists: [], foldFormFlag: false, @@ -366,11 +376,32 @@ export default { this.processStep = window.URL.createObjectURL(res.data) }) }, - //转办事件 + //转办按钮 handleTransfer(){ - this.drawerModal = true - this.drawerTitle = '转办处理人' - this.selectPeople = row + this.phoneshowflag = true + this.phoneRoleList = this.roleTransfer + this.phoneDrawerTitle = '转办处理人' + }, + //确认转办 + drawerCheck (data) { + this.roleTransfer = data + this.phoneRoleList = this.roleTransfer + this.turnLoading = true + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + assignee: data[0].id, // 被委托人 + userId: this.$store.getters.userInfo.userId, // 委托人 + pId: this.$route.query.prcId // 流程实例 + }).then(res =>{ + if (res.success) { + this.turnLoading = false + this.$message.success('调整成功') + this.$router.push("/processCenter") + } else { + this.$message.warning(res.message) + } + }) + this.modalshowflag = false }, // 点击查看 handlePreview(item) { From 4f706d43a803be94c1c292f34b657a31596ca4d9 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 22 Dec 2021 21:00:56 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BA=93=20-=20=E5=88=86?= =?UTF-8?q?=E8=A7=A3=E5=8D=95=E7=BC=96=E8=BE=91=20-=20=E9=80=82=E7=94=A8?= =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E4=B8=8B=E6=8B=89=E6=A1=86=E5=A4=9A=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../details/otherStandardDetails/index.vue | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index c0dd20f61..30fd8caf5 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -901,16 +901,14 @@ - - + import PutQuestionButton from '@/components/PutQuestionButton' import CustomSVPPS from '@/components/CustomFormComponents/SVPPS' +import CustomSelectArray from '@/components/CustomFormComponents/SelectArray' import CustomOrg from '@/components/CustomFormComponents/OrgTree' import {dateFormat} from '@/common/date' import RelatedTermsSelect from './components/RelatedTermsSelect' @@ -1577,6 +1576,7 @@ export default { components: { PutQuestionButton, CustomSVPPS, + CustomSelectArray, CustomOrg, RelatedTermsSelect }, @@ -1760,7 +1760,10 @@ export default { ZRBM: '', FO: '' }, - applyArcticOptions: [], // 适用车辆类型下拉框 + applyArcticOptions: { + attrName: '适用车型', + options:[] + }, // 适用车辆类型下拉框 emergyKindOptions: [], // 能源种类下拉框 requestOptions: [], BZFGGXOUIUJ: [], // 企标覆盖关系 @@ -2533,6 +2536,7 @@ export default { if (typeof this.resolveListForm.zccssrq !== 'string'){ this.resolveListForm.zccssrq = this.resolveListForm.zccssrq.join(',') } + this.resolveListForm.applyArctic = this.resolveListForm.applyArctic.join(',') this.$http.putData( 'SarStandItems/sar-stand-items/updateSarItemAndInterpretation', this.resolveListForm, @@ -3365,7 +3369,7 @@ export default { this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this }, res => { - this.applyArcticOptions = res.data.ENERGYTYPES // 根据需求文档，产品类别对应标准属性中的“适用车辆类型” + this.applyArcticOptions.options = res.data.ENERGYTYPES // 根据需求文档，产品类别对应标准属性中的“适用车辆类型” this.emergyKindOptions = res.data.ENERGYTYPES this.requestOptions = res.data.REQUESTTYPE this.BZFGGXOUIUJ = res.data.BZFGGXOUIUJ // 企标覆盖关系 From 08d23af5b6b9657bea6badebd9810d78b78d62c0 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 22 Dec 2021 21:13:51 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BA=93=20-=20=E5=88=86?= =?UTF-8?q?=E8=A7=A3=E5=8D=95=E7=BC=96=E8=BE=91=20-=20=E8=B4=A3=E4=BB=BB?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=B8=88=E7=94=A8=E6=A0=91=E5=BD=A2=E6=9E=B6?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../details/otherStandardDetails/index.vue | 102 ++++++++++++++++-- 1 file changed, 91 insertions(+), 11 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 30fd8caf5..33ac7800b 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -909,16 +909,30 @@ v-model="resolveListForm.applyArctic" > - - - + + + + + + + + + + + + + + + { + // if (item.hasChild === '0' && item.children === null) { + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id + nameList += item.name + // } + }) + if (this.drawerTitle === '责任部门'){ + this.sarStandardsInfoEO.ZRBMId = idList; + this.sarStandardsInfoEO['ZRBM'] = nameList; + }else if (this.drawerTitle === '查询责任部门'){ + this.advanceSearchMapping['ZRBM'] = nameList + } + }, + choiceZRRS (type, title, id) { + console.log('2077',type, title, id) + this.nodeList = [] + this.nodeList.push(id) + this.userType = type + this.drawerTitle = title + this.modalShowRoleFlag = true + }, + checkedRole2 (data) { + console.log('1712',this.drawerTitle) + let idList = '' + let nameList = '' + data.forEach( item => { + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id + nameList += item.name + }) + if (this.drawerTitle === '查询责任工程师'){ + this.resolveListForm.dutyEngineer = nameList + } + + }, select(selection, row) { // 清除 所有勾选项 this.$refs.multipleTable.clearSelection() @@ -2536,7 +2614,9 @@ export default { if (typeof this.resolveListForm.zccssrq !== 'string'){ this.resolveListForm.zccssrq = this.resolveListForm.zccssrq.join(',') } - this.resolveListForm.applyArctic = this.resolveListForm.applyArctic.join(',') + if (typeof this.resolveListForm.applyArctic !== 'string'){ + this.resolveListForm.applyArctic = this.resolveListForm.applyArctic.join(',') + } this.$http.putData( 'SarStandItems/sar-stand-items/updateSarItemAndInterpretation', this.resolveListForm, From 47b8c59f3025fe6ef9a91f696802f440786612c1 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 22 Dec 2021 21:29:02 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BA=93=20-=20=E5=88=86?= =?UTF-8?q?=E8=A7=A3=E5=8D=95=E7=BC=96=E8=BE=91=20-=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../details/otherStandardDetails/index.vue | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 33ac7800b..3706a9596 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -875,8 +875,9 @@ type="dates" value-format="yyyy-MM-dd" style="width: 45%" + prefix-icon="none" v-model="resolveListForm.xccssrq" - placeholder="选择一个或多个日期"> + placeholder="请选择新车型实施日期"> @@ -891,9 +892,10 @@ + placeholder="请选择在产车实施日期"> @@ -918,7 +920,7 @@ class="add-form-item" > - @@ -958,7 +960,7 @@ /> -