jbb 2 years ago
parent
commit
0a5f0c8750

+ 2 - 1
src/api/document/packing-list/packinglist-clothes.js

@@ -43,9 +43,10 @@ const upload = params => postAction('/splt/syPackingListTailoring/importExcel3',
 
 // 参照
 const queryOrderData = params => getAction('/splt/syPackingListTailoring/querySpaplId2', params)
+const pushOrderData = params => getAction('/splt/syPackingListTailoring/pushBatch', params)
 
 
 
 
-export {spltList,orderSpltList,deleteSpltList,batchDelete,orderSpltListId,editSpltList,addSpltList,spltListId,SubmitList,cancelSubmitList,bitchSubmitList,bitchCancelSubmitList,fileDetail,upload,queryOrderData}
+export {spltList,orderSpltList,deleteSpltList,batchDelete,orderSpltListId,editSpltList,addSpltList,spltListId,SubmitList,cancelSubmitList,bitchSubmitList,bitchCancelSubmitList,fileDetail,upload,queryOrderData,pushOrderData}
 

+ 2 - 1
src/api/document/packing-list/packinglist-fabrics.js

@@ -39,6 +39,7 @@ const synchronizationData = params => getAction('/splfi/syPackingListFabric/getU
 const upload = params => postAction('splfi/syPackingListFabric/importExcel', params)
 //导入获取信息
 const fileDetail = params => postAction('splfi/syPackingListFabric/importExcel2', params)
+const pushOrderData = params => getAction('/splfi/syPackingListFabric/pushBatch', params)
 
 
-export {fabricList,referenceList,getShippingDetailId,addFabricList,fabricListId,editFabricList,deleteFabricList,submitList,cancelSubmit,bitchSubmit,bitchCancelSubmit,synchronizationData,upload,fileDetail}
+export {fabricList,referenceList,getShippingDetailId,addFabricList,fabricListId,editFabricList,deleteFabricList,submitList,cancelSubmit,bitchSubmit,bitchCancelSubmit,synchronizationData,upload,fileDetail,pushOrderData}

+ 13 - 2
src/views/packing-list/clothes-list.vue

@@ -188,6 +188,7 @@
                   <a href="javascript:void(0);" style="color:red;">删除</a>
                 </a-popconfirm>
               </a-menu-item>
+              <a-menu-item><a @click="pushU8(record)">推送U8</a></a-menu-item>
             </a-menu>
 
             <!-- 已提交 -->
@@ -195,6 +196,7 @@
               <a-menu-item>
                 <a @click="details(record)">详情</a>
               </a-menu-item>
+              <a-menu-item><a @click="pushU8(record)">推送U8</a></a-menu-item>
               <!-- <a-menu-item><a @click="itemXls(record)">导出</a></a-menu-item> -->
 
 
@@ -242,13 +244,13 @@ import ReferencePrePacklist from '@views/packing-list/packinglist-clothes/refere
 import clothesAddDrawer from '@views/packing-list/packinglist-clothes/clothesAddDrawer.vue'
 import detailsClothesDrawer from '@views/packing-list/packinglist-clothes/detailsClothesDrawer.vue'
 import editClothesDrawer from '@views/packing-list/packinglist-clothes/editClothesDrawer.vue'
-import { spltList,deleteSpltList,spltListId,SubmitList,cancelSubmitList,bitchSubmitList,bitchCancelSubmitList,fileDetail,upload} from '@api/document/packing-list/packinglist-clothes'
+import { spltList,deleteSpltList,spltListId,SubmitList,cancelSubmitList,bitchSubmitList,bitchCancelSubmitList,fileDetail,upload,pushOrderData} from '@api/document/packing-list/packinglist-clothes'
 
 
 export default {
   name: 'ClothesList', // 装箱单-成衣
   mixins: [JeecgListMixin],
-  components: { JEllipsis, clothesAddDrawer, detailsClothesDrawer, editClothesDrawer,ReferencePrePacklist },
+  components: { JEllipsis, clothesAddDrawer, detailsClothesDrawer, editClothesDrawer,ReferencePrePacklist,pushOrderData },
   data() {
     // let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} /> // 省略
 
@@ -638,6 +640,15 @@ export default {
      })
 
     },
+    pushU8(record){
+      pushOrderData({ids : record.id}).then(res =>{
+        if (res.success) {
+            this.$message.success('推送U8成功成功');
+          }else{
+            this.$message.error(res.message);
+          }
+     })
+    },
     // 导入
     importData() {},
     // 新增

+ 26 - 1
src/views/packing-list/fabric-list.vue

@@ -84,6 +84,13 @@
             <a-input style="width:100%" v-model="record.containerNumber" />
           </a-form-model-item>
         </a-form-model> -->
+        <!-- 单据状态 -->
+        <span slot="pushState" slot-scope="text, record">
+          <a-tag color="orange" v-if="record.status == '0'">未推送</a-tag>
+          <a-tag color="red" v-if="record.status == '2'">推送失败</a-tag>
+          <a-tag color="green" v-if="record.status == '1'">推送成功</a-tag>
+        </span>
+
          <!-- 单据状态 -->
         <span slot="state" slot-scope="text, record">
           <a-tag color="orange" v-if="record.status == '0'">已保存</a-tag>
@@ -101,6 +108,7 @@
             <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="pushU8(record)">推送U8</a></a-menu-item>
               <!-- <a-menu-item><a @click="itemXls(record)">导出</a></a-menu-item> -->
               <!-- <a-menu-item><a @click="submit(record)">提交</a></a-menu-item> -->
               <a-menu-item>
@@ -112,6 +120,7 @@
             <!-- 已提交 -->
             <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="pushU8(record)">推送U8</a></a-menu-item>
               <!-- <a-menu-item><a @click="itemXls(record)">导出</a></a-menu-item> -->
               <!-- <a-menu-item><a @click="cancel(record)">取消提交</a></a-menu-item> -->
             </a-menu>
@@ -146,7 +155,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,cancelSubmit,bitchSubmit,bitchCancelSubmit,synchronizationData,upload,fileDetail} from '@api/document/packing-list/packinglist-fabrics'
+import { fabricList,fabricListId,deleteFabricList,submitList,cancelSubmit,bitchSubmit,bitchCancelSubmit,synchronizationData,upload,fileDetail,pushOrderData} from '@api/document/packing-list/packinglist-fabrics'
 
 export default {
   name: 'FabricList', // 装箱单-面料
@@ -235,6 +244,13 @@ export default {
           width: 160,
            ellipsis: true,
           className: 'replacecolor'
+        },
+        {
+          title: '推送状态',
+          dataIndex: 'pushState',
+          scopedSlots: { customRender: 'pushState' },
+          width: 140,
+          className: 'replacecolor'
         },
          {
           title: '状态',
@@ -521,6 +537,15 @@ export default {
           }
      })
     },
+    pushU8(record){
+      pushOrderData({ids : record.id}).then(res =>{
+        if (res.success) {
+            this.$message.success('推送U8成功');
+          }else{
+            this.$message.error(res.message);
+          }
+     })
+    },
 
     cancel(record){
       console.log(record.id)