From ace2c6622ca1c3e2d89ed114ea7726982329343a Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 3 Dec 2024 11:36:33 +0800 Subject: [PATCH] =?UTF-8?q?12/3=20=E5=B7=B2=E5=AE=8C=E6=88=90=E5=8D=95?= =?UTF-8?q?=E6=8D=AE-=E7=A0=81=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/inout/order.js | 8 + .../product/drug/drugInfoManageSpDetail.vue | 19 +- src/views/collect/DialogCheckCode.vue | 337 ++++++++++++++++++ src/views/collect/PanelOrderEndSearch.vue | 31 +- .../inout/receive/receiveAuditDetail.vue | 10 + .../receive/receiveAuditDetail.vue | 9 + 6 files changed, 403 insertions(+), 11 deletions(-) create mode 100644 src/views/collect/DialogCheckCode.vue diff --git a/src/api/inout/order.js b/src/api/inout/order.js index 25770bb2..ee27cbea 100644 --- a/src/api/inout/order.js +++ b/src/api/inout/order.js @@ -683,3 +683,11 @@ export function batchUpdateCode(query) { }); } + +export function checkCode(query) { + return axios({ + url: "/warehouse/inout/checkCode", + method: "post", + data: query + }); +} diff --git a/src/views/basic/product/drug/drugInfoManageSpDetail.vue b/src/views/basic/product/drug/drugInfoManageSpDetail.vue index c8bbc6cb..27189641 100644 --- a/src/views/basic/product/drug/drugInfoManageSpDetail.vue +++ b/src/views/basic/product/drug/drugInfoManageSpDetail.vue @@ -32,47 +32,48 @@
- 药品名称:  + 药品标识: 
- 药品标识:  + 药品名称: 
+
- 规格型号:  + 制剂单位: 
@@ -111,7 +112,7 @@
- 制剂单位:  + 剂型: 
+
+ + + + + + + + + + + + + 添加 + + + + + + + + + + + + + + + + + + + {{ orderData.billNo }} + {{ orderData.fromCorp }} + {{ orderData.fromCorpName }} + {{ orderData.billTime }} + {{ orderData.fromType }} + {{ orderData.createTime }} + {{ orderData.updateTime }} + {{ orderData.remark }} + + + + + + + + 单据 {{ orderData.billNo }}-追溯码详情 + + + + + + + + + + + + + + + + + + +
+ + + + + diff --git a/src/views/collect/PanelOrderEndSearch.vue b/src/views/collect/PanelOrderEndSearch.vue index e52913d2..6cab307c 100644 --- a/src/views/collect/PanelOrderEndSearch.vue +++ b/src/views/collect/PanelOrderEndSearch.vue @@ -272,6 +272,22 @@ + + + + + +
@@ -286,6 +302,7 @@ import PanelOrderManuTagCode from './PanelOrderManuTagCode' import prescribeOriginPanel from '@/views/collect/PannelOrderBiz' import CollectFinishOrderDetail from '@/views/collect/CollectFinishOrderDetail' import CollectFinishOrderBackupDetail from "./CollectFinishOrderBackupDetail" +import DialogCheckCode from "./DialogCheckCode" import {orderFinish, orderPage} from '@/api/collect/collectOrder' import {filterWorkOptimize} from '@/api/basic/workPlace/sysWorkplaceManage' @@ -391,6 +408,9 @@ export default { }, showType: 1, isLinkDisabled: false, + codeCheckVisible: false, + + //码校验数据 } }, @@ -402,7 +422,8 @@ export default { prescribeOriginPanel, PanelOrderManuTagCode, CollectFinishOrderDetail, - CollectFinishOrderBackupDetail + CollectFinishOrderBackupDetail, + DialogCheckCode }, methods: { changePlace(_this, query) { @@ -535,7 +556,13 @@ export default { _this.loading = false _this.options.findWorkPlace = [] }) - } + }, + + //码校验 + codeCheckClick(_this,row){ + _this.curRow = row + _this.codeCheckVisible = true + }, }, created() { diff --git a/src/views/inout/receive/receiveAuditDetail.vue b/src/views/inout/receive/receiveAuditDetail.vue index 14be5010..e0ddf0d7 100644 --- a/src/views/inout/receive/receiveAuditDetail.vue +++ b/src/views/inout/receive/receiveAuditDetail.vue @@ -203,6 +203,13 @@ export default { //审核拒绝 this.noPassLoading = true } + // 显示加载状态 + const loading = this.$loading({ + lock: true, + text: '审核中...', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); getAudit(data).then((res => { if (val == '3'){ this.passLoading = false @@ -210,11 +217,14 @@ export default { this.noPassLoading = false } if (res.code == 20000) { + loading.close(); this.closeDialog(); } else { + loading.close(); this.$message.error(res.message); } })) + loading.close(); this.closeDialog() } }, diff --git a/src/views/pharmaceuticals/receive/receiveAuditDetail.vue b/src/views/pharmaceuticals/receive/receiveAuditDetail.vue index 17ae4aa9..98b8cd02 100644 --- a/src/views/pharmaceuticals/receive/receiveAuditDetail.vue +++ b/src/views/pharmaceuticals/receive/receiveAuditDetail.vue @@ -203,6 +203,12 @@ export default { //审核拒绝 this.noPassLoading = true } + const loading = this.$loading({ + lock: true, + text: '审核中...', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); getAudit(data).then((res => { if (val == '3'){ this.passLoading = false @@ -211,10 +217,13 @@ export default { } if (res.code == 20000) { this.closeDialog(); + loading.close(); } else { + loading.close(); this.$message.error(res.message); } })) + loading.close(); this.closeDialog() } },