From 9e6f07039080f670ad03b5c44435813dda5c77d4 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 5 Sep 2024 16:51:52 +0800
Subject: [PATCH] =?UTF-8?q?9/5=20=E8=8D=AF=E5=93=81=E5=9F=BA=E7=A1=80?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../product/drug/basicCompanyDrugsImport.vue | 2 +-
src/views/basic/product/drug/drugAdd.vue | 31 ++++++++++---------
.../basic/product/drug/drugInfoManageSp.vue | 12 +++++--
src/views/basic/product/drug/drugMaintain.vue | 4 +--
src/views/basic/product/productEdit.vue | 26 ++++++++--------
5 files changed, 41 insertions(+), 34 deletions(-)
diff --git a/src/views/basic/product/drug/basicCompanyDrugsImport.vue b/src/views/basic/product/drug/basicCompanyDrugsImport.vue
index edf54366..274c64da 100644
--- a/src/views/basic/product/drug/basicCompanyDrugsImport.vue
+++ b/src/views/basic/product/drug/basicCompanyDrugsImport.vue
@@ -442,7 +442,7 @@ export default {
this.loading = false;
if (response.code == 20000) {
this.$message.success(response.data);
- this.$emit("closeSelDialog", true);
+ // this.$emit("closeSelDialog", true);
this.closeSelDialog();
} else {
this.$message.error(response.message);
diff --git a/src/views/basic/product/drug/drugAdd.vue b/src/views/basic/product/drug/drugAdd.vue
index fef74f13..72815040 100644
--- a/src/views/basic/product/drug/drugAdd.vue
+++ b/src/views/basic/product/drug/drugAdd.vue
@@ -208,9 +208,9 @@
+
-
@@ -302,7 +302,7 @@
-
+
@@ -310,18 +310,18 @@
-
-
-
- 选入
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -405,7 +405,7 @@
-
+
@@ -433,7 +433,8 @@ export default {
isUseDyCheck: false,
lockStatusMap: {"1": "未提交", "2": "已提交", "3": "已锁定"},
loading: false,
- activeNames: ['1']
+ activeNames: ['1'],
+ unitFk: ''
};
},
@@ -533,6 +534,7 @@ export default {
this.$message.error("请先选择供应商！");
return;
}
+ this.unitFk = this.filterQuery.unitFk
this.selectProductVisible = true;
},
intentDetail() {
@@ -779,9 +781,13 @@ export default {
this.selectErpDialogVisible = false;
this.selectLocalVisible = false;
this.selectVersionVisible = false;
- this.selectProductVisible = false;
this.getList();
},
+ closeSelDialog(){
+ this.selectProductVisible = false
+ this.filterQuery.unitFk = this.unitFk
+ this.getList()
+ },
onAddSubmit() {
if (this.checked == true) {
this.relevanceEdit.isUseDy = 1;
diff --git a/src/views/basic/product/drug/drugMaintain.vue b/src/views/basic/product/drug/drugMaintain.vue
index 5211eb23..58be8c53 100644
--- a/src/views/basic/product/drug/drugMaintain.vue
+++ b/src/views/basic/product/drug/drugMaintain.vue
@@ -83,7 +83,7 @@
显示/隐藏搜索栏
重置
查询
- 选入药品信息
+
添加院内药品
新增药品信息
@@ -93,7 +93,7 @@
>
-
+
diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index fac193b8..dac94c47 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -56,19 +56,19 @@
-
-
-
-
- 选入
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+