|
@@ -266,6 +266,15 @@
|
|
|
@changeParent="getPReturnOrderInfo"
|
|
@changeParent="getPReturnOrderInfo"
|
|
|
ref="returnOrderDialogRef"
|
|
ref="returnOrderDialogRef"
|
|
|
></purchase-return-order-dialog>
|
|
></purchase-return-order-dialog>
|
|
|
|
|
+
|
|
|
|
|
+ <!-- 调拨发货 -->
|
|
|
|
|
+ <inventory-allocation-dialog
|
|
|
|
|
+ ref="inventoryAllocationDialogRef"
|
|
|
|
|
+ :inventoryAllocationDialogFlag.sync="inventoryAllocationDialogFlag"
|
|
|
|
|
+ v-if="inventoryAllocationDialogFlag"
|
|
|
|
|
+ @changeParent="getTransferSendInfo"
|
|
|
|
|
+ ></inventory-allocation-dialog>
|
|
|
|
|
+
|
|
|
</ele-modal>
|
|
</ele-modal>
|
|
|
</template>
|
|
</template>
|
|
|
|
|
|
|
@@ -279,6 +288,7 @@
|
|
|
import sendListDialog from '@/views/transportManager/shipManage/taskWorkManage/components/sendListDialog.vue';
|
|
import sendListDialog from '@/views/transportManager/shipManage/taskWorkManage/components/sendListDialog.vue';
|
|
|
import purchaseReceivingGoodsDialog from '@/views/purchasingManage/purchaseOrder/returnGoods/components/sendListDialog.vue';
|
|
import purchaseReceivingGoodsDialog from '@/views/purchasingManage/purchaseOrder/returnGoods/components/sendListDialog.vue';
|
|
|
import purchaseReturnOrderDialog from '@/views/transportManager/shipManage/dispatchManage/components/purchaseReturnOrderDialog.vue';
|
|
import purchaseReturnOrderDialog from '@/views/transportManager/shipManage/dispatchManage/components/purchaseReturnOrderDialog.vue';
|
|
|
|
|
+ import inventoryAllocationDialog from '@/views/transportManager/shipManage/dispatchManage/components/inventoryAllocationDialog.vue';
|
|
|
|
|
|
|
|
export default {
|
|
export default {
|
|
|
name: 'addOrEditDialog',
|
|
name: 'addOrEditDialog',
|
|
@@ -290,7 +300,8 @@
|
|
|
outSourceSendDialog,
|
|
outSourceSendDialog,
|
|
|
sendListDialog,
|
|
sendListDialog,
|
|
|
purchaseReceivingGoodsDialog,
|
|
purchaseReceivingGoodsDialog,
|
|
|
- purchaseReturnOrderDialog
|
|
|
|
|
|
|
+ purchaseReturnOrderDialog,
|
|
|
|
|
+ inventoryAllocationDialog
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
props: {
|
|
props: {
|
|
@@ -308,6 +319,7 @@
|
|
|
entrustedReceiveDialogFlag: false,
|
|
entrustedReceiveDialogFlag: false,
|
|
|
returnOrderDialogFlag: false,
|
|
returnOrderDialogFlag: false,
|
|
|
purchaseReturnOrderDialogFlag: false,
|
|
purchaseReturnOrderDialogFlag: false,
|
|
|
|
|
+ inventoryAllocationDialogFlag: false,
|
|
|
billingMethodList: [
|
|
billingMethodList: [
|
|
|
{
|
|
{
|
|
|
label: '按方计费',
|
|
label: '按方计费',
|
|
@@ -482,8 +494,34 @@
|
|
|
case '6': //采购退货
|
|
case '6': //采购退货
|
|
|
this.handlePurchaseReturnOrder(row);
|
|
this.handlePurchaseReturnOrder(row);
|
|
|
break;
|
|
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() {
|
|
handleOrderBtn() {
|
|
|
// this.$refs.sendListDialogRef.open();
|
|
// this.$refs.sendListDialogRef.open();
|