From 5f9fbc69b6bdd57d82a271b9a17dd457af2b79b2 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 9 Apr 2025 15:16:49 +0800
Subject: [PATCH] =?UTF-8?q?4/9=20=E4=BC=98=E5=8C=961.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/collect/IoCollectCodeSelect.js | 18 +++++++++++-------
src/views/collect/IoReturnOrderBiz.vue | 11 ++++++-----
src/views/collect/IoReturncllectOrder.vue | 7 ++++---
src/views/collect/retraceCode.vue | 20 +++++++++++++-------
4 files changed, 34 insertions(+), 22 deletions(-)
diff --git a/src/api/collect/IoCollectCodeSelect.js b/src/api/collect/IoCollectCodeSelect.js
index 391d5de3..015b19be 100644
--- a/src/api/collect/IoCollectCodeSelect.js
+++ b/src/api/collect/IoCollectCodeSelect.js
@@ -19,13 +19,17 @@ export function getCodeEndList(query) {
-// export function IoCollectCodePageList(query) {
-// return axios({
-// url: "/udiwms/basic/collect/ioCollectCodeBackup/list",
-// method: "get",
-// params: query
-// });
-// }
+
+export function codeOrders(query) {
+ return axios({
+ url: "/udiwms/basic/collect/ioCollectCodeBackup/codeOrders",
+ method: "get",
+ params: query
+ });
+}
+
+
+
//
//
// export function deleteCollectCode(query) {
diff --git a/src/views/collect/IoReturnOrderBiz.vue b/src/views/collect/IoReturnOrderBiz.vue
index aceafdbc..5630d6b9 100644
--- a/src/views/collect/IoReturnOrderBiz.vue
+++ b/src/views/collect/IoReturnOrderBiz.vue
@@ -24,7 +24,7 @@
{{ scope.row.count }}
-
+
@@ -108,7 +108,7 @@
label="序号"
>
-
+
@@ -173,6 +173,7 @@ import {
manualCodeDetail,
autoCodeResult, codeReturnRemove
} from '@/api/collect/collectOrder'
+import { codeOrders, ioCollectCodePageList } from '@/api/collect/IoCollectCodeSelect'
/**
* 处方退药码明细
@@ -310,7 +311,7 @@ export default {
returnOrderDetail(_this.preQuery).then(res => {
_this.preLoading = false
if (res.code != 20000) {
- _this.$message.error(res.message)
+ // _this.$message.error(res.message)
return
}
_this.preDetailList = res.data.list
@@ -368,10 +369,10 @@ export default {
if (this.prescribeData == null)
return
if (this.prescribeData != null) {
- this.codeQuery.orderIdFk = this.prescribeData.remark
+ this.codeQuery.billNo = this.prescribeData.remark
this.codeQuery.relId = row.relId
}
- manualCodeDetail(this.codeQuery).then(res => {
+ codeOrders(this.codeQuery).then(res => {
this.codeLoading = false
if (res.code != 20000) {
this.$message.error(res.message)
diff --git a/src/views/collect/IoReturncllectOrder.vue b/src/views/collect/IoReturncllectOrder.vue
index 81d6772a..4a64bd6f 100644
--- a/src/views/collect/IoReturncllectOrder.vue
+++ b/src/views/collect/IoReturncllectOrder.vue
@@ -395,7 +395,8 @@ export default {
busType: null,
workPlaceCode: null,
fromCorp: null,
- confirmFinish: false
+ confirmFinish: false,
+ remark:null,
},
selectPrescriptionVisible: false,
corpOrderIdDisabled: false,
@@ -692,7 +693,7 @@ export default {
}
orderDetail(preQuery).then(res => {
if (res.code != 20000) {
- this.$message.error(res.message)
+ // this.$message.error(res.message)
return
}
this.overdeleteCode()
@@ -1022,7 +1023,7 @@ export default {
if (res.code == 20000){
// const audio = new Audio(require('@/assets/audioFiles/order.mp3'))
// audio.play()
- this.resetSplit()
+ this.reset()
return this.$message.success("退货成功")
}else {
return this.$message.error(res.message)
diff --git a/src/views/collect/retraceCode.vue b/src/views/collect/retraceCode.vue
index 1b7af9fa..13f5936f 100644
--- a/src/views/collect/retraceCode.vue
+++ b/src/views/collect/retraceCode.vue
@@ -56,17 +56,23 @@
-
-
-
+
+
+
+
+
+
- {{ notCodeTypeMap[scope.row.notCodeType] }}
+ {{ notCodeTypeMap[scope.row.notCodeType] }}
-
-
-
+
+
+
+
+
+