From a429ac06aeae4a369f74c223a9841a7334895b35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sat, 26 Mar 2022 15:08:35 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomFormComponents/InputForAllStandards2.vue | 13 +++++++------ .../pages/creatProcess/bzdy/step1-1.vue | 4 ++-- .../processCenter/pages/creatProcess/bzdy/step1.vue | 4 ++-- .../processCenter/pages/creatProcess/bzdy/step2.vue | 4 ++-- .../processCenter/pages/creatProcess/bzdy/step3.vue | 4 ++-- .../processCenter/pages/creatProcess/bzdy/step4.vue | 4 ++-- .../creatProcess/qbzxdjhgk/component/establish.vue | 2 +- 7 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/components/CustomFormComponents/InputForAllStandards2.vue b/src/components/CustomFormComponents/InputForAllStandards2.vue index d21d8e051..1ae78d471 100644 --- a/src/components/CustomFormComponents/InputForAllStandards2.vue +++ b/src/components/CustomFormComponents/InputForAllStandards2.vue @@ -310,12 +310,13 @@ type: 'warning' }) } - if (this.selectedListRep.length + textArr.length > 20) { - return this.$message({ - message: '代替标准号最多选择20项', - type: 'warning' - }) - } + //去除最多勾选20条限制 + // if (this.selectedListRep.length + textArr.length > 20) { + // return this.$message({ + // message: '代替标准号最多选择20项', + // type: 'warning' + // }) + // } this.selectedListRep.map((item) => { let texts = '' if (item.standYear != null && item.standYear !== '') { diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue index 3b7afd36c..942224e43 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue @@ -55,7 +55,7 @@ clearable >
-
+
{{ item.name }}
-
+
{{ item.name }}
-
+
{{ item.name }}
-
+
{{ item.name }}
-
+
{{ item.name }}
-
+
{{ item.name }}
-
+
{{ item.name }}
-
+
{{ item.name }}
-
+
{{ item.name }}
-
+
{{ item.name }} Date: Sat, 26 Mar 2022 15:26:26 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=9C=80=E5=A4=9A?= =?UTF-8?q?=E5=8B=BE=E9=80=89=E7=9A=84=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomFormComponents/InputForStandards.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/CustomFormComponents/InputForStandards.vue b/src/components/CustomFormComponents/InputForStandards.vue index e8aee574a..551ab711e 100644 --- a/src/components/CustomFormComponents/InputForStandards.vue +++ b/src/components/CustomFormComponents/InputForStandards.vue @@ -351,12 +351,12 @@ export default { type: 'warning' }) } - if (this.selectedListRep.length + textArr.length > 20) { - return this.$message({ - message: `${this.config.attrName}最多选择20项`, - type: 'warning' - }) - } + // if (this.selectedListRep.length + textArr.length > 20) { + // return this.$message({ + // message: `${this.config.attrName}最多选择20项`, + // type: 'warning' + // }) + // } this.selectedListRep.map((item) => { let texts = '' if (item.standYear != null && item.standYear !== '') { From 2dbb651a4177d87d1e4f4cfc9fe3b2a4e196b632 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sat, 26 Mar 2022 15:36:14 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=9B=BD=E5=86=85?= =?UTF-8?q?=E6=B5=B7=E5=A4=96=E5=88=87=E6=8D=A2=E5=90=8D=E7=A7=B0=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 6ec4ff063..75147920a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1269,19 +1269,19 @@ :maxlength="100"> - + - - - - - - - + + + @@ -1342,7 +1342,7 @@ Date: Sat, 26 Mar 2022 17:05:40 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=B7=BB=E5=8A=A0=E6=A0=87=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 75147920a..d2fbca014 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1450,6 +1450,7 @@ export default { callback() } return { + textList: [], gdType: '', //归档位置的赋值 standTypeModel: 'INLAND', submitType: '', @@ -2651,8 +2652,8 @@ export default { }, // 代替政策编号确定 replaceLawsNumModelBt() { + let subFlag = true let textArr = [] - if (typeof this.value === 'string') { if (this.value) { textArr = this.value.split(',') @@ -2677,7 +2678,23 @@ export default { } else { texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber } - textArr.push(texts) + // textArr.push(texts) + if(this.textList.length < 1){ + textArr.push(texts) + }else{ + this.textList.forEach(item =>{ + if(item !== texts){ + textArr.push(texts) + }else{ + this.$message.warning('请勿重复添加数据') + subFlag = false + return + } + }) + } + if(!subFlag){ + textArr = [] + } textArr = [...new Set(textArr)] this.replaceLawsNumModel = false }) @@ -2722,6 +2739,15 @@ export default { this.getReplaceLawsNumRow() }, selectLaws(type) { + if(type === 'dtbjh'){ + this.textList = this.form.dtbjh.split(',') + }else if(type === 'bfbdtbzh'){ + this.textList = this.form.bfbdtbzh.split(',') + }else if(type === 'cbbh'){ + this.textList = this.form.cbbh.split(',') + }else if(type === 'yybj'){ + this.textList = this.form.yybj.split(',') + } // if (this.standNumFlag === 1) { // this.$refs.selections.selectAll(false) // } From 081c3467db9c9ad9702783ac560cb5b9012990b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sat, 26 Mar 2022 17:15:46 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=BD=92=E6=A1=A3=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=AD=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/treeSelect/treeSelectStand.vue | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/src/components/treeSelect/treeSelectStand.vue b/src/components/treeSelect/treeSelectStand.vue index 79c384bdf..7e8d9068e 100644 --- a/src/components/treeSelect/treeSelectStand.vue +++ b/src/components/treeSelect/treeSelectStand.vue @@ -13,19 +13,21 @@ placeholder="输入关键字进行过滤" v-model="filterText"> - - +
+ + +