Merge remote-tracking branch 'origin/otherChange' into zhairh

public/config.js

@@ -2,19 +2,19 @@ window.global_config = {
     // "BASE_URL":"http://127.0.0.1:9996",
     // "BASE_URL":"http://139.159.187.130/SPMS_SERVER/",
 
-    "BASE_URL": "http://139.159.187.130:8980",
+   // "BASE_URL": "http://139.159.187.130:8980",
 
-    /**
+     //
-     "BASE_URL":"http://192.168.192.201/SPMS_SERVER",
+     // "BASE_URL":"http://192.168.192.201/SPMS_SERVER",
-     "SERVER_IP": "http://192.168.192.201/SPMS_SERVER"
+     // "SERVER_IP": "http://192.168.192.201/SPMS_SERVER"
 
 
-     "BASE_URL":"http://192.168.0.109:9996",
+     "BASE_URL":"http://127.0.0.1:9906",
-     "SERVER_IP": "http://192.168.0.109:9996"
+     "SERVER_IP": "http://127.0.0.1:9906"
+
 
 
 
-     */
 
 
 };

src/views/basic/CorpMaintain.vue

@@ -417,6 +417,9 @@ export default {
             this.getList();
         },
         getList() {
+                if(this.query.key!=null){
+                    this.query.page=1
+                }
             this.loading = true;
             this.erpIdColumn = false;
             this.thirdIdColumn = false;

src/views/basic/UdiInfoManage.vue

@@ -1207,6 +1207,10 @@ export default {
                     this.loading = false;
                     this.detailList = response.data || [];
                     this.detailList.forEach((item, index, array) => {
+                        this.detailList[index].isAdavence=item.adavence
+                        this.detailList[index].isDisable=item.disable
+                        this.detailList[index].useMuti=item.useMuti
+
                         if (item.zxxsbzbhsydysl > 1) {
                             this.isUseDyCheck = true;
                         }

src/views/inventory/InvStatistics.vue

@@ -62,7 +62,7 @@
 <!--                        </el-select>-->
 <!--                    </el-form-item>-->
                     <el-form-item class="query-form-item">
-                        <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
+                        <el-select v-model="filterQuery.invWarehouseCode"  @change="invWarehouseChange"  placeholder="请选择当前仓库" clearable="true"
                                    size="mini">
                             <el-option
                                 v-for="item in subInvList"
@@ -217,9 +217,19 @@ export default {
         },
         onSubmit() {
             //判断统计条件是否全部为空
+
+            if (this.$isBlank(this.filterQuery.invWarehouseCode)) {
+                this.$message({
+                    message: '请先选择当前仓库',
+                    type: 'warning'
+                });
+                return;
+            }
+            //判断统计条件是否全部为空
             var param = this.filterQuery;
             if (param.cpmctymc == null && param.ggxh == null && param.zczbhhzbapzbh == null && param.ylqxzcrbarmc == null
-                && param.invStorageCode == null && param.nameCode == null && param.batchNo == null && param.supId == null) {
+                && param.invStorageCode == null && param.nameCode == null && param.batchNo == null && param.supId == null
+              ) {
                 this.$message({
                     message: '统计条件不可为空',
                     type: 'warning'
@@ -264,6 +274,13 @@ export default {
                     this.total = 0;
                 });
         },
+        invWarehouseChange(invWarehouseCode) {
+            this.subInvList.forEach(item => {
+                if (item.code === invWarehouseCode) {
+                    this.filterQuery.invStorageCode = item.parentId;
+                }
+            });
+        },
 
         //供应商名称候选查询
         findMethod(query) {

src/views/purchase/supCertificationAdd.vue

@@ -470,8 +470,8 @@ export default {
 
         onReset2() {
             this.registrationQuery = {
-                customerId: null,
+                customerId: this.registrationQuery.customerId,
-                manufacturerIdFk: null,
+                manufacturerIdFk: this.registrationQuery.manufacturerIdFk,
                 recordProductName: "",
                 recordCode: "",
                 recordPeopleName: "",

src/views/purchase/supManufacturerEditDialog.vue

@@ -511,21 +511,7 @@ export default {
     },
     methods: {
         onModifySubmit(type) {
-            
-            //判断本企业产品是否是通过审核的
-                let query = {
-                  customerId: this.$store.getters.customerId
-                  }
-                getCompany(query)
-                 .then((response) => {
-                   if(response.data.auditStatus!=1){
-                    this.$message.error("本企业信息还未通过审核!");
-                    return;
-                   }else{
             this.addOrModifyCompany(type);
-                   }}).catch(() => {
-
-                   });
         },
         addOrModifyCompany (type){
 

src/views/thrsys/thrOrderNew.vue

@@ -806,8 +806,10 @@ export default {
             this.formData.corpName  = row.name;
 
         },
-        subStorageChange(code) {
+        subStorageChange(item) {
-            this.formData.locStorageCode= this.subInvList.find(item => item.code == code).parentId
+            this.formData.locStorageCode= this.subInvList.find(item => item.code == this.formData.invWarehouseCode).parentId
+            this.formData.corpId=this.subInvList.find(item => item.code == this.formData.invWarehouseCode).code
+            this.formData.corpName=this.subInvList.find(item => item.code == this.formData.invWarehouseCode).warehouseName
             this.getBusType();
             this.findSubStorageMethod();
         },

src/views/warehouse/DialogcChangeNewOrder.vue

@@ -297,8 +297,12 @@ export default {
                     this.loading = false;
                 });
         },
-        getFormStorageCode(){
+        getFormStorageCode(subInvId){
-            // this.formData.locStorageCode= this.subInvList.find(item => item.code == this.formData.invWarehouseCode).parentId
+            this.fromSubStorageOptions.forEach(item => {
+                if (subInvId === item.code) {
+                    this.formData.fromCorp = item.warehouseName;
+                }
+            });
         },
 
         locCHange() {
@@ -351,6 +355,7 @@ export default {
                 })
                 .catch(() => {
                 });
+            this.getBusType()
         },
         findMethod(query) {
             this.fromOptions = [];
@@ -420,6 +425,7 @@ export default {
         getBusType() {
             let query = {
                 enabled: true,
+                code:this.formData.invWarehouseCode
             };
             getLocalJoinByUser(query)
                 .then((response) => {

src/views/warehouse/IONewOrder.vue

@@ -431,6 +431,7 @@ export default {
             }
         },
         getBusType() {
+            this.filterQuery.locStorageCode= this.subInvList.find(item => item.code == this.filterQuery.invWarehouseCode).parentId
             let query = {
                 code: this.filterQuery.invWarehouseCode,
                 enabled: true,

src/views/warehouse/stockHospOrderNew.vue

@@ -61,7 +61,6 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
-//
                 <el-row :gutter="20" style="margin-top: -5px">
                     <el-col :span="3">
                         <div class="ao-text">
@@ -535,7 +534,6 @@ export default {
     },
     methods: {
         saveOrder(status) {
-
             this.code = "";
             this.$refs.multipleTable.setCurrentRow();
             this.currentRow = {};

src/views/warehouse/stockOrderDelSearch.vue

@@ -603,6 +603,9 @@ export default {
                         this.total = response.data.total || 0;
                     } else {
                         this.$message.error(response.message);
+                        this.list = [];
+                        this.total = 0;
+                        this.detailList = [];
                     }
 
                 })
@@ -793,6 +796,9 @@ export default {
             }
         },
         getBusType() {
+            if(this.subInvList.length>0){
+                this.query.locStorageCode= this.subInvList.find(item => item.code == this.query.invWarehouseCode).parentId
+            }
             let query = {
                 code: this.query.invWarehouseCode,
                 enabled: true,

src/views/warehouse/stockOrderEditDistribution.vue

@@ -62,7 +62,6 @@
                     </el-col>
                     <el-col :span="7">
                         <el-form-item prop="corpName">
-                            <el-input v-if="formData.fromSubInvName ==null" v-model="formData.corpName" auto-complete="off" :disabled="true"></el-input>
                             <el-input v-if="formData.fromSubInvName !=null" v-model="formData.fromSubInvName"
                                       auto-complete="off" :disabled="true"></el-input>
                         </el-form-item>
@@ -576,6 +575,8 @@ export default {
                     };
                     this.selectInvProductVisible = true;
                 } else {
+                    this.invQueryData.corpId = this.formData.corpId;
+                    this.thisData.noInvOut = this.formData.noInvOut;
                     this.selectProductVisible = true;
                 }
 

src/views/warehouse/stockOrderEditor.vue

@@ -634,6 +634,9 @@ export default {
 
             this.query.page = 1;
             this.getList();
+            //清空详情数据
+            this.detailQuery.page=1
+            this.detailTotal=0
             if (this.query.status === "202") {
                 this.haveDistributionVisible = true;
             } else {
@@ -765,6 +768,7 @@ export default {
             if (this.$isNotBlank(row)) {
                 this.detailQuery.orderIdFk = row.id;
                 this.formData = row;
+                this.detailQuery.page=1;
             }
             this.detailLoading = true;
             stockOrderDetail(this.detailQuery)

src/views/warehouse/stockOrderNew.vue

@@ -657,6 +657,8 @@ export default {
                         this.detailList = [];
                     } else {
                         this.$message.error(response.message);
+                        this.list = [];
+                        this.total = 0;
                     }
 
                 })
@@ -724,6 +726,7 @@ export default {
             if (this.$isNotBlank(row)) {
                 this.detailQuery.orderIdFk = row.id;
                 this.formData = row;
+                this.detailQuery.page=1;
             }
             this.detailLoading = true;
             stockOrderDetail(this.detailQuery)

src/views/warehouse/stockOrderNewDistribution.vue

@@ -569,6 +569,7 @@ export default {
                 if (this.orderEditor) {
                     this.thisData.orderId = this.formData.id
                 }
+                this.invQueryData.corpId = this.formData.corpId;
                 this.selectProductVisible = true;
                 return;
             }

src/views/warehouse/stockOrderWaitCheck.vue

@@ -609,6 +609,7 @@ export default {
         getStockOrderDetailList(row) {
             if (this.$isNotBlank(row)) {
                 this.detailQuery.orderIdFk = row.id;
+                this.detailQuery.page=1;
             }
             this.detailLoading = true;
             stockOrderDetail(this.detailQuery)