供应链后台--订单列表增加入库状态，以及移动端--入库理货输入入仓号支持模糊查询并选择

assets/css/tally/index.scss

@@ -301,3 +301,52 @@
         color: #ffffff;
     }
 }
+
+.popup-content-sn {
+    background-color: #f1f4f6;
+    padding: 28rpx 24rpx 24rpx 24rpx;
+    border-radius: 10rpx;
+    width: 675rpx;
+    .tally-title {
+        margin-bottom: 10rpx;
+        .t1 {
+            font-size: 26rpx;
+            color: #333;
+        }
+        .t2 {
+            font-size: 26rpx;
+            color: #197adb;
+        }
+    }
+    .tally-list {
+        padding: 24rpx;
+        background-color: #ffffff;
+        margin-top: 24rpx;
+        .scroll-Y {
+            max-height: 600rpx;
+        }
+        .box {
+            height: 80rpx;
+            border-bottom: 1px solid #e6edf0;
+            &:last-child {
+                border-bottom: none;
+            }
+            .t1 {
+                font-size: 26rpx;
+                color: #333;
+            }
+            .t2 {
+                font-size: 26rpx;
+                color: #333;
+            }
+            .t3 {
+                font-size: 26rpx;
+                color: #6e767a;
+            }
+            .select {
+                font-size: 26rpx;
+                color: #197adb;
+            }
+        }
+    }
+}

pages/tally/index.vue

@@ -234,6 +234,34 @@
         <uni-popup ref="inputDialog" type="dialog" :mask-click="true" @maskClick="maskClick">
             <uni-popup-dialog ref="inputClose" mode="input" :title="title" v-model="gross_weight" value="" confirmText="新箱子" cancelText="不需要换箱" placeholder="请输入毛重" @close="dialogInputClose" @confirm="dialogInputConfirm" :before-close="true"></uni-popup-dialog>
         </uni-popup>
+        <!-- 多个入仓号查询 -->
+        <uni-popup ref="popupTally" background-color="#F1F4F6">
+            <view class="popup-content-sn">
+                <view class="tally-title">
+                    <text class="t2">{{erp_order_sn}}</text>
+                    <text class="t1">有相似入仓号订单，请选择</text>
+                </view>
+                <view class="tally-list">
+                    <scroll-view scroll-y="true" class="scroll-Y">
+                        <view class="box row verCenter">
+                            <view class="row verCenter" style="width: 90%;">
+                                <text class="t3 row rowCenter verCenter" style="width: 40%;">入仓单号</text>
+                                <text class="t3 row rowCenter verCenter" style="width: 25%;">明细数</text>
+                                <text class="t3 row rowCenter verCenter" style="width: 35%;">入库状态</text>
+                            </view>
+                        </view>
+                        <view class="box row bothSide verCenter" v-for="(item,index) in tallyList" :key="index">
+                            <view class="row verCenter" style="width: 90%;">
+                                <text class="t1 row rowCenter verCenter" style="width: 45%;">{{item.erp_order_sn}}</text>
+                                <text class="t2 row rowCenter verCenter" style="width: 25%;">{{item.order_goods_num}}</text>
+                                <text class="t2 row rowCenter verCenter" style="width: 35%;">{{item.stock_in_status_cn}}</text>
+                            </view>
+                            <text class="select" @click="selecttErpOrderSn(index)">选中</text>
+                        </view>
+                    </scroll-view>
+                </view>
+            </view>
+        </uni-popup>
     </view>
 </template>
 
@@ -267,6 +295,7 @@
                 origin_list: [], //产地
                 origin: '', //搜索国家携带的参数
                 form: [],
+                tallyList: [],
                 isRequestSent: false,
                 isStopRequest: false,
                 gross_weight: '',
@@ -713,6 +742,35 @@
                     return false;
                 }
                 this.step = 1;
+                this.getTallyList();
+            },
+            /**
+             * 获取入仓号数量接口
+             */
+            getTallyList() {
+                this.request(API.getTallyList, 'POST', { erp_order_sn: this.erp_order_sn }, true).then(res => {
+                    if (res.err_code === 0) {
+                        this.tallyList = res.data;
+                        if (res.data.length > 1) {
+                            this.$refs.popupTally.open('center');
+                        } else {
+                            this.getTallyData();
+                        }
+                    } else {
+                        uni.showToast({
+                            title: res.err_msg,
+                            icon: 'none'
+                        });
+                    }
+                });
+            },
+            /**
+             * 选中入仓号
+             * @param {Object} index
+             */
+            selecttErpOrderSn(index) {
+                this.$refs.popupTally.close();
+                this.erp_order_sn = this.tallyList[index].erp_order_sn;
                 this.getTallyData();
             },
             /**

util/api.js

-const API_BASE = 'https://api.ichunt.com';
-const API_BASE_OSS = 'https://image.ichunt.net'; //oss系统
-const API_BASE_OSS_HK = 'http://hk.image.semour.com'; //oss系统 HK
-const API_BASE_WMS = 'https://wms.ichunt.net'; //WMS系统
+// const API_BASE = 'https://api.ichunt.com';
+// const API_BASE_OSS = 'https://image.ichunt.net'; //oss系统
+// const API_BASE_OSS_HK = 'http://hk.image.semour.com'; //oss系统 HK
+// const API_BASE_WMS = 'https://wms.ichunt.net'; //WMS系统
 
-// const API_BASE = 'http://api.liexin.com';
-// const API_BASE_OSS = 'http://image.liexindev.net';
-// const API_BASE_OSS_HK = 'http://image.liexindev.net'; //oss系统 HK
-// const API_BASE_WMS = 'http://wms.liexindev.net'; //WMS系统
+const API_BASE = 'http://api.liexin.com';
+const API_BASE_OSS = 'http://image.liexindev.net';
+const API_BASE_OSS_HK = 'http://image.liexindev.net'; //oss系统 HK
+const API_BASE_WMS = 'http://wms.liexindev.net'; //WMS系统
 
 
 const API = {
@@ -291,6 +291,10 @@ const API = {
      */
     cancelTallyDetail: API_BASE + '/supplywechatwms/cancelTallyDetail',
     /**
+     * 获取入仓号数量接口 
+     */
+    getTallyList: API_BASE + '/supplywechatwms/getTallyList',
+    /**
      * 获取异常理货明细 
      */
     getAbnormalTallyDetail: API_BASE + '/supplywechatwms/getAbnormalTallyDetail',