发运明细 参照订单

src/views/shipment-details/addShipDetDrawer.vue

@@ -289,19 +289,8 @@ export default {
           scopedSlots: { customRender: 'itemNumber' },
           fixed: 'left',
           width: 180,
-          // align: middle,
           className: 'replacecolor'
         },
-
-        // {
-        //   title: '创建时间',
-        //   dataIndex: 'createTime',
-        //   align: 'center',
-        //   sorter: true,
-        //   customRender: text => {
-        //     return moment(text).format('YYYY-MM-DD')
-        //   }
-        // },
         {
           title: '订单日期',
           dataIndex: 'orderDate',
@@ -417,13 +406,15 @@ export default {
         {
           title: '客户简称',
           dataIndex: 'customerAbbreviation',
-          width: 120,
+          width: 220,
+          align: 'left',
           className: 'replacecolor'
         },
         {
           title: '客户名称',
           dataIndex: 'customerName',
           width: 220,
+          align: 'left',
           className: 'replacecolor'
         },
         {
@@ -432,12 +423,7 @@ export default {
           width: 120,
           className: 'replacecolor'
         },
-        // {
-        //   title: '整单（合计）',
-        //   dataIndex: 'wholeOrderTotal',
-        //   width: 120,
-        //   className: 'replacecolor'
-        // },
+
         {
           title: '销售部门',
           dataIndex: 'salesDepartment',
@@ -466,7 +452,8 @@ export default {
         {
           title: '第三方',
           dataIndex: 'thirdParty',
-          width: 120,
+          width: 220,
+          align: 'left',
           className: 'replacecolor'
         },
         {

src/views/shipment-details/referOrderDataModal.vue

@@ -329,7 +329,7 @@ export default {
           className: 'replacecolor'
         }
       ],
-      orderListData: [],
+      orderListData: [], //订单数据
       confirmLoading: false,
       referOrderDataModVis: false,
 
@@ -342,7 +342,8 @@ export default {
       },
       // 分页
       pagination: {},
-      confimList: []
+      confimList: [], //勾选的订单数组
+      propList: [] //需要给新增页的数据
     }
   },
   // 接收父组件 方法
@@ -373,25 +374,20 @@ export default {
       if (this.selectedRowKeys.length == 0) {
         this.$message.error('请勾选订单数据')
       } else {
-        console.log('勾选', this.selectedRows)
-
         this.selectedRows.forEach(item => {
           this.confimList.push(item.syOrderDataItemId)
         })
-        // itemId:"1232,1231,123,123,123,13,123" 这种
         console.log('勾选的id数组', this.confimList)
-        confimOrderData({ "itemId": this.confimList }).then(res => {
+
+        confimOrderData(this.confimList).then(res => {
           if (res.success) {
-            console.log('结果', res.result)
-            // this.orderListData = res.result.records
-            this.pagination = {
-              total: res.result.total,
-              current: res.result.current,
-              pageSize: res.result.size
-            }
+            console.log('结果 res', res.result)
+            this.propList = res.result
+            this.$emit('bao', this.propList)
+            console.log('结果this.propList', this.propList)
           }
         })
-        this.$emit('bao', this.selectedRows)
+
         this.referOrderDataModVis = false
         this.selectedRowKeys = []
         this.selectedRows = []