diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue index 39bc2dc0..f344f400 100644 --- a/src/views/basic/product/product.vue +++ b/src/views/basic/product/product.vue @@ -1,1134 +1,1193 @@ @@ -1153,6 +1212,10 @@ import selectLocalUdi from "./UdiInfoSelectLocalUdi"; import selectUdiVersion from "./UdiinfoSelectVersion"; import ProductEdit from "@/views/basic/product/productEdit"; 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"; export default { @@ -1170,8 +1233,13 @@ export default { limit: 20, addType: 1, thrPiId: null, - filterType: null + filterType: null, + diType: 1 }, + rId: null, + selectUdiTypeVisible: false, + selectHospProductVisible: false, + selectUnBindHospProductVisible:false, loading: false, showSearch: true, productType: null, @@ -1183,7 +1251,7 @@ export default { sptm: null, packUnit: null, measname: null, - nameCode:null + nameCode: null }, pId: 0, productRemarkSet: {}, @@ -1213,6 +1281,7 @@ export default { filterList: [], total: 0, thirdNo: "", + treeList: [], uuid: "111", originUuid: null, thirdId: null, @@ -1252,7 +1321,8 @@ export default { ggxh: null, page: 1, limit: 20, - addType: 1 + addType: 1, + diType: 1 }; this.getList(); }, @@ -1304,6 +1374,10 @@ export default { this.detailList = []; }); }, + hideForm(){ + this.selectUdiTypeVisible=false; + this.getTerrList(); + }, getThirdSysDetail() { let query = { id: this.relevanceEdit.id, @@ -1423,7 +1497,7 @@ export default { type: "success", message: "删除成功！", }); - this.editDialogVisible=false; + this.editDialogVisible = false; this.getList(); this.cancelDialog(); } else { @@ -1572,10 +1646,12 @@ export default { }); }, closeUdi(val) { + debugger this.selectUdiDialogVisible = false; this.selectErpDialogVisible = false; this.selectLocalVisible = false; this.selectVersionVisible = false; + this.selectHospProductVisible=false; this.getThirdSysDetail(); if (val) { this.getList(); @@ -1602,7 +1678,7 @@ export default { this.editSingleFormat.sptm = temp.sptm; this.editSingleFormat.packUnit = temp.packUnit; this.editSingleFormat.measname = temp.measname; - this.editSingleFormat.nameCode=temp.nameCode; + this.editSingleFormat.nameCode = temp.nameCode; this.editSingleDiDialogVisible = true; }, diEdit(row) { @@ -1613,6 +1689,8 @@ export default { this.selectErpDialogVisible = false; this.selectLocalVisible = false; this.selectVersionVisible = false; + this.selectHospProductVisible=false; + this.selectUnBindHospProductVisible=false; }, onAddSubmit(relSubmit) { this.editFormat.relSubmit = relSubmit; @@ -1702,6 +1780,47 @@ export default { }); }, + editUdiType() { + this.selectUdiTypeVisible = true; + }, + + getTerrList() { + getListTree(this.query) + .then((response) => { + var invlist = response.data || []; + this.treeList = this.handleTree(invlist, "code", "parentCode"); + }) + .catch(() => { + }); + }, + + addHospProduct(data) { + this.rId = data.code + if(data.code!=10000){ + this.filterQuery.bindCode = data.code + }else{ + this.filterQuery.bindCode = null; + } + this.selectHospProductVisible = true; + }, + removeHospProduct(data){ + this.rId = data.code + if(data.code!=10000){ + this.filterQuery.bindCode = data.code + }else{ + this.filterQuery.bindCode = null; + } + this.selectUnBindHospProductVisible = true; + }, + handleNodeClick(data) { + this.rId = data.code + if(data.code!=10000){ + this.filterQuery.bindCode = data.code + }else{ + this.filterQuery.bindCode = null; + } + this.getList(); + } }, mounted() { }, @@ -1712,10 +1831,14 @@ export default { selectErp, selectLocalUdi, selectUdiVersion, + productUdiType, + selectHospProduct, + selectUnBindHospProduct }, created() { this.findBasicProductSet(); this.getList(); + this.getTerrList(); this.selectSysParam(); this.getSysFilter(); }, @@ -1770,4 +1893,6 @@ export default { padding-bottom: 17px; padding-top: 17px; } + + diff --git a/src/views/basic/product/product2.vue b/src/views/basic/product/product2.vue deleted file mode 100644 index 39ec988f..00000000 --- a/src/views/basic/product/product2.vue +++ /dev/null @@ -1,1895 +0,0 @@ - - - -