add

pages/arrivalRegister/splitGoods.vue

@@ -6,10 +6,14 @@
                 <radio-group @change="radioChange" class="row verCenter">
                 <radio-group @change="radioChange" class="row verCenter">
                     <label class="radio row verCenter">
                     <label class="radio row verCenter">
                         <radio value="0" checked="true" style="transform:scale(0.7)" color="#1969F9" />
                         <radio value="0" checked="true" style="transform:scale(0.7)" color="#1969F9" />
-                        <text class="tt">全量搜索</text>
+                        <text class="tt">其他物流</text>
                     </label>
                     </label>
-                    <label class="radio">
+                    <label class="radio row verCenter">
                         <radio value="1" style="transform:scale(0.7)" color="#1969F9" />
                         <radio value="1" style="transform:scale(0.7)" color="#1969F9" />
+                        <text class="tt">货品名称</text>
+                    </label>
+                    <label class="radio">
+                        <radio value="2" style="transform:scale(0.7)" color="#1969F9" />
                         <text class="tt">FedEX</text>
                         <text class="tt">FedEX</text>
                     </label>
                     </label>
                 </radio-group>
                 </radio-group>
@@ -23,16 +27,20 @@
                 <template v-if="index == 0">
                 <template v-if="index == 0">
                     <input class="uni-input" placeholder="请扫描或输入物流单号" placeholder-style="color:#919399" :focus="is_focus" v-model="searchParams.shipment_number" @input="handleInput(1, $event)" maxlength="-1" />
                     <input class="uni-input" placeholder="请扫描或输入物流单号" placeholder-style="color:#919399" :focus="is_focus" v-model="searchParams.shipment_number" @input="handleInput(1, $event)" maxlength="-1" />
                 </template>
                 </template>
+                <!-- 货品名称 -->
+                <template v-if="index == 1">
+                    <input class="uni-input" placeholder="请输入货品名称" placeholder-style="color:#919399" :focus="is_focus" v-model="searchParams.goods_name" @input="handleInput(2, $event)" maxlength="-1" />
+                </template>
                 <!-- fedex -->
                 <!-- fedex -->
-                <template v-else-if="index == 1">
-                    <input class="uni-input" placeholder="请输入FedEx" placeholder-style="color:#919399" :focus="is_focus" v-model="searchParams.shipment_number" @input="handleInput(2, $event)" maxlength="-1" />
+                <template v-else-if="index == 2">
+                    <input class="uni-input" placeholder="请输入FedEx" placeholder-style="color:#919399" :focus="is_focus" v-model="searchParams.shipment_number" @input="handleInput(3, $event)" maxlength="-1" />
                 </template>
                 </template>
             </view>
             </view>
             <text class="iconfont icon-a-juxing11" @click="clearInput()" v-if="input_flag"></text>
             <text class="iconfont icon-a-juxing11" @click="clearInput()" v-if="input_flag"></text>
         </view>
         </view>
         <!-- 列表数据 -->
         <!-- 列表数据 -->
         <view class="list row bothSide" v-if="list.length > 0">
         <view class="list row bothSide" v-if="list.length > 0">
-            <view class="box row" v-for="(item, index) in list" :key="index" :class="{ curr: filter_list[index] }" @click="filterChange(index)">
+            <view class="box column" v-for="(item, index) in list" :key="index" :class="{ curr: filter_list[index] }" @click="filterChange(index)">
                 <view class="check-box-icon"></view>
                 <view class="check-box-icon"></view>
                 <view class="wrap row verCenter bothSide">
                 <view class="wrap row verCenter bothSide">
                     <view class="row verCenter">
                     <view class="row verCenter">
@@ -40,7 +48,13 @@
                         <text class="t2">{{item.warehouse_receipt_sn}}</text>
                         <text class="t2">{{item.warehouse_receipt_sn}}</text>
                         <text class="t3">{{item.shipping_name}}：{{item.shipment_number}}</text>
                         <text class="t3">{{item.shipping_name}}：{{item.shipment_number}}</text>
                     </view>
                     </view>
-                    <text class="t4">{{item.purchase_name}}</text>
+                    <text class="t4">{{item.purchase_name}}/{{item.department}}</text>
+                </view>
+                <view class="wrap row verCente" style="margin-left: 24rpx;margin-top: 15rpx;">
+                    <text class="t3" style="width: 228rpx;">{{item.goods_name}}</text>
+                    <text class="t3" style="width: 150rpx">{{item.brand_name}}</text>
+                    <text class="t3" style="width: 100rpx">{{item.origin}}</text>
+                    <text class="t3" style="width: 100rpx">{{item.goods_num}}PCS</text>
                 </view>
                 </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 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>
@@ -82,7 +96,8 @@
                 filter_id: [], //过滤处理的id
                 filter_id: [], //过滤处理的id
                 curr: 0,
                 curr: 0,
                 searchParams: {
                 searchParams: {
-                    shipment_number: '' //物流单号
+                    shipment_number: '', //物流单号
+                    goods_name: ''
                 }
                 }
             };
             };
         },
         },
@@ -138,6 +153,7 @@
              */
              */
             clearInput() {
             clearInput() {
                 this.searchParams.shipment_number = '';
                 this.searchParams.shipment_number = '';
+                this.searchParams.goods_name = '';
                 this.resetChange();
                 this.resetChange();
                 this.clearInputAndFocus();
                 this.clearInputAndFocus();
             },
             },
@@ -153,6 +169,8 @@
                         //全量搜索
                         //全量搜索
                         this.searchParams.shipment_number = val;
                         this.searchParams.shipment_number = val;
                     } else if (type == 2) {
                     } else if (type == 2) {
+                        this.searchParams.goods_name = val;
+                    } else if (type == 3) {
                         //FedEx
                         //FedEx
                         if (val.length > 22) {
                         if (val.length > 22) {
                             let last22 = val.slice(22); // 截取后22位
                             let last22 = val.slice(22); // 截取后22位

pages/preCheck/list.vue

@@ -547,6 +547,7 @@
                     this.$refs.showRightDeliver.open();
                     this.$refs.showRightDeliver.open();
                     var result = this.list.find(item => item.precheck_id === this.filter_id[0]); //筛选单条数据
                     var result = this.list.find(item => item.precheck_id === this.filter_id[0]); //筛选单条数据
                     this.stockPreCheckDeliverParams.to_shipment_number = result.to_shipment_number; //发货物流赋值
                     this.stockPreCheckDeliverParams.to_shipment_number = result.to_shipment_number; //发货物流赋值
+                    this.stockPreCheckDeliverParams.to_shipping_id = result.to_shipping_id;
                     var index = this.to_shipping.findIndex(item => item.value === result.to_shipping_id);
                     var index = this.to_shipping.findIndex(item => item.value === result.to_shipping_id);
                     this.to_shipping_index = index; //发货快递选择
                     this.to_shipping_index = index; //发货快递选择
                     this.detail = result;
                     this.detail = result;
@@ -580,6 +581,7 @@
                             icon: 'success'
                             icon: 'success'
                         });
                         });
                         setTimeout(() => {
                         setTimeout(() => {
+                            this.closeDrawer();
                             this.resetChange();
                             this.resetChange();
                             this.getData();
                             this.getData();
                         }, 2000)
                         }, 2000)
@@ -777,6 +779,7 @@
             closeDrawer() {
             closeDrawer() {
                 this.$refs.showRight.close();
                 this.$refs.showRight.close();
                 this.$refs.showRightTallys.close();
                 this.$refs.showRightTallys.close();
+                this.$refs.showRightDeliver.close();
             }
             }
         }
         }
     };
     };