From c9276360911a9eb4170d561e5f15518ce97e90df Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 30 Jul 2024 15:31:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=207/30=201.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../purApplyDrug/purApplyEditDiaolog.vue | 8 ++---
.../purApplyDrug/purOrderSelectProduct.vue | 17 ++++++-----
.../purApplyDrug/pureApplyDetailDialog.vue | 6 ++--
.../purApplyDrug/selectApplyListDialog.vue | 4 +--
.../purOderDrug/purOrderAuditDrug.vue | 6 ++--
.../purOderDrug/purOrderDetailDialog.vue | 6 ++--
.../purOderDrug/purOrderEditDialog.vue | 16 +++++-----
.../purOderDrug/purOrderSelectProduct.vue | 20 ++++++-------
.../purPlanDrug/purOrderSelectProduct.vue | 23 ++++++++-------
.../purPlanDrug/purPlanDetailDialog.vue | 6 ++--
.../purPlanDrug/purPlanEditDialog.vue | 8 ++---
.../purPlanDrug/selectPlanListDialog.vue | 6 ++--
.../receive/DialogNewReceive.vue | 10 +++----
.../receive/DialogSelectInvProduct.vue | 29 ++++++++++---------
.../receive/receiveAuditDetail.vue | 4 +--
15 files changed, 86 insertions(+), 83 deletions(-)
diff --git a/src/views/pharmaceuticals/purApplyDrug/purApplyEditDiaolog.vue b/src/views/pharmaceuticals/purApplyDrug/purApplyEditDiaolog.vue
index 2fb4dde0..621dee4f 100644
--- a/src/views/pharmaceuticals/purApplyDrug/purApplyEditDiaolog.vue
+++ b/src/views/pharmaceuticals/purApplyDrug/purApplyEditDiaolog.vue
@@ -112,8 +112,8 @@
-
-
+
+
@@ -126,7 +126,7 @@
oninput="value=value.replace(/[^\d]/g,'')">
-
+
@@ -166,7 +166,7 @@
-
+
-
-
+
@@ -100,15 +100,15 @@
@selection-change="handleSelectionChange" ref="multipleTable">
-
+
-
+
-
-
-
+
+
+
-
-
+
+
-
+
diff --git a/src/views/pharmaceuticals/purApplyDrug/selectApplyListDialog.vue b/src/views/pharmaceuticals/purApplyDrug/selectApplyListDialog.vue
index 5d4ef51c..e724783e 100644
--- a/src/views/pharmaceuticals/purApplyDrug/selectApplyListDialog.vue
+++ b/src/views/pharmaceuticals/purApplyDrug/selectApplyListDialog.vue
@@ -65,10 +65,10 @@
-
+
-
+
diff --git a/src/views/pharmaceuticals/purOderDrug/purOrderAuditDrug.vue b/src/views/pharmaceuticals/purOderDrug/purOrderAuditDrug.vue
index 58db1180..97596bc8 100644
--- a/src/views/pharmaceuticals/purOderDrug/purOrderAuditDrug.vue
+++ b/src/views/pharmaceuticals/purOderDrug/purOrderAuditDrug.vue
@@ -278,13 +278,13 @@
-
-
+
+
-
+
diff --git a/src/views/pharmaceuticals/purOderDrug/purOrderDetailDialog.vue b/src/views/pharmaceuticals/purOderDrug/purOrderDetailDialog.vue
index 5e08b4d6..78561ca8 100644
--- a/src/views/pharmaceuticals/purOderDrug/purOrderDetailDialog.vue
+++ b/src/views/pharmaceuticals/purOderDrug/purOrderDetailDialog.vue
@@ -151,8 +151,8 @@
-
-
+
+
@@ -166,7 +166,7 @@
oninput="value=value.replace(/[^\d]/g,'')">
-
+
diff --git a/src/views/pharmaceuticals/purOderDrug/purOrderEditDialog.vue b/src/views/pharmaceuticals/purOderDrug/purOrderEditDialog.vue
index 18302aed..4c487ad1 100644
--- a/src/views/pharmaceuticals/purOderDrug/purOrderEditDialog.vue
+++ b/src/views/pharmaceuticals/purOderDrug/purOrderEditDialog.vue
@@ -133,7 +133,7 @@
- 产品录入
+ 药品录入
@@ -144,8 +144,8 @@
-
-
+
+
@@ -158,7 +158,7 @@
oninput="value=value.replace(/[^\d]/g,'')">
-
+
@@ -209,7 +209,7 @@
>
{
if (valid) {
if (this.codeArray.length < 1) {
- this.$message.warning('未添加产品');
+ this.$message.warning('未添加药品');
return;
}
if (status === '2') {
@@ -385,7 +385,7 @@ export default {
return this.$message.error('单据数量不能为0');
}
if (this.$isBlank(this.codeArray[i].supName)) {
- return this.$message.error('请选择产品对应供应商');
+ return this.$message.error('请选择药品对应供应商');
}
}
}
@@ -407,7 +407,7 @@ export default {
return this.$message.error('单据数量不能为0');
}
if (this.$isBlank(this.codeArray[i].supName)) {
- return this.$message.error('请选择产品对应供应商');
+ return this.$message.error('请选择药品对应供应商');
}
}
diff --git a/src/views/pharmaceuticals/purOderDrug/purOrderSelectProduct.vue b/src/views/pharmaceuticals/purOderDrug/purOrderSelectProduct.vue
index 07ef9e0b..37698edc 100644
--- a/src/views/pharmaceuticals/purOderDrug/purOrderSelectProduct.vue
+++ b/src/views/pharmaceuticals/purOderDrug/purOrderSelectProduct.vue
@@ -19,14 +19,14 @@
-
+
-
-
+
@@ -47,8 +47,8 @@
-
-
+
@@ -74,13 +74,13 @@
-
-
+
+
-
+
@@ -112,7 +112,7 @@
-
+
@@ -179,9 +179,9 @@ export default {
limit: 10,
zczbhhzbapzbh: null,
manufactory: null,
-
basicPrductRemak1: null,
basicPrductRemak2: null,
+ productsType: 2
},
combineQuery: {
thirdId: "",
diff --git a/src/views/pharmaceuticals/purPlanDrug/purOrderSelectProduct.vue b/src/views/pharmaceuticals/purPlanDrug/purOrderSelectProduct.vue
index 2bfda2c2..9f7ad364 100644
--- a/src/views/pharmaceuticals/purPlanDrug/purOrderSelectProduct.vue
+++ b/src/views/pharmaceuticals/purPlanDrug/purOrderSelectProduct.vue
@@ -19,14 +19,14 @@
-
+
-
-
+
@@ -62,13 +62,13 @@
-
-
-
-
+
+
+
+
-
-
+
+
@@ -89,7 +89,7 @@
-
+
@@ -158,6 +158,7 @@ export default {
thrPiId: null,
page: 1,
limit: 10,
+ productsType: 2,
},
combineQuery: {
thirdId: "",
diff --git a/src/views/pharmaceuticals/purPlanDrug/purPlanDetailDialog.vue b/src/views/pharmaceuticals/purPlanDrug/purPlanDetailDialog.vue
index 56c6f771..cb7d50fe 100644
--- a/src/views/pharmaceuticals/purPlanDrug/purPlanDetailDialog.vue
+++ b/src/views/pharmaceuticals/purPlanDrug/purPlanDetailDialog.vue
@@ -148,12 +148,12 @@
-
-
+
+
-
+
diff --git a/src/views/pharmaceuticals/purPlanDrug/purPlanEditDialog.vue b/src/views/pharmaceuticals/purPlanDrug/purPlanEditDialog.vue
index df815779..e3f73391 100644
--- a/src/views/pharmaceuticals/purPlanDrug/purPlanEditDialog.vue
+++ b/src/views/pharmaceuticals/purPlanDrug/purPlanEditDialog.vue
@@ -108,8 +108,8 @@
-
-
+
+
@@ -121,7 +121,7 @@
oninput="value=value.replace(/[^\d]/g,'')">
-
+
@@ -160,7 +160,7 @@
-
+
-
+
-
+
diff --git a/src/views/pharmaceuticals/receive/DialogNewReceive.vue b/src/views/pharmaceuticals/receive/DialogNewReceive.vue
index d3f5e9ca..5bfb0979 100644
--- a/src/views/pharmaceuticals/receive/DialogNewReceive.vue
+++ b/src/views/pharmaceuticals/receive/DialogNewReceive.vue
@@ -117,7 +117,7 @@
type="primary"
@click.native.stop="selectProductFunction()"
:loading="loading"
- >产品录入
+ >药品录入
@@ -128,8 +128,8 @@
border
max-height="300" height="300" ref="multipleTable">
-
-
+
+
@@ -145,7 +145,7 @@
-
+
@@ -186,7 +186,7 @@
-
-
+
+
-
-
+
+
@@ -25,16 +25,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -75,8 +75,8 @@
-
-
+
+
@@ -88,7 +88,7 @@
-
+
@@ -218,6 +218,7 @@ export default {
} else
this.filterQuery.invCode = this.invQueryData.invCode;
this.filterQuery.filterNoInv = 1;
+ this.filterQuery.productsType = 2;
//寄售
if (this.invQueryData.advanceType == 3) {
getInvPreProductStock(this.filterQuery)
diff --git a/src/views/pharmaceuticals/receive/receiveAuditDetail.vue b/src/views/pharmaceuticals/receive/receiveAuditDetail.vue
index 0203641d..28fa637c 100644
--- a/src/views/pharmaceuticals/receive/receiveAuditDetail.vue
+++ b/src/views/pharmaceuticals/receive/receiveAuditDetail.vue
@@ -82,10 +82,10 @@
-
+
-
+