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

src/views/saleOrder/index.vue

@@ -204,9 +204,9 @@
             type: 'selection',
             columnKey: 'selection',
             align: 'center',
-            selectable: (row, index) => {
-              return this.activeName != 'second';
-            }
+            // selectable: (row, index) => {
+            //   return this.activeName != 'second';
+            // }
           },
           {
             columnKey: 'index',

src/views/workOrder/index.vue

@@ -462,7 +462,12 @@
             align: 'center',
             showOverflowTooltip: true
           },
-
+          {
+            prop: 'specification',
+            label: '规格',
+            align: 'center',
+            showOverflowTooltip: true
+          },
           {
             prop: 'priority',
             label: '优先级',

src/views/workOrder/mixins/release.js

@@ -515,13 +515,13 @@ export default {
           totalSum += item.quantity - 0;
         }
       });
-      if (totalSum != this.current.formingNum - 0) {
-        this.$message.warning(
-          `首工序已派单的数据数量相加需要等于要求生产数量${this.current.formingNum}`
-        );
-        this.handleClick({ name: data.id });
-        return;
-      }
+      // if (totalSum != this.current.formingNum - 0) {
+      //   this.$message.warning(
+      //     `首工序已派单的数据数量相加需要等于要求生产数量${this.current.formingNum}`
+      //   );
+      //   this.handleClick({ name: data.id });
+      //   return;
+      // }
 
       this.toolbarLoading = true;