diff --git a/.env.production b/.env.production index 15d4fd21..2087eabd 100644 --- a/.env.production +++ b/.env.production @@ -37,10 +37,10 @@ ENV = 'production' # VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/' # 长泰医院 -# VUE_APP_BASE_API = 'http://192.168.6.189:9150/UDI_WMS_MC/' +VUE_APP_BASE_API = 'http://192.168.6.189:9150/UDI_WMS_MC/' # 三明大田医院 -VUE_APP_BASE_API = 'http://172.20.124.4:9150/UDI_WMS_MC/' +# VUE_APP_BASE_API = 'http://172.20.124.4:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.0.207:9150/UDI_WMS_MC/' diff --git a/src/api/basic/sicker/skPersonApi.js b/src/api/basic/sicker/skPersonApi.js index eb5c5d8b..8c87e2da 100644 --- a/src/api/basic/sicker/skPersonApi.js +++ b/src/api/basic/sicker/skPersonApi.js @@ -9,6 +9,15 @@ export function page(query) { }); } +export function filterNoPage(query) { + return axios({ + url: "/udiwms/basic/sk/sicker/filter/noPage", + method: "get", + params: query + }); +} + + export function downloadSick(query) { return axios({ url: "/udiwms/basic/sk/sicker/download", diff --git a/src/api/dev/deviceInfoApi.js b/src/api/dev/deviceInfoApi.js index d88320bf..e004d2d1 100644 --- a/src/api/dev/deviceInfoApi.js +++ b/src/api/dev/deviceInfoApi.js @@ -77,3 +77,14 @@ export function genDeviceQR(deviceCode) { ) } +export function printDevLabel(query) { + return axios({ + url: "/udiwms/inv/deptDevice/printOrder", + method: "post", + data: query, + headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}, + responseType: 'arraybuffer', //一定要设置响应类型，否则页面会是空白pdf + }); +} + + diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue index 914bfb00..43a7d87b 100644 --- a/src/views/basic/product/product.vue +++ b/src/views/basic/product/product.vue @@ -5,11 +5,11 @@ {{ @@ -37,20 +37,20 @@ @@ -59,45 +59,45 @@ {{ item.sysName }} @@ -109,30 +109,30 @@ @@ -143,10 +143,10 @@ @@ -160,30 +160,30 @@ @@ -207,163 +207,163 @@ @@ -372,10 +372,10 @@ - - - 删除 - - 上传 - + + + - 上传日志 - -
@@ -591,10 +597,10 @@ 产品是否禁用: 
@@ -608,10 +614,10 @@ 是否寄售:  @@ -627,10 +633,10 @@ 允许无批次号:  @@ -644,10 +650,10 @@ 允许无失效日期:  @@ -663,10 +669,10 @@ 允许无生产日期:  @@ -680,10 +686,10 @@ 允许无序列号:  @@ -699,10 +705,10 @@ 启用使用单元:  @@ -716,10 +722,10 @@ 允许科室多次使用出库:  @@ -741,11 +747,11 @@ 产品名称:  @@ -756,11 +762,11 @@ 最小包装内包含使用单元数量:  @@ -774,11 +780,11 @@ @@ -789,11 +795,11 @@ 包含最小销售包装数量:  @@ -806,11 +812,11 @@ 包装单位:  @@ -821,12 +827,12 @@ 最小包装可使用次数:  @@ -844,11 +850,11 @@ 产品标识:  @@ -858,11 +864,11 @@ 规格型号:  @@ -875,11 +881,11 @@ 产品类别:  @@ -890,11 +896,11 @@ 分类编码:  @@ -907,11 +913,11 @@ 器械类别:  @@ -922,11 +928,11 @@ 注册证/备案号:  @@ -938,11 +944,11 @@ 医疗器械注册人:  @@ -953,11 +959,11 @@ 注册人英文名称:  @@ -969,11 +975,11 @@ 医保编码:  @@ -983,11 +989,11 @@ 统一社会信用号:  @@ -999,11 +1005,11 @@ 商品名称:  @@ -1014,11 +1020,11 @@ 商品条码:  @@ -1031,11 +1037,11 @@ 计量单位:  @@ -1045,11 +1051,11 @@ 生产企业:  @@ -1062,11 +1068,11 @@ 产品描述:  @@ -1074,9 +1080,9 @@
@@ -1085,19 +1091,19 @@ >
@@ -1106,11 +1112,11 @@ >
@@ -1118,9 +1124,9 @@
@@ -1129,19 +1135,19 @@ >
@@ -1150,11 +1156,11 @@ >
@@ -1162,9 +1168,9 @@
@@ -1173,19 +1179,19 @@ >
@@ -1194,11 +1200,11 @@ >
@@ -1206,9 +1212,9 @@
@@ -1217,19 +1223,19 @@ >
@@ -1238,11 +1244,11 @@ >
@@ -1260,11 +1266,11 @@ 是否包含批号:  @@ -1274,11 +1280,11 @@ 是否包含序列号:  @@ -1290,11 +1296,11 @@ 是否包含生产日期:  @@ -1304,11 +1310,11 @@ 是否包含失效日期:  @@ -1326,11 +1332,11 @@ 上级产品编码:  @@ -1341,11 +1347,11 @@ 包装级别:  @@ -1358,11 +1364,11 @@ @@ -1373,11 +1379,11 @@ 包含下级包装数量:  @@ -1396,17 +1402,17 @@ 当前版本号:  切换版本 @@ -1418,184 +1424,184 @@
提交 取消
提交 取消
@@ -1641,7 +1647,7 @@ import {postThirdProduct} from "@/api/thrsys/thrProductsExport"; export default { name: "prodcut", - props: {isChoose: {required: false, default: false, type: Boolean},chooseFunc: {required:false,type: Function}}, + props: {isChoose: {required: false, default: false, type: Boolean}, chooseFunc: {required: false, type: Function}}, data() { return { Dictionary: false, //物资字典分类显示、隐藏 @@ -1759,6 +1765,7 @@ export default { activeNames: ["1"], useNumEnable: true, vueRouteSource: 1, //路由来源 1:耗材字典：2：第三方产品信息上传 + isSelect: false, }; }, filters: { @@ -1816,16 +1823,16 @@ export default { }, getList() { getUdiInfos(this.filterQuery) - .then((response) => { - this.loading = false; - this.list = response.data.list || []; - this.total = response.data.total || 0; - }) - .catch(() => { - this.loading = false; - this.list = []; - this.total = 0; - }); + .then((response) => { + this.loading = false; + this.list = response.data.list || []; + this.total = response.data.total || 0; + }) + .catch(() => { + this.loading = false; + this.list = []; + this.total = 0; + }); }, hideSearch() { this.showSearch = !this.showSearch; @@ -1838,26 +1845,26 @@ export default { getDetailList(detailQuery) { this.loading = true; filterByUuid(detailQuery) - .then((response) => { - this.isUseDyCheck = false; - this.loading = false; - this.detailList = response.data || []; - this.detailList.forEach((item, index, array) => { - // this.detailList[index].isAdavence = item.adavence - // this.detailList[index].isDisable = item.disable - // this.detailList[index].useMuti = item.useMuti - if (item.zxxsbzbhsydysl > 1) { - this.isUseDyCheck = true; - } - }); - this.productType = this.detailList[0].productType; - this.editQuery.versionNumber = this.detailList[0].versionNumber - this.editQuery.originUuid = this.detailList[0].originUuid - }) - .catch(() => { - this.loading = false; - this.detailList = []; + .then((response) => { + this.isUseDyCheck = false; + this.loading = false; + this.detailList = response.data || []; + this.detailList.forEach((item, index, array) => { + // this.detailList[index].isAdavence = item.adavence + // this.detailList[index].isDisable = item.disable + // this.detailList[index].useMuti = item.useMuti + if (item.zxxsbzbhsydysl > 1) { + this.isUseDyCheck = true; + } }); + this.productType = this.detailList[0].productType; + this.editQuery.versionNumber = this.detailList[0].versionNumber + this.editQuery.originUuid = this.detailList[0].originUuid + }) + .catch(() => { + this.loading = false; + this.detailList = []; + }); }, hideForm() { this.selectUdiTypeVisible = false; @@ -1868,14 +1875,14 @@ export default { id: this.relevanceEdit.id, }; thirdSysDetail(query) - .then((response) => { - this.loading = false; - this.sysList = response.data.list || []; - }) - .catch(() => { - this.loading = false; - this.sysList = []; - }); + .then((response) => { + this.loading = false; + this.sysList = response.data.list || []; + }) + .catch(() => { + this.loading = false; + this.sysList = []; + }); }, handleDetail(row) { @@ -1894,20 +1901,20 @@ export default { }; deletetUdiInfos(tquery) - .then((response) => { - this.loading = false; - if (response.code == 20000) { - this.getList(); - this.$message({ - type: "success", - message: "删除成功！", - }); - } else { - this.$message.error(response.message); - } - }) - .catch(() => { - }); + .then((response) => { + this.loading = false; + if (response.code == 20000) { + this.getList(); + this.$message({ + type: "success", + message: "删除成功！", + }); + } else { + this.$message.error(response.message); + } + }) + .catch(() => { + }); }, deleteDialog(rowId) { @@ -1916,11 +1923,11 @@ export default { cancelButtonText: "取消", type: "warning", }) - .then(() => { - this.deleteOrders(rowId); - }) - .catch(() => { - }); + .then(() => { + this.deleteOrders(rowId); + }) + .catch(() => { + }); }, intentDetail() { @@ -1939,30 +1946,30 @@ export default { cancelButtonText: "取消", type: "warning", }) - .then(() => { - let query = { - relId: this.pId, - thirdSys: row.sysId, - }; - removeRl(query) - .then((response) => { - if (response.code == 20000) { - this.$message({ - type: "success", - message: "删除成功！", - }); - this.getList(); - this.cancelDialog(); - this.getThirdSysDetail(); - } else { - this.$message.error(response.message); - } - }) - .catch(() => { + .then(() => { + let query = { + relId: this.pId, + thirdSys: row.sysId, + }; + removeRl(query) + .then((response) => { + if (response.code == 20000) { + this.$message({ + type: "success", + message: "删除成功！", }); - }) - .catch(() => { - }); + this.getList(); + this.cancelDialog(); + this.getThirdSysDetail(); + } else { + this.$message.error(response.message); + } + }) + .catch(() => { + }); + }) + .catch(() => { + }); }, removeDi() { @@ -1971,29 +1978,29 @@ export default { cancelButtonText: "取消", type: "warning", }) - .then(() => { - let query = { - relId: this.editQuery.id, - }; - removeDiRl(query) - .then((response) => { - if (response.code == 20000) { - this.$message({ - type: "success", - message: "删除成功！", - }); - this.editDialogVisible = false; - this.getList(); - this.cancelDialog(); - } else { - this.$message.error(response.message); - } - }) - .catch(() => { + .then(() => { + let query = { + relId: this.editQuery.id, + }; + removeDiRl(query) + .then((response) => { + if (response.code == 20000) { + this.$message({ + type: "success", + message: "删除成功！", }); - }) - .catch(() => { - }); + this.editDialogVisible = false; + this.getList(); + this.cancelDialog(); + } else { + this.$message.error(response.message); + } + }) + .catch(() => { + }); + }) + .catch(() => { + }); }, intentSelectErp(val) { @@ -2022,25 +2029,25 @@ export default { keys: keys, }; uploadSmp(tquery) - .then((response) => { - if (response.code == 20000) { - this.$message({ - type: "success", - message: "上传成功！", - }); - } else { - this.$message({ - type: "error", - message: response.message, - }); - } - }) - .catch(() => { + .then((response) => { + if (response.code == 20000) { + this.$message({ + type: "success", + message: "上传成功！", + }); + } else { this.$message({ type: "error", - message: "上传失败", + message: response.message, }); + } + }) + .catch(() => { + this.$message({ + type: "error", + message: "上传失败", }); + }); }, intentSelectUdi(val) { this.relId = val.id; @@ -2150,18 +2157,18 @@ export default { postQuery.ids.push(row.id); }); lockStatus(postQuery) - .then((response) => { - if (response.code == 20000) { - this.loading = false; - this.$message.success(response.data); - this.getList(); - } else { - this.$message.error(response.message); - } - }) - .catch(() => { + .then((response) => { + if (response.code == 20000) { this.loading = false; - }); + this.$message.success(response.data); + this.getList(); + } else { + this.$message.error(response.message); + } + }) + .catch(() => { + this.loading = false; + }); }, closeUdi(val) { this.selectUdiDialogVisible = false; @@ -2182,14 +2189,14 @@ export default { getSysFilter() { sysFilter() - .then((response) => { - this.loading = false; - this.filterList = response.data.list || []; - }) - .catch(() => { - this.loading = false; - this.filterList = []; - }); + .then((response) => { + this.loading = false; + this.filterList = response.data.list || []; + }) + .catch(() => { + this.loading = false; + this.filterList = []; + }); }, singleDiEdit() { let temp = JSON.parse(JSON.stringify(this.editQuery)); @@ -2228,34 +2235,34 @@ export default { this.editFormat.relSubmit = relSubmit; console.log(this.editFormat); updatetUdiInfos(this.editFormat) - .then((response) => { - if (response.code == 20000) { - this.getList(); - this.cancelDialog(); - this.editDiDialogVisible = false; - } else { - this.$message.error(response.message); - } - }) - .catch(() => { + .then((response) => { + if (response.code == 20000) { + this.getList(); this.cancelDialog(); - }); + this.editDiDialogVisible = false; + } else { + this.$message.error(response.message); + } + }) + .catch(() => { + this.cancelDialog(); + }); }, onAddSingleSubmit() { updatetSingleUdiInfo(this.editSingleFormat) - .then((response) => { - if (response.code == 20000) { - this.getList(); - this.cancelDialog(); - this.editDialogVisible = false; - } else { - this.$message.error(response.message); - } - }) - .catch(() => { + .then((response) => { + if (response.code == 20000) { + this.getList(); this.cancelDialog(); - }); + this.editDialogVisible = false; + } else { + this.$message.error(response.message); + } + }) + .catch(() => { + this.cancelDialog(); + }); }, findBasicProductSet() { @@ -2273,12 +2280,12 @@ export default { getTerrList() { getListTree(this.query) - .then((response) => { - var invlist = response.data || []; - this.treeList = this.handleTree(invlist, "code", "parentCode"); - }) - .catch(() => { - }); + .then((response) => { + var invlist = response.data || []; + this.treeList = this.handleTree(invlist, "code", "parentCode"); + }) + .catch(() => { + }); }, addHospProduct(data) { @@ -2318,14 +2325,14 @@ export default { limit: 20 }; getHslbs(cQuery) - .then((response) => { - this.loading = false; - let result = response.data.list[0] || []; - return result.hsmc; - }) - .catch(() => { - this.loading = false; - }); + .then((response) => { + this.loading = false; + let result = response.data.list[0] || []; + return result.hsmc; + }) + .catch(() => { + this.loading = false; + }); } }, mounted() { @@ -2342,6 +2349,9 @@ export default { selectUnBindHospProduct, }, created() { + // debugger + // if (this.isChoose != null) + // this.isSelect = this.isChoose; this.vueRouteSource = this.$route.query.vueRouteSource; this.findBasicProductSet(); this.getList(); diff --git a/src/views/basic/sicker/skPerson.js b/src/views/basic/sicker/skPerson.js index 7e006158..082faf50 100644 --- a/src/views/basic/sicker/skPerson.js +++ b/src/views/basic/sicker/skPerson.js @@ -146,7 +146,7 @@ export default { updatePrecribe() { this.updatePrecribeLoading = true; - downloadPrescribe({sickCode: this.sickerInfo.code}).then(res => { + downloadPrescribe({sickCode: this.sickerInfo.code,adNum:this.sickerInfo.adNum}).then(res => { this.updatePrecribeLoading = false if (res.code != 20000) { this.$message.error(res.message) diff --git a/src/views/dev/deviceInfo.vue b/src/views/dev/deviceInfo.vue index a24107e3..1ef01333 100644 --- a/src/views/dev/deviceInfo.vue +++ b/src/views/dev/deviceInfo.vue @@ -20,10 +20,10 @@ style="width: 100%" clearable> + v-for="item in deviceStatus" + :key="item.key" + :label="item.desc" + :value="item.key"> @@ -34,9 +34,9 @@ 显示/隐藏搜索栏 重置 @@ -82,11 +82,11 @@ @@ -127,7 +127,7 @@ @@ -161,28 +161,36 @@ >设备码 - 选择 + 打印 + + { this.loading = false }) + }, + printDevLabel(row) { + let tQuery = { + labelId: 5, + deviceCode: row.deviceCode + }; + + printDevLabel(tQuery).then((response) => { + //将pdf文件转换为url。 + const binaryData = []; + binaryData.push(response); + //获取blob链接。 + let url = window.URL.createObjectURL( + new Blob(binaryData, {type: "application/pdf"}) + ); + this.loading = false; + window.open(url);//打开新标签页，预览pdf。 + }).catch(() => { + this.loading = false; + }); } + } } diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue index 935e276c..dde90c4f 100644 --- a/src/views/inout/DialogCreateOrder.vue +++ b/src/views/inout/DialogCreateOrder.vue @@ -631,7 +631,7 @@ import selectRlDialog from "./DialogSelectRl"; import DialogSelectSpace from "./DialogSelectSpace"; import {isBlank} from "@/utils/strUtil"; import {getDetailBizs} from "@/api/inout/orderDetailCode"; -import {page} from "@/api/basic/sicker/skPersonApi"; +import {filterNoPage, page} from "@/api/basic/sicker/skPersonApi"; import {selectSysParamByKey} from "@/api/param/systemParamConfig"; export default { @@ -958,7 +958,7 @@ export default { limit: 10, key: key, }; - page(sickQuery).then(res => { + filterNoPage(sickQuery).then(res => { this.fromSickOptions = res.data.list || [] }).catch(() => { });