Browse Source

托书参照成衣字段调整

jbb 2 years ago
parent
commit
3c69eb04af
2 changed files with 19 additions and 19 deletions
  1. 10 10
      src/views/book/addBookDrawer.vue
  2. 9 9
      src/views/book/packingListModal.vue

+ 10 - 10
src/views/book/addBookDrawer.vue

@@ -552,19 +552,19 @@ export default {
          englishName:'',
          styleNumber:data.itemNumber,
          smailPo:data.smallPo,
-         number : data.inventoryQuantity,
-         boxNumber:'',
-         grossWeight:'',
-         netWeight:'',
-         volume:'',
+         number : data.planQuantity,
+         boxNumber:data.actualPackingQty,
+         grossWeight:data.totalGrossWeight,
+         netWeight:data.totalNetWeight,
+         volume:data.totalVolume,
          distributionPoint:data.distributionPoint,
-         containerCode:'',
-         containerNumber:'',
-         unitPrice:'',
+         containerCode:data.containerCode,
+         containerNumber:data.containerNumber,
+         unitPrice:data.factoryUnitPrice,
          preShipmentDate:data.preDeliveryDate,
-         salesman:'',
+         salesman:data.salesman,
          operatingDepartment:'',
-         purchaseOutsourcingOrderNo:data.purchase,
+         purchaseOutsourcingOrderNo:data.purOrSubOrder,
          outsourcingFactoryForProcurement:'',
         };
         ret.push(sub);

+ 9 - 9
src/views/book/packingListModal.vue

@@ -16,7 +16,7 @@
           <a-row :gutter="24">
             <a-col :md="6" :sm="8">
               <a-form-item label="订单号">
-                <a-input placeholder="请输入订单号" v-model="queryParam.purchase"></a-input>
+                <a-input placeholder="请输入订单号" v-model="queryParam.orderNumber"></a-input>
               </a-form-item>
             </a-col>
 
@@ -168,7 +168,7 @@ export default {
         },
         {
           title: '采购/委外订单号',
-          dataIndex: 'purchase',
+          dataIndex: 'purOrSubOrder',
           width: 140,
           className: 'replacecolor'
         },
@@ -181,31 +181,31 @@ export default {
 
         {
           title: '工厂单价',
-          dataIndex: 'theFactoryPrice',
+          dataIndex: 'factoryUnitPrice',
           width: 120,
           className: 'replacecolor'
         },
         {
           title: '数量(按合并规则累计)',
-          dataIndex: 'quantity',
+          dataIndex: 'planQuantity',
           width: 180,
           className: 'replacecolor'
         },
         {
           title: '箱数',
-          dataIndex: 'boxesNum',
+          dataIndex: 'actualPackingQty',
           width: 90,
           className: 'replacecolor'
         },
         {
           title: '总净重',
-          dataIndex: 'totalSuttle',
+          dataIndex: 'totalNetWeight',
           width: 120,
           className: 'replacecolor'
         },
         {
           title: '总毛重',
-          dataIndex: 'totalRoughWeigh',
+          dataIndex: 'totalGrossWeight;',
           width: 120,
           className: 'replacecolor'
         },
@@ -231,14 +231,14 @@ export default {
 
         {
           title: '集装箱号',
-          dataIndex: 'containerNo',
+          dataIndex: 'containerNumber',
           width: 120,
           fixed: 'right',
           className: 'replacecolor'
         },
         {
           title: '预托书号',
-          dataIndex: 'preBookNum',
+          dataIndex: 'depositaryReceiptNo',
           width: 120,
           fixed: 'right',
           className: 'replacecolor'