diff --git a/public/config.json b/public/config.json index 3d77e04..f987e7a 100644 --- a/public/config.json +++ b/public/config.json @@ -1,6 +1,6 @@ { - "BASE_URL": "http://192.168.1.13:9906", - "SERVER_IP": "http://192.168.1.13:9906", + "BASE_URL": "http://192.168.0.109:9906", + "SERVER_IP": "http://192.168.0.109:9906", "hosp_name": "福建省XX市医院" } diff --git a/src/api/param/systemParamConfig.js b/src/api/param/systemParamConfig.js index 0801cc0..cec49bd 100644 --- a/src/api/param/systemParamConfig.js +++ b/src/api/param/systemParamConfig.js @@ -31,6 +31,7 @@ export function selectSysParamByKey(query) { params: query }); } + export function selectIp(query) { return axios({ url: "/udiwms/basic/thirdsys/selectIp", @@ -38,3 +39,13 @@ export function selectIp(query) { params: query }); } + +//获取产品信息设置 +export function finProductSet(query) { + return axios({ + url: "/udiwms/sys/config/selectByBasic", + method: "get", + params: query + }); +} + diff --git a/src/router/index.js b/src/router/index.js index 11ede65..6fc63a1 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -470,7 +470,7 @@ export const asyncRouterMap = [ { path: "invWarehouse", component: invWarehouse, - name: "仓库 / 科室字典", + name: "仓库/科室字典", icon: "", meta: { authRule: ["basicProduct/invWarehouse"] diff --git a/src/views/basic/BussinessType.vue b/src/views/basic/BussinessType.vue index ebd5048..7a5a065 100644 --- a/src/views/basic/BussinessType.vue +++ b/src/views/basic/BussinessType.vue @@ -232,7 +232,7 @@ export default { uploadFileUrl: null, headers: {}, configParms: {}, - + loading: false, }; }, @@ -292,9 +292,14 @@ export default { } insertBussinessType(this.inputQuery) .then((response) => { - this.loading = false; - this.cancelDialog(); - this.getList(); + if (response.code == 20000) { + this.loading = false; + this.cancelDialog(); + this.getList(); + } else { + this.$message.error(response.message); + } + }) .catch(() => { this.loading = false; @@ -307,16 +312,20 @@ export default { this.$message.error("本地单据不能为空！"); return; } - if (this.inputQuery.mainAction == "" || this.inputQuery.mainAction == null) { this.$message.error("出入库类型不能为空！"); return; } updateBussinessType(this.inputQuery) .then((response) => { - this.loading = false; - this.cancelDialog(); - this.getList(); + if (response.code == 20000) { + this.loading = false; + this.cancelDialog(); + this.getList(); + } else { + this.$message.error(response.message); + } + }) .catch(() => { this.loading = false; diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue index 0830765..b1c6403 100644 --- a/src/views/basic/BussinessTypeModify.vue +++ b/src/views/basic/BussinessTypeModify.vue @@ -61,8 +61,6 @@ - -
@@ -194,16 +192,12 @@ >
- - 单据设置：
- - 启用单据类型 允许手动输入客户信息 diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue index 5e85611..8c96aaa 100644 --- a/src/views/basic/UdiInfoManage.vue +++ b/src/views/basic/UdiInfoManage.vue @@ -336,22 +336,146 @@ + - + +
- 进口产品代理商:  + {{ productRemarkSet.remarkTitle1 }}: 
+
+ + + +
+
+ {{ productRemarkSet.remarkTitle2 }}:  +
+
+ + + +
+
+ {{ productRemarkSet.remarkTitle3 }}:  +
+ +
+ + + +
+
+ {{ productRemarkSet.remarkTitle4 }}:  +
+ +
+ + + + + + +
+
+ {{ productRemarkSet.remarkTitle5 }}:  +
+ +
+ + + +
+
+ {{ productRemarkSet.remarkTitle6 }}:  +
+ +
+ + + + + + +
+
+ {{ productRemarkSet.remarkTitle7 }}:  +
+ +
+ + + +
+
+ {{ productRemarkSet.remarkTitle8 }}:  +
+ +
+ + + + + + + + + + + + + + + + + +
@@ -868,7 +992,7 @@ import { thirdSysDetail, removeRl, sysFilter, spcombie, lockStatus, removeDiRl, disableUdi } from "../../api/basic/udiRelevance"; -import {selectSysParamByKey} from "../../api/param/systemParamConfig"; +import {selectSysParamByKey, finProductSet} from "../../api/param/systemParamConfig"; import {filterByUuid} from "../../api/basic/udiInfo"; import selectUdi from "./UdiInfoRelevance.vue"; @@ -897,6 +1021,7 @@ export default { }, productType: null, editQuery: null, + productRemarkSet: {}, relevanceEdit: { id: null, thirdId: "", @@ -1366,6 +1491,18 @@ export default { }); }, + findBasicProductSet() { + finProductSet().then((response) => { + if (response.code == 20000) { + + this.productRemarkSet = response.data; + } else { + //出错了 + } + }); + }, + + selectSysParam() { let query = { paramKey: "smp_isUploadProuct", @@ -1420,6 +1557,8 @@ export default { selectUdiVersion, }, created() { + + this.findBasicProductSet(); this.getList(); this.selectSysParam(); this.getSysFilter(); diff --git a/src/views/basic/basicCompanyProducts.vue b/src/views/basic/basicCompanyProducts.vue index 3cf6d54..bbb4e10 100644 --- a/src/views/basic/basicCompanyProducts.vue +++ b/src/views/basic/basicCompanyProducts.vue @@ -377,16 +377,139 @@ >
- + + + + + + + + + + + + + + + + + +
+
+ {{ productRemarkSet.remarkTitle1 }}:  +
+ +
+ + + +
+
+ {{ productRemarkSet.remarkTitle2 }}:  +
+ +
+ + + + + + +
+
+ {{ productRemarkSet.remarkTitle3 }}:  +
+ +
+ + + +
+
+ {{ productRemarkSet.remarkTitle4 }}:  +
+ +
+ + + + + + +
+
+ {{ productRemarkSet.remarkTitle5 }}:  +
+ +
+ + +
- 进口产品代理商:  + {{ productRemarkSet.remarkTitle6 }}: 
+
+ + + + + + +
+
+ {{ productRemarkSet.remarkTitle7 }}:  +
+ +
+ + + +
+
+ {{ productRemarkSet.remarkTitle8 }}:  +
+
@@ -1478,7 +1601,7 @@ import { deleteCompanyProductRelevance, filterCompanyProductRelevance } from "../../api/warehouse/companyProductRelevance"; -import {selectSysParamByKey} from "../../api/param/systemParamConfig"; +import {finProductSet, selectSysParamByKey} from "../../api/param/systemParamConfig"; import {filterByUuid} from "../../api/basic/udiInfo"; import selectUdi from "./UdiInfoRelevance.vue"; @@ -1511,6 +1634,7 @@ export default { addProductVisible: false, selectVersionVisible: false, editQuery: null, + productRemarkSet: {}, relevanceEdit: { id: null, thirdId: "", @@ -1992,16 +2116,16 @@ export default { this.relevanceEdit.isUseDy = 0; } this.relevanceEdit.id = this.editQuery.rlId, - updatetUdiInfos(this.relevanceEdit) - .then((response) => { - this.loading = false; - this.getList(); - this.cancelDialog(); - }) - .catch(() => { - this.loading = false; - this.cancelDialog(); - }); + updatetUdiInfos(this.relevanceEdit) + .then((response) => { + this.loading = false; + this.getList(); + this.cancelDialog(); + }) + .catch(() => { + this.loading = false; + this.cancelDialog(); + }); }, selectSysParam() { @@ -2052,7 +2176,18 @@ export default { this.getList(); } this.addProductVisible = false; - } + }, + + findBasicProductSet() { + finProductSet().then((response) => { + if (response.code == 20000) { + + this.productRemarkSet = response.data; + } else { + //出错了 + } + }); + }, } , @@ -2069,6 +2204,7 @@ export default { } , created() { + this.findBasicProductSet(); this.getList(); this.selectSysParam(); this.getSysFilter(); diff --git a/src/views/userManage/param/systemParamConfig.vue b/src/views/userManage/param/systemParamConfig.vue index 55746da..eaa1b47 100644 --- a/src/views/userManage/param/systemParamConfig.vue +++ b/src/views/userManage/param/systemParamConfig.vue @@ -212,10 +212,10 @@ export default { } }, formSubmit() { - if (!Number.isInteger(parseInt(this.formData.paramValue))) { - this.$message.warning("参数值必须为数字"); - return; - } + // if (!Number.isInteger(parseInt(this.formData.paramValue))) { + // this.$message.warning("参数值必须为数字"); + // return; + // } this.$refs["dataForm"].validate(valid => { if (valid) { this.formLoading = true;