理货照片必填控制需求变更

pages/picking/sort.vue

@@ -652,6 +652,7 @@
                 input_flag_container_sn: false,
                 input_flag_container_sn: false,
                 filter_list: [], //筛选已选中的列表
                 filter_list: [], //筛选已选中的列表
                 filter_id: [], //过滤处理的id
                 filter_id: [], //过滤处理的id
+                company_id: uni.getStorageSync('company_id') || 1, //公司组织
                 page: 1,
                 page: 1,
                 limit: 1000,
                 limit: 1000,
                 curr: 0,
                 curr: 0,
@@ -1292,10 +1293,24 @@
                 }
                 }
                 var num = Number(this.detail.lock_qty) - Number(this.detail.pick_qty); //需求拣货的数量
                 var num = Number(this.detail.lock_qty) - Number(this.detail.pick_qty); //需求拣货的数量
                 var pick_qty_num = pick_qty * 1; //真实拣货数量
                 var pick_qty_num = pick_qty * 1; //真实拣货数量
+
                 //拣货图片集合
                 //拣货图片集合
                 var pic_ids = this.image_list.map(item => {
                 var pic_ids = this.image_list.map(item => {
                     return item.pic_id;
                     return item.pic_id;
                 });
                 });
+
+                //当前登录组织为深贸电子才必填
+                if (this.company_id == 2) {
+                    if (pic_ids <= 0) {
+                        uni.showToast({
+                            title: '请至少上传一张拣货图片',
+                            icon: 'none'
+                        });
+                        return false;
+                    }
+                }
+
+
                 this.request(API.pick, 'POST', {
                 this.request(API.pick, 'POST', {
                     lock_id: lock_id,
                     lock_id: lock_id,
                     pick_qty: pick_qty,
                     pick_qty: pick_qty,

pages/tallyReceive/index.vue

@@ -387,7 +387,7 @@
                 });
                 });
             },
             },
             /**
             /**
-             * 清空数据 1（全量搜索，入仓号，FedEx，DigiKey，Rochester，TME，Chip1stop）
+             * 清空数据 1（全量搜索，入仓号，箱号， FedEx，DigiKey，Rochester，TME，Chip1stop）
              * @param {Object} type
              * @param {Object} type
              */
              */
             clearInput(type) {
             clearInput(type) {
@@ -400,25 +400,28 @@
                         //清空入仓号
                         //清空入仓号
                         this.searchParams.stock_in_with_stock_in_items_inhouse = '';
                         this.searchParams.stock_in_with_stock_in_items_inhouse = '';
                     } else if (this.index == 2) {
                     } else if (this.index == 2) {
+                        //清空箱号
+                        this.searchParams.box_sn = '';
+                    } else if (this.index == 3) {
                         //清空FedEx
                         //清空FedEx
                         this.searchParams.tracking_no = '';
                         this.searchParams.tracking_no = '';
-                    } else if (this.index == 3) {
+                    } else if (this.index == 4) {
                         //清空DigiKey以及赋值的goods_name
                         //清空DigiKey以及赋值的goods_name
                         this.searchParams.code_type = '';
                         this.searchParams.code_type = '';
                         this.searchParams.goods_name = '';
                         this.searchParams.goods_name = '';
-                    } else if (this.index == 4) {
+                    } else if (this.index == 5) {
                         //清空Rochester供应商以及赋值的goods_name
                         //清空Rochester供应商以及赋值的goods_name
                         this.searchParams.code_type = '';
                         this.searchParams.code_type = '';
                         this.searchParams.goods_name = '';
                         this.searchParams.goods_name = '';
-                    } else if (this.index == 5) {
+                    } else if (this.index == 6) {
                         //清空TME供应商以及赋值的goods_name
                         //清空TME供应商以及赋值的goods_name
                         this.searchParams.code_type = '';
                         this.searchParams.code_type = '';
                         this.searchParams.goods_name = '';
                         this.searchParams.goods_name = '';
-                    } else if (this.index == 6) {
+                    } else if (this.index == 7) {
                         //清空Chip1stop供应商以及赋值的goods_name
                         //清空Chip1stop供应商以及赋值的goods_name
                         this.searchParams.code_type = '';
                         this.searchParams.code_type = '';
                         this.searchParams.goods_name = '';
                         this.searchParams.goods_name = '';
-                    } else if (this.index == 7) {
+                    } else if (this.index == 8) {
                         //清空Mouser供应商以及赋值的goods_name
                         //清空Mouser供应商以及赋值的goods_name
                         this.searchParams.code_type = '';
                         this.searchParams.code_type = '';
                         this.searchParams.goods_name = '';
                         this.searchParams.goods_name = '';
@@ -539,7 +542,7 @@
                     this.input_flag = false;
                     this.input_flag = false;
                     this.getData();
                     this.getData();
                 }
                 }
-            }, that.index == 3 ? 0 : 500),
+            }, 500),
             /**
             /**
              * 重置参数
              * 重置参数
              */
              */