diff --git a/.env.development b/.env.development index c36d00d3..eed92e7d 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VUE_APP_TITLE = UDI管理系统 ENV = 'development' # 开发环境 -VUE_APP_BASE_API = 'http://192.168.0.166:9991' +VUE_APP_BASE_API = 'http://127.0.0.1:9991' VUE_APP_SYNC_API ="http://127.0.0.1:10001" diff --git a/.env.production b/.env.production index 34fbd6dd..d27b795d 100644 --- a/.env.production +++ b/.env.production @@ -8,7 +8,7 @@ ENV = 'production' #林纪裕cd -VUE_APP_BASE_API = 'http://www.linjiyu.lol:81/UDI_WMS_MC/' +# VUE_APP_BASE_API = 'http://www.linjiyu.lol:81/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://www.linjiyu.lol:83/UDI_WMS_MC/' @@ -16,6 +16,11 @@ VUE_APP_BASE_API = 'http://www.linjiyu.lol:81/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.0.127:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.0.127:9160/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.0.127:9170/UDI_WMS_MC/' +# VUE_APP_BASE_API = 'http://dm.xmglxp.com:8082/UDI_WMS_MC/' + +# VUE_APP_BASE_API = 'http://192.168.8.58:9150/UDI_WMS_MC/' + + # 平潭正式 # VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/' @@ -34,6 +39,13 @@ VUE_APP_BASE_API = 'http://www.linjiyu.lol:81/UDI_WMS_MC/' # 长泰医院 # VUE_APP_BASE_API = 'http://192.168.6.189:9150/UDI_WMS_MC/' +# 三明大田医院 +# VUE_APP_BASE_API = 'http://170.20.124.4:9150/UDI_WMS_MC/' + + +VUE_APP_BASE_API = 'http://192.168.0.207:9150/UDI_WMS_MC/' + + # 应用访问路径 例如使用前缀 /admin/ VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/' diff --git a/package.json b/package.json index 20805d4a..a0ebfe56 100644 --- a/package.json +++ b/package.json @@ -51,6 +51,7 @@ "js-cookie": "3.0.1", "js-sha256": "^0.10.1", "jsencrypt": "3.0.0-rc.1", + "loadsh": "^0.0.4", "lodash": "^4.17.21", "nprogress": "0.2.0", "pinyin": "^2.10.2", diff --git a/src/api/basic/sicker/prescribeApi.js b/src/api/basic/sicker/prescribeApi.js index 9d6dbaf3..937fb81c 100644 --- a/src/api/basic/sicker/prescribeApi.js +++ b/src/api/basic/sicker/prescribeApi.js @@ -27,3 +27,5 @@ export function downloadPrescribe(query) { + + diff --git a/src/api/basic/sicker/skPersonApi.js b/src/api/basic/sicker/skPersonApi.js index bc9e5e10..8a6d7346 100644 --- a/src/api/basic/sicker/skPersonApi.js +++ b/src/api/basic/sicker/skPersonApi.js @@ -18,4 +18,17 @@ export function downloadSick(query) { } +/** + * 处方使用耗材明细 + */ + +export function skPrescribeDi(query) { + return axios({ + url: "/udiwms/basic/sk/prescribe/di/filter", + method: "get", + params: query + }); +} + + diff --git a/src/views/basic/busType/bussinessType.vue b/src/views/basic/busType/bussinessType.vue index 3e9e83b6..808c3f21 100644 --- a/src/views/basic/busType/bussinessType.vue +++ b/src/views/basic/busType/bussinessType.vue @@ -268,6 +268,7 @@ export default { secCheckReview: null, thrCheckReview: null, inPreInBack: 1, + deptNoInvType: 0, }, enableMap: { true: '是', @@ -555,6 +556,7 @@ export default { backPreinType: 1, sortNum: 999, inPreInBack: 1, + deptNoInvType: 0, } this.addDialogVisible = true }, diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue index 0a4379bd..5ff191e3 100644 --- a/src/views/basic/busType/bussinessTypeModify.vue +++ b/src/views/basic/busType/bussinessTypeModify.vue @@ -458,6 +458,29 @@ + + + + 科室库存出库模式 + + + + + + + + + + + + + 科室库存出库模式 + + + + 预验收剩余库存自动退库 diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue index 632f5165..914bfb00 100644 --- a/src/views/basic/product/product.vue +++ b/src/views/basic/product/product.vue @@ -276,7 +276,6 @@ show-overflow-tooltip v-if="$auth.hasPermi('basic:spmc')" > - - - + + + @@ -1672,6 +1691,13 @@ export default { true: "可配送", false: "不可配送", }, + uploadMap: { + null: "未上传", + 1: "已上传", + 2: "上传失败", + }, + + pId: 0, productRemarkSet: { remarkTitle1: "备注字段1", @@ -1751,6 +1777,16 @@ export default { }; return statusMap[status]; }, + + uploadFilterType(status) { + const statusMap = { + null: "warning", + 0: "warning", + 1: "success", + 2: "danger", + }; + return statusMap[status]; + }, }, methods: { @@ -2066,6 +2102,19 @@ export default { }, + uploadMsg(row) { + this.$alert(row.uploadMsg, '上传', { + confirmButtonText: '确定', + callback: action => { + this.$message({ + type: 'info', + message: `action: ${action}` + }); + } + }); + }, + + uploadThird(row) { this.$confirm('确定上传至第三方系统?', '提示', { confirmButtonText: '确定', diff --git a/src/views/basic/product/udiInfoRelevance.vue b/src/views/basic/product/udiInfoRelevance.vue index e2b4c515..692eb224 100644 --- a/src/views/basic/product/udiInfoRelevance.vue +++ b/src/views/basic/product/udiInfoRelevance.vue @@ -253,7 +253,6 @@ - - diff --git a/src/views/basic/sicker/skPerson.js b/src/views/basic/sicker/skPerson.js index e9514ccf..7e006158 100644 --- a/src/views/basic/sicker/skPerson.js +++ b/src/views/basic/sicker/skPerson.js @@ -1,6 +1,8 @@ import {downloadSick, page} from "@/api/basic/sicker/skPersonApi"; import {detail, downloadPrescribe, page as prescribePage} from "@/api/basic/sicker/prescribeApi"; +import skPrescribeDi from "./skPrescribeDi.vue"; + let query = { name: "", code: "", @@ -33,6 +35,8 @@ export default { // =============患者================= showSickerDialog: false, sicker: null, + sickDiDialog: false, + // =============患者end================ // ============处方============= sickerInfo: null, @@ -51,6 +55,10 @@ export default { created() { this.getList() }, + components: { + skPrescribeDi + + }, methods: { onReset() { this.filterQuery = {...query} @@ -78,6 +86,10 @@ export default { this.prescribeQuery = {...prescribeQuery} this.prescribeQuery.sickerCode = row.code this.prescribeLoading = true + this.getPrescribeList() + }, + + getPrescribeList() { prescribePage(this.prescribeQuery).then(res => { this.prescribeLoading = false this.prescribeList = res.data.list || [] @@ -88,10 +100,20 @@ export default { this.prescribeTotal = 0 }) }, + + showSickerInfo(row) { this.sicker = {...row} this.showSickerDialog = true }, + + + showPrescribeDiInfo(row) { + this.sicker = {...row} + this.sickDiDialog = true + }, + + showPrescribeDetail(row) { this.fullscreenLoading = true detail({prescribeCode: row.code}).then(res => { diff --git a/src/views/basic/sicker/skPerson.vue b/src/views/basic/sicker/skPerson.vue index a39679dd..c9b6c683 100644 --- a/src/views/basic/sicker/skPerson.vue +++ b/src/views/basic/sicker/skPerson.vue @@ -40,9 +40,10 @@ - + @@ -89,9 +90,9 @@ @@ -176,6 +177,20 @@ + + + + + diff --git a/src/views/basic/sicker/skPrescribeDi.vue b/src/views/basic/sicker/skPrescribeDi.vue new file mode 100644 index 00000000..dc9261dc --- /dev/null +++ b/src/views/basic/sicker/skPrescribeDi.vue @@ -0,0 +1,127 @@ + + + + +