diff --git a/public/config.json b/public/config.json index ea701d5..559e2ca 100644 --- a/public/config.json +++ b/public/config.json @@ -1,6 +1,6 @@ { - "BASE_URL": "http://192.168.0.166:9906", - "SERVER_IP": "http://192.168.0.166:9906", + "BASE_URL": "http://192.168.1.20:9906", + "SERVER_IP": "http://192.168.1.20:9906", "hosp_name": "福建省XX市医院" } diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue index 572bd52..371fc68 100644 --- a/src/views/basic/UdiInfoManage.vue +++ b/src/views/basic/UdiInfoManage.vue @@ -212,6 +212,7 @@ border key="3" @current-change="handleDetail" + highlight-current-row > { this.loading = false; diff --git a/src/views/basic/UdiInfoManageSp.vue b/src/views/basic/UdiInfoManageSp.vue index 625a5e5..5e8a8d6 100644 --- a/src/views/basic/UdiInfoManageSp.vue +++ b/src/views/basic/UdiInfoManageSp.vue @@ -192,7 +192,7 @@ v-if="editDialogVisible" > - + { this.loading = false; diff --git a/src/views/basic/basicCompanyProducts.vue b/src/views/basic/basicCompanyProducts.vue index b71fde5..16a5a3c 100644 --- a/src/views/basic/basicCompanyProducts.vue +++ b/src/views/basic/basicCompanyProducts.vue @@ -353,7 +353,9 @@ export default { isDisable: null, isUseDy: false, isAdavence: null, + pId: null, }, + pId: 0, productType: null, defaultSys: null, isImport: false, @@ -735,6 +737,7 @@ export default { this.thisData = row; this.editDialogVisible = true; this.editQuery = row; + this.pId = row.id; this.relevanceEdit = { id: row.rlId, isUseDy: row.isUseDy, @@ -826,7 +829,8 @@ export default { this.relevanceEdit.isDisable = this.editQuery.isDisable; this.relevanceEdit.isLock = this.editQuery.isLock; this.relevanceEdit.isAdavence = this.editQuery.isAdavence; - this.relevanceEdit = this.editQuery; + this.relevanceEdit = this.editQuery + this.relevanceEdit.pid = this.pId; if (this.checked == true) { this.relevanceEdit.isUseDy = 1; } else { diff --git a/src/views/basic/basicProductEdit.vue b/src/views/basic/basicProductEdit.vue index d5f044f..eaf89d1 100644 --- a/src/views/basic/basicProductEdit.vue +++ b/src/views/basic/basicProductEdit.vue @@ -58,6 +58,7 @@ -
diff --git a/src/views/inventory/InvProducts.vue b/src/views/inventory/InvProducts.vue index 5504135..ce2efa9 100644 --- a/src/views/inventory/InvProducts.vue +++ b/src/views/inventory/InvProducts.vue @@ -49,21 +49,21 @@ + + + + + + + + + + + + + - - - {{ item.name }} - - - - - { @@ -407,7 +407,6 @@ export default { }; }, created() { - this.getStorage(); this.findMethod(); let query = this.$route.query; this.filterQuery = Object.assign(this.filterQuery, query); diff --git a/src/views/inventory/InvStatistics.vue b/src/views/inventory/InvStatistics.vue index 4848c7a..4e48650 100644 --- a/src/views/inventory/InvStatistics.vue +++ b/src/views/inventory/InvStatistics.vue @@ -49,20 +49,20 @@ + + + + + + + + + + + + - - - {{ item.name }} - - - - - { - this.storageList = response.data || []; - }) - .catch(() => { - }); - }, - invChange() { - // this.$set(this.filterQuery, "entrustUser", ""); - this.filterQuery.invWarehouseCode = ""; + getSubInvList() { this.subInvList = []; let query = { - pcode: this.filterQuery.invStorageCode + filter: 3, }; filterSubByInv(query) .then((response) => { @@ -367,7 +356,7 @@ export default { this.loading = true; this.getList(); this.findStorageCode(); - this.getStorage(); + this.getSubInvList(); }, }; diff --git a/src/views/purchase/purPlanDetailDialog.vue b/src/views/purchase/purPlanDetailDialog.vue index 437ae8a..4712d78 100644 --- a/src/views/purchase/purPlanDetailDialog.vue +++ b/src/views/purchase/purPlanDetailDialog.vue @@ -62,8 +62,8 @@ - - + + + + + + + + + + + + + - - - {{ item.name }} - - - - - @@ -825,25 +825,10 @@ export default { } } }, - getStorage() { - this.storageList = []; - filterAllByUser() - .then((response) => { - this.storageList = response.data || []; - if (this.storageList.length > 0) { - this.getSubInvList(); - this.getList(); - } - }) - .catch(() => { - }); - }, - invChange() { - this.query.invWarehouseCode = ""; this.subInvList = []; let query = { - pcode: this.query.locStorageCode + filter: 3, }; filterSubByInv(query) .then((response) => { @@ -855,11 +840,13 @@ export default { getSubInvList() { let query = { - pcode: this.query.locStorageCode + filter: 3, }; filterSubByInv(query) .then((response) => { this.subInvList = response.data || []; + this.getList(); + }) .catch(() => { }); @@ -936,7 +923,7 @@ export default { } }, created() { - this.getStorage(); + this.getSubInvList(); this.getBusType(); let end = new Date(); let start = new Date();