bug

pages/arrivalRegister/index.vue

@@ -456,7 +456,7 @@
                                     <view class="select-box row verCenter">
                                     <view class="select-box row verCenter">
                                         <picker @change="bindPickerZYChange($event, 9, index)" :value="saveZyGoodsParams[index].picking_other_attr_index" :range="otherAttrList" style="width: 100%;height: 100%;">
                                         <picker @change="bindPickerZYChange($event, 9, index)" :value="saveZyGoodsParams[index].picking_other_attr_index" :range="otherAttrList" style="width: 100%;height: 100%;">
                                             <view class="row verCenter bothSide">
                                             <view class="row verCenter bothSide">
-                                                <view class="uni-input row verCenter">{{ saveZyGoodsParams[index].picking_other_attr_index == '' ? '请选择' : saveZyGoodsParams[index].picking_other_attr }}</view>
+                                                <view class="uni-input row verCenter">{{ saveZyGoodsParams[index].picking_other_attr_index == -1 ? '请选择' : saveZyGoodsParams[index].picking_other_attr }}</view>
                                                 <view class="uni-arrow"></view>
                                                 <view class="uni-arrow"></view>
                                             </view>
                                             </view>
                                         </picker>
                                         </picker>
@@ -567,7 +567,7 @@ export default {
             this.curr = index;
             this.curr = index;
             if (index == 1) {
             if (index == 1) {
                 //获取自营货品信息
                 //获取自营货品信息
-                this.getZyGoodsData(stock_in_sn);
+                this.getZyGoodsData(stock_in_sn, 1);
             }
             }
         },
         },
         radioChange(e) {
         radioChange(e) {
@@ -828,15 +828,20 @@ export default {
          * @param {Object} stock_in_sn 入库单号
          * @param {Object} stock_in_sn 入库单号
          *
          *
          */
          */
-        getZyGoodsData(stock_in_sn) {
-            this.request(API.getZyGoodsData, 'GET', { stock_in_sn: stock_in_sn, is_first_check: 1 }, true).then(res => {
+        getZyGoodsData(stock_in_sn, type) {
+            if (type) {
+                var params = { stock_in_sn: stock_in_sn };
+            } else {
+                var params = { stock_in_sn: stock_in_sn, is_first_check: 1 };
+            }
+            this.request(API.getZyGoodsData, 'GET', params, true).then(res => {
                 if (res.code === 0) {
                 if (res.code === 0) {
                     this.zyGoodsData = res.data;
                     this.zyGoodsData = res.data;
                     this.saveZyGoodsParams = res.data; //赋值自营数据
                     this.saveZyGoodsParams = res.data; //赋值自营数据
                     // 添加 picking_other_attr_index 到每个对象并设置默认值为 0
                     // 添加 picking_other_attr_index 到每个对象并设置默认值为 0
                     this.saveZyGoodsParams = res.data.map(item => ({
                     this.saveZyGoodsParams = res.data.map(item => ({
                         ...item,
                         ...item,
-                        picking_other_attr_index: 0
+                        picking_other_attr_index: -1
                     }));
                     }));
                 } else {
                 } else {
                     uni.showToast({
                     uni.showToast({

pages/picking/sort.vue

@@ -110,7 +110,8 @@
                         </view>
                         </view>
                         <view class="input-box row verCenter">
                         <view class="input-box row verCenter">
                             <text class="label">应拣数量：</text>
                             <text class="label">应拣数量：</text>
-                            <text class="text" style="color: #F98119;">{{ item.lock_qty - item.pick_qty }}&nbsp;&nbsp;({{ item.pick_num_with_packing_val }})</text>
+                            <text class="text" style="color: #F98119;">{{ item.lock_qty - item.pick_qty }}&nbsp;&nbsp;</text>
+                            <text class="text" v-if="item.pick_num_with_packing_val">({{ item.pick_num_with_packing_val }})</text>
                         </view>
                         </view>
                         <view class="input-box row verCenter">
                         <view class="input-box row verCenter">
                             <text class="label">拣货方式：</text>
                             <text class="label">拣货方式：</text>
@@ -276,11 +277,12 @@
                     </view>
                     </view>
                     <view class="item row verCenter">
                     <view class="item row verCenter">
                         <text class="label">应拣数量：</text>
                         <text class="label">应拣数量：</text>
-                        <text class="text">{{ picked_num }}&nbsp;&nbsp;({{ detail.pick_num_with_packing_val }})</text>
+                        <text class="text">{{ picked_num }}&nbsp;&nbsp;</text>
+                        <text class="text" v-html="detail.pick_num_with_packing_val">({{ detail.pick_num_with_packing_val }})</text>
                     </view>
                     </view>
                     <view class="item row verCenter">
                     <view class="item row verCenter">
                         <text class="label">拣货方式：</text>
                         <text class="label">拣货方式：</text>
-                        <text class="text">{{ detail.picking_mode_union_val }}</text>
+                        <text class="text">{{ detail.picking_mode_vals }}</text>
                     </view>
                     </view>
                 </view>
                 </view>
                 <view class="form-input" style="margin-bottom: 0;">
                 <view class="form-input" style="margin-bottom: 0;">