浏览代码

Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

28169 6 个月前
父节点
当前提交
d81dba71d6
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 2 2
      src/xt_pages/stock/drugs/drugStockInOrderAdd.vue
  2. 1 1
      src/xt_pages/stock/stockInOrderAdd.vue

+ 2 - 2
src/xt_pages/stock/drugs/drugStockInOrderAdd.vue 查看文件

916
             }
916
             }
917
           }
917
           }
918
 
918
 
919
-          if(this.$store.getters.xt_user.org_id == 0 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10278 || this.$store.getters.xt_user.org_id == 10610 ||  this.$store.getters.xt_user.org_id == 10537 ) {
919
+          if(this.$store.getters.xt_user.org_id == 0 || this.this.$store.getters.xt_user.org_id == 10138 || this.this.$store.getters.xt_user.org_id == 10278 || this.this.$store.getters.xt_user.org_id == 10610 ||  this.this.$store.getters.xt_user.org_id == 10537 ) {
920
             for (let i = 0; i < array.length; i++) {
920
             for (let i = 0; i < array.length; i++) {
921
               if (array[i].drug_code.length == 0) {
921
               if (array[i].drug_code.length == 0) {
922
                 this.$message.error(array[i].drug_name + " 药品溯源码不能为空");
922
                 this.$message.error(array[i].drug_name + " 药品溯源码不能为空");
932
               }
932
               }
933
             }
933
             }
934
           }
934
           }
935
-         
935
+
936
 
936
 
937
           if (this.recordInfo.recordData.length <= 0) {
937
           if (this.recordInfo.recordData.length <= 0) {
938
             this.$message.success("请添加入库商品");
938
             this.$message.success("请添加入库商品");

+ 1 - 1
src/xt_pages/stock/stockInOrderAdd.vue 查看文件

787
               array[i].packing_price = array[i].packing_price.toString()
787
               array[i].packing_price = array[i].packing_price.toString()
788
             }
788
             }
789
 
789
 
790
-            if(this.$store.getters.xt_user.org_id == 0 || this.this.$store.getters.xt_user.org_id == 10138 || this.this.$store.getters.xt_user.org_id == 10278 || this.this.$store.getters.xt_user.org_id == 10610 ||  this.this.$store.getters.xt_user.org_id == 10537 ) {
790
+            if(this.$store.getters.xt_user.org_id == 0 || this.this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10278 || this.$store.getters.xt_user.org_id == 10610 ||  this.$store.getters.xt_user.org_id == 10537 ) {
791
               for (let i = 0; i < array.length; i++) {
791
               for (let i = 0; i < array.length; i++) {
792
                 if (array[i].good_code.length == 0) {
792
                 if (array[i].good_code.length == 0) {
793
                   this.$message.error(array[i].good_name  + " 溯源码不能为空");
793
                   this.$message.error(array[i].good_name  + " 溯源码不能为空");