From 0f43773caf6ffd6832b95997bf1fb029fdb30a87 Mon Sep 17 00:00:00 2001 From: zhangyanduan Date: Thu, 30 Jun 2022 17:10:45 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B5=B7=E5=A4=96?= =?UTF-8?q?=E6=A0=87=E5=87=86=E4=B8=AD=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=B9=B4=E4=BB=BD=E6=98=BE=E7=A4=BA=E6=A8=AA?= =?UTF-8?q?=E7=BA=BF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreignStandardsAndRegulations/index.vue | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 399185dba..ffc259728 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -197,19 +197,24 @@ width="150" > Date: Thu, 30 Jun 2022 17:20:02 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B5=B7=E5=A4=96?= =?UTF-8?q?=E6=A0=87=E5=87=86=E4=B8=AD=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=B9=B4=E4=BB=BD=E6=98=BE=E7=A4=BA=E6=A8=AA?= =?UTF-8?q?=E7=BA=BF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreignStandardsAndRegulations/index.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index ffc259728..1067b3dae 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -203,6 +203,9 @@ {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }} + + {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }} + {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }} @@ -212,6 +215,9 @@ {{ scope.row.standSortShow }} {{ scope.row.standNumber }} + + {{ scope.row.standSortShow }} {{ scope.row.standNumber }} + {{ scope.row.standSortShow }} {{ scope.row.standNumber }} From ded47baeea094f4bff44749f38f9a655fb66fe93 Mon Sep 17 00:00:00 2001 From: zyd Date: Thu, 30 Jun 2022 17:43:59 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix:=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreignStandardsAndRegulations/index.vue | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 1067b3dae..192491223 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -236,6 +236,9 @@ {{ scope.row.standName }} + {{ + scope.row.standName + }} {{ scope.row.standName }} @@ -254,6 +257,9 @@ {{ scope.row.standEnName }} + {{ + scope.row.standEnName + }} {{ scope.row.standEnName }} @@ -271,6 +277,9 @@
{{ formatIssueDate(scope.row.issueTime) }}
+
+ {{ formatIssueDate(scope.row.issueTime) }} +
{{ formatIssueDate(scope.row.issueTime) }}
@@ -288,6 +297,9 @@ {{ scope.row.SSRQ }} + {{ + scope.row.SSRQ + }} {{ scope.row.SSRQ }} @@ -303,6 +315,9 @@ {{ scope.row.XCXSSRQ }} + {{ + scope.row.XCXSSRQ + }} {{ scope.row.XCXSSRQ }} @@ -319,6 +334,9 @@ {{ scope.row.ZCCSSRQ }} + {{ + scope.row.ZCCSSRQ + }} {{ scope.row.ZCCSSRQ }} @@ -340,6 +358,9 @@ {{ textStatusMap[scope.row.textStatus] }} + {{ + textStatusMap[scope.row.textStatus] + }} {{ textStatusMap[scope.row.textStatus] }} From cd442b280fa909fe6b0359ca2146df5c5b9f52e1 Mon Sep 17 00:00:00 2001 From: zhaoxianhui <1994861028@qq.com> Date: Fri, 1 Jul 2022 13:42:18 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E3=80=90WELINK=E3=80=91=E6=A0=87=E5=87=86?= =?UTF-8?q?=E8=B0=83=E7=A0=94=E6=B5=81=E7=A8=8B=20=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=88=86=E5=8F=91=E8=8A=82=E7=82=B9=20=E8=BD=AC=E5=8A=9E?= =?UTF-8?q?=E5=90=8E=20=E9=A1=B5=E9=9D=A2=E6=B2=A1=E9=80=80=E5=9B=9EBug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/phone/bzdy/step2.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pages/processCenter/pages/phone/bzdy/step2.vue b/src/pages/processCenter/pages/phone/bzdy/step2.vue index d3882d6dc..405de4a03 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step2.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step2.vue @@ -108,6 +108,7 @@ import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' import {inboundLiaisonDetail,processCreateStand,saveTaskForPub,changeAssigneeNew} from 'api/process' + import hwh5 from '@/api/hwh5-cloudonline.js' import axios from "axios"; export default { @@ -170,6 +171,7 @@ this.drawerModal = false this.$message.success('调整成功') this.processNum() + hwh5.close() this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } else { this.$message.warning(res.message) @@ -258,6 +260,7 @@ }, {}, res => { if (res.success) { this.$message.success('提交成功') + hwh5.close() this.$router.push('/processCenter') } this.isSubmit = false From d2af044c34b51a83666a3d1fd835cbe478aa4274 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Fri, 1 Jul 2022 14:35:57 +0800 Subject: [PATCH 5/6] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20bug?= =?UTF-8?q?=20#56143=20=E4=BC=81=E6=A0=87=E7=9B=B8=E5=85=B3--=20=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E4=BA=BA=E5=91=98=E5=90=8E=E5=B8=A6=E5=85=A5=E7=9A=84?= =?UTF-8?q?=E8=B5=B7=E8=8D=89=E8=B4=A3=E4=BB=BB=E5=8D=95=E4=BD=8D=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E4=B8=89=E7=BA=A7=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/roleTree/index.vue | 3 ++- .../pages/creatProcess/qbfs/step4.vue | 4 ++-- .../pages/creatProcess/qbfs/stepC4.vue | 12 ++++++------ .../pages/creatProcess/qbrk-product/step1.vue | 6 ++++-- .../pages/creatProcess/qbrk-product/step13.vue | 17 +++++++++++++++++ .../pages/creatProcess/qbrk-product/step3.vue | 6 ++++-- .../pages/creatProcess/qbrk-product/step6.vue | 6 ++++-- .../pages/creatProcess/qbrk-product/stepC3.vue | 6 ++++-- .../pages/creatProcess/qbrk-product/stepC6.vue | 6 ++++-- .../pages/creatProcess/qbrk/step1.vue | 7 ++++--- .../pages/creatProcess/qbrk/step13.vue | 16 ++++++++++++++++ .../pages/creatProcess/qbrk/step3.vue | 4 ++-- .../pages/creatProcess/qbrk/step6.vue | 4 ++-- .../pages/creatProcess/qbrk/stepC1.vue | 12 ++++++++++++ .../pages/creatProcess/qbrk/stepC3.vue | 4 ++-- .../pages/creatProcess/qbrk/stepC6.vue | 4 ++-- .../qbzxdjhgk/component/establish.vue | 8 ++++---- .../pages/creatProcess/qbzxdlx/step1.vue | 4 ++-- .../pages/creatProcess/qbzxdlx/step2.vue | 4 ++-- .../enterpriseStandardPlan/index.vue | 4 ++-- 20 files changed, 97 insertions(+), 40 deletions(-) diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue index 951b77249..e6a1e0880 100644 --- a/src/components/roleTree/index.vue +++ b/src/components/roleTree/index.vue @@ -308,7 +308,8 @@ } }) this.$http.get('SarInstitution/institution/getNextById', { - ids: ids + ids: ids, + topNum: 3, }, { _this: this }, res => { diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue index 8069a53e0..7778e27b6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue @@ -321,8 +321,8 @@ export default { this.formKey++ } if(data && data.length > 0){ - const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",") - const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",") + const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",") + const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",") this.qbfsForm.QCDWID = institutionIdList this.qbfsForm.QCDW = institutionNameList } diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue index 9bad3576c..567354376 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue @@ -316,12 +316,12 @@ export default { this.qbfsForm.QCRBUSS=nameList; this.formKey++ } - if(data !== undefined && data && data.length > 0){ - const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",") - const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",") - this.qbfsForm.QCDWID = institutionIdList - this.qbfsForm.QCDW = institutionNameList - } + if(data && data.length > 0){ + const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",") + const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",") + this.qbfsForm.QCDWID = institutionIdList + this.qbfsForm.QCDW = institutionNameList + } this.modalShowRoleFlag = false }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index 8cdd2205c..ab0ff19ee 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -1868,11 +1868,13 @@ } if(data && data.length > 0){ - const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",") - const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",") + const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",") + const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",") this.form.QCDWID = institutionIdList this.form.QCDW = institutionNameList } + + this.modalShowRoleFlag = false }, checkedRole (data) { if (this.type === 0) { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index f57b8db63..0e9745896 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -1340,7 +1340,24 @@ }else if(this.userType === 'hqUserId'){ this.roleForm.hqUserId=idList; this.roleForm.hqUserName=nameList; + }else if(this.userType === 'QCRBUSS'){ + this.form.QCRBUSSID=idList; + this.form.QCRBUSS=nameList; + this.formKey++ } + + if(data && data.length > 0){ + const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",") + const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",") + this.form.QCDWID = institutionIdList + this.form.QCDW = institutionNameList + } + + this.modalShowRoleFlag = false + }, + unique(newArr) { + const res = new Map(); + return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1)); }, checkedRole (data) { if (this.type === 0) { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue index 7a3eb350e..afa08139b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -1397,11 +1397,13 @@ } if(data && data.length > 0){ - const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",") - const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",") + const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",") + const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",") this.form.QCDWID = institutionIdList this.form.QCDW = institutionNameList } + + this.modalShowRoleFlag = false }, unique(newArr) { const res = new Map(); diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue index 70834da99..6d08b7c77 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -1485,11 +1485,13 @@ } if(data && data.length > 0){ - const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",") - const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",") + const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",") + const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",") this.form.QCDWID = institutionIdList this.form.QCDW = institutionNameList } + + this.modalShowRoleFlag = false }, unique(newArr) { const res = new Map(); diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue index 5ec58d3af..12889b35d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue @@ -1398,11 +1398,13 @@ } if(data && data.length > 0){ - const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",") - const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",") + const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",") + const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",") this.form.QCDWID = institutionIdList this.form.QCDW = institutionNameList } + + this.modalShowRoleFlag = false }, unique(newArr) { const res = new Map(); diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue index 882b4b85a..037674c80 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue @@ -1495,11 +1495,13 @@ } if(data && data.length > 0){ - const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",") - const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",") + const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",") + const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",") this.form.QCDWID = institutionIdList this.form.QCDW = institutionNameList } + + this.modalShowRoleFlag = false }, unique(newArr) { const res = new Map(); diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 531523a04..43a95ddc1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -1790,9 +1790,10 @@ this.roleForm.bzUserName = nameList } - if(data !== undefined && data && data.length > 0){ - const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",") - const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",") + if(data && data.length > 0){ + console.log(data) + const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",") + const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",") this.form.QCDWID = institutionIdList this.form.QCDW = institutionNameList } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index b84238721..b3ad5f10f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -1378,7 +1378,23 @@ }else if(this.userType === 'hqUserId'){ this.roleForm.hqUserId=idList; this.roleForm.hqUserName=nameList; + }else if(this.userType === 'QCRBUSS'){ + this.form.QCRBUSSID=idList; + this.form.QCRBUSS=nameList; + this.formKey++ } + if(data !== undefined && data && data.length > 0){ + const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",") + const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",") + this.form.QCDWID = institutionIdList + this.form.QCDW = institutionNameList + } + + this.modalShowRoleFlag = false + }, + unique(newArr) { + const res = new Map(); + return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1)); }, checkedRole (data) { if (this.type === 0) { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue index 7f1b07def..1a3857e00 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue @@ -1433,8 +1433,8 @@ this.formKey++ } if(data !== undefined && data && data.length > 0){ - const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",") - const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",") + const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",") + const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",") this.form.QCDWID = institutionIdList this.form.QCDW = institutionNameList } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue index d6f4c86a0..30fa57398 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue @@ -1768,8 +1768,8 @@ this.formKey++ } if(data !== undefined && data && data.length > 0){ - const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",") - const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",") + const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",") + const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",") this.form.QCDWID = institutionIdList this.form.QCDW = institutionNameList } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue index a355675ef..f81cc7ba9 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue @@ -1640,6 +1640,18 @@ this.roleForm.bzUserId = idList this.roleForm.bzUserName = nameList } + if(data && data.length > 0){ + console.log(data) + const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",") + const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",") + this.form.QCDWID = institutionIdList + this.form.QCDW = institutionNameList + } + this.modalShowRoleFlag = false + }, + unique(newArr) { + const res = new Map(); + return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1)); }, checkedRole (data) { if (this.type === 0) { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue index d0440fca4..d215e44f0 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue @@ -1421,8 +1421,8 @@ this.formKey++ } if(data !== undefined && data && data.length > 0){ - const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",") - const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",") + const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",") + const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",") this.form.QCDWID = institutionIdList this.form.QCDW = institutionNameList } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue index e9b7cc330..3bf2284f8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue @@ -1767,8 +1767,8 @@ this.formKey++ } if(data !== undefined && data && data.length > 0){ - const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",") - const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",") + const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",") + const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",") this.form.QCDWID = institutionIdList this.form.QCDW = institutionNameList } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index f33243c47..6f3786354 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -856,8 +856,8 @@ export default { let idList = "", nameList = "" let unitList = "", unitNameList = "" data.forEach(item => { - unList.push(item.institutionName) - uidList.push(item.institutionId) + unList.push(item.topUnit) + uidList.push(item.topUnitId) if (nameList.length) { nameList += ","; idList += ","; @@ -866,8 +866,8 @@ export default { } idList += item.id; nameList += item.name; - unitList += item.institutionId - unitNameList += item.institutionName + unitList += item.topUnit + unitNameList += item.topUnitId }); let unNameList = [] let unIdList = [] diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue index b807dce55..b8f46ee97 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue @@ -717,8 +717,8 @@ export default { } idList += item.id; nameList += item.name; - unitList += item.institutionId - unitNameList += item.institutionName + unitList += item.topUnitId + unitNameList += item.topUnit }); if(this.roleType === '1'){ this.$set(this.addQblxData, 'drafter', idList) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue index b21ed321d..79b565e5b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue @@ -1254,8 +1254,8 @@ export default { } idList += item.id; nameList += item.name; - unitList += item.institutionId - unitNameList += item.institutionName + unitList += item.topUnitId + unitNameList += item.topUnit }); if(this.roleType === '1'){ this.$set(this.qbfsForm, 'drafter', idList) diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index 2a38bff64..9d395de3a 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -1111,8 +1111,8 @@ } idList += item.id nameList += item.name - bmIdList += item.institutionId - bmNameList += item.institutionName + bmIdList += item.topUnitId + bmNameList += item.topUnit }) if (this.type === 'resPerson') { this.addForm.resPerson = idList From ec0dbcc0be0a7fb95a66f0924a058ed202b3f75b Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 1 Jul 2022 16:13:52 +0800 Subject: [PATCH 6/6] =?UTF-8?q?bug=20=20=E6=B5=81=E7=A8=8B=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E4=B8=8A=20=E5=8A=A0=E4=B8=8A=E6=88=AA=E6=AD=A2?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/xmpg/step2.vue | 9 +++++++++ .../processCenter/pages/creatProcess/xmpg/step3.vue | 9 +++++++++ .../processCenter/pages/creatProcess/xmpg/step4.vue | 9 +++++++++ 3 files changed, 27 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index 4a13e5943..22145f398 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -22,6 +22,15 @@ + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index ef7a2600f..e6c2483d2 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -36,6 +36,15 @@ clearable > + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index 7d3410827..89dc03251 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -36,6 +36,15 @@ clearable > + + + +