重点工程隐患处罚相关bug修复

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 => {
+      this.$confirm('此操作将会修改企业登录密码为Aa@123456789是否继续?', '提示', {
-        if (valid) {
+        confirmButtonText: '确定',
-          if (this.form.INDUSTRYALL && this.form.INDUSTRYALL.length > 0) {
+        cancelButtonText: '取消',
-            this.form.CORP_TYPE = this.form.INDUSTRYALL[0] || ''
+        type: 'warning'
-            this.form.CORP_TYPE2 = this.form.INDUSTRYALL[1] || ''
+      }).then(() => {
-            this.form.CORP_TYPE3 = this.form.INDUSTRYALL[2] || ''
+        this.$refs.form.validate(valid => {
-            this.form.CORP_TYPE4 = this.form.INDUSTRYALL[3] || ''
+          if (valid) {
-          }
+            if (this.form.INDUSTRYALL && this.form.INDUSTRYALL.length > 0) {
-          requestFN(
+              this.form.CORP_TYPE = this.form.INDUSTRYALL[0] || ''
-            this.$parent.indexVal ? '/corpinfo/edit' : '/corpinfo/add',
+              this.form.CORP_TYPE2 = this.form.INDUSTRYALL[1] || ''
-            {
+              this.form.CORP_TYPE3 = this.form.INDUSTRYALL[2] || ''
-              ...this.form,
+              this.form.CORP_TYPE4 = this.form.INDUSTRYALL[3] || ''
-              PROVINCE: this.form.shudi[0],
-              CITY: this.form.shudi[1],
-              COUNTRY: this.form.shudi[2],
-              ISDELETE: Number(this.form.ISDELETE)
             }
-          ).then((data) => {
+            requestFN(
-            this.uploadImg()
+              this.$parent.indexVal ? '/corpinfo/edit' : '/corpinfo/add',
-            this.$message.success('新建成功')
+              {
-            this.goBack()
+                ...this.form,
-          }).catch((e) => { })
+                PROVINCE: this.form.shudi[0],
-        } else {
+                CITY: this.form.shudi[1],
-          return false
+                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

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: '1', NAME: 'AI报警' },
-        { ID: '2', NAME: 'AI报警(企业端)' },
         { ID: '4', NAME: '安全环保检查(监管端)' },
         { ID: '5', NAME: '安全环保检查(企业端)' }
       ],

src/views/keyprojects/inspection/components/list.vue

@@ -11,7 +11,7 @@
         <!--        </el-col>-->
         <el-col :span="5">
           <el-form-item label="重点工程名称">
-            <el-input v-model="OUTSOURCED_NAME" placeholder="搜索重点工程名称" />
+            <el-input v-model="KEYWORDS" placeholder="搜索重点工程名称" />
           </el-form-item>
         </el-col>
         <el-col :span="5">
@@ -134,7 +134,6 @@ export default {
         '/outsourced/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
           KEYWORDS: this.KEYWORDS,
-          OUTSOURCED_NAME: this.OUTSOURCED_NAME,
           CORPINFO_ID: this.$parent.CORPINFO_ID,
           STATE: this.STATE
         }

src/views/keyprojects/punish/components/list.vue

@@ -9,14 +9,6 @@
             <el-input v-model="KEYWORDS" placeholder="搜索关键字"/>
           </el-form-item>
         </el-col>
-        <el-col :span="4">
-          <el-form-item label="处罚状态">
-            <el-select v-model="HANDLED">
-              <el-option value="1" label="待反馈处罚"/>
-              <el-option value="2" label="已完成处罚"/>
-            </el-select>
-          </el-form-item>
-        </el-col>
         <el-col :span="6">
           <el-form-item label-width="10px">
             <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">

src/views/keyprojects/punish/components/list2.vue

@@ -10,8 +10,8 @@
         <el-col :span="4">
           <el-form-item label="处罚状态">
             <el-select v-model="HANDLED">
-              <el-option value="1" label="待反馈处罚"/>
+              <el-option value="0" label="待反馈处罚"/>
-              <el-option value="2" label="已完成处罚"/>
+              <el-option value="1" label="已完成处罚"/>
             </el-select>
           </el-form-item>
         </el-col>