diff --git a/.env.production b/.env.production index 0117a90e..b36dd60c 100644 --- a/.env.production +++ b/.env.production @@ -11,12 +11,12 @@ ENV = 'production' # 吴雨泽 # VUE_APP_BASE_API = 'http://192.168.0.67:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.0.127:9170/UDI_WMS_MC/' -# VUE_APP_BASE_API = 'http://dm.xmglxp.com:82/UDI_WMS_MC/' # 诏安总医院 # VUE_APP_BASE_API = 'http://192.168.8.58:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_WMS_MC/' +# VUE_APP_BASE_API = 'http://dm.xmglxp.com:83/UDI_WMS_MC/' # 平潭正式 # VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/' @@ -30,7 +30,7 @@ ENV = 'production' # 平和县医院 # VUE_APP_BASE_API = 'http://192.168.0.43:9150/UDI_WMS_MC/' -# VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_WMS_MC/' +VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_WMS_MC/' # 长泰医院 # VUE_APP_BASE_API = 'http://192.168.6.189:9150/UDI_WMS_MC/' @@ -70,7 +70,7 @@ ENV = 'production' # VUE_APP_BASE_API = 'http://192.168.20.128:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.0.132:9150/UDI_WMS_MC/' # 四川平武 -VUE_APP_BASE_API = 'http://192.168.20.3:9150/UDI_WMS_MC/' +# VUE_APP_BASE_API = 'http://192.168.20.3:9150/UDI_WMS_MC/' # 应用访问路径 例如使用前缀 /admin/ VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/' diff --git a/src/api/collect/IoCollectCodeSelect.js b/src/api/collect/IoCollectCodeSelect.js index 4112aa78..e6bb66da 100644 --- a/src/api/collect/IoCollectCodeSelect.js +++ b/src/api/collect/IoCollectCodeSelect.js @@ -9,6 +9,25 @@ export function ioCollectCodePage(query) { } +export function getCodeEndList(query) { + return axios({ + url: "/udiwms/basic/collect/ioCollectCode/endList", + method: "get", + params: query + }); +} + + + + +export function checkCode(query) { + return axios({ + url: "/udiwms/basic/collect/ioCollectCode/checkCode", + method: "post", + data: query + }); +} + // export function IoCollectCodePageList(query) { // return axios({ // url: "/udiwms/basic/collect/ioCollectCodeBackup/list", diff --git a/src/api/inout/order.js b/src/api/inout/order.js index ee27cbea..516a5844 100644 --- a/src/api/inout/order.js +++ b/src/api/inout/order.js @@ -684,10 +684,3 @@ export function batchUpdateCode(query) { } -export function checkCode(query) { - return axios({ - url: "/warehouse/inout/checkCode", - method: "post", - data: query - }); -} diff --git a/src/views/basic/workplace/addBusTypeDialog.vue b/src/views/basic/workplace/addBusTypeDialog.vue index b488dec4..e039b444 100644 --- a/src/views/basic/workplace/addBusTypeDialog.vue +++ b/src/views/basic/workplace/addBusTypeDialog.vue @@ -259,34 +259,34 @@ - - - - - - - - - - - - - - {{ item.name }} - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/src/views/collect/ConfirmDrugDealOrder.vue b/src/views/collect/ConfirmDrugDealOrder.vue index 15a26ad0..bd2f6794 100644 --- a/src/views/collect/ConfirmDrugDealOrder.vue +++ b/src/views/collect/ConfirmDrugDealOrder.vue @@ -804,7 +804,7 @@ export default { if (!this.parseString(this.filterQuery.code)) { this.$refs.inputRef.focus(); this.$refs.inputRef.select(); - this.$message.error("非法产品编码"); + this.$message.error("无效追溯码"); return; } let tQuery = { diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue index aee68b3b..ac208891 100644 --- a/src/views/collect/DealOrder.vue +++ b/src/views/collect/DealOrder.vue @@ -631,14 +631,14 @@ export default { }, findFromInvList(val) { let cQuery = { - corpType: this.formDataVisible.consignee, + corpType: this.formDataVisible.consignee, invCode: this.formData.invCode }; findFromCorp(cQuery) .then((response) => { - if (!isBlank(this.$route.query.busType) && this.formDataVisible.consignee == 2){ - this.invList = response.data || []; - }else { + if (!isBlank(this.$route.query.busType) && this.formDataVisible.consignee == 2) { + this.invList = response.data || []; + } else { this.fromInvOptions = response.data || []; } }) @@ -810,7 +810,7 @@ export default { if (!this.parseString(this.filterQuery.code)) { this.$refs.inputRef.focus(); this.$refs.inputRef.select(); - this.$message.error("非法产品编码"); + this.$message.error("无效追溯码"); return; } let tQuery = { @@ -1108,7 +1108,8 @@ export default { this.loading = false if (res.code == 20000) { this.reset() - this.findCurOrder() + if (this.formDataVisible.scanType != 1) + this.findCurOrder() } else if (res.code == 502) { this.$confirm(res.message, '提示', { confirmButtonText: '确定', @@ -1274,7 +1275,7 @@ export default { resultParts.push("层级标识: " + data.udi); } if (data.cpmctymc) { - resultParts.push( data.productType == 2 ? "药品通用名称" : "产品通用名称: " + data.cpmctymc); + resultParts.push(data.productType == 2 ? "药品通用名称" : "产品通用名称: " + data.cpmctymc); } if (data.batchNo) { resultParts.push("批次号: " + data.batchNo); @@ -1288,11 +1289,11 @@ export default { if (data.serialNo) { resultParts.push("序列号: " + data.serialNo); } - if (data.productType == 2){ + if (data.productType == 2) { if (data.bzgg) { resultParts.push("包装规格: " + data.bzgg); } - }else { + } else { if (data.ggxh) { resultParts.push("规格型号: " + data.ggxh); } @@ -1392,6 +1393,9 @@ export default { clearCode() { this.originCode = ""; this.formData.code = ""; + this.formData.billNo = null; + this.formData.shipper = null; + this.formData.fromCorp = null; this.scanCode = ""; this.scanTitle = "扫码结果："; this.result = ""; @@ -1443,9 +1447,9 @@ export default { } getInvListByUser(query) .then((response) => { - if (!isBlank(this.$route.query.busType) && this.formDataVisible.consignee == 2){ + if (!isBlank(this.$route.query.busType) && this.formDataVisible.consignee == 2) { this.fromInvOptions = response.data || []; - }else { + } else { this.invList = response.data || [] } }) diff --git a/src/views/collect/DialogCheckCode.vue b/src/views/collect/DialogCheckCode.vue index 532cc4b7..0206e822 100644 --- a/src/views/collect/DialogCheckCode.vue +++ b/src/views/collect/DialogCheckCode.vue @@ -1,7 +1,7 @@