supportMainId

pages/aps/plan/detailAccessory.vue

@@ -10,7 +10,7 @@
       <Content>
         <div class="mb20" v-for="(item,index) in datas" :key="index">
           <p class="fwBold" :id="'item'+index">
-            <span >申请编号：{{item.code}}</span>
+            <span>申请编号：{{item.code}}</span>
             <span class="ml20">齐套日期：{{item.finishDate}}</span>
             <span class="ml20">申请人：{{item.creator}}</span>
             <span class="ml20">申请时间：{{item.applyTime}}</span>
@@ -111,7 +111,7 @@ export default {
                     click: () => this.application(0, params.row),
                   },
                 },
-                "撤回"
+                params.row.status == 0 ? "撤回" : ""
               ),
             ]);
           },
@@ -156,16 +156,24 @@ export default {
         parms.push(arr.id);
       } else {
         arr.forEach((ele) => {
-          parms.push(ele.id);
+          if (ele.status == 0) {
+            parms.push(ele.id);
+          }
         });
       }
-      Api.batchdelete(parms).then((res) => {
-        if (res.success && res.result) {
-          this.$Message.success("撤销成功");
-          this.load(this.eid);
-          this.$emit("on-ok");
-        }
-      });
+      if (parms.length > 0) {
+        Api.batchdelete(parms).then((res) => {
+          if (res.success && res.result) {
+            this.$Message.success("撤销成功");
+            this.load(this.eid);
+            this.$emit("on-ok");
+          }
+        });
+      }
+      else
+      {
+        this.$Message.error("物料无法撤回！")
+      }
     },
     //配套申请
     setName(list, v) {

pages/aps/supprotMain/outbound.vue

@@ -7,7 +7,7 @@
       <span class="ml20">申请时间：{{row.creationTime}}</span>
       <span class="ml20">
         状态：
-        <state code="outstore.status" :value="row.status+''" type="text"></state>
+       <state code="accessory.status" :value="row.status+''" type="text"></state>
       </span>
     </p>
     <Card :padding="0">
@@ -241,8 +241,7 @@ export default {
           this.butTxt = "更多";
           this.iconLabel = "md-arrow-dropdown";
 
-          let parm = { orderId: r.result.orderId };
-          this.orderId = r.result.orderId;
+          let parm = { supportMainId : v };
           this.curRowId = 0;
           Api.listbysupportitem(parm).then((res) => {
             if (res.success) {