bug

pages/arrivalRegister/index.vue

@@ -39,7 +39,7 @@
                     </label>
                 </radio-group>
             </view>
-            <view class="total-text">共<text>{{list.length}}</text>条数据</view>
+            <view class="total-text">共<text>{{total}}</text>条数据</view>
         </view>
         <view class="search-all row verCenter bothSide">
             <view class="row verCenter">
@@ -113,6 +113,7 @@
                     <view class="btn1 row rowCenter verCenter" @click="showDrawer(item.stock_in_sn)">详情</view>
                 </view>
             </view>
+            <view class="row rowCenter verCenter" v-if="!hasMoreData && page > 1" style="color: #999;font-size: 16rpx;padding: 10px 0;flex: 0 0 100%;font-weight: normal;">--&nbsp;已经到底了&nbsp;--</view>
         </view>
         <!-- 无数据展示 -->
         <view class="no-date column rowCenter verCenter" v-else>
@@ -489,6 +490,7 @@
                 interval: 2000,
                 duration: 500,
                 input_flag: false,
+                total: 0, //总数
                 page: 1,
                 limit: 30,
                 index: 0,
@@ -778,11 +780,13 @@
                         //全量搜索
                         this.searchParams.mobile_register_all_search = val;
                     } else if (type == 2) {
-                        //入仓号
+                        // 入仓号处理逻辑
                         var str = val;
                         if (str.startsWith('F')) {
+                            // 如果以 'F' 开头，直接赋值给搜索参数
                             this.searchParams.stock_in_with_stock_in_items_inhouse = val;
                         } else {
+                            // 否则去掉最后一个字符后赋值给搜索参数
                             this.searchParams.stock_in_with_stock_in_items_inhouse = str.slice(0, -1);
                         }
                     } else if (type == 3) {
@@ -867,9 +871,10 @@
              * 获取列表数据
              */
             getData() {
-                this.request(API.stockInMobileRegisterList, 'POST', { page: this.page, limit: this.limit, is_register: 0, ...this.searchParams }, false).then(res => {
+                this.request(API.stockInMobileRegisterList, 'POST', { page: this.page, limit: this.limit, is_register: 0, ...this.searchParams }, true).then(res => {
                     if (res.code === 0) {
                         if (res.data.list.length > 0) {
+                            this.total = res.data.total;
                             this.hasMoreData = true;
                             this.list = this.list.concat(res.data.list);
                             this.filter_list = createArray(this.list.length, false);

pages/picking/sort.vue

@@ -376,7 +376,7 @@
                             </template>
                         </view>
                     </view>
-                    <view style="font-size: 18rpx;color: #F98119;">该货品需拆出部分拣货并重贴标签</view>
+                    <view style="font-size: 18rpx;color: #F98119;" v-if="detail.pick_type_val == '散'">该货品需拆出部分拣货并重贴标签</view>
                 </view>
                 <view class="btn row verCenter bothSide">
                     <view class="btn1 row rowCenter verCenter" @click="pick(detail.lock_id, formParams.pick_qty, detail.stock_out_item_id)">拣 货</view>

util/api.js

-const API_BASE_USER = 'http://user.liexindev.net'; //用户系统
-const API_BASE_PUR = 'http://pur.liexindev.net'; //采购系统
-const API_BASE = 'http://wms.liexindev.net'; //WMS系统
-const API_BASE_OSS = 'http://image.liexindev.net'; //oss系统
+// const API_BASE_USER = 'http://user.liexindev.net'; //用户系统
+// const API_BASE_PUR = 'http://pur.liexindev.net'; //采购系统
+// const API_BASE = 'http://wms.liexindev.net'; //WMS系统
+// const API_BASE_OSS = 'http://image.liexindev.net'; //oss系统
 
-// const API_BASE_USER = 'https://user.ichunt.net'; //用户系统
-// const API_BASE_PUR = 'https://purchase.ichunt.net'; //采购系统
-// const API_BASE = 'https://wms.ichunt.net'; //WMS系统
-// const API_BASE_OSS = 'https://image.ichunt.net'; //oss系统
+const API_BASE_USER = 'https://user.ichunt.net'; //用户系统
+const API_BASE_PUR = 'https://purchase.ichunt.net'; //采购系统
+const API_BASE = 'https://wms.ichunt.net'; //WMS系统
+const API_BASE_OSS = 'https://image.ichunt.net'; //oss系统
 
 
 const API = {