diff --git a/.env.production b/.env.production index 92bd490..d22932e 100644 --- a/.env.production +++ b/.env.production @@ -7,7 +7,7 @@ ENV = 'production' #林纪裕 # VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_SPMS_SERVER/' -# VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:82/UDI_SPMS_SERVER/' +VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:82/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_SPMS_SERVER/' @@ -24,7 +24,7 @@ ENV = 'production' # VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_SPMS_SERVER/' # 漳州中医院 -VUE_APP_BASE_API = 'http://116.204.116.198:9150/UDI_SPMS_SERVER/' +# VUE_APP_BASE_API = 'http://116.204.116.198:9150/UDI_SPMS_SERVER/' # 应用访问路径 例如使用前缀 /admin/ diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue index c638596..959e638 100644 --- a/src/views/basic/product/product.vue +++ b/src/views/basic/product/product.vue @@ -13,8 +13,8 @@ > {{ - node.label - }} @@ -183,32 +183,32 @@
显示/隐藏搜索栏 + >显示/隐藏搜索栏 重置 + >重置 查询 + >查询 选入DI信息 + >选入DI信息 添加院内字典 + >添加院内字典 关联添加 + >关联添加
@@ -289,56 +289,56 @@ show-overflow-tooltip > 关联DI + >关联DI 详情 + >详情 编辑 + >编辑 删除 + >删除 @@ -1007,7 +1007,7 @@
{{ productRemarkSet.remarkTitle1 }}: {{ productRemarkSet.remarkTitle1 }}: 
{{ productRemarkSet.remarkTitle2 }}: {{ productRemarkSet.remarkTitle2 }}: 
{{ productRemarkSet.remarkTitle3 }}: {{ productRemarkSet.remarkTitle3 }}: 
{{ productRemarkSet.remarkTitle4 }}: {{ productRemarkSet.remarkTitle4 }}: 
{{ productRemarkSet.remarkTitle5 }}: {{ productRemarkSet.remarkTitle5 }}: 
{{ productRemarkSet.remarkTitle6 }}: {{ productRemarkSet.remarkTitle6 }}: 
{{ productRemarkSet.remarkTitle7 }}: {{ productRemarkSet.remarkTitle7 }}: 
{{ productRemarkSet.remarkTitle8 }}: {{ productRemarkSet.remarkTitle8 }}: 
切换版本 + >切换版本 @@ -1345,7 +1345,7 @@ @click.native.stop="updateVersion()" :loading="updateLoading" style="margin-left: 5%" - >更新当前版本信息 + >更新当前版本信息 @@ -1380,14 +1380,14 @@ size="small" icon="search" @click="onAddSubmit(false)" - >提交 + >提交 取消 + >取消
@@ -1409,14 +1409,14 @@ size="small" icon="search" @click="onAddSingleSubmit(false)" - >提交 + >提交 取消 + >取消 @@ -1562,7 +1562,7 @@ import { selectSysParamByKey, finProductSet, } from "@/api/param/systemParamConfig"; -import { filterByUuid } from "@/api/basic/product/udiInfo"; +import {filterByUuid} from "@/api/basic/product/udiInfo"; import selectUdi from "./UdiInfoSelectRel.vue"; import selectErp from "./udiInfoselectErpUdi"; @@ -1573,8 +1573,8 @@ import ProductSingleEdit from "@/views/basic/product/productSingleEdit"; import productUdiType from "@/views/basic/product/productUdiType"; import selectHospProduct from "@/views/basic/product/bindHospProduct"; import selectUnBindHospProduct from "@/views/basic/product/unbindHospProduct"; -import { getBasicHospType, getListTree } from "@/api/basic/basicHospType"; -import { dlLastVersionByDi } from "@/api/basic/udiInfo"; +import {getBasicHospType, getListTree} from "@/api/basic/basicHospType"; +import {dlLastVersionByDi} from "@/api/basic/udiInfo"; export default { data() { @@ -1623,7 +1623,16 @@ export default { false: "不可配送", }, pId: 0, - productRemarkSet: {}, + productRemarkSet: { + remarkTitle1: "备注字段1", + remarkTitle2: "备注字段2", + remarkTitle3: "备注字段3", + remarkTitle4: "备注字段4", + remarkTitle5: "备注字段5", + remarkTitle6: "备注字段6", + remarkTitle7: "备注字段7", + remarkTitle8: "备注字段8", + }, relevanceEdit: { id: null, thirdId: "", @@ -1670,7 +1679,7 @@ export default { selectVersionVisible: false, selectLocalVisible: false, //关联UDI isUseDyCheck: false, - lockStatusMap: { 1: "未提交", 2: "已提交", 3: "已锁定" }, + lockStatusMap: {1: "未提交", 2: "已提交", 3: "已锁定"}, activeNames: ["1"], useNumEnable: true, updateLoading: false, @@ -1801,7 +1810,8 @@ export default { this.$message.error(response.message); } }) - .catch(() => {}); + .catch(() => { + }); }, deleteDialog(rowId) { @@ -1813,7 +1823,8 @@ export default { .then(() => { this.deleteOrders(rowId); }) - .catch(() => {}); + .catch(() => { + }); }, intentDetail() { @@ -1851,9 +1862,11 @@ export default { this.$message.error(response.message); } }) - .catch(() => {}); + .catch(() => { + }); }) - .catch(() => {}); + .catch(() => { + }); }, removeDi() { @@ -1880,9 +1893,11 @@ export default { this.$message.error(response.message); } }) - .catch(() => {}); + .catch(() => { + }); }) - .catch(() => {}); + .catch(() => { + }); }, intentSelectErp(val) { @@ -2062,10 +2077,10 @@ export default { isAdavence: row.isAdavence, }; this.editFormat = JSON.parse(JSON.stringify(row)); - if( this.editFormat.overStockNum == null){ + if (this.editFormat.overStockNum == null) { this.editFormat.overStockNum = 0; } - if( this.editFormat.lowStockNum == null){ + if (this.editFormat.lowStockNum == null) { this.editFormat.lowStockNum = 0; } this.editDiDialogVisible = true; @@ -2174,7 +2189,8 @@ export default { var invlist = response.data || []; this.treeList = this.handleTree(invlist, "code", "parentCode"); }) - .catch(() => {}); + .catch(() => { + }); }, addHospProduct(data) { @@ -2233,10 +2249,12 @@ export default { this.total = 0; }); }) - .catch(() => {}); + .catch(() => { + }); }, }, - mounted() {}, + mounted() { + }, components: { ProductSingleEdit, ProductEdit, @@ -2262,6 +2280,7 @@ export default { margin-left: -2px; height: 30px; } + .tree { ::v-deep .el-tree-node { .el-tree-node__content { diff --git a/src/views/supplier/company/basicCompanyProducts.vue b/src/views/supplier/company/basicCompanyProducts.vue index bd02e6d..2a8a272 100644 --- a/src/views/supplier/company/basicCompanyProducts.vue +++ b/src/views/supplier/company/basicCompanyProducts.vue @@ -682,7 +682,7 @@ export default { isUseDy: row.isUseDy, isDisable: row.isDisable, isAdavence: row.isAdavence, - useMuti: row.useMuti + useMuti: row.useMuti }; }, sumitLockStatus(row) {