Merge branch 'dev' into yhkp

# Conflicts:
#	src/views/keyprojects/hidden/index.vue

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,6 +509,11 @@ export default {
     },
     // 保存
     confirm() {
+      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) {
@@ -535,6 +540,7 @@ export default {
             return false
           }
         })
+      })
     },
 
     beforeFileUpload(file) {
@@ -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

@@ -102,7 +102,7 @@
       </el-table-column>
       <el-table-column label="是否处罚">
         <template slot-scope="{row}">
-          {{ row.ISPUNISH && (row.ISPUNISH === "1" ? "是" : "否") }}
+          {{ row.ISPUNISH === "1" ? "是" : row.ISPUNISH === "2" ?"否":"处罚人未处理" }}
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" width="100">
@@ -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报警',

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>