Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

pages/mesPlan/index.vue

@@ -366,20 +366,22 @@ export default {
                   on: { click: () => this.edit(params.row) },
                   style:
                     this.wfstatu == 1
-                      ? (params.row.status == 1 &&
+                      ? (
+                      (params.row.status == 1 &&
                           params.row.id == params.row.rootId &&
                           params.row.divideMark != 0) ||
                         params.row.id != params.row.rootId ||
                         params.row.status != 1
                         ? "display:none"
-                        : ""
-                      : (params.row.status == 3 &&
+                        : "")
+                      : (
+                      (params.row.status == 3 &&
                           params.row.id == params.row.rootId &&
                           params.row.divideMark != 0) ||
                         params.row.id != params.row.rootId ||
                         params.row.status != 3
                       ? "display:none"
-                      : ""
+                      : "")
                 },
                 "编辑"
               ),
@@ -390,20 +392,22 @@ export default {
                   on: { click: () => this.remove(params.row) },
                   style:
                     this.wfstatu == 1
-                      ? (params.row.status == 1 &&
+                      ? (
+                      (params.row.status == 1 &&
                           params.row.id == params.row.rootId &&
                           params.row.divideMark != 0) ||
                         params.row.id != params.row.rootId ||
                         params.row.status != 1
                         ? "display:none"
-                        : ""
-                      : (params.row.status == 3 &&
+                        : "")
+                      : (
+                      (params.row.status == 3 &&
                           params.row.id == params.row.rootId &&
                           params.row.divideMark != 0) ||
                         params.row.id != params.row.rootId ||
                         params.row.status != 3
                       ? "display:none"
-                      : ""
+                      : "")
                 },
                 "删除"
               ),
@@ -414,18 +418,20 @@ export default {
                   on: { click: () => this.split(params.row) },
                   style:
                     this.wfstatu == 1
-                      ? (params.row.divideMark != 0 &&
+                      ? (
+                      (params.row.divideMark != 0 &&
                           params.row.id == params.row.rootId) ||
                         params.row.status != 1 ||
                         params.row.quantity <= 1
                         ? "display:none"
-                        : ""
-                      : (params.row.divideMark != 0 &&
+                        : "")
+                      : (
+                      (params.row.divideMark != 0 &&
                           params.row.id == params.row.rootId) ||
                         params.row.status != 3 ||
                         params.row.quantity <= 1
                       ? "display:none"
-                      : ""
+                      : "")
                 },
                 "分解"
               )
@@ -747,7 +753,7 @@ export default {
       let ues = this.$refs.userProcess;
       this.dataListRetrunNew.operatorIdList = this.$refs.orderSendView.getUsers();
       //返回审批数据
-
+      //alert(JSON.stringify(this.dataListRetrunNew));
       this.$http.order.batchstart(this.dataListRetrunNew).then(res => {
         if (res.success) {
           this.$Message.success("订单送审成功!");