移动端--PC端，上架操作时，增加校验需看货的物料，未已看货才能上架

assets/css/putaway/index.scss

@@ -161,8 +161,15 @@
                 color: #484b59;
             }
         }
+        .btn3 {
+            width: 200rpx;
+            height: 75rpx;
+            background: #1e9fff;
+            font-size: 23rpx;
+            color: #ffffff;
+        }
         .btn2 {
-            width: calc(100% - 150rpx);
+            width: calc(100% - 350rpx);
             height: 75rpx;
             background: #1969f9;
             font-size: 23rpx;

pages/arrivalRegister/splitGoods.vue

@@ -280,6 +280,16 @@
                 } else if (type == 3) {
                     this.logistics_company_index = e.detail.value;
                     this.formParams.logistics_company = this.logistics_company[e.detail.value];
+
+                    //物流单号
+                    if (this.formParams.logistics_company == '联邦快递') {
+                        var val = this.formParams.logistics_sn;
+                        if (val.length > 22) {
+                            let last22 = val.slice(22); // 截取后22位
+                            this.formParams.logistics_sn = last22;
+                        }
+                    }
+
                 }
             },
             /**
@@ -348,10 +358,12 @@
                         //全量搜索
                         this.searchParams.shipment_number = val;
                         this.input_flag = true;
+                        this.getData();
                     } else if (type == 2) {
                         //货品名称
                         this.searchParams.goods_name = val;
                         this.input_flag = true;
+                        this.getData();
                     } else if (type == 3) {
                         //FedEx
                         if (val.length > 22) {
@@ -361,6 +373,7 @@
                             this.searchParams.shipment_number = val;
                         }
                         this.input_flag = true;
+                        this.getData();
                     } else if (type == 4) {
                         //物流单号
                         if (this.formParams.logistics_company == '联邦快递') {
@@ -374,8 +387,8 @@
                     }
                 } else {
                     this.input_flag = false;
+                    this.getData();
                 }
-                this.getData();
             }, 500),
             /**
              * 货品查询特殊处理

pages/putaway/index.vue

@@ -44,6 +44,7 @@
                 <view class="text-item row verCenter">
                     <text class="label">入仓号：</text>
                     <text class="t1">{{ item.inhouse }}</text>
+                    <text class="t1" style="width: auto;color: #1969f9;margin-left: 18rpx;" v-if="item.watch_status == 1">{{item.watch_status_cn}}</text>
                 </view>
                 <view class="text-item row verCenter">
                     <text class="label">仓库：</text>
@@ -110,6 +111,7 @@
                 <text class="check-box-icon" :class="{ curr: filter_list.length > 0 && filter_list.length == filter_id.length }"></text>
                 <text class="text row rowCenter verCenter">{{ filter_id.length == 0 ?  totalText : filter_id.length }}</text>
             </view>
+            <view class="btn3 row rowCenter verCenter" @click="watchStatusAct()">已看货</view>
             <view class="btn2 row rowCenter verCenter" @click="showDrawer()">一键上架</view>
         </view>
         <!-- 一键理货弹窗 -->
@@ -295,9 +297,19 @@
                 this.is_submit = true;
                 //所选仓库必须要一样
                 if (isAllElementsEqual) {
+                    var result = this.list.filter(item => this.filter_id.includes(item.tally_id)).map(item => item.watch_status);
+                    var validData = result.every(item => item == 0 || item == 2);
+                    if (!validData) {
+                        uni.showToast({
+                            title: '待看货货品不能上架',
+                            icon: 'none'
+                        });
+                        return false;
+                    }
                     this.$refs.showRight.open();
                     this.warehouse_id = warehouse_id[0];
                     this.stock_in_type = stock_in_type[0];
+
                 } else {
                     uni.showToast({
                         title: '请勾选相同仓库',
@@ -536,6 +548,53 @@
                 });
             },
             /**
+             * 已看货
+             */
+            watchStatusAct() {
+                if (this.filter_id.length == 0) {
+                    uni.showToast({
+                        title: '请选择货品',
+                        icon: 'error'
+                    });
+                    return false;
+                }
+                var result = this.list.filter(item => this.filter_id.includes(item.tally_id)).map(item => item.watch_status);
+                var validData = result.every(item => item == 1);
+                if (!validData) {
+                    uni.showToast({
+                        title: '请勾选待看货货品',
+                        icon: 'error'
+                    });
+                    return false;
+                }
+                this.request(API.watchStatusAct, 'POST', { tally_ids: this.filter_id.join(',') }, true).then(res => {
+                    if (res.code === 0) {
+                        uni.showToast({
+                            title: '看货成功',
+                            icon: 'success'
+                        });
+                        setTimeout(() => {
+                            this.resetChange(); //清空
+                            this.filter_id = [];
+                            this.formParams.position_code = ''; //清空一键上架输入的库位
+                            this.is_submit = true;
+                            this.search_keyword = '';
+                            this.searchParams.search_keyword = '';
+                            this.history_id = [];
+                            this.closeDrawer();
+                            this.getData();
+                            this.clearInputAndFocus(); //再次获取焦点
+                        }, 2000);
+                    } else {
+                        uni.showModal({
+                            itle: '提示',
+                            content: res.msg,
+                            showCancel: false
+                        });
+                    }
+                });
+            },
+            /**
              * 一键上架
              */
             oneKeyPutawayAction() {

util/api.js

@@ -383,7 +383,11 @@ const API = {
     /**
      *  新增分货登记
      * */
-    addSeparateStockInRegister: API_BASE + '/api/stockIn/stockInRegister/addSeparateStockInRegister'
+    addSeparateStockInRegister: API_BASE + '/api/stockIn/stockInRegister/addSeparateStockInRegister',
+    /**
+     *  操作已看货
+     * */
+    watchStatusAct: API_BASE + '/api/h5/stockIn/watchStatusAct'
 }