js

assets/css/pda/logisticsList.scss

@@ -75,7 +75,7 @@
             background: #fff;
             background: #fff;
             border-bottom: 1px solid #cad9e0;
             border-bottom: 1px solid #cad9e0;
             text {
             text {
-                flex: 0 0 25%;
+                flex: 0 0 20%;
                 font-size: 22rpx;
                 font-size: 22rpx;
                 color: #6e767a;
                 color: #6e767a;
                 border-right: 1px solid #cad9e0;
                 border-right: 1px solid #cad9e0;

pages/pda/logisticsList.vue

@@ -23,12 +23,12 @@
                 <text class="row verCenter rowCenter">出库</text>
                 <text class="row verCenter rowCenter">出库</text>
             </view>
             </view>
             <template v-if="total > 0">
             <template v-if="total > 0">
-                <view class="uni-tr row verCenter" v-for="(item, index) in rePackageList" :key="index">
-                    <text class="row verCenter rowCenter color">{{ item.tray_name }}</text>
-                    <text class="row verCenter rowCenter" :class="{ color: item.scan_status_cn == '全部已经扫描' }">{{ item.have_load_box_num }}</text>
-                    <text class="row verCenter rowCenter" :class="{ color: item.scan_status_cn != '全部已经扫描' }">{{ item.scan_status_cn }}</text>
-                    <text class="row verCenter rowCenter">{{ item.audit_status_cn || '' }}</text>
-                    <text class="row verCenter rowCenter">{{ item.audit_status_cn || '' }}</text>
+                <view class="uni-tr row verCenter" v-for="(item, index) in list" :key="index">
+                    <text class="row verCenter rowCenter">{{ item.entrustNo || '-' }}</text>
+                    <text class="row verCenter rowCenter">{{ item.carOrder || '-' }}</text>
+                    <text class="row verCenter rowCenter">{{ item.boxesNum || '-' }}</text>
+                    <text class="row verCenter rowCenter">{{ item.inWoreStatus || '-' }}</text>
+                    <text class="row verCenter rowCenter">{{ item.outWoreStatus || '-' }}</text>
                 </view>
                 </view>
             </template>
             </template>
             <template v-else>
             <template v-else>
@@ -51,11 +51,7 @@ export default {
             textArr: ['全部', '未入库', '未出库'],
             textArr: ['全部', '未入库', '未出库'],
             today: currentDate,
             today: currentDate,
             total: 1,
             total: 1,
-            page: 1,
-            limit: 1000,
-            is_loading: false,
-            loading: false,
-            rePackageList: []
+            list: []
         };
         };
     },
     },
     computed: {
     computed: {
@@ -66,12 +62,6 @@ export default {
             return this.getDate('end');
             return this.getDate('end');
         }
         }
     },
     },
-    onReachBottom() {
-        if (this.is_loading) return;
-        this.page++;
-        this.loading = true;
-        this.getData();
-    },
     onShow() {
     onShow() {
         this.getData();
         this.getData();
     },
     },
@@ -97,20 +87,19 @@ export default {
         bindDateChange(e) {
         bindDateChange(e) {
             this.today = e.detail.value;
             this.today = e.detail.value;
             this.total = 0;
             this.total = 0;
-            this.page = 1;
-            this.rePackageList = [];
+            this.list = [];
             this.getData();
             this.getData();
         },
         },
         getData() {
         getData() {
-            this.request(API.rePackageList, 'POST', { page: this.page, limit: this.limit, today: this.today }, this.loading).then(res => {
+            this.request(API.szScanOutInList, 'POST', { today: this.today }, true).then(res => {
                 if (res.err_code === 0) {
                 if (res.err_code === 0) {
-                    if (res.data.data.length > 0) {
+                    if (res.data.length > 0) {
                         this.is_loading = false;
                         this.is_loading = false;
-                        this.rePackageList = this.rePackageList.concat(res.data.data);
-                        this.total = res.data.total;
+                        this.list = res.data;
+                        this.total = 100;
                     } else {
                     } else {
                         this.total = 0;
                         this.total = 0;
-                        this.is_loading = true;
+                        this.list = [];
                     }
                     }
                 } else {
                 } else {
                     uni.showToast({
                     uni.showToast({

util/api.js

@@ -116,7 +116,11 @@ const API = {
     /**
     /**
      * 扫描出库
      * 扫描出库
      */
      */
-    szScanOut: API_BASE + '/supplywechatwms/szScanOut'
+    szScanOut: API_BASE + '/supplywechatwms/szScanOut',
+    /**
+     * 扫描出入库列表
+     */
+    szScanOutInList: API_BASE + '/supplywechatwms/szScanOutInList'
 
 
 }
 }