Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dengfei

src/api/technology/production/index.js

@@ -51,6 +51,7 @@ export default {
     if (res.data.code == 0) {
       return res.data.message;
     }
+    // return Promise.reject(new Error(res.data.message));
   },
 
   // 工序质检参数保存
@@ -71,7 +72,7 @@ export default {
       return res.data;
     }
 
-    return Promise.reject(new Error(res.data.message));
+    // return Promise.reject(new Error(res.data.message));
   },
 
   byTaskId: async (taskId) => {

src/views/regulationManagement/index.vue

@@ -141,6 +141,7 @@
     },
     computed: {
       columns() {
+      let columnsVersion=this.columnsVersion
         return [
           {
             width: 45,

src/views/technology/production/index.vue

@@ -419,11 +419,7 @@
           .delete([row.id])
           .then((msg) => {
             loading.close();
-            if(msg.code=='0'){
-              this.$message.success('删除成功');
-            }else{
-              this.$message.error(msg.message);
-            }
+            // this.$message.success('删除成功');
             this.reload();
           })
           .catch((e) => {
@@ -446,11 +442,11 @@
             producetask
               .delete(this.selection.map((d) => d.id))
               .then((msg) => {
-                if(msg.code=='0'){
-                  this.$message.success('删除成功');
-                }else{
-                  this.$message.error(msg.message);
-                }
+                // if(code=='0'){
+                //   this.$message.success('删除成功');
+                // }else{
+                //   this.$message.error(msg.message);
+                // }
                 loading.close();
 
                 this.reload();