From 93a0ca58c109ccfcf1a65451814c8366823eabfe Mon Sep 17 00:00:00 2001 From: "wangxiahui@91isoft.com" <140316hui> Date: Fri, 3 Sep 2021 16:09:25 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E5=BF=85=E5=A1=AB=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreignStandardsAndRegulations/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index c1acaa477..6d8ab71ef 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -1935,9 +1935,9 @@ export default { {type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change'} // {validator: this.verify.valiateEnName, trigger: 'blur'} ], - // standState: [ - // {required: true, message: '标准状态不能为空', trigger: 'change'} - // ], + standState: [ + {required: true, message: '文本状态不能为空', trigger: 'change'} + ], replaceStandNum: [ {type: 'string', max: 100, message: '代替标准编号不能超过100个字符', trigger: 'change'} ], From f81aff8d577b07b070aa729c85e27733e1940d28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 3 Sep 2021 16:37:09 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=8F=90=E4=BA=A4bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue | 2 ++ src/pages/processCenter/pages/creatProcess/xmpg/step1.vue | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index dda043f7d..fb9021132 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -731,10 +731,12 @@ export default { } }); } else { + this.isSubmit = false return this.$message.warning("请完善人员信息"); } }); } else { + this.isSubmit = false return this.$message.warning("请完善基础信息"); } }); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index db361dfff..df6bed631 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -705,10 +705,12 @@ export default { } }); } else { + this.isSubmit = false; return this.$message.warning("请完善人员信息"); } }); } else { + this.isSubmit = false; return this.$message.warning("请完善基础信息"); } }); From 40a34adca443949556f2e7544de44875d7c46393 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Fri, 3 Sep 2021 17:24:21 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=AE=A1=E7=90=86--?= =?UTF-8?q?=E5=8A=A0=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=EF=BC=9A=E5=A7=93?= =?UTF-8?q?=E5=90=8D=E5=92=8C=E9=82=AE=E7=AE=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/pages/mechanismManage/index.vue | 44 ++++++++++++++++++- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue index bf1e90b44..bd978749c 100644 --- a/src/pages/config/pages/mechanismManage/index.vue +++ b/src/pages/config/pages/mechanismManage/index.vue @@ -27,6 +27,32 @@
+ +
+ + + + + + + + + + + + + + 查询 + + + + + 清空 + + + +
{ + console.log(res.data) res.data.forEach((item) => { var NameList = '' item.positions.forEach((items) => { From 8efe4c5a810bc88868058b5b6b22046623bd9693 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Fri, 3 Sep 2021 20:31:57 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84--=E7=BC=96=E8=BE=91=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=E6=89=8B=E5=8A=A8=E6=9F=A5=E6=89=BE=E6=9F=A5?= =?UTF-8?q?=E6=89=BE=E7=9A=84=E6=A0=87=E5=87=86=E7=9A=84=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=AF=B9=EF=BC=8C?= =?UTF-8?q?=E4=B8=94=E6=8A=8A=E6=A0=87=E5=87=86=E7=8A=B6=E6=80=81=E6=94=B9?= =?UTF-8?q?=E6=88=90=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InputForStandardsForForeign.vue | 28 +++++++++++++++++-- .../foreignStandardsAndRegulations/index.vue | 2 +- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/components/CustomFormComponents/InputForStandardsForForeign.vue b/src/components/CustomFormComponents/InputForStandardsForForeign.vue index 303fce717..bcd048c27 100644 --- a/src/components/CustomFormComponents/InputForStandardsForForeign.vue +++ b/src/components/CustomFormComponents/InputForStandardsForForeign.vue @@ -112,9 +112,14 @@ width="130"> + {{$t('m.dataAcquisition')}} @@ -178,6 +183,8 @@ export default { }, data() { return { + textStatus:'',//文本状态 + textStatusMap: {}, // 文本状态id与name对应 replaceLawsNumModel: false, sarBussionessLawsEO: { replaceLawsNum: '' @@ -213,6 +220,12 @@ export default { } }, methods: { + // 将文本状态的id与name对应 + setMap(data) { + data.forEach(item => { + this.$set(this.textStatusMap, item.value, item.label) + }) + }, handleChange (event) { // const value = event.target.value const value = event @@ -336,6 +349,17 @@ export default { this.getReplaceLawsNumRow() } }, + async mounted () { + // 从数据库中查询各下拉框数据 + this.$http.get('sys/dictype/getDicTypeListCode', '', { + _this: this + }, res => { + this.standStateOptions = res.data.WBZTCLASS // 文本状态 + this.setMap(this.standStateOptions) + }, e => { + console.log("error"); + }) + }, watch: { dataSourceFrom: { handler (val) { diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index c1acaa477..835ca9a81 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -2196,7 +2196,7 @@ export default { data.forEach(item => { this.$set(this.textStatusMap, item.value, item.label) }) - console.log(this.textStatusMap, '文本状态的值') + console.log(this.textStatusMap, '外面的文本状态的值') }, busVsFunc(){ this.$http.get('sarVppsTree/list', '', { From b3875f85a9239949c5582c160d2fa1a28c6bda47 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Sat, 4 Sep 2021 10:07:00 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=20=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=BA=93--=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E7=9A=84?= =?UTF-8?q?=E4=BB=A3=E6=9B=BF=E4=BC=81=E6=A0=87=E7=BC=96=E5=8F=B7=E7=9A=84?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=9F=A5=E6=89=BE=E9=A1=B5=E9=9D=A2,1.?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81=E6=B2=A1=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=EF=BC=8C=E6=A0=87=E5=87=86=E7=8A=B6=E6=80=81=E6=94=B9=E6=88=90?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81=20{2.=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=A5=E6=BA=90=E5=8F=AA=E8=83=BD=E6=98=AF=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E6=A0=87=E5=87=86--(=E5=B7=B2=E6=94=B9)}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomFormComponents/InputForStandardsForEnterprise.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue b/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue index 1cce90a58..18586f89e 100644 --- a/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue +++ b/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue @@ -124,7 +124,7 @@ width="130"> From c4d7fdaeb9b28dec51942dc5cfc08e2b48ea67a2 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, 4 Sep 2021 14:20:53 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B=E6=95=B0=E6=8D=AE=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue index 76bcc77c7..2b0c6bf74 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue @@ -354,9 +354,13 @@ export default { this.qdform.prcNum = this.prcNum; this.qdform.prcName = this.prcName; this.qdform["id"] = item.id; + this.projectId = item.projectId + this.getStandData(); }else{ this.qdform = item.form this.dataList =item.form.dataList + this.projectId = item.form.projectId + this.getStandData(); } }); },