发运明细调整

src/api/document/shipmentList.js

@@ -8,9 +8,12 @@ const shipmentList = params => getAction('/shippingDetails/syShippingDetails/lis
 // 新增
 const addShipmentList = params => postAction('/shippingDetails/syShippingDetails/add', params)
 
-// 详情
+// ID查询
 const shipmentQueryById = params => getAction('/shippingDetails/syShippingDetails/queryById', params)
 
+//详情
+const queryByDetails = params => getAction('/shippingDetails/syShippingDetails/queryByDetails', params)
+
 // 编辑
 const editById = params => postAction('/shippingDetails/syShippingDetails/edit', params)
 
@@ -54,6 +57,7 @@ export {
   submitShipment,
   queryOrderData,
   shipmentQueryById,
+  queryByDetails,
   editById,
   queryDeclarationElements,
   syDeclarationElementsAdd,

src/views/shipment-details/addShipDetDrawer.vue

@@ -656,8 +656,11 @@ export default {
             var rowData = newObj.syShippingDetailsItemList[i];
             for (var j=i+1;j<newObj.syShippingDetailsItemList.length; j++){
               var nextData = newObj.syShippingDetailsItemList[j];
-              if (rowData.syOrderDataItemId == nextData.syOrderDataItemId){
-                this.$message.error('第'+(i+1)+'行和第'+(j+1)+'行物订单子表id重复，无法保存');
+              if (rowData.smallPo == nextData.smallPo && rowData.orderNumber == nextData.orderNumber  && 
+              rowData.preDeliveryDate == nextData.preDeliveryDate  && rowData.preCompletionDate == nextData.preCompletionDate && 
+              rowData.itemNumber == nextData.itemNumber && rowData.inventoryCode == nextData.inventoryCode&& 
+              rowData.colour == nextData.colour&& rowData.size == nextData.size){
+                this.$message.error('第'+(i+1)+'行和第'+(j+1)+'行数据相同，无法保存');
                 return;
               }
             }

src/views/shipment-details/detailsShipDetDrawer.vue

@@ -105,6 +105,68 @@ export default {
           className: 'replacecolor'
         },
 
+ {
+          title: '小po',
+          dataIndex: 'smallPo',
+          width: 120,
+          className: 'replacecolor'
+        },
+         {
+          title: 'Pack Id',
+          dataIndex: 'packId',
+          width: 120,
+          className: 'replacecolor'
+        },
+          {
+          title: '分销点',
+          dataIndex: 'distributionPoint',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '存货编码',
+          dataIndex: 'inventoryCode',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '存货名称',
+          dataIndex: 'inventoryName',
+          width: 250,
+          className: 'replacecolor'
+        },
+         {
+          title: '颜色',
+          dataIndex: 'colour',
+          width: 160,
+          customRender: t => ellipsis(t),
+          className: 'replacecolor'
+        },
+        {
+          title: '尺码',
+          dataIndex: 'size',
+          width: 100,
+          className: 'replacecolor'
+        },
+        {
+          title: '配码规格',
+          dataIndex: 'codingRules',
+          width: 180,
+          className: 'replacecolor'
+        },
+        {
+          title: '订单数量',
+          dataIndex: 'orderQuantity',
+          width: 120,
+          className: 'replacecolor'
+        },
+          {
+          title: '发货数量',
+          dataIndex: 'shipmentQuantity',
+          width: 120,
+          className: 'replacecolor'
+        },
+
         // {
         //   title: '创建时间',
         //   dataIndex: 'createTime',
@@ -156,43 +218,10 @@ export default {
 
           className: 'replacecolor'
         },
-        {
-          title: '小po',
-          dataIndex: 'smallPo',
-          width: 120,
-          className: 'replacecolor'
-        },
-        {
-          title: 'Pack Id',
-          dataIndex: 'packId',
-          width: 120,
-          className: 'replacecolor'
-        },
-        {
-          title: '分销点',
-          dataIndex: 'distributionPoint',
-          width: 120,
-          className: 'replacecolor'
-        },
-        {
-          title: '颜色',
-          dataIndex: 'colour',
-          width: 160,
-          customRender: t => ellipsis(t),
-          className: 'replacecolor'
-        },
-        {
-          title: '尺码',
-          dataIndex: 'size',
-          width: 100,
-          className: 'replacecolor'
-        },
-        {
-          title: '配码规格',
-          dataIndex: 'codingRules',
-          width: 180,
-          className: 'replacecolor'
-        },
+       
+       
+      
+       
         {
           title: '采购/委外订单号',
           dataIndex: 'purOrSubOrder',

src/views/shipment-details/shipmentList.vue

@@ -241,6 +241,7 @@ import {
   deleteShipment,
   submitShipment,
   shipmentQueryById,
+  queryByDetails,
   queryDeclarationElements,
   cancelSubmitShipment,
   pushShipment,
@@ -594,7 +595,7 @@ export default {
     edit(record) {
       this.$refs.editShipDetDrawer.visible = true
 
-      shipmentQueryById({ id: record.id }).then(res => {
+      queryByDetails({ id: record.id,itemIds: record.itemIds }).then(res => {
         if (res.success) {
           // console.log('编辑对象', res.result)
           this.$refs.editShipDetDrawer.editShipDet = res.result
@@ -606,7 +607,7 @@ export default {
     details(record) {
       this.$refs.detailsShipDetDrawer.visible = true
       // console.log('点击项的ID', record.id)
-      shipmentQueryById({ id: record.id }).then(res => {
+      queryByDetails({ id: record.id,itemIds: record.itemIds}).then(res => {
         if (res.success) {
           console.log('点击的对象', res.result)
           // 把通过id查询到的对象，赋值给子组件