托书参照装箱单成衣列表字段调整

src/views/book/packingListModal.vue

@@ -32,6 +32,35 @@
               </a-form-item>
             </a-col>
 
+             <template v-if="toggleSearchStatus">
+              <a-col :md="6" :sm="8">
+              <a-form-item label="分销点">
+                <a-input placeholder="请输入分销点" v-model="queryParam.distributionPoint"></a-input>
+              </a-form-item>
+             </a-col>
+             <a-col :md="6" :sm="8">
+              <a-form-item label="预发货日期">
+                <a-date-picker placeholder="请输入预发货日期" style="width:100%;" v-model="queryParam.hod"/>
+              </a-form-item>
+             </a-col>
+              <a-col :md="6" :sm="8">
+              <a-form-item label="小po">
+                <a-input placeholder="请输入款号" v-model="queryParam.smallPo"></a-input>
+              </a-form-item>
+             </a-col>
+             <a-col :md="6" :sm="8">
+              <a-form-item label="供应商">
+                <a-input placeholder="请输入款号" v-model="queryParam.supplier"></a-input>
+              </a-form-item>
+              <a-col :md="6" :sm="8">
+              <a-form-item label="预托书号">
+                <a-input placeholder="请输入预托书号" v-model="queryParam.depositaryReceiptNo"></a-input>
+              </a-form-item>
+             </a-col>
+             </a-col>
+
+              </template>
+
             <a-col :md="6" :sm="8">
               <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                 <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
@@ -72,12 +101,17 @@ 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'
+
+
+
 
 export default {
   name: 'PackingListModal', // 参照装箱单 弹框
   mixins: [JeecgListMixin],
   components: { JEllipsis, moment },
   data() {
+    let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} /> // 省略
     return {
       // 查询条件
       queryParam: {
@@ -87,125 +121,124 @@ export default {
       loading: false, // 表格加载
       // 表头
       packingListColumns: [
-        {
-          title: '款号',
-          dataIndex: 'itemNumber',
+         {
+          title: '预托书号',
+          dataIndex: 'depositaryReceiptNo',
           width: 120,
+          ellipsis: true,
           fixed: 'left',
           className: 'replacecolor'
         },
-        {
-          title: '客户简称',
-          dataIndex: 'customerAbbreviation',
+         {
+          title: '托书号',
+          dataIndex: 'shippingOrderNumber',
           width: 120,
+         ellipsis: true,
           fixed: 'left',
           className: 'replacecolor'
-        },
-        //  {
-        //   title: '创建时间',
-        //   dataIndex: 'createTime',
-        //   align: 'center',
-        //   sorter: true,
-        //   customRender: text => {
-        //     return moment(text).format('YYYY-MM-DD')
-        //   }
-        // },
-        {
-          title: '预发货日期',
-          dataIndex: 'preDeliveryDate',
-          width: 120,
-          className: 'replacecolor'
-        },
-        {
-          title: '小PO',
-          dataIndex: 'smallPo',
-          width: 120,
-          className: 'replacecolor'
-        },
-        {
-          title: '分销点',
-          dataIndex: 'distributionPoint',
+        }, 
+       {
+          title: '集装箱代号',
+          dataIndex: 'containerCode',
+          ellipsis: true,
           width: 120,
           className: 'replacecolor'
         },
 
         {
-          title: '备注',
-          dataIndex: 'memo',
+          title: '集装箱号',
+          dataIndex: 'containerNumber',
+          ellipsis: true,
           width: 120,
+          // fixed: 'right',
           className: 'replacecolor'
         },
-        {
-          title: '发货日期',
-          dataIndex: 'shipDate',
+         {
+          title: '集装箱代单据号号',
+          dataIndex: 'documentNo',
+          ellipsis: true,
           width: 120,
           className: 'replacecolor'
         },
-        {
-          title: '业务员',
-          dataIndex: 'salesman',
+          {
+          title: '订单号',
+          dataIndex: 'orderNumber',
+          ellipsis: true,
           width: 120,
+          // fixed: 'left',
           className: 'replacecolor'
         },
         {
-          title: '客户',
-          dataIndex: 'customer',
+          title: '款号',
+          dataIndex: 'itemNumber',
+          ellipsis: true,
           width: 120,
+          // fixed: 'left',
           className: 'replacecolor'
         },
         {
-          title: '存货名称',
-          dataIndex: 'inventoryName',
+          title: '客户简称',
+          dataIndex: 'customerAbbreviation',
+          ellipsis: true,
           width: 120,
+          // fixed: 'left',
           className: 'replacecolor'
         },
-
+        //  {
+        //   title: '创建时间',
+        //   dataIndex: 'createTime',
+        //   align: 'center',
+        //   sorter: true,
+        //   customRender: text => {
+        //     return moment(text).format('YYYY-MM-DD')
+        //   }
+        // },
         {
-          title: '颜色',
-          dataIndex: 'colour',
+          title: '预发货日期',
+          dataIndex: 'hod',
+          ellipsis: true,
           width: 120,
           className: 'replacecolor'
         },
         {
-          title: '采购/委外订单号',
-          dataIndex: 'purOrSubOrder',
-          width: 140,
-          className: 'replacecolor'
-        },
-        {
-          title: '订单类型',
-          dataIndex: 'orderType',
+          title: '小PO',
+          dataIndex: 'smallPo',
+           ellipsis: true,
           width: 120,
           className: 'replacecolor'
         },
-
         {
-          title: '工厂单价',
-          dataIndex: 'factoryUnitPrice',
+          title: '分销点',
+          dataIndex: 'distributionPoint',
+           ellipsis: true,
           width: 120,
           className: 'replacecolor'
         },
         {
           title: '数量（按合并规则累计）',
-          dataIndex: 'planQuantity',
+          dataIndex: 'total',
+           ellipsis: true,
           width: 180,
           className: 'replacecolor'
         },
         {
           title: '箱数',
-          dataIndex: 'actualPackingQty',
+          dataIndex: 'totalBoxes',
+           ellipsis: true,
           width: 90,
           className: 'replacecolor'
         },
         {
           title: '总净重',
           dataIndex: 'totalNetWeight',
+           ellipsis: true,
           width: 120,
           className: 'replacecolor'
         },
         {
           title: '总毛重',
           dataIndex: 'totalGrossWeight',
+           ellipsis: true,
           width: 120,
           className: 'replacecolor'
         },
@@ -213,36 +246,90 @@ export default {
         {
           title: '总体积',
           dataIndex: 'totalVolume',
+           ellipsis: true,
           width: 120,
           className: 'replacecolor'
         },
+
+        // {
+        //   title: '备注',
+        //   dataIndex: 'memo',
+        //   width: 120,
+        //   className: 'replacecolor'
+        // },
+        // {
+        //   title: '发货日期',
+        //   dataIndex: 'shipDate',
+        //   width: 120,
+        //   className: 'replacecolor'
+        // },
+        // {
+        //   title: '业务员',
+        //   dataIndex: 'salesman',
+        //   width: 120,
+        //   className: 'replacecolor'
+        // },
+        // {
+        //   title: '客户',
+        //   dataIndex: 'customer',
+        //   width: 120,
+        //   className: 'replacecolor'
+        // },
+        // {
+        //   title: '存货名称',
+        //   dataIndex: 'inventoryName',
+        //   width: 120,
+        //   className: 'replacecolor'
+        // },
+
+        // {
+        //   title: '颜色',
+        //   dataIndex: 'colour',
+        //   width: 120,
+        //   className: 'replacecolor'
+        // },
         {
-          title: '总价',
-          dataIndex: 'totalPrices',
-          width: 120,
+          title: '采购/委外订单号',
+          dataIndex: 'purchase',
+           ellipsis: true,
+          width: 140,
           className: 'replacecolor'
         },
-        {
-          title: '集装箱代号',
-          dataIndex: 'containerCode',
-          width: 120,
+         {
+          title: '成衣工厂',
+          dataIndex: 'garmentFactory',
+          width: 140,
+           ellipsis: true,
           className: 'replacecolor'
         },
-
-        {
-          title: '集装箱号',
-          dataIndex: 'containerNumber',
-          width: 120,
-          fixed: 'right',
+          {
+          title: '外销发票号',
+          dataIndex: 'exportInvoiceNo',
+          width: 130,
+           ellipsis: true,
           className: 'replacecolor'
         },
-        {
-          title: '预托书号',
-          dataIndex: 'depositaryReceiptNo',
-          width: 120,
-          fixed: 'right',
-          className: 'replacecolor'
-        }
+        // {
+        //   title: '订单类型',
+        //   dataIndex: 'orderType',
+        //   width: 120,
+        //   className: 'replacecolor'
+        // },
+
+        // {
+        //   title: '工厂单价',
+        //   dataIndex: 'factoryUnitPrice',
+        //   width: 120,
+        //   className: 'replacecolor'
+        // },
+        
+        // {
+        //   title: '总价',
+        //   dataIndex: 'totalPrices',
+        //   width: 120,
+        //   className: 'replacecolor'
+        // },
+      
       ],
       packingListData: [],
       selectedRows:[],
@@ -266,8 +353,10 @@ export default {
   created() {},
   methods: {
     getPackingList(){
+      debugger
       this.$nextTick(() => {
-      PackingList(this.queryParam).then(res => {
+      spltList(this.queryParam).then(res => {
+        debugger
           if (res.success) {
            this.packingListData = res.result.records
            this.pagination = {