Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-eom into dev

src/views/purchasingManage/purchaseOrder/invoice/components/outSourceSendDialog.vue

@@ -127,8 +127,11 @@ export default {
   },
 
   methods: {
-    init() {
+    init(item) {
       this.reload()
+      if (item && item.id) {
+        this.radio = item.id;
+      }
     },
     /* 表格数据源 */
     datasource({page, limit, where}) {

src/views/saleManage/saleOrder/customerReturnOrder/returnOrderDialog.vue

@@ -111,6 +111,11 @@ export default {
   },
 
   methods: {
+    init(item) {
+      if (item && item.id) {
+        this.radio = item.id;
+      }
+    },
     /* 表格数据源 */
     datasource({page, limit, where, order}) {
       if(this.contactData.id){

src/views/saleManage/saleOrder/invoice/components/entrustedReceiveDialog.vue

@@ -131,7 +131,11 @@ export default {
   },
 
   methods: {
-    init() {},
+    init(item) {
+      if (item && item.id) {
+        this.radio = item.id;
+      }
+    },
     /* 表格数据源 */
     datasource({ page, limit, where }) {
       if (this.contactData.id) {

src/views/transportManager/shipManage/dispatchManage/components/purchaseReturnOrderDialog.vue

@@ -100,6 +100,11 @@ export default {
   },
 
   methods: {
+    init(item) {
+      if (item && item.id) {
+        this.radio = item.id;
+      }
+    },
     /* 表格数据源 */
     datasource({page, limit, where, order}) {
       return getReturnTableList({

src/views/transportManager/shipManage/dispatchManage/components/taskInfoTable.vue

@@ -251,7 +251,7 @@
       :purchaseReturnOrderDialogFlag.sync="purchaseReturnOrderDialogFlag"
       v-if="purchaseReturnOrderDialogFlag"
       @changeParent="getPReturnOrderInfo"
-      ref="returnOrderDialogRef"
+      ref="purchaseReturnOrderDialogRef"
     ></purchase-return-order-dialog>
     <!-- 选择司机   -->
     <select-driver-dialog
@@ -511,8 +511,12 @@
       },
 
       //选择发货单
-      handleOrderBtn() {
-        this.$refs.sendListDialogRef.open();
+      handleOrderBtn(row) {
+        console.log('row', row.taskId)
+        const item = {
+          id: row.taskId
+        }
+        this.$refs.sendListDialogRef.open(item);
       },
       //选择发货单回调
       changeOrder(params) {
@@ -523,8 +527,11 @@
         this.setSelectData(row);
       },
       //选择采购收货单
-      handlePurchaseReceivingGoods() {
-        this.$refs.purchaseReceivingGoodsRef.open();
+      handlePurchaseReceivingGoods(row) {
+        const item = {
+          id: row.taskId
+        }
+        this.$refs.purchaseReceivingGoodsRef.open(item);
       },
       //选择采购收货单回调
       getPurchaseReceivingGoodsInfo(params) {
@@ -536,10 +543,13 @@
       },
 
       //选择委外发货单弹框
-      handleOutsourceSend() {
+      handleOutsourceSend(row) {
         this.outSourceSendDialogFlag = true;
+        const item = {
+          id: row.taskId
+        }
         this.$nextTick(() => {
-          this.$refs.outSourceSendDialogRef.init();
+          this.$refs.outSourceSendDialogRef.init(item);
         });
       },
       //选择委外发货单回调
@@ -551,10 +561,13 @@
         this.setSelectData(row);
       },
       //选择受托收货单弹框
-      handleEntrustedReceive(e) {
+      handleEntrustedReceive(row) {
         this.entrustedReceiveDialogFlag = true;
+        const item = {
+          id: row.taskId
+        }
         this.$nextTick(() => {
-          this.$refs.entrustedReceiveDialogRef.init();
+          this.$refs.entrustedReceiveDialogRef.init(item);
         });
       },
       //获取受托收货单数据回调
@@ -566,11 +579,14 @@
         this.setSelectData(row);
       },
       //选择销售退货单
-      handleSaleReturnOrder() {
+      handleSaleReturnOrder(row) {
         this.returnOrderDialogFlag = true;
-        // this.$nextTick(() => {
-        //   this.$refs.returnOrderDialogRef.init()
-        // })
+        const item = {
+          id: row.taskId
+        }
+        this.$nextTick(() => {
+          this.$refs.returnOrderDialogRef.init(item)
+        })
       },
       //销售退货单回调
       getSReturnOrderInfo(params) {
@@ -581,8 +597,14 @@
         this.setSelectData(row);
       },
       //选择采购退货单
-      handlePurchaseReturnOrder() {
+      handlePurchaseReturnOrder(row) {
         this.purchaseReturnOrderDialogFlag = true;
+        const item = {
+          id: row.taskId
+        }
+        this.$nextTick(() => {
+          this.$refs.purchaseReturnOrderDialogRef.init(item)
+        })
       },
       //采购退货单回调
       getPReturnOrderInfo(params) {