From 2131214127da1e5ed7821dc301c5e90d8924bba7 Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Mon, 13 Nov 2023 11:03:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E9=9A=90=E6=82=A3=E7=AE=A1=E7=90=86=E5=B1=95=E7=A4=BA=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E7=9B=B8=E5=90=8C=E7=9A=84=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/keyprojects/hidden/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/keyprojects/hidden/index.vue b/src/views/keyprojects/hidden/index.vue index c5341aa..957f15e 100644 --- a/src/views/keyprojects/hidden/index.vue +++ b/src/views/keyprojects/hidden/index.vue @@ -1,7 +1,8 @@ From 167f4c9e7e57e9ae2b979d50cdc30216fdbfe3c8 Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Mon, 13 Nov 2023 17:51:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E9=9A=90=E6=82=A3=E5=A4=84=E7=BD=9A=E7=9B=B8=E5=85=B3bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../corpInfo/info/components/indexAdd.vue | 58 ++++++++++--------- .../keyprojects/hidden/components/list.vue | 4 +- .../inspection/components/list.vue | 3 +- .../keyprojects/punish/components/list.vue | 8 --- .../keyprojects/punish/components/list2.vue | 4 +- 5 files changed, 36 insertions(+), 41 deletions(-) diff --git a/src/views/corpInfo/info/components/indexAdd.vue b/src/views/corpInfo/info/components/indexAdd.vue index cc43fc4..8f3524a 100644 --- a/src/views/corpInfo/info/components/indexAdd.vue +++ b/src/views/corpInfo/info/components/indexAdd.vue @@ -271,7 +271,7 @@ export default { CORP_NAME: [{ required: true, message: '分公司名称不能为空', trigger: 'blur' }], shudi: [{ required: true, message: '属地不能为空', trigger: 'blur' }], // POSTAL_CODE: [{ required: true, message: '邮政编码不能为空', trigger: 'blur' }], - CODE: [{ required: true, message: '统一社会信用代码不能为空', trigger: 'blur' }], + CODE: [{ required: false, message: '统一社会信用代码不能为空', trigger: 'blur' }], INDUSTRY: [{ required: true, message: '所属行业不能为空', trigger: 'blur' }], ECO_TYPE: [{ required: true, message: '经济类型不能为空', trigger: 'blur' }], // ADDRESS_BUSINESS: [{ required: true, message: '企事业单位经营地址不能为空', trigger: 'blur' }], @@ -509,31 +509,37 @@ export default { }, // 保存 confirm() { - this.$refs.form.validate(valid => { - if (valid) { - if (this.form.INDUSTRYALL && this.form.INDUSTRYALL.length > 0) { - this.form.CORP_TYPE = this.form.INDUSTRYALL[0] || '' - this.form.CORP_TYPE2 = this.form.INDUSTRYALL[1] || '' - this.form.CORP_TYPE3 = this.form.INDUSTRYALL[2] || '' - this.form.CORP_TYPE4 = this.form.INDUSTRYALL[3] || '' - } - requestFN( - this.$parent.indexVal ? '/corpinfo/edit' : '/corpinfo/add', - { - ...this.form, - PROVINCE: this.form.shudi[0], - CITY: this.form.shudi[1], - COUNTRY: this.form.shudi[2], - ISDELETE: Number(this.form.ISDELETE) + this.$confirm('此操作将会修改企业登录密码为Aa@123456789是否继续?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.$refs.form.validate(valid => { + if (valid) { + if (this.form.INDUSTRYALL && this.form.INDUSTRYALL.length > 0) { + this.form.CORP_TYPE = this.form.INDUSTRYALL[0] || '' + this.form.CORP_TYPE2 = this.form.INDUSTRYALL[1] || '' + this.form.CORP_TYPE3 = this.form.INDUSTRYALL[2] || '' + this.form.CORP_TYPE4 = this.form.INDUSTRYALL[3] || '' } - ).then((data) => { - this.uploadImg() - this.$message.success('新建成功') - this.goBack() - }).catch((e) => { }) - } else { - return false - } + requestFN( + this.$parent.indexVal ? '/corpinfo/edit' : '/corpinfo/add', + { + ...this.form, + PROVINCE: this.form.shudi[0], + CITY: this.form.shudi[1], + COUNTRY: this.form.shudi[2], + ISDELETE: Number(this.form.ISDELETE) + } + ).then((data) => { + this.uploadImg() + this.$message.success('新建成功') + this.goBack() + }).catch((e) => { }) + } else { + return false + } + }) }) }, @@ -607,7 +613,7 @@ export default { } this.form.jinweidu = data.pd.LONGITUDE + ' , ' + data.pd.LATITUDE this.form.shudi = [data.pd.PROVINCE, data.pd.CITY, data.pd.COUNTRY] - this.shudiPlaceholder = data.pd.PROVINCE_VAL + "-" + data.pd.CITY_VAL + "-" + data.pd.COUNTRY_VAL + this.shudiPlaceholder = data.pd.PROVINCE_VAL + '-' + data.pd.CITY_VAL + '-' + data.pd.COUNTRY_VAL this.hImgs = data.hImgs this.$forceUpdate() this.listLoading = false diff --git a/src/views/keyprojects/hidden/components/list.vue b/src/views/keyprojects/hidden/components/list.vue index 112a822..04fe43d 100644 --- a/src/views/keyprojects/hidden/components/list.vue +++ b/src/views/keyprojects/hidden/components/list.vue @@ -150,7 +150,6 @@ export default { ], sourceState: { 1: 'AI报警', - 2: 'AI报警(企业端)', 4: '安全环保检查(监管端)', 5: '安全环保检查(企业端)' }, @@ -160,8 +159,7 @@ export default { 4: '已验收' }, SOURCEList: [ - { ID: '1', NAME: 'AI报警(监管端)' }, - { ID: '2', NAME: 'AI报警(企业端)' }, + { ID: '1', NAME: 'AI报警' }, { ID: '4', NAME: '安全环保检查(监管端)' }, { ID: '5', NAME: '安全环保检查(企业端)' } ], diff --git a/src/views/keyprojects/inspection/components/list.vue b/src/views/keyprojects/inspection/components/list.vue index 0d499b6..97919c7 100644 --- a/src/views/keyprojects/inspection/components/list.vue +++ b/src/views/keyprojects/inspection/components/list.vue @@ -11,7 +11,7 @@ - + @@ -134,7 +134,6 @@ export default { '/outsourced/list?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page, { KEYWORDS: this.KEYWORDS, - OUTSOURCED_NAME: this.OUTSOURCED_NAME, CORPINFO_ID: this.$parent.CORPINFO_ID, STATE: this.STATE } diff --git a/src/views/keyprojects/punish/components/list.vue b/src/views/keyprojects/punish/components/list.vue index 03bbb69..cfd86b6 100644 --- a/src/views/keyprojects/punish/components/list.vue +++ b/src/views/keyprojects/punish/components/list.vue @@ -9,14 +9,6 @@ - - - - - - - - diff --git a/src/views/keyprojects/punish/components/list2.vue b/src/views/keyprojects/punish/components/list2.vue index c6b4c87..93cb6c8 100644 --- a/src/views/keyprojects/punish/components/list2.vue +++ b/src/views/keyprojects/punish/components/list2.vue @@ -10,8 +10,8 @@ - - + + From 51e543b8420679a5a88282cab1dd31db89818762 Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Tue, 14 Nov 2023 16:16:52 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=20?= =?UTF-8?q?=E9=9A=90=E6=82=A3=E7=AE=A1=E7=90=86=20=E5=85=B3=E4=BA=8E?= =?UTF-8?q?=E5=A4=84=E7=BD=9A=E6=90=9C=E7=B4=A2=E6=A1=86=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/keyprojects/hidden/components/list.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/keyprojects/hidden/components/list.vue b/src/views/keyprojects/hidden/components/list.vue index 04fe43d..52e290b 100644 --- a/src/views/keyprojects/hidden/components/list.vue +++ b/src/views/keyprojects/hidden/components/list.vue @@ -102,7 +102,7 @@ @@ -146,7 +146,8 @@ export default { // { ID: '1', NAME: '申请中' }, // { ID: '2', NAME: '已完成' } { ID: '1', NAME: '是' }, - { ID: '2', NAME: '否' } + { ID: '2', NAME: '否' }, + { ID: '3', NAME: '处罚人未处理' } ], sourceState: { 1: 'AI报警',