已修复标签补打（华云），和理货，一键理货深茂必填的验证

pages/repairPrint/index.vue

@@ -149,6 +149,9 @@
             } else if (company_id == 2) {
             } else if (company_id == 2) {
                 this.warehouse_arr = [{ name: '香港仓', value: '10' }];
                 this.warehouse_arr = [{ name: '香港仓', value: '10' }];
                 this.formParams.warehouse_id = 10;
                 this.formParams.warehouse_id = 10;
+            } else if (company_id == 3) {
+                this.warehouse_arr = [{ name: '华云现货仓', value: '11' }];
+                this.formParams.warehouse_id = 11;
             }
             }
         },
         },
         methods: {
         methods: {

pages/tallyReceive/index.vue

@@ -576,33 +576,15 @@
              * 一键理货提交
              * 一键理货提交
              */
              */
             createTallyReceiveSubmit() {
             createTallyReceiveSubmit() {
-                //仅单据的组织为深贸电子时，容器必填，相应操作容器必填
-                if (this.company_id == 1) {
-                    if (this.searchParams.container_id) {
-                        if (!this.is_submit) {
-                            uni.showToast({
-                                title: '请输入正确容器',
-                                icon: 'none'
-                            });
-                            return false;
-                        }
-                    }
-                } else if (this.company_id == 2) {
-                    if (!this.searchParams.container_id) {
-                        uni.showToast({
-                            title: '请输入容器',
-                            icon: 'none'
-                        });
-                        return false;
-                    }
-                    if (!this.is_submit) {
-                        uni.showToast({
-                            title: '请输入正确容器',
-                            icon: 'none'
-                        });
-                        return false;
-                    }
+                // 现在需求是都去掉容器必填的验证
+                if (!this.is_submit) {
+                    uni.showToast({
+                        title: '请输入正确容器',
+                        icon: 'error'
+                    });
+                    return false;
                 }
                 }
+
                 //当前登录组织为深贸电子才必填
                 //当前登录组织为深贸电子才必填
                 if (this.company_id == 2) {
                 if (this.company_id == 2) {
                     if (this.formParams.image_ids.length <= 0) {
                     if (this.formParams.image_ids.length <= 0) {
@@ -639,32 +621,13 @@
                 });
                 });
             },
             },
             showDrawer() {
             showDrawer() {
-                //仅单据的组织为深贸电子时，容器必填，相应操作容器必填
-                if (this.company_id == 1) {
-                    if (this.searchParams.container_id) {
-                        if (!this.is_submit) {
-                            uni.showToast({
-                                title: '请输入正确容器',
-                                icon: 'none'
-                            });
-                            return false;
-                        }
-                    }
-                } else if (this.company_id == 2) {
-                    if (!this.searchParams.container_id) {
-                        uni.showToast({
-                            title: '请输入容器',
-                            icon: 'error'
-                        });
-                        return false;
-                    }
-                    if (!this.is_submit) {
-                        uni.showToast({
-                            title: '请输入正确容器',
-                            icon: 'error'
-                        });
-                        return false;
-                    }
+                // 现在需求是都去掉容器必填的验证
+                if (!this.is_submit) {
+                    uni.showToast({
+                        title: '请输入正确容器',
+                        icon: 'error'
+                    });
+                    return false;
                 }
                 }
 
 
                 if (this.filter_id.length == 0) {
                 if (this.filter_id.length == 0) {

pages/tallyReceive/operate.vue

@@ -731,32 +731,13 @@
              * 理货提交
              * 理货提交
              */
              */
             createTallyReceive() {
             createTallyReceive() {
-                //仅单据的组织为深贸电子时，容器必填，相应操作容器必填
-                if (this.company_id == 1) {
-                    if (this.searchParams.container_id) {
-                        if (!this.is_submit) {
-                            uni.showToast({
-                                title: '请输入正确容器',
-                                icon: 'none'
-                            });
-                            return false;
-                        }
-                    }
-                } else if (this.company_id == 2) {
-                    if (!this.searchParams.container_id) {
-                        uni.showToast({
-                            title: '请输入容器',
-                            icon: 'error'
-                        });
-                        return false;
-                    }
-                    if (!this.is_submit) {
-                        uni.showToast({
-                            title: '请输入正确容器',
-                            icon: 'error'
-                        });
-                        return false;
-                    }
+                // 现在需求是都去掉容器必填的验证
+                if (!this.is_submit) {
+                    uni.showToast({
+                        title: '请输入正确容器',
+                        icon: 'error'
+                    });
+                    return false;
                 }
                 }
 
 
                 if (!this.formParams.tally_qty) {
                 if (!this.formParams.tally_qty) {