装箱单面料提交

src/api/document/packing-list/packinglist-fabrics.js

@@ -23,10 +23,10 @@ const editFabricList = params => postAction('/splfi/syPackingListFabric/edit', p
 const deleteFabricList = params => deleteAction('/splfi/syPackingListFabric/delete', params)
 
 //提交
-const submitList = params => postAction('/splfi/syPackingListFabric/submit', params)
+const submitList = params => getAction('/splfi/syPackingListFabric/submit', params)
 
 //取消提交
-const cancelSubmit = params => postAction('/splfi/syPackingListFabric/cancelSubmit', params)
+const cancelSubmit = params => getAction('/splfi/syPackingListFabric/cancelSubmit', params)
 
 
 

src/views/packing-list/fabric-list.vue

@@ -88,7 +88,7 @@
           <a-divider type="vertical" />
           <a-dropdown>
             <a class="ant-dropdown-link">更多<a-icon type="down"/></a>
-            <a-menu slot="overlay">
+            <a-menu slot="overlay" v-if="record.status=='0'">
               <a-menu-item><a @click="details(record)">详情</a></a-menu-item>
               <a-menu-item><a @click="edit(record)">编辑</a></a-menu-item>
               <a-menu-item><a @click="submit(record)">提交</a></a-menu-item>
@@ -98,6 +98,11 @@
                 </a-popconfirm>
               </a-menu-item>
             </a-menu>
+            <!-- 已提交 -->
+            <a-menu slot="overlay" v-if="record.status=='1'">
+              <a-menu-item><a @click="details(record)">详情</a></a-menu-item>
+              <a-menu-item><a @click="cancel(record)">取消提交</a></a-menu-item>
+            </a-menu>
           </a-dropdown>
         </span>
       </a-table>
@@ -119,7 +124,7 @@ import moment from 'moment'
 import addFabricDrawer from '@views/packing-list/packinglist-fabrics/addFabricDrawer.vue'
 import detailsFabricDrawer from '@views/packing-list/packinglist-fabrics/detailsFabricDrawer.vue'
 import editFabricDrawer from '@views/packing-list/packinglist-fabrics/editFabricDrawer.vue'
-import { fabricList,fabricListId,deleteFabricList,submitList} from '@api/document/packing-list/packinglist-fabrics'
+import { fabricList,fabricListId,deleteFabricList,submitList,cancelSubmit} from '@api/document/packing-list/packinglist-fabrics'
 
 export default {
   name: 'FabricList', // 装箱单-面料
@@ -345,18 +350,29 @@ export default {
     
     //提交
     submit(record){
-     this.$nextTick(() => {
-        submitList({id: record.id}).then(res => {
-          if (res.success) {
-            console.log('提交成功，单据状态改为【已提交】')
-            record.status = '1'
-            this.getFabricList() // 渲染 发运明细列表
+      console.log(record.id)
+      submitList({id:record.id}).then(res =>{
+        if (res.success) {
+           record.status = 1
+           this.getFabricList()
             this.$message.success('提交成功')
-          }else {
-             this.$message.error(res.message)
+          }else{
+            this.$message.error(res.message);
           }
-        })
-      })
+     })
+    },
+
+    cancel(record){
+      console.log(record.id)
+      cancelSubmit({id:record.id}).then(res =>{
+        if (res.success) {
+           record.status = 0
+           this.getFabricList()
+            this.$message.success('取消提交成功')
+          }else{
+            this.$message.error(res.message);
+          }
+     })
     },
     // 操作 删除
     handleDelete(id) {

src/views/packing-list/packinglist-fabrics/addFabricDrawer.vue

@@ -543,10 +543,12 @@ export default {
     getFabricData(rows,token) {
       this.addFabric = {}
       this.addFabricData = []
-      var rowsId = []
-      rows.map(item => rowsId.push(item.id) )
-      var ids = rowsId.toString()
-      getShippingDetailId({ids:ids,token:token}).then(res => {
+      var rowsId = [],
+         group = []
+      rows.map(item => {rowsId.push(item.id),group.push(item.groupId)} )
+      var ids = rowsId.toString(),
+          groupId =group.toString()
+      getShippingDetailId({ids:ids,groupIds:groupId}).then(res => {
           if (res.success) {
             var data = res.result
             this.addFabric ={
@@ -644,7 +646,7 @@ export default {
             preparedDate:this.addFabric.preparedDate,
             exportInvoiceNo:this.addFabric.exportInvoiceNo,
             shippingOrderNumber:this.addFabric.shippingOrderNumber,
-            memo:this.addFabric.remarks,
+            remarks:this.addFabric.remarks,
             syPackingListFabricItem:this.addFabricData
           }
           if(this.defaultMethod === 'add'){