Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search

client/src/views/ability/mQualityTask.vue

@@ -421,7 +421,7 @@
           <el-upload
             ref="upload"
             :action="upUrl"
-            accept=".zip,.pdf,.jpg"
+            accept=".pdf,.jpg,.png"
             :on-success="handleUpSuccessQuality"
             :on-remove="handleRemoveQuality"
             :headers="upHeaders"
@@ -430,7 +430,7 @@
           >
             <el-button size="small" type="primary">上传文件</el-button>
             <span class="el-upload__tip">
-              可上传压缩包.zip,图片.jpg、.png等文件
+              可上传.pdf文件,图片.jpg、.png等文件，仅可上传一个文件
             </span>
           </el-upload>
         </el-form-item>
@@ -926,8 +926,8 @@
         }
       },
       getCheckCity(data) {
-        debugger;
+        // debugger;
-        console.log(data);
+        // console.log(data);
         this.qualiForm.citys = data;
       },
       getCites(province) {
@@ -1090,7 +1090,6 @@
           if (valid) {
             let obj = new Object();
             obj.qtask = that.qtask;
-
             let value2 = new Object();
             for (let [key, value] of Object.entries(that.qualiForm)) {
               console.log(key,value);
@@ -1102,12 +1101,6 @@
               value2.citys[index] = parseInt(item);
             });
             obj.value2 = value2;
-            debugger;
-            console.log(obj);
-            console.log(obj.value2);
-            console.log(obj.value2.citys);
-            debugger;
-
             const isEdit = that.dialogType === "edit";
             if (isEdit) {
               updateQuali(obj).then((res) => {
@@ -1118,8 +1111,8 @@
                 }
               });
             } else {
-              debugger;
+              // debugger;
-              console.log(obj);
+              // console.log(obj);
               createQuali(obj).then((res) => {
                 if (res.code >= 200 && res.code < 400) {
                   that.getList();
@@ -1152,9 +1145,9 @@
         });
       },
       handleDetail(type,item){
-        debugger;
+        // debugger;
-        console.log(type)
+        // console.log(type)
-        console.log(item)
+        // console.log(item)
         let that = this;
         that.drawer = true;
         this.showData.id = item.id;

client/src/views/qualityinspect/inspectTable.vue

@@ -243,7 +243,9 @@ export default {
       inspectTableList: [],
       typeOptions: [],
        stateOptions: [
-        { key: "合规", name: "合规" },
+        { key: "重大风险", name: "重大风险" },
+        { key: "严重风险", name: "严重风险" },
+        { key: "主要风险", name: "主要风险" },
         { key: "体系", name: "体系" }
       ],
       listLoading: true,