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 04fe43d..52e290b 100644
--- a/src/views/keyprojects/hidden/components/list.vue
+++ b/src/views/keyprojects/hidden/components/list.vue
@@ -102,7 +102,7 @@
- {{ row.ISPUNISH && (row.ISPUNISH === "1" ? "是" : "否") }}
+ {{ row.ISPUNISH === "1" ? "是" : row.ISPUNISH === "2" ?"否":"处罚人未处理" }}
@@ -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报警',
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 @@
-
-
+
+