From 49976f8a7544efe89d00c522c166987113d2a0a9 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 1 Mar 2022 15:28:16 +0800 Subject: [PATCH 1/3] commit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 3 ++- src/pages/processCenter/pages/creatProcess/bzrk/step4.vue | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index e00ae2275..df1744eb1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -2712,7 +2712,8 @@ export default { this.replaceLawsNumForm.quoteIdList = '' } if(this.replaceLawType === 'cbbh') { - this.replaceLawsNumForm.standType = 'FOREIGN' + this.replaceLawsNumForm.standType = '' + // this.replaceLawsNumForm.standType = 'FOREIGN' } else { this.replaceLawsNumForm.standType = '' // this.form.standInData === '1' ? 'FOREIGN' : 'INLAND' } diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 950d566a0..231233b99 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -2168,7 +2168,8 @@ export default { this.replaceLawsNumForm.quoteIdList = '' } if (this.replaceLawType === 'cbbh') { - this.replaceLawsNumForm.standType = 'FOREIGN' + this.replaceLawsNumForm.standType = '' + // this.replaceLawsNumForm.standType = 'FOREIGN' } else { this.replaceLawsNumForm.standType = '' // this.form.standInData === '1' ? 'FOREIGN' : 'INLAND' } From 9e6d8ca4e8f4b7aba84baeff0ca3941c24037875 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 1 Mar 2022 16:02:11 +0800 Subject: [PATCH 2/3] commit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index df1744eb1..014adfead 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -99,7 +99,6 @@ > - @@ -2230,6 +2229,11 @@ export default { }, res => { if (res && res.data) { const bringData = res.data + if (res.data.country) { + res.data.country = res.data.country.split(','); + } else { + res.data.country = [] + } bringData.txlb = '' bringData.signFlag = this.form.signFlag && this.form.signFlag != '' ? this.form.signFlag : '0' bringData.standInData = this.form.standInData && this.form.standInData != '' ? this.form.standInData : '0' @@ -2271,7 +2275,6 @@ export default { } } }) - } else if (this.standardCheckedList.length > 1) { this.$message.warning('最多可以带入一条标准信息') } else { @@ -3388,6 +3391,7 @@ export default { }) this.busVsFunc() this.modelFunc() + } } From f78cc7201b564c2906ca27f380de969956633bd1 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, 1 Mar 2022 16:28:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qbzxdjhgk/component/cancel.vue | 36 +++++++++--------- .../qbzxdjhgk/component/delay.vue | 36 +++++++++--------- .../qbzxdjhgk/component/establish.vue | 22 +++++------ .../qbzxdjhgk/component/merge.vue | 38 +++++++++---------- .../qbzxdjhgk/component/rename.vue | 36 +++++++++--------- .../pages/creatProcess/qbzxdjhgk/step1-5.vue | 22 +++++------ .../pages/creatProcess/qbzxdjhgk/step2.vue | 22 +++++------ .../pages/creatProcess/qbzxdjhgk/step3.vue | 22 +++++------ .../pages/creatProcess/qbzxdjhgk/step4.vue | 22 +++++------ .../pages/creatProcess/qbzxdjhgk/step5.vue | 22 +++++------ 10 files changed, 139 insertions(+), 139 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index 3929de539..4d36599a6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -47,6 +47,17 @@ + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index 7617ca8c8..3f0280a71 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -70,6 +70,17 @@ + + + + + + - - - @@ -148,17 +151,6 @@ placeholder="请选择标准发布时间"> - - - - - - + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue index 9e7431fed..c93a389fb 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue @@ -46,6 +46,17 @@ + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - -