托书节点字段调整

src/views/book/addBookDrawer.vue

@@ -37,13 +37,13 @@
               </a-col>
 
               <a-col :md="6" :sm="8">
-                <a-form-model-item label="经营单位" prop="businessUnit">
+                <a-form-model-item label="经营单位" prop="unitInOperation">
                   <a-input placeholder="请输入经营单位" v-model="addBook.unitInOperation"></a-input>
                 </a-form-model-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
-                <a-form-model-item label="经营单位地址" prop="businessUnitAdd">
+                <a-form-model-item label="经营单位地址" prop="unitInOperationAddress">
                    <a-input placeholder="请输入经营单位地址" v-model="addBook.unitInOperationAddress"></a-input>
                 </a-form-model-item>
               </a-col>
@@ -61,7 +61,7 @@
 
 
               <a-col :md="6" :sm="8">
-                <a-form-model-item label="最终船期" prop="finalShipDate">
+                <a-form-model-item label="最终船期" prop="theFinalShippingDate">
                   <a-input placeholder="请输入最终船期" v-model="addBook.theFinalShippingDate"></a-input>
                 </a-form-model-item>
               </a-col>
@@ -143,7 +143,7 @@
               </a-col>
 
               <a-col :md="6" :sm="8">
-                <a-form-model-item label="收汇方式" prop="collectionMethod">
+                <a-form-model-item label="收汇方式" prop="exchangeEarningsValue">
                    <j-search-select-tag
                     placeholder="请选择收汇方式"
                     v-model="addBook.exchangeEarningsValue"
@@ -154,7 +154,7 @@
               </a-col>
 
               <a-col :md="6" :sm="8">
-                <a-form-model-item label="成交方式" prop="soldType">
+                <a-form-model-item label="成交方式" prop="termsOfDeliveryvalue">
                   <j-search-select-tag
                     placeholder="请选择成交方式"
                     v-model="addBook.termsOfDeliveryvalue"
@@ -172,13 +172,13 @@
               </a-col>
 
               <a-col :md="6" :sm="8">
-                <a-form-model-item label="人民币" prop="RMB">
+                <a-form-model-item label="人民币" prop="cny">
                   <a-input placeholder="请输入人民币" v-model="addBook.cny"></a-input>
                 </a-form-model-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
-                <a-form-model-item label="美元" prop="dollar">
+                <a-form-model-item label="美元" prop="usd">
                   <a-input placeholder="请输入美元" v-model="addBook.usd"></a-input>
                 </a-form-model-item>
               </a-col>
@@ -217,8 +217,8 @@
               </template>
 
               <!-- 集装箱号 输入框-->
-              <template slot="containerNo" slot-scope="text, record, index">
-                <a-form-model-item prop="containerNo" :rules="rules.containerNo">
+              <template slot="containerNumber" slot-scope="text, record, index">
+                <a-form-model-item prop="containerNumber" :rules="rules.containerNumber">
                   <a-input style="width:100%" type="text" v-model="record.containerNumber" />
                 </a-form-model-item>
               </template>
@@ -349,82 +349,119 @@ export default {
       // 表头
       addBookColumns: [
         {
-          title: '英文名称',
-          dataIndex: 'englishName',
+          title: '单据号',
+          dataIndex: 'documentNo',
+          width: 120,
+          ellipsis: true,
+          fixed: 'left',
+          className: 'replacecolor'
+        },
+         {
+          title: '制单人',
+          dataIndex: 'createBy',
+          width: 120,
+          ellipsis: true,
+          fixed: 'left',
+          className: 'replacecolor'
+        },
+         {
+          title: '外销发票号',
+          dataIndex: 'exportInvoiceNo',
+          width: 120,
+          ellipsis: true,
+          fixed: 'left',
+          className: 'replacecolor'
+        },
+         {
+          title: '集装箱号',
+          dataIndex: 'containerNumber',
+          ellipsis: true,
+          scopedSlots: { customRender: 'containerNumber' },
           width: 120,
           fixed: 'left',
           className: 'replacecolor'
         },
         {
-          title: '款号',
-          dataIndex: 'styleNumber',
+          title: '成衣工厂',
+          dataIndex: 'garmentFactory',
           width: 120,
+          ellipsis: true,
           fixed: 'left',
           className: 'replacecolor'
         },
         {
-          title: '小po号',
-          dataIndex: 'smailPo',
+          title: '供应商',
+          dataIndex: 'supplierPrintingPlant',
           width: 120,
+          ellipsis: true,
           className: 'replacecolor'
         },
         {
-          title: '数量',
-          dataIndex: 'number',
+          title: '铅分号',
+          dataIndex: 'plumbumNo',
           width: 120,
+          ellipsis: true,
           className: 'replacecolor'
         },
         {
-          title: '箱数',
-          dataIndex: 'boxNumber',
+          title: '总件数',
+          dataIndex: 'total',
           width: 90,
+          ellipsis: true,
           className: 'replacecolor'
         },
 
         {
-          title: '毛重',
-          dataIndex: 'grossWeight',
+          title: '款号',
+          dataIndex: 'itemNumber',
           width: 120,
+          ellipsis: true,
           className: 'replacecolor'
         },
         {
-          title: '净重',
-          dataIndex: 'netWeight',
+          title: '小po',
+          dataIndex: 'smallPo',
           width: 120,
+          ellipsis: true,
           className: 'replacecolor'
         },
         {
-          title: '体积',
-          dataIndex: 'volume',
+          title: '箱数',
+          dataIndex: 'planQuantity',
           width: 160,
+          ellipsis: true,
           className: 'replacecolor'
         },
         {
-          title: '分销点',
-          dataIndex: 'distributionPoint',
+          title: '毛重',
+          dataIndex: 'grossWeight',
           customRender: t => ellipsis(t),
           width: 120,
+          ellipsis: true,
           className: 'replacecolor'
         },
         {
-          title: '集装箱代号',
-          dataIndex: 'containerCode',
+          title: '净重',
+          dataIndex: 'netWeight',
           width: 120,
-          scopedSlots: { customRender: 'containerCode' },
+          ellipsis: true,
+          // scopedSlots: { customRender: 'containerCode' },
           className: 'replacecolor'
         },
 
         {
-          title: '集装箱号',
-          dataIndex: 'containerNumber',
+          title: '体积',
+          dataIndex: 'totalVolume',
           width: 120,
-          scopedSlots: { customRender: 'containerNo' },
-          className: 'replacecolor'
+          ellipsis: true,
+          // scopedSlots: { customRender: 'containerNo' },
+          // className: 'replacecolor'
         },
         {
-          title: '单价',
-          dataIndex: 'unitPrice',
+          title: '分销点',
+          dataIndex: 'distributionPoint',
           width: 120,
+          ellipsis: true,
           className: 'replacecolor'
         },
         //         {
@@ -437,41 +474,75 @@ export default {
         //   }
         // },
         {
-          title: '预发货日期',
-          dataIndex: 'preShipmentDate',
+          title: '集装箱代号',
+          dataIndex: 'containerCode',
+          scopedSlots: { customRender: 'containerCode' },
           width: 120,
+          ellipsis: true,
           className: 'replacecolor'
         },
         {
-          title: '业务员',
-          dataIndex: 'salesman',
+          title: '单价',
+          dataIndex: 'price',
           width: 120,
+          ellipsis: true,
           className: 'replacecolor'
         },
 
         {
-          title: '业务部门',
-          dataIndex: 'operatingDepartment',
+          title: '金额',
+          dataIndex: 'totalPrice',
           width: 120,
+          ellipsis: true,
           className: 'replacecolor'
         },
         {
-          title: '采购/委外订单号',
-          dataIndex: 'purchaseOutsourcingOrderNo',
+          title: '预发货日期',
+          dataIndex: 'preDeliveryDate',
           width: 160,
+          ellipsis: true,
           className: 'replacecolor'
         },
 
         {
-          title: '采购/委外工厂',
-          dataIndex: 'outsourcingFactoryForProcurement',
+          title: '业务员',
+          dataIndex: 'salesman',
           width: 160,
+          ellipsis: true,
+          className: 'replacecolor'
+        },
+         {
+          title: '业务部门',
+          dataIndex: 'salesDepartment',
+          width: 160,
+          ellipsis: true,
+          className: 'replacecolor'
+        },
+         {
+          title: '采购/委外订单号',
+          dataIndex: 'purOrSubOrder',
+          width: 160,
+          ellipsis: true,
+          className: 'replacecolor'
+        },
+        {
+          title: '英文名称',
+          dataIndex: 'englishProductName',
+          width: 160,
+          ellipsis: true,
+          className: 'replacecolor'
+        },
+        {
+          title: '订单号',
+          dataIndex: 'orderNumber',
+          width: 160,
+          ellipsis: true,
           className: 'replacecolor'
         },
-
         {
           title: '操作',
           dataIndex: 'operation',
+          ellipsis: true,
           scopedSlots: { customRender: 'operationSlot' },
           width: 160,
           fixed: 'right',
@@ -562,42 +633,30 @@ export default {
       }
     },
     referCallback(data){
-        var subList = this.convertReferToSub(data);
-        this.addBookData = this.addBookData.concat(subList);
+      data.map(item=>{
+         item.readyFabric=item.readyFabric
+         item.tailoringFabricItemId=item.itemId
+         item.tailoringFabricId=item.id
+      })
+        // var subList = this.convertReferToSub(data);
+        this.addBookData = this.addBookData.concat(data);
     },
 
     // 参照数据转换成子表
-    convertReferToSub(dataList){
-      var ret = [];
-      for (var i=0; i<dataList.length; i++){
-        var data = dataList[i];
-        var sub = {
-         customer: data.customer,
-         readyFabric:data.readyFabric,
-         tailoringFabricItemId:data.itemId,
-         tailoringFabricId:data.id,
-         englishName:'',
-         styleNumber:data.itemNumber,
-         smailPo:data.smallPo,
-         number : data.planQuantity,
-         boxNumber:data.actualPackingQty,
-         grossWeight:data.totalGrossWeight,
-         netWeight:data.totalNetWeight,
-         volume:data.totalVolume,
-         distributionPoint:data.distributionPoint,
-         containerCode:data.containerCode,
-         containerNumber:data.containerNumber,
-         unitPrice:data.factoryUnitPrice,
-         preShipmentDate:data.preDeliveryDate,
-         salesman:data.salesman,
-         operatingDepartment:'',
-         purchaseOutsourcingOrderNo:data.purOrSubOrder,
-         outsourcingFactoryForProcurement:'',
-        };
-        ret.push(sub);
-      }
-      return ret;
-    },
+    // convertReferToSub(dataList){
+    //   var ret = [];
+    //   for (var i=0; i<dataList.length; i++){
+    //     var data = dataList[i];
+    //     var sub = {
+        
+    //      documentNo:data.documentNo,
+    //      createBy:data.createBy,
+
+    //     };
+    //     ret.push(sub);
+    //   }
+    //   return ret;
+    // },
     // 増行
     // handleAddColumn() {
     //   console.log('増行')

src/views/book/packingListModal.vue

@@ -83,7 +83,7 @@
           :data-source="packingListData"
           :loading="loading"
           :pagination="pagination"
-          :row-key="record => record.id"
+          :row-key="record => record.itemId"
           :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
           @change="handleTableChange"
           bordered
@@ -101,7 +101,6 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import JEllipsis from '@/components/jeecg/JEllipsis'
 import moment from 'moment'
 import {PackingList} from '@api/document/book.js'
-import { spltList} from '@api/document/packing-list/packinglist-clothes'
 
 
 
@@ -154,7 +153,7 @@ export default {
           className: 'replacecolor'
         },
          {
-          title: '集装箱代单据号号',
+          title: '单据号',
           dataIndex: 'documentNo',
           ellipsis: true,
           width: 120,
@@ -195,7 +194,7 @@ export default {
         // },
         {
           title: '预发货日期',
-          dataIndex: 'hod',
+          dataIndex: 'preDeliveryDate',
           ellipsis: true,
           width: 120,
           className: 'replacecolor'
@@ -216,28 +215,28 @@ export default {
         },
         {
           title: '数量（按合并规则累计）',
-          dataIndex: 'total',
+          dataIndex: 'number ',
            ellipsis: true,
           width: 180,
           className: 'replacecolor'
         },
         {
           title: '箱数',
-          dataIndex: 'totalBoxes',
+          dataIndex: 'planQuantity',
            ellipsis: true,
           width: 90,
           className: 'replacecolor'
         },
         {
           title: '总净重',
-          dataIndex: 'totalNetWeight',
+          dataIndex: 'netWeight',
            ellipsis: true,
           width: 120,
           className: 'replacecolor'
         },
         {
           title: '总毛重',
-          dataIndex: 'totalGrossWeight',
+          dataIndex: 'grossWeight',
            ellipsis: true,
           width: 120,
           className: 'replacecolor'
@@ -290,7 +289,7 @@ export default {
         // },
         {
           title: '采购/委外订单号',
-          dataIndex: 'purchase',
+          dataIndex: 'purOrSubOrder;',
            ellipsis: true,
           width: 140,
           className: 'replacecolor'
@@ -353,10 +352,8 @@ export default {
   created() {},
   methods: {
     getPackingList(){
-      debugger
       this.$nextTick(() => {
-      spltList(this.queryParam).then(res => {
-        debugger
+      PackingList(this.queryParam).then(res => {
           if (res.success) {
            this.packingListData = res.result.records
            this.pagination = {