Merge remote-tracking branch 'origin/pet' into dev

src/views/corpInfo/information/qualifications/components/edit.vue

@@ -86,7 +86,15 @@ export default {
         NAME: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
         VALIDITYTIME: [{ required: true, message: '证书有效期不能为空', trigger: 'blur' }],
         NUMBER: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-        FILE: [{ required: true, message: '图片不能为空', trigger: 'blur' }]
+        FILE: [
+          { validator: (rule, value, callback) => {
+            if (this.certificate_files.length > 0) {
+              callback()
+            } else {
+              callback(new Error('图片不能为空'))
+            }
+          }, trigger: 'blur' }
+        ]
       }
     }
   },
@@ -191,6 +199,8 @@ export default {
       if (!isImage) {
         this.$message.error('上传图片只能是 JPG、JPEG、PNG 格式!')
         fileList.pop()
+      } else {
+        this.beforeFileUpload(file)
       }
     },
     handlePictureCardPreview(file) {

src/views/hiddenApi/publicMethod/list.vue

@@ -101,6 +101,14 @@
             />
           </el-form-item>
         </el-col>
+        <el-col v-if="hiddenVueType !='ignore'" :span="4">
+          <el-form-item label="是否相关方">
+            <el-select v-model="condform.isrelevant" placeholder="请选择" style="width: 100%;">
+              <el-option v-for="item in isrelevantList" :key="item.ID" :label="item.NAME" :value="item.ID" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        
         <el-col :span="4">
           <el-form-item label-width="10px">
             <el-button v-waves type="primary" icon="el-icon-search" @click="getQuery">
@@ -271,7 +279,8 @@ export default {
         state: '', // 隐患状态
         hiddenpart: '', // 隐患部位
         hiddenType: '', // 隐患类型
-        creatorUserDept: ''// 隐患发现部门
+        creatorUserDept: '', // 隐患发现部门
+        isrelevant: '' // 是否相关方
       },
       /** 条件中的字段,没有放在form表单中,是因为怕动态加载中出现问题 **/
       sourceList: [
@@ -281,6 +290,10 @@ export default {
         { ID: '5', NAME: '安全环保检查(企业端)' },
         { ID: '6', NAME: '消防检查' }
       ],
+      isrelevantList: [
+        { ID: '1', NAME: '是' },
+        { ID: '2', NAME: '否' }
+      ],
       statusList: [
         { ID: '1', NAME: '未整改' },
         { ID: '2', NAME: '已整改' },