From fc129d6f40c6a457139605ebc14dfbcc5f32b216 Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Tue, 29 Mar 2022 14:12:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052192=20=E4=BC=81?= =?UTF-8?q?=E6=A0=87=E5=88=B6=E4=BF=AE=E8=AE=A2=E8=AE=A1=E5=88=92=E7=AE=A1?= =?UTF-8?q?=E6=8E=A7--=E5=90=88=E5=B9=B6=EF=BC=8C=E9=80=89=E8=AF=84?= =?UTF-8?q?=E5=AE=A1=E8=B4=A3=E4=BB=BB=E4=BA=BA=EF=BC=8C=E7=82=B9=E7=A1=AE?= =?UTF-8?q?=E5=AE=9A=E6=B2=A1=E6=9C=89=E5=9B=9E=E6=98=BE=EF=BC=88=E8=B5=B7?= =?UTF-8?q?=E8=8D=89=E4=BA=BA=E4=B9=9F=E8=BF=99=E6=A0=B7=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbzxdjhgk/component/merge.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index beb0960e6..6bf09993a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -680,6 +680,8 @@ export default { reviewer: "", draftTime: "", isSubTime: "", + resPerson: "", // 评审责任人 + drafter: "", // 起草人 planStatus: "0", mergeReason: "", company: "", @@ -988,12 +990,12 @@ export default { unIdList.push(item) } }) - if(this.roleType === '1'){ + if(this.type === '1'){ this.$set(this.qbfsForm, 'drafter', idList) this.$set(this.qbfsForm, 'drafterName', nameList) this.$set(this.qbfsForm, 'unit', unIdList.join(',')) this.$set(this.qbfsForm, 'unitName', unNameList.join(',')) - }else if(this.roleType === '2'){ + }else if(this.type === '2'){ this.$set(this.qbfsForm, 'resPerson', idList) this.$set(this.qbfsForm, 'resPersonName', nameList) } From ae0d7455346793eed163c36834e6da1ede3ea436 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 29 Mar 2022 14:45:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AD=97=E6=AE=B5=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step2.vue | 6 ++ .../pages/creatProcess/bzrk/step4.vue | 55 ++++++++++++------- 2 files changed, 41 insertions(+), 20 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index fde11ae9b..2fa77ea9c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -1169,8 +1169,14 @@ export default { * @description: 动态表单读取 */ getFormFieldList(item) { + console.log(item); this.$nextTick(() => { this.form = JSON.parse(JSON.stringify(item)) + console.log(this.form); + this.form.sycpx = this.form.sycpx.split(',') + this.form.nylx = this.form.nylx.split(',') + this.form.cllx = this.form.cllx.split(',') + this.form.syrz = this.form.syrz.split(',') this.defaultCheckedKeys = [this.form.standSystem] this.defaultCheckedKeys1 = [this.form.cycvppsbm] this.defaultCheckedKeys2 = [this.form.kccvppsbm] diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 90f4868cf..5109f1d53 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -1656,6 +1656,7 @@ export default { validFlag: '0', menuId: 'nomenu' }, + loading: false, replaceLawsNumRow: [], // 代替政策号 数组内容 replaceTotal: 0, selectedListRep: [], @@ -1848,11 +1849,9 @@ export default { if (val === '1') { this.rules.standName[0].required = false this.rules.standEnName[0].required = true; - this.rules.standNature[0].required = false } else { this.rules.standName[0].required = true this.rules.standNature[0].required = true - this.rules.standEnName[0].required = false; } this.standardSearchForm.standType = val === '0' ? 'INLAND' : 'FOREIGN' }, @@ -2607,31 +2606,49 @@ export default { /** * @description: 动态表单读取 */ + // getFormFieldList(item) { + // this.$nextTick(() => { + // this.form = JSON.parse(JSON.stringify(item)) + // this.defaultCheckedKeys = [this.form.standSystem]; + // this.defaultCheckedKeys1 = [this.form.cycvppsbm]; + // this.defaultCheckedKeys2 = [this.form.kccvppsbm]; + // this.defaultCheckedKeys3 = [this.form.dybxh]; + // this.treeCheckedKeys = this.form.treeListId.split(',') + // this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' + // this.form.standYear = this.form.standYear ? this.form.standYear : '' + // this.form.prcNum = this.prcNum + // this.form.prcName = this.prcName + // this.form['id'] = item.id + // + // + // // 遍历对象 + // for (const p in this.form) { + // if (typeof (this.form[p]) != "function") { + // this.initializeFileList(p, this.form[p]); + // } + // } + // + // this.$forceUpdate() + // }) + // }, getFormFieldList(item) { this.$nextTick(() => { this.form = JSON.parse(JSON.stringify(item)) - this.defaultCheckedKeys = [this.form.standSystem]; - this.defaultCheckedKeys1 = [this.form.cycvppsbm]; - this.defaultCheckedKeys2 = [this.form.kccvppsbm]; - this.defaultCheckedKeys3 = [this.form.dybxh]; - this.treeCheckedKeys = this.form.treeListId.split(',') + this.defaultCheckedKeys = [this.form.standSystem] + this.defaultCheckedKeys1 = [this.form.cycvppsbm] + this.defaultCheckedKeys2 = [this.form.kccvppsbm] + this.defaultCheckedKeys3 = [this.form.dybxh] this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' this.form.standYear = this.form.standYear ? this.form.standYear : '' + if (this.form.country !== undefined && this.form.country !== null && this.form.country !== '') { + this.form.country = this.form.country.split(","); + } this.form.prcNum = this.prcNum this.form.prcName = this.prcName this.form['id'] = item.id - - - // 遍历对象 - for (const p in this.form) { - if (typeof (this.form[p]) != "function") { - this.initializeFileList(p, this.form[p]); - } - } - - this.$forceUpdate() }) - }, initializeFileList(property, value) { + }, + initializeFileList(property, value) { switch (property) { case 'xgd': this.getFileList(value, this.xgdFileList); @@ -2939,11 +2956,9 @@ export default { if (this.form.standInData === '1') { this.rules.standYear[0].required = false; this.rules.standName[0].required = false - this.rules.standNature[0].required = false } else { this.rules.standYear[0].required = true; this.rules.standName[0].required = true - this.rules.standNature[0].required = true } } }, From 281d4858c80fa3a8faefd2c4754e0bf7534e3491 Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Tue, 29 Mar 2022 15:00:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052187=20=E5=9B=BD?= =?UTF-8?q?=E5=86=85=EF=BC=8C=E6=B5=B7=E5=A4=96=E5=BA=93=EF=BC=8C=E4=BC=81?= =?UTF-8?q?=E6=A0=87=E5=BA=93=20=E5=8F=91=E5=B8=83=E7=A8=BF=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E9=99=84=E4=BB=B6=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=8D=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/otherBussStandardDetails/index.vue | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index 4a88f9d6e..cdc08821f 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -354,9 +354,10 @@

{{ sarStandardsInfoEO.standCode }}