diff --git a/src/api/basic/product/udiRelevance.js b/src/api/basic/product/udiRelevance.js index b966232..89b726e 100644 --- a/src/api/basic/product/udiRelevance.js +++ b/src/api/basic/product/udiRelevance.js @@ -184,6 +184,15 @@ export function changeVersion(query) { }); } +export function syncOnline(query) { + return axios({ + url: "/udi/udirel/syncOnline", + method: "post", + data: query + }); +} + + export function getGgxhList(params) { return axios({ url: "/udiwms/udiinfo/getGgxhList", diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue index 808fc2b..7f376c6 100644 --- a/src/views/basic/busType/bussinessTypeModify.vue +++ b/src/views/basic/busType/bussinessTypeModify.vue @@ -115,7 +115,7 @@ + style="width: 90%" placeholder="是否允许"> @@ -125,7 +125,7 @@ + style="width: 90%" placeholder=""> @@ -153,7 +153,7 @@ + style="width: 90%" placeholder=""> @@ -163,7 +163,7 @@ + style="width: 90%" placeholder=""> @@ -192,7 +192,7 @@ - + @@ -239,7 +239,7 @@ + placeholder="是否启用"> @@ -295,7 +295,7 @@ - + @@ -335,7 +335,7 @@ + placeholder="是否启用"> @@ -355,7 +355,7 @@ + placeholder="是否启用"> @@ -436,7 +436,7 @@ - + @@ -454,7 +454,7 @@ - + - + @@ -552,7 +552,7 @@ - + @@ -575,7 +575,7 @@ - + @@ -598,7 +598,7 @@ - + @@ -621,7 +621,7 @@ - + @@ -644,7 +644,7 @@ - + @@ -666,7 +666,7 @@ - + @@ -689,7 +689,7 @@ - + @@ -711,7 +711,7 @@ - + @@ -723,6 +723,8 @@ 手工补单的单据 + + @@ -1140,6 +1142,7 @@ 手工补单的单据 + @@ -1152,7 +1155,7 @@ import {candidateBusType} from '@/api/basic/busType' import busTypeAdvancedSettings from '@/views/basic/busType/busTypeAdvancedSettings.vue' import {isBlank} from '@/utils/strUtil' -import {getOriginBusType,selectList} from '@/api/basic/busOriginType' +import {getOriginBusType, selectList} from '@/api/basic/busOriginType' import {getBasicUnitMaintains2} from '@/api/basic/basicUnitMaintain' export default { @@ -1286,17 +1289,17 @@ export default { }, - selectBussinessList(){ + selectBussinessList() { selectList().then((res) => { - this.preInBackList=res.data; + this.preInBackList = res.data; }) }, - getPreInBack(){ - if(this.inputQuery.preInBack==false){ - this.inputQuery.preInBackAction=null; - this.inputQuery.backPreinType=''; - }else{ - this.inputQuery.backPreinType=1; + getPreInBack() { + if (this.inputQuery.preInBack == false) { + this.inputQuery.preInBackAction = null; + this.inputQuery.backPreinType = ''; + } else { + this.inputQuery.backPreinType = 1; } }, //获取单据类型 @@ -1381,9 +1384,9 @@ export default { this.findSpecialMethod() this.selectBussinessList() this.oldData = Object.assign({}, this.inputQuery) - if(this.inputQuery.id==null || this.inputQuery.id==''){ - this.inputQuery.codeFillCheck=false; - this.inputQuery.preInBack=false; + if (this.inputQuery.id == null || this.inputQuery.id == '') { + this.inputQuery.codeFillCheck = false; + this.inputQuery.preInBack = false; } } diff --git a/src/views/basic/product/UdiinfoSelectVersion.vue b/src/views/basic/product/UdiinfoSelectVersion.vue index aea98e3..92cc5da 100644 --- a/src/views/basic/product/UdiinfoSelectVersion.vue +++ b/src/views/basic/product/UdiinfoSelectVersion.vue @@ -46,7 +46,7 @@ show-overflow-tooltip > - + diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue index baed886..4d27e3a 100644 --- a/src/views/basic/product/product.vue +++ b/src/views/basic/product/product.vue @@ -12,8 +12,8 @@ > {{ - node.label - }} @@ -164,32 +164,38 @@
显示/隐藏搜索栏显示/隐藏搜索栏 + 重置重置 + 查询查询 + 选入DI信息选入DI信息 + 添加院内字典添加院内字典 + 关联添加关联添加 +
@@ -270,27 +276,27 @@ size="small" :disabled="scope.row.originUuid != null" @click.native.stop="intentSelectUdi(scope.row)" - >关联DI + >关联DI 详情 + >详情 编辑 + >编辑 删除 + >删除 @@ -899,7 +905,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 }}: 

版本信息

-
@@ -1220,15 +1225,24 @@ splaceholder="请输入内容" v-model="editQuery.versionNumber" > - 切换版本 -
+ + 切换版本 + + + + 更新当前版本信息 + +
@@ -1261,14 +1275,14 @@ size="small" icon="search" @click="onAddSubmit(false)" - >提交 + >提交 取消 + >取消
@@ -1290,14 +1304,14 @@ size="small" icon="search" @click="onAddSingleSubmit(false)" - >提交 + >提交 取消 + >取消 @@ -1436,13 +1450,13 @@ import { spcombie, lockStatus, removeDiRl, - disableUdi, + disableUdi, syncOnline, } from "@/api/basic/product/udiRelevance"; 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"; @@ -1453,7 +1467,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 {getBasicHospType, getListTree} from "@/api/basic/basicHospType"; +import {dlLastVersionByDi} from "@/api/basic/udiInfo"; export default { data() { @@ -1548,9 +1563,10 @@ export default { selectVersionVisible: false, selectLocalVisible: false, //关联UDI isUseDyCheck: false, - lockStatusMap: { 1: "未提交", 2: "已提交", 3: "已锁定" }, + lockStatusMap: {1: "未提交", 2: "已提交", 3: "已锁定"}, activeNames: ["1"], useNumEnable: true, + updateLoading: false, }; }, filters: { @@ -1678,7 +1694,8 @@ export default { this.$message.error(response.message); } }) - .catch(() => {}); + .catch(() => { + }); }, deleteDialog(rowId) { @@ -1690,7 +1707,8 @@ export default { .then(() => { this.deleteOrders(rowId); }) - .catch(() => {}); + .catch(() => { + }); }, intentDetail() { @@ -1728,9 +1746,11 @@ export default { this.$message.error(response.message); } }) - .catch(() => {}); + .catch(() => { + }); }) - .catch(() => {}); + .catch(() => { + }); }, removeDi() { @@ -1757,9 +1777,11 @@ export default { this.$message.error(response.message); } }) - .catch(() => {}); + .catch(() => { + }); }) - .catch(() => {}); + .catch(() => { + }); }, intentSelectErp(val) { @@ -2045,7 +2067,8 @@ export default { var invlist = response.data || []; this.treeList = this.handleTree(invlist, "code", "parentCode"); }) - .catch(() => {}); + .catch(() => { + }); }, addHospProduct(data) { @@ -2075,8 +2098,40 @@ export default { } this.getList(); }, + + updateVersion() { + this.$confirm("此操作将访问国家库查询最新版本信息, 是否继续?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + debugger + this.updateLoading = true; + let query = {uuid: this.editQuery.uuid, originUuid: this.editQuery.originUuid}; + syncOnline(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(() => { + }); + + }, + }, + mounted() { }, - mounted() {}, components: { ProductSingleEdit, ProductEdit, @@ -2101,12 +2156,14 @@ export default { .tree { ::v-deep .el-tree-node { white-space: normal; + .el-tree-node__content { height: 100%; align-items: start; } } } + .itemTag { float: left; text-align: right; diff --git a/src/views/supplier/company/basicCompanyproductDetail.vue b/src/views/supplier/company/basicCompanyproductDetail.vue index 0311e1d..e41c02f 100644 --- a/src/views/supplier/company/basicCompanyproductDetail.vue +++ b/src/views/supplier/company/basicCompanyproductDetail.vue @@ -799,12 +799,24 @@ splaceholder="请输入内容" v-model="editQuery.versionNumber" > - 切换版本 -
+ + 切换版本 + + + + 更新当前版本信息 + + @@ -881,7 +893,7 @@