diff --git a/public/config.json b/public/config.json index 21c4bcf..ea701d5 100644 --- a/public/config.json +++ b/public/config.json @@ -1,6 +1,6 @@ { - "BASE_URL": "http://192.168.0.41:9996", - "SERVER_IP": "http://192.168.0.41:9996", + "BASE_URL": "http://192.168.0.166:9906", + "SERVER_IP": "http://192.168.0.166:9906", "hosp_name": "福建省XX市医院" } diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue index 72d4873..572bd52 100644 --- a/src/views/basic/UdiInfoManage.vue +++ b/src/views/basic/UdiInfoManage.vue @@ -907,7 +907,7 @@ - +
当前版本号:  @@ -919,12 +919,22 @@ splaceholder="请输入内容" v-model="editQuery.versionNumber" > - 切换版本 -
+ + + 切换版本 + + + + 更新当前版本信息 + + @@ -1027,7 +1037,7 @@ import { removeRl, sysFilter, spcombie, lockStatus, removeDiRl, disableUdi } from "../../api/basic/udiRelevance"; import {selectSysParamByKey, finProductSet} from "../../api/param/systemParamConfig"; -import {filterByUuid} from "../../api/basic/udiInfo"; +import {dlLastVersionByDi, filterByUuid} from "../../api/basic/udiInfo"; import selectUdi from "./UdiInfoRelevance.vue"; import selectErp from "./UdiInfoselectErpUdi"; @@ -1101,6 +1111,7 @@ export default { configParms: {}, activeNames: ['1'], useNumEnable: true, + updateLoading: false, }; }, @@ -1219,6 +1230,39 @@ export default { this.originUuid = this.editQuery.originUuid; this.relId = this.editQuery.id; }, + + + updateVersion() { + this.$confirm("此操作将访问国家库查询最新版本信息, 是否继续?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.updateLoading = true; + let query = {nameCode: this.editQuery.nameCode}; + dlLastVersionByDi(query) + .then((response) => { + this.updateLoading = false; + if (response.code == 20000) { + this.$message.success("更新成功！"); + this.closeDialog(); + } else { + this.$message.error(response.message); + } + }) + .catch(() => { + this.updateLoading = false; + this.udidlList = []; + this.total = 0; + }); + }) + .catch(() => { + }); + + }, + + deleteOrders(data) { this.loading = true; let tquery = { diff --git a/src/views/basic/basicProductEdit.vue b/src/views/basic/basicProductEdit.vue index 9e062da..d5f044f 100644 --- a/src/views/basic/basicProductEdit.vue +++ b/src/views/basic/basicProductEdit.vue @@ -712,7 +712,7 @@

版本信息

- +
当前版本号:  @@ -724,12 +724,22 @@ splaceholder="请输入内容" v-model="editQuery.versionNumber" > - 切换版本 -
+ + + 切换版本 + + + + 更新当前版本信息 + + @@ -766,6 +776,25 @@ :supEnable="true" > + + + + +
@@ -773,6 +802,8 @@ import {removeDiRl, removeRl, updatetUdiInfos} from "@/api/basic/udiRelevance"; import {finProductSet} from "@/api/param/systemParamConfig"; import selectErp from "./UdiInfoselectErpUdi"; +import selectUdiVersion from "./UdiinfoSelectVersion"; +import {dlLastVersionByDi} from "../../api/basic/udiInfo"; export default { name: "basicProductEdit", @@ -825,6 +856,9 @@ export default { isUseDy: false, isAdavence: null, }, + originUuid: null, + selectVersionVisible: false, + updateLoading: false, } }, @@ -937,7 +971,7 @@ export default { type: "success", message: "删除成功！", }); - this.cancelDialog(); + this.closeUdi(); } else { this.$message.error(response.message); } @@ -949,16 +983,53 @@ export default { }); }, + selectVersion() { + this.selectVersionVisible = true; + this.uuid = this.editQuery.uuid; + this.originUuid = this.editQuery.originUuid; + this.relId = this.editQuery.rlId; + }, + + updateVersion() { + this.$confirm("此操作将访问国家库查询最新版本信息, 是否继续?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.updateLoading = true; + let query = {nameCode: this.editQuery.nameCode}; + dlLastVersionByDi(query) + .then((response) => { + this.updateLoading = false; + if (response.code == 20000) { + this.$message.success("更新成功！"); + this.closeUdi(); + } else { + this.$message.error(response.message); + } + }) + .catch(() => { + this.updateLoading = false; + this.udidlList = []; + this.total = 0; + }); + }) + .catch(() => { + }); + + }, }, created() { this.relId = this.editQuery.rlId; - if(this.editQuery.isUseDy==1){ - this.checked=true + if (this.editQuery.isUseDy == 1) { + this.checked = true } this.findBasicProductSet(); - }, + } + , components: { - selectErp, + selectErp, selectUdiVersion } diff --git a/src/views/inventory/DialogInvProduct.vue b/src/views/inventory/DialogInvProduct.vue index fc16deb..6c67f98 100644 --- a/src/views/inventory/DialogInvProduct.vue +++ b/src/views/inventory/DialogInvProduct.vue @@ -152,6 +152,7 @@ export default { }, methods: { onReset() { + this.$router.push({ path: "", }); @@ -165,6 +166,8 @@ export default { supId: null, page: 1, limit: 10, + invStorageCode:this.invQueryData.locStorageCode, + invWarehouseCode:this.invQueryData.invWarehouseCode }; this.getList(); }, @@ -333,6 +336,7 @@ export default { }; }, created() { + this.getBusType(); let query = this.$route.query; diff --git a/src/views/purchase/purPlanEditDialog.vue b/src/views/purchase/purPlanEditDialog.vue index ab2ac84..d0e319a 100644 --- a/src/views/purchase/purPlanEditDialog.vue +++ b/src/views/purchase/purPlanEditDialog.vue @@ -356,9 +356,6 @@ export default { if (this.formData.billDate == "" || this.formData.billDate == null) { return this.$message.error("单据日期不能为空！"); } - /*if(this.formData.billType=="" || this.formData.billType==null){ - return this.$message.error("采购类型不能为空！"); - }*/ if(this.formData.invWarehouseCode=="" || this.formData.invWarehouseCode==null){ return this.$message.error("采购分库不能为空！"); diff --git a/src/views/purchase/pureApplyDetailDialog.vue b/src/views/purchase/pureApplyDetailDialog.vue index 9ad842c..7f0e94f 100644 --- a/src/views/purchase/pureApplyDetailDialog.vue +++ b/src/views/purchase/pureApplyDetailDialog.vue @@ -61,18 +61,20 @@ - - - {{ item.name }} - {{ item.warehouseName }} - - + + + {{ item.name }} + {{ + item.warehouseName + }} + + @@ -88,22 +90,8 @@ disabled autosize> - - - - {{ item.name }} - {{ item.warehouseName }} - - - - @@ -150,12 +138,34 @@ - - + + +
+ 采购科室： +
+ + + + + + {{ item.name }} + {{ + item.warehouseName + }} + + + + + - @@ -213,7 +223,6 @@ - { @@ -560,7 +572,9 @@ export default { } this.getStorage(); this.findSubInvs(); - this.getTargetStorage(); + // this.getTargetStorage(); + + this.findTargetSubInvs(); this.codeArray = []; this.getBusType(); }, diff --git a/src/views/thrsys/SysUdimsConfig.vue b/src/views/thrsys/SysUdimsConfig.vue index 7e90eeb..519e0e4 100644 --- a/src/views/thrsys/SysUdimsConfig.vue +++ b/src/views/thrsys/SysUdimsConfig.vue @@ -26,7 +26,6 @@ - diff --git a/src/views/thrsys/ThrDiProductsCheck.vue b/src/views/thrsys/ThrDiProductsCheck.vue index 8159db5..ae55baa 100644 --- a/src/views/thrsys/ThrDiProductsCheck.vue +++ b/src/views/thrsys/ThrDiProductsCheck.vue @@ -187,6 +187,7 @@ export default { }, checDialog(row) { this.checkVisible = true; + this.remark = ""; this.curRow = row; }, search() { diff --git a/src/views/thrsys/thrOrderNew.vue b/src/views/thrsys/thrOrderNew.vue index 4590b9c..144d194 100644 --- a/src/views/thrsys/thrOrderNew.vue +++ b/src/views/thrsys/thrOrderNew.vue @@ -499,7 +499,9 @@ export default { this.subInvList = response.data || []; if (this.subInvList != null && this.subInvList.length == 1) { this.formData.invWarehouseCode = this.subInvList[0].code; + this.formData.locStorageCode = this.subInvList[0].parentId; this.getBusType(); + this.findSubStorageMethod(); } }) .catch(() => { @@ -514,27 +516,7 @@ export default { } }, - //往来仓库 - findStorageMethod() { - if (this.formData.locStorageCode == null) - return; - this.fromStorageOptions = []; - let cQuery = { - locInvCode: this.formData.locStorageCode, - }; - filterAllByLoc(cQuery) - .then((response) => { - let temp = response.data || []; - for (let i = 0; i < temp.length; i++) { - if (temp[i].code != this.formData.locStorageCode) { - this.fromStorageOptions.push(temp[i]); - } - } - }) - .catch(() => { - }); - }, //往来分库 findSubStorageMethod() { @@ -918,7 +900,6 @@ export default { } this.formData.locStorageCode = item; this.$forceUpdate(); - this.findStorageMethod(); this.findSubInvs(); }, @@ -960,7 +941,7 @@ export default { this.getBusType(); this.findSubInvs(); - this.findSubStorageMethod(); + // this.findSubInvByInv(); this.codeArray = []; this.closeConfirmFunction(false); diff --git a/src/views/warehouse/IOCheckErrOrder.vue b/src/views/warehouse/IOCheckErrOrder.vue index 9f6355c..9ca62de 100644 --- a/src/views/warehouse/IOCheckErrOrder.vue +++ b/src/views/warehouse/IOCheckErrOrder.vue @@ -1,450 +1,450 @@ @@ -969,10 +970,10 @@ export default { diff --git a/src/views/warehouse/IOWaitOrder.vue b/src/views/warehouse/IOWaitOrder.vue index 58bec5c..c0043ca 100644 --- a/src/views/warehouse/IOWaitOrder.vue +++ b/src/views/warehouse/IOWaitOrder.vue @@ -33,21 +33,21 @@ + + + + + + + + + + + + + - - - {{ item.name }} - - - - - { this.subInvList = response.data || []; + this.getList(); }) .catch(() => { }); @@ -1009,7 +1011,7 @@ export default { }, created() { - this.getStorage(); + this.getSubInvList(); this.getBusType(); let query = this.$route.query; this.query = Object.assign(this.query, query); diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue index 292b45b..9ff868d 100644 --- a/src/views/warehouse/addHosOrder.vue +++ b/src/views/warehouse/addHosOrder.vue @@ -1005,7 +1005,6 @@ export default { }; filterSubByInv(cQuery) .then((response) => { - this.fromSubStorageOptions = response.data || []; if (val == 1) { @@ -1182,7 +1181,6 @@ export default { }, created() { - this.formData.code = ''; this.formData.actDate = new Date(); this.codeArray = []; @@ -1221,9 +1219,9 @@ export default { if (this.$isNotBlank(this.formData.locStorageCode)) { this.findStorageMethod(); } + this.findSubStorageMethod(); } this.findSubInvByInv(); - this.findSubStorageMethod(); this.getBusType(); //查询是否启用多级仓库，判断是否启用部门 diff --git a/src/views/warehouse/addOrder.vue b/src/views/warehouse/addOrder.vue index 48aa454..b8c425b 100644 --- a/src/views/warehouse/addOrder.vue +++ b/src/views/warehouse/addOrder.vue @@ -1,308 +1,308 @@