配套申请--申请&&申请单--撤回

pages/aps/plan/addAccessory.vue

@@ -342,7 +342,8 @@ export default {
             Api.supportmainCreate(parms).then((res) => {
               if (res.success) {
                 this.$Message.success("申请成功");
-                this.$emit("cancel");
+                //this.$emit("cancel");
+                this.$emit('on-ok')
               }
             });
           }

pages/aps/plan/api.js

@@ -50,5 +50,8 @@ export default {
     groupitemlist(params){//申请单列表
         return Api.post(`${technologyUrl}supportmain/groupitemlist`, params);
     },
+    batchdelete(params){//批量撤回
+        return Api.post(`${technologyUrl}supportitem/batchdelete`, params);
+    },
    
 }
\ No newline at end of file

pages/aps/plan/detailAccessory.vue

@@ -9,7 +9,7 @@
     <Layout>
       <Content>
         <div class="mb20" v-for="(item,index) in datas" :key="index">
-          <p class="fwBold"  :id="'item'+index">
+          <p class="fwBold" :id="'item'+index">
             齐套日期：{{item.finishDate}}
             <span class="ml20">申请人：{{item.creator}}</span>
             <span class="ml20">申请时间：{{item.applyTime}}</span>
@@ -94,7 +94,7 @@ export default {
                     oprate: "detail",
                   },
                   on: {
-                    click: () => this.application(0,params.row),
+                    click: () => this.application(0, params.row),
                   },
                 },
                 "撤回"
@@ -135,18 +135,22 @@ export default {
         }
       });
     },
-
-    application(type,arr) {
-        let msg=""
-        if(type==0)
-        {
-           msg="行内数据"
-        }
-        else
+    application(type, arr) {//撤回配套申请 type:0 单条 1 全部
+      let parms = [];
+      if (type == 0) {
+        parms.push(arr.id);
+      } else {
+        arr.forEach((ele) => {
+          parms.push(ele.id);
+        });
+      }
+      Api.batchdelete(parms).then(res=>{
+        if(res.success&&res.result)
         {
-             msg="整个申请单数据"
+          this.$Message.success("撤销成功");
+          this.$emit('on-ok')
         }
-      alert(msg+"_____"+JSON.stringify(arr));
+      })
     },
   },
   watch: {

pages/aps/plan/index.vue

@@ -134,7 +134,7 @@
         :drawnNumber="drawnNumber"
         :count="count"
         @on-close="cancel"
-        @on-ok="ok"
+        @on-ok="addOk"
       />
     </Modal>
   </div>
@@ -652,6 +652,7 @@ export default {
       this.listBatchIds = [];
       this.listBatchIds1 = [];
       this.canselFooter();
+      this.modalAccessory = false;
     },
     search() {
       this.$refs.grid.reload(this.easySearch);
@@ -689,6 +690,7 @@ export default {
       //aps
       this.dispatchModal = false;
       this.scheduleModal = false;
+      this.modalAccessory = false;
       // this.listBatchIds = []
       // this.listBatchIds1 = []
       // this.canselFooter()
@@ -821,10 +823,6 @@ export default {
 
       this.modalAccessory = true;
     },
-    cancel() {
-      this.curId = 0;
-      this.modalAccessory = false;
-    },
     ok() {
       this.modalAccessory = false;
       this.curId = 0;