Kaynağa Gözat

feat(运输管理): 添加调拨发货功能并修复状态字段

liujt 2 ay önce
ebeveyn
işleme
dd9e258a5b

+ 1 - 1
.env

@@ -3,4 +3,4 @@ VUE_APP_API_BASE_URL=/api
 
 # 环境变量
 # clientEnvironmentId 
-# 3 碳谷 4 宝悦  5 嘉实  6 润天智科
+# 3 碳谷 4 宝悦  5 嘉实  6 润天智科  8 华泰

+ 39 - 1
src/views/transportManager/shipManage/taskWorkManage/components/addOrEditDialog.vue

@@ -266,6 +266,15 @@
       @changeParent="getPReturnOrderInfo"
       ref="returnOrderDialogRef"
     ></purchase-return-order-dialog>
+
+    <!-- 调拨发货   -->
+    <inventory-allocation-dialog
+      ref="inventoryAllocationDialogRef"
+      :inventoryAllocationDialogFlag.sync="inventoryAllocationDialogFlag"
+      v-if="inventoryAllocationDialogFlag"
+      @changeParent="getTransferSendInfo"
+    ></inventory-allocation-dialog>
+
   </ele-modal>
 </template>
 
@@ -279,6 +288,7 @@
   import sendListDialog from '@/views/transportManager/shipManage/taskWorkManage/components/sendListDialog.vue';
   import purchaseReceivingGoodsDialog from '@/views/purchasingManage/purchaseOrder/returnGoods/components/sendListDialog.vue';
   import purchaseReturnOrderDialog from '@/views/transportManager/shipManage/dispatchManage/components/purchaseReturnOrderDialog.vue';
+  import inventoryAllocationDialog from '@/views/transportManager/shipManage/dispatchManage/components/inventoryAllocationDialog.vue';
 
   export default {
     name: 'addOrEditDialog',
@@ -290,7 +300,8 @@
       outSourceSendDialog,
       sendListDialog,
       purchaseReceivingGoodsDialog,
-      purchaseReturnOrderDialog
+      purchaseReturnOrderDialog,
+      inventoryAllocationDialog
     },
 
     props: {
@@ -308,6 +319,7 @@
         entrustedReceiveDialogFlag: false,
         returnOrderDialogFlag: false,
         purchaseReturnOrderDialogFlag: false,
+        inventoryAllocationDialogFlag: false,
         billingMethodList: [
           {
             label: '按方计费',
@@ -482,8 +494,34 @@
           case '6': //采购退货
             this.handlePurchaseReturnOrder(row);
             break;
+          case '7': //调拨发货
+            this.handleTransferSend(row);
+            break;
         }
       },
+      //选择调拨发货单
+      handleTransferSend() {
+        this.inventoryAllocationDialogFlag = true;
+      },
+      //调拨发货单回调
+      getTransferSendInfo(params) {
+        console.log(params, 'params ++++++++++');
+        let row = {
+          id: params.id,
+          code: params.allotCode,
+          orderNo: params.saleOrderNos,
+          contactName: params.name
+        };
+        this.tableList = [row];
+        // this.tableList = params.map((item) => {
+        //   return {
+        //     id: item.id, // id
+        //     code: item.allotCode, // 发货编码
+        //     orderNo: item.saleOrderNos,
+        //     contactName: item.name
+        //   };
+        // });
+      },
       //选择发货单
       handleOrderBtn() {
         // this.$refs.sendListDialogRef.open();

+ 1 - 1
src/views/transportManager/shipManage/taskWorkManage/pageSearchTable.vue

@@ -26,7 +26,7 @@ export default {
         },
         {
           label: '状态:',
-          value: 'planName',
+          value: 'status',
           type: 'select',
           placeholder: '请选择',
           planList: [