From ad43c3b64ac781d31538cf0b4081a916cd65d87f Mon Sep 17 00:00:00 2001
From: zane <zane0312@foxmail.com>
Date: Fri, 6 Sep 2024 14:42:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/thirdSys/product/thrProducts.vue | 28 ++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/src/views/thirdSys/product/thrProducts.vue b/src/views/thirdSys/product/thrProducts.vue
index 31b9a898..4cf312a5 100644
--- a/src/views/thirdSys/product/thrProducts.vue
+++ b/src/views/thirdSys/product/thrProducts.vue
@@ -49,6 +49,24 @@
</el-form-item>
</el-col>
</el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="产品类型:">
+ <el-select v-model="filterQuery.productType" placeholder="请选择产品类型"
+ style="width: 90%" clearable
+ >
+ <el-option
+ v-for="item in productTypes"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ <span style="float: left">{{ item.label }}</span>
+ <span style="float: right; color: #8492a6; font-size: 13px">{{ item.value }}</span>
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-form>
<div class="top-right-btn">
<el-button-group style="display:flex;">
@@ -184,6 +202,15 @@ export default {
cpms: null
},
configParms: {},
+ productTypes: [
+ {
+ value: 1,
+ label: '耗材'
+ }, {
+ value: 2,
+ label: '药品'
+ }
+ ],
};
},
@@ -199,6 +226,7 @@ export default {
manufactory: null,
name: "",
thirdSys: this.mainThirdSys,
+ productType:null,
page: 1,
limit: 20,
};
From 3860a49acfc3ab9c3760cc1646a724669a481ca1 Mon Sep 17 00:00:00 2001
From: zane <zane0312@foxmail.com>
Date: Fri, 6 Sep 2024 14:49:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=87=8D=E7=BD=AEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/collect/CollectOrderNew.vue | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/views/collect/CollectOrderNew.vue b/src/views/collect/CollectOrderNew.vue
index ed092ece..08272985 100644
--- a/src/views/collect/CollectOrderNew.vue
+++ b/src/views/collect/CollectOrderNew.vue
@@ -357,7 +357,14 @@ export default {
this.showSearch = !this.showSearch;
},
onReset() {
- this.filterQuery = {};
+ this.filterQuery = {
+ tagStatus: this.tagStatus,
+ billNo: null,
+ busType: null,
+ workPlaceCode: null,
+ page: 1,
+ limit: 10,
+ };
this.actDateRange = [];
this.getList();
},