装箱单成衣分页查询

src/views/packing-list/clothes-list.vue

@@ -8,26 +8,26 @@
           <a-row :gutter="24">
             <a-col :md="6" :sm="8">
               <a-form-item label="订单号">
-                <a-input placeholder="请输入订单号" v-model="queryParam.orderNum"></a-input>
+                <a-input placeholder="请输入订单号" v-model="queryParam.orderNumber"></a-input>
               </a-form-item>
             </a-col>
 
             <a-col :md="6" :sm="8">
               <a-form-item label="款号">
-                <a-input placeholder="请输入款号" v-model="queryParam.styleNum"></a-input>
+                <a-input placeholder="请输入款号" v-model="queryParam.itemNumber"></a-input>
               </a-form-item>
             </a-col>
 
             <a-col :md="6" :sm="8">
               <a-form-item label="品名">
-                <a-input placeholder="请输入品名" v-model="queryParam.name"></a-input>
+                <a-input placeholder="请输入品名" v-model="queryParam.productName"></a-input>
               </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.bookNum"></a-input>
+                  <a-input placeholder="请输入托书号" v-model="queryParam.shippingOrderNumber"></a-input>
                 </a-form-item>
               </a-col>
             </template>
@@ -70,7 +70,7 @@
         :columns="clothesListColumns"
         :data-source="clothesListData"
         :loading="loading"
-        :pagination="ipagination"
+        :pagination="pagination"
         :row-key="record => record.id"
         :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         @change="handleTableChange"
@@ -146,6 +146,8 @@
       </a-table>
     </a-card>
 
+    <!-- 子表 -->
+
     <!-- 抽屉 -->
     <div>
       <clothesAdd-drawer ref="clothesAddDrawer" :father="aa" @ok="modalFormOk"></clothesAdd-drawer>
@@ -161,6 +163,8 @@ import JEllipsis from '@/components/jeecg/JEllipsis'
 import clothesAddDrawer from '@views/packing-list/packinglist-clothes/clothesAddDrawer.vue'
 import detailsClothesDrawer from '@views/packing-list/packinglist-clothes/detailsClothesDrawer.vue'
 import editClothesDrawer from '@views/packing-list/packinglist-clothes/editClothesDrawer.vue'
+import { spltList} from '@api/document/packing-list/packinglist-clothes'
+
 
 export default {
   name: 'ClothesList', // 装箱单-成衣
@@ -174,21 +178,21 @@ export default {
       clothesListColumns: [
         {
           title: '款号',
-          dataIndex: 'styleNum',
+          dataIndex: 'itemNumber',
           width: 120,
           fixed: 'left',
           className: 'replacecolor'
         },
         {
           title: '客户简称',
-          dataIndex: 'customerShortName',
+          dataIndex: 'customerAbbreviation',
           width: 120,
           fixed: 'left',
           className: 'replacecolor'
         },
         {
           title: '预发货日期',
-          dataIndex: 'scheduledShipDate',
+          dataIndex: 'hod',
           width: 120,
           className: 'replacecolor'
         },
@@ -213,13 +217,13 @@ export default {
         },
         {
           title: '颜色',
-          dataIndex: 'color',
+          dataIndex: 'colour',
           width: 120,
           className: 'replacecolor'
         },
         {
           title: '采购/委外订单号',
-          dataIndex: 'purchaseAboardOrderNum',
+          dataIndex: 'purchase',
           width: 160,
           className: 'replacecolor'
         },
@@ -231,32 +235,32 @@ export default {
         },
         {
           title: '工厂单价',
-          dataIndex: 'factoryPeice',
+          dataIndex: 'factoryUnitPrice',
           width: 120,
           className: 'replacecolor'
         },
         {
           title: '数量（按合并规则累计）',
-          dataIndex: 'quantity',
+          dataIndex: 'total',
           width: 200,
           className: 'replacecolor'
         },
 
         {
           title: '箱数',
-          dataIndex: 'boxesNum',
+          dataIndex: 'totalBoxes',
           width: 90,
           className: 'replacecolor'
         },
         {
           title: '总净重',
-          dataIndex: 'totalSuttle',
+          dataIndex: 'totalNetWeight',
           width: 120,
           className: 'replacecolor'
         },
         {
           title: '总毛重',
-          dataIndex: 'totalRoughWeigh',
+          dataIndex: 'totalGrossWeight',
           width: 120,
           className: 'replacecolor'
         },
@@ -270,7 +274,7 @@ export default {
 
         {
           title: '总价',
-          dataIndex: 'totalPrices',
+          dataIndex: 'totalPrice',
           width: 120,
           className: 'replacecolor'
         },
@@ -283,7 +287,7 @@ export default {
         },
         {
           title: '集装箱号',
-          dataIndex: 'containerNo',
+          dataIndex: 'containerNumber',
           width: 140,
           scopedSlots: { customRender: 'containerNo' },
           className: 'replacecolor'
@@ -291,7 +295,7 @@ export default {
 
         {
           title: '预托书号',
-          dataIndex: 'preBookNum',
+          dataIndex: 'depositaryReceiptNo',
           width: 160,
           scopedSlots: { customRender: 'preBookNum' },
           className: 'replacecolor'
@@ -299,7 +303,7 @@ export default {
 
         {
           title: '成衣工厂',
-          dataIndex: 'clothesFactory',
+          dataIndex: 'garmentFactory',
           width: 140,
           customRender: t => ellipsis(t),
           className: 'replacecolor'
@@ -315,14 +319,14 @@ export default {
 
         {
           title: '单据状态',
-          dataIndex: 'documentState',
+          dataIndex: 'theDocumentsState',
           width: 90,
           scopedSlots: { customRender: 'documentState' },
           className: 'replacecolor'
         },
         {
           title: '原因',
-          dataIndex: 'reason',
+          dataIndex: 'cause',
           width: 180,
           customRender: t => ellipsis(t),
           className: 'replacecolor'
@@ -330,7 +334,7 @@ export default {
 
         {
           title: '是否云工厂推送',
-          dataIndex: 'isPushCloudfactory ',
+          dataIndex: 'whetherCloudFactoryPush ',
           width: 90,
           // scopedSlots: { customRender: 'isPushCloudfactory' },
           className: 'replacecolor'
@@ -338,7 +342,7 @@ export default {
 
         {
           title: '托书号',
-          dataIndex: 'bookNum',
+          dataIndex: 'shippingOrderNumber',
           width: 120,
           className: 'replacecolor'
         },
@@ -369,17 +373,23 @@ export default {
         }
       ],
 
-      clothesListData: [{}, {}, {}],
+      clothesListData: [],
 
       selectedRowKeys: [], // 勾选航
       loading: false, // 表格加载
 
       // 查询条件
       queryParam: {
-        orderNum: '',
-        styleNum: '',
-        name: '', // 品名
-        bookNum: '' // 托书号
+        orderNumber: '', // 订单号
+        itemNumber	: '', //款号
+        productName: '', // 品名
+        shippingOrderNumber: '' ,// 托书号
+        pageNo: '' // 初始页
+      },
+      pagination: {
+        // total: '',
+        // current: 0,
+        // pageSize: 0
       },
       url: {
         // syncUser: '/act/process/extActProcess/doSyncUser',
@@ -392,17 +402,37 @@ export default {
     }
   },
   created() {
-    // this.getAdPaListClothes()
+    this.getSpltList()
   },
   methods: {
+    //分页查询
+    getSpltList() {
+     var that = this;
+      this.$nextTick(() => {
+        spltList(this.queryParam).then(res => {
+          if (res.success) {
+            that.clothesListData = res.result.records;
+            that.pagination = {
+              total: res.result.total,
+              current: res.result.current,
+              pageSize: res.result.size
+            }
+          }else{
+              that.$message.error(res.message);
+          }
+        })
+      })
+    },
+
     // 查询按钮
     searchQuery() {
-      // this.getAnnList() // 装箱单-成衣列表
+       this.queryParam.pageNo = ''
+       this.getSpltList()
     },
     searchReset() {
       // console.log('>>>>重置')
       this.queryParam = {}
-      // this.getAnnList()
+      this.getSpltList()
     },
     // 推送
     push() {},
@@ -442,13 +472,13 @@ export default {
     // --------------------------------------
     aa() {},
     bb() {},
-    cc() {}
+    cc() {},
     // 分页、排序、筛选变化时触发
-    // handleTableChange(pagination, filters, sorter) {
-    //   // console.log('当前页信息>>>>',pagination)
-    //   this.queryParam.pageNo = pagination.current
-    //   // this.getAnnList()
-    // }
+    handleTableChange(pagination, filters, sorter) {
+      // console.log('当前页信息>>>>',pagination)
+      this.queryParam.pageNo = pagination.current
+      this.getSpltList()
+    }
   },
   computed: {
     // 导入