分卡、回收

pages/order/monitoring/index.vue

@@ -25,7 +25,13 @@
       <Record :eid="recordId" />
     </Modal>
     <Modal v-model="SpeedModal" title="工单信息" fullscreen footer-hide class="recordM">
-      <Speed :result="result" :load="loading" @on-close="clsoeSpeedModal" :executeId="dispatchExecuteId" :orderId="orderId" />
+      <Speed
+        :result="result"
+        :load="loading"
+        @on-close="clsoeSpeedModal"
+        :executeId="dispatchExecuteId"
+        :orderId="orderId"
+      />
     </Modal>
     <Modal v-model="recycleModal" title="确定回收订单" width="600" class="suspend">
       <Form ref="form" :model="recovery" :rules="rulesRecycle" :label-width="120">
@@ -383,7 +389,10 @@ export default {
           render: (h, params) => {
             return h("div", { class: "action" }, [
               h(
-                params.row.status == 5 && params.row.upSplitId == 0
+                (params.row.status == 5 && params.row.upSplitId == 0) ||
+                  (params.row.status == 5 &&
+                    params.row.upSplitId > 0 &&
+                    params.row.splitCardStatus == 1)
                   ? "Button"
                   : "", //订单状态暂停，启动
                 {
@@ -408,7 +417,7 @@ export default {
                 ""
               ),
               h(
-                params.row.status == 6 && params.row.upSplitId == 0
+                params.row.status == 6 
                   ? "Button"
                   : "", //订单状态执行中，暂停
                 {
@@ -434,7 +443,7 @@ export default {
                 ""
               ),
               h(
-                params.row.status == 5 && params.row.upSplitId > 0 ? "op" : "", //订单状态执行中，暂停
+                params.row.status == 5 && params.row.splitCardStatus == 0 ? "op" : "", //订单状态执行中，暂停
                 {
                   attrs: {
                     icon: "md-sync",
@@ -542,9 +551,8 @@ export default {
         }
       });
     },
-    clsoeSpeedModal()
-    {
-      this.SpeedModal=false;
+    clsoeSpeedModal() {
+      this.SpeedModal = false;
     },
     suspend(row) {
       console.log(row);
@@ -634,5 +642,4 @@ export default {
 .ivu-btn-group {
   height: 21px !important;
 }
-
 </style>
\ No newline at end of file

pages/order/monitoring/speed.vue

@@ -7,7 +7,7 @@
       <DataGrid :columns="columns" :data="result" border :tool="false" :height="820" :page="false"></DataGrid>
     </div>
     <Modal v-model="workOrderPauseModal" title="工单暂停原因" width="800" footer-hide class="suspend">
-      <EntryPause  @on-ok="pauseOk" ref="addBug" :info="info" />
+      <EntryPause @on-ok="pauseOk" ref="addBug" :info="info" />
     </Modal>
     <Modal v-model="modalSplit" title="订单分卡" width="650" footer-hide>
       <div slot="close">
@@ -310,11 +310,11 @@ export default {
     split(row, index) {
       //工单分卡
       this.getProduct(row.id);
-      (this.initeId = {
+      this.initeId = {
         routingDetailId: row.detailId,
         dispatchId: row.id
-      }),
-        (this.modalSplit = true);
+      };
+      this.modalSplit = true;
     },
     onchangeAction(val) {
       //选择移入排产时显示排产模型下拉框
@@ -353,7 +353,7 @@ export default {
             .then(res => {
               if (res.success) {
                 this.$Message.success("分卡成功");
-                this.$emit("on-close")
+                this.$emit("on-close");
               } else {
                 this.$Message.error("分卡失败");
               }