装箱单页面调整

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

@@ -379,7 +379,7 @@ export default {
          {
           title: '账套',
           dataIndex: 'acSetNo',
-          width: 100,
+          width: 80,
           // fixed: 'left',
             className: 'replacecolor',
             ellipsis: true,
@@ -395,7 +395,7 @@ export default {
         {
           title: 'HOD',
           dataIndex: 'hod',
-          width: 120,
+          width: 110,
            className: 'replacecolor',
            ellipsis: true,
         },
@@ -417,7 +417,7 @@ export default {
         {
           title: 'ITEM NO./SKU NO./UPC NO./PACKS CODE',
           dataIndex: 'itemCode',
-          width: 340,
+          width: 310,
            className: 'replacecolor',
            ellipsis: true,
         },
@@ -432,7 +432,7 @@ export default {
         {
           title: '分销点/DC/LABEL',
           dataIndex: 'distributionPoint',
-          width: 200,
+          width: 120,
            className: 'replacecolor',
           insertAfter:true,
           ellipsis: true,
@@ -460,7 +460,7 @@ export default {
         {
           title: '颜色（中英文）',
           dataIndex: 'colour',
-          width: 140,
+          width: 120,
           className: 'replacecolor',
           ellipsis: true,
         },
@@ -474,13 +474,13 @@ export default {
         {
           title: '件数/箱',
           dataIndex: 'piecesBox',
-          width: 100,
+          width: 90,
           // type: JVXETypes.normal 
         },
         {
           // title: '箱数',
           dataIndex: 'boxNumber',
-          width: 120,
+          width: 90,
            className: 'replacecolor',
            scopedSlots: { customRender: 'boxNumber' }  , 
            slots:{title:'boxNumberTitle'}
@@ -559,7 +559,7 @@ export default {
         {
           title: '总体积',
           dataIndex: 'totalVolume',
-          width: 100,
+          width: 90,
            className: 'replacecolor'
         },
         {
@@ -999,7 +999,7 @@ export default {
         {
           title: '账套',
           dataIndex       : 'acSetNo',
-          width: 100,
+          width: 80,
           // fixed: 'left',
             className: 'replacecolor',
              ellipsis: true,
@@ -1015,7 +1015,7 @@ export default {
         {
           title: 'HOD',
           dataIndex       : 'hod',
-          width: 120,
+          width: 110,
            className: 'replacecolor',
             ellipsis: true,
         },
@@ -1037,7 +1037,7 @@ export default {
         {
           title: 'ITEM NO./SKU NO./UPC NO./PACKS CODE',
           dataIndex       : 'itemCode',
-          width: 340,
+          width: 310,
            className: 'replacecolor',
             ellipsis: true,
         },
@@ -1051,7 +1051,7 @@ export default {
         {
           title: '分销点/DC/LABEL',
           dataIndex       : 'distributionPoint',
-          width: 200,
+          width: 120,
            className: 'replacecolor',
           insertAfter:true,
            ellipsis: true,
@@ -1077,7 +1077,7 @@ export default {
         {
           title: '颜色（中英文）',
           dataIndex       : 'colour',
-          width: 140,
+          width: 120,
           className: 'replacecolor',
            ellipsis: true,
         },
@@ -1091,14 +1091,14 @@ export default {
         {
           title: '件数/箱',
           dataIndex       : 'piecesBox',
-          width: 100,
+          width: 90,
           // type: JVXETypes.normal 
            ellipsis: true,
         },
         {
           title: '箱数',
           dataIndex       : 'boxNumber',
-          width: 120,
+          width: 90,
            className: 'replacecolor',
            scopedSlots: { customRender: 'replacecolor' }  ,
           slots:{title:'boxNumberTitle'}           
@@ -1185,7 +1185,7 @@ export default {
         {
           title: '总体积',
           dataIndex       : 'totalVolume',
-          width: 100,
+          width: 90,
            className: 'replacecolor',
             ellipsis: true,
         },

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

@@ -149,7 +149,7 @@ export default {
         {
           title: '款号',
           dataIndex: 'itemNumber',
-          width: 120,
+          width: 80,
           ellipsis: true,
           // fixed: 'left',
           className: 'replacecolor',
@@ -158,7 +158,7 @@ export default {
         {
           title: '客户简称',
           dataIndex: 'customerAbbreviation',
-          width: 120,
+          width: 100,
           // fixed: 'left',
           // customRender: t => ellipsis(t),
           ellipsis: true,
@@ -174,7 +174,7 @@ export default {
         {
           title: '小PO',
           dataIndex: 'smallPo',
-          width: 120,
+          width: 100,
           // customRender: t => ellipsis(t),
           ellipsis: true,
           className: 'replacecolor'
@@ -217,7 +217,7 @@ export default {
         {
           title: '颜色',
           dataIndex: 'colour',
-          width: 120,
+          width: 80,
           ellipsis: true,
           // customRender: t => ellipsis(t),
           className: 'replacecolor'
@@ -225,7 +225,7 @@ export default {
         {
           title: '采购/委外订单号',
           dataIndex: 'spurOrSubOrder',
-          width: 200,
+          width: 140,
           ellipsis: true,
           // customRender: t => ellipsis(t),
           className: 'replacecolor'
@@ -242,14 +242,14 @@ export default {
         {
           title: '箱数',
           dataIndex: 'totalBoxes',
-          width: 90,
+          width: 80,
           ellipsis: true,
           className: 'replacecolor'
         },
         {
           title: '数量（按合并规则累计）',
           dataIndex: 'total',
-          width: 200,
+          width: 180,
           className: 'replacecolor',
           ellipsis: true,
         },
@@ -270,28 +270,28 @@ export default {
         {
           title: '集装箱号',
           dataIndex: 'containerNumber',
-          width: 120,
+          width: 100,
           ellipsis: true,
           className: 'replacecolor'
         },
          {
           title: '预托书号',
           dataIndex: 'depositaryReceiptNo',
-          width: 120,
+          width: 100,
           ellipsis: true,
           className: 'replacecolor'
         },
         {
           title: '总净重',
           dataIndex: 'totalNetWeight',
-          width: 90,
+          width: 80,
           ellipsis: true,
           className: 'replacecolor'
         },
         {
           title: '总毛重',
           dataIndex: 'totalGrossWeight',
-          width: 90,
+          width: 80,
           ellipsis: true,
           className: 'replacecolor'
         },
@@ -299,14 +299,14 @@ export default {
         {
           title: '总体积',
           dataIndex: 'totalVolume',
-          width: 90,
+          width: 80,
           ellipsis: true,
           className: 'replacecolor'
         }, 
          {
           title: '成衣工厂',
           dataIndex: 'garmentFactory',
-          width: 90,
+          width: 80,
           ellipsis: true,
           className: 'replacecolor'
         },

src/views/shipment-details/shipmentList.vue

@@ -171,6 +171,7 @@
       <a-table
         v-if="shipmentListData"
         bordered
+        ref="TableInfo"
         rowKey="itemIds"
         :columns="shipmentListColumns"
         :data-source="shipmentListData"
@@ -591,6 +592,23 @@ export default {
   created() {
     // this.getShipmentList() // 渲染 发运明细列表
     this.defalutDate()
+  },
+  mounted(){
+    let dom = this.$refs.TableInfo.$el.querySelectorAll('.ant-table-body')[0]
+    const offsetHeight = dom.offsetHeight;
+            dom.addEventListener(
+             'scroll',
+                () => {
+                  const scrollTop = dom.scrollTop;
+                  const scrollHeight = dom.scrollHeight;
+                  debugger
+                 if (offsetHeight + scrollTop >= scrollHeight ) {
+                  debugger
+         	//触发事件
+                }
+                  // this.sctollList()
+               },
+              )
   },
    watch:{
     selectedRowKeys(newVal){
@@ -629,22 +647,45 @@ export default {
              this.exportButton ='1'
              this.exportButton1 = '0'
            }
-           this.shipmentListData = res.result.records
+           this.allList = res.result.records
+           this.allList.map((item,index)=>{
+            if(index<=19){
+              this.shipmentListData.push(item)
+            }
+           })
+          //  this.shipmentListData = res.result.records
             for (var i=0; i<this.shipmentListData.length; i++){
               this.shipmentListData.randomId = randomUUID();
             }
+            
             this.selectedRowKeys = []
-            this.pagination = {
-              total: res.result.total,
-              current: res.result.current,
-              pageSize: res.result.size
-            }
+            // this.pagination = {
+            //   total: res.result.total,
+            //   current: res.result.current,
+            //   pageSize: res.result.size
+            // }
           }else {
              this.$message.error(res.message)
              this.loading = false
           }
         })
     },
+    sctollList(){
+      debugger
+      this.shipmentListData=this.allList
+      debugger
+      // if(this.shipmentListData.length<this.allList.length){
+      //   this.allList.map((item,index)=>{
+      //     if(index > (this.shipmentListData.length-1)){
+      //        if(index < (this.shipmentListData.length+20)){
+      //          this.shipmentListData.push(item)
+      //        }
+           
+           
+      //     }
+      //   })
+      // }
+    },
     //关闭申报要素弹窗
      async closeDeclare(){
        //判断是否是新增的数据