From 6752f96d4f8b2b2764b1bf8a930127da1583379c Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 12 Nov 2024 15:07:16 +0800
Subject: [PATCH 1/4] =?UTF-8?q?11/12=20=E4=BE=9B=E5=BA=94=E5=95=86?=
=?UTF-8?q?=E9=80=89=E5=85=A5=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
=?UTF-8?q?=E4=BB=B6=E5=88=B6=E5=89=82=E8=A7=84=E6=A0=BC=20=E5=8C=85?=
=?UTF-8?q?=E8=A3=85=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../basicCompanyProductsImport.vue | 45 ++++++++++++-------
1 file changed, 30 insertions(+), 15 deletions(-)
diff --git a/src/views/supplier/companyDrug/basicCompanyProductsImport.vue b/src/views/supplier/companyDrug/basicCompanyProductsImport.vue
index e5568c3..fe0e34c 100644
--- a/src/views/supplier/companyDrug/basicCompanyProductsImport.vue
+++ b/src/views/supplier/companyDrug/basicCompanyProductsImport.vue
@@ -15,6 +15,16 @@
clearable="true">
+
+
+
+
+
+
+
+
+
+
@@ -26,25 +36,26 @@
clearable="true">
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -768,7 +779,9 @@ export default {
limit: 10,
addType: 1,
isDisable: false,
- productsType: 2
+ productsType: 2,
+ bzgg:"",
+ prepnSpec:"",
},
@@ -912,7 +925,9 @@ export default {
page: 1,
limit: 10,
addType: 1,
- productsType: 2
+ productsType: 2,
+ bzgg:"",
+ prepnSpec:"",
};
this.getList();
},
From 461c1bf3c78e13041d397800bed0fd762d9f2b38 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Tue, 12 Nov 2024 16:06:44 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/basic/product/drug/drugMaintain.vue | 2 +-
src/views/supplier/companyDrug/basicCompanyDrugProducts.vue | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/basic/product/drug/drugMaintain.vue b/src/views/basic/product/drug/drugMaintain.vue
index 6bdbef3..2195ef9 100644
--- a/src/views/basic/product/drug/drugMaintain.vue
+++ b/src/views/basic/product/drug/drugMaintain.vue
@@ -363,7 +363,7 @@ export default {
},
beforeUpload(file) {
const isXML = file.name.endsWith('.txt');
- const isLt5M = file.size / 1024 / 1024 < 10;
+ const isLt5M = file.size / 1024 / 1024 < 100;
if (!isXML) {
this.$message.error('上传文件只能是 TXT 格式!');
}
diff --git a/src/views/supplier/companyDrug/basicCompanyDrugProducts.vue b/src/views/supplier/companyDrug/basicCompanyDrugProducts.vue
index 1cdbe60..9106296 100644
--- a/src/views/supplier/companyDrug/basicCompanyDrugProducts.vue
+++ b/src/views/supplier/companyDrug/basicCompanyDrugProducts.vue
@@ -680,7 +680,7 @@ export default {
},
beforeUpload(file) {
const isXML = file.name.endsWith('.txt');
- const isLt5M = file.size / 1024 / 1024 < 10;
+ const isLt5M = file.size / 1024 / 1024 < 100;
if (!isXML) {
this.$message.error('上传文件只能是 TXT 格式!');
}
From 5cea5f592da6278cffac662d7728c59d83632797 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 12 Nov 2024 16:42:10 +0800
Subject: [PATCH 3/4] =?UTF-8?q?11/12=20=E7=BB=B4=E6=8A=A4=E8=8D=AF?=
=?UTF-8?q?=E5=93=81=E9=80=89=E5=85=A5=E8=8D=AF=E5=93=81=E5=B1=82=E7=BA=A7?=
=?UTF-8?q?=E5=B8=A6=E5=85=A5=E6=89=B9=E5=87=86=E6=96=87=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/basic/product/drug/drugAdd.vue | 2 ++
src/views/supplier/companyDrug/basicCompanyproductEdit.vue | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/views/basic/product/drug/drugAdd.vue b/src/views/basic/product/drug/drugAdd.vue
index f1126c0..589967b 100644
--- a/src/views/basic/product/drug/drugAdd.vue
+++ b/src/views/basic/product/drug/drugAdd.vue
@@ -628,6 +628,7 @@ export default {
page: 1,
limit: 20,
total: 0,
+ approvalNum:"",
},
newProductData: {
cpmctymc: null,
@@ -966,6 +967,7 @@ export default {
},
selectDrugLevel(){
//获取分页列表
+ this.filterQueryDrugLevel.approvalNum = this.newProductData.zczbhhzbapzbh
getDrugLevelList(this.filterQueryDrugLevel).then((response) => {
if (response.code == 20000) {
this.selectDrugLevelList = response.data.list || []
diff --git a/src/views/supplier/companyDrug/basicCompanyproductEdit.vue b/src/views/supplier/companyDrug/basicCompanyproductEdit.vue
index e121722..d7d893f 100644
--- a/src/views/supplier/companyDrug/basicCompanyproductEdit.vue
+++ b/src/views/supplier/companyDrug/basicCompanyproductEdit.vue
@@ -908,7 +908,8 @@ export default {
cpmctymc: '',
page: 1,
limit: 20,
- total: 0
+ total: 0,
+ approvalNum: "",
}
}
@@ -1134,6 +1135,7 @@ export default {
},
selectDrugLevel() {
//获取分页列表
+ this.filterQueryDrugLevel.approvalNum = this.newProductData.zczbhhzbapzbh
getDrugLevelList(this.filterQueryDrugLevel).then((response) => {
if (response.code == 20000) {
this.selectDrugLevelList = response.data.list || []
From f0107b2a6ce68a03c8c7d3fa9541c540552ed9bb Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 12 Nov 2024 17:15:59 +0800
Subject: [PATCH 4/4] =?UTF-8?q?11/12=20=E9=80=89=E5=85=A5=E8=8D=AF?=
=?UTF-8?q?=E5=93=81=E5=B1=82=E7=BA=A7=E5=A2=9E=E5=8A=A0=E6=89=B9=E5=87=86?=
=?UTF-8?q?=E6=96=87=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/basic/product/drug/drugAdd.vue | 1 +
src/views/supplier/companyDrug/basicCompanyproductEdit.vue | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/views/basic/product/drug/drugAdd.vue b/src/views/basic/product/drug/drugAdd.vue
index 589967b..897923d 100644
--- a/src/views/basic/product/drug/drugAdd.vue
+++ b/src/views/basic/product/drug/drugAdd.vue
@@ -534,6 +534,7 @@
+
diff --git a/src/views/supplier/companyDrug/basicCompanyproductEdit.vue b/src/views/supplier/companyDrug/basicCompanyproductEdit.vue
index d7d893f..690a0e3 100644
--- a/src/views/supplier/companyDrug/basicCompanyproductEdit.vue
+++ b/src/views/supplier/companyDrug/basicCompanyproductEdit.vue
@@ -709,6 +709,7 @@
+