From ae3e984230c166ede969dc554c1b6abed1306669 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Fri, 12 Jan 2024 09:13:04 +0800
Subject: [PATCH] 1111

---
 src/views/order/allDistributionCount.vue | 43 +++++++++++++++++++++---
 src/views/order/distributionCount.vue    | 40 +++++++++++++++++++---
 src/views/order/index.vue                | 40 ++++++++++++++++++++--
 src/views/order/subBranch.vue            | 43 +++++++++++++++++++++---
 4 files changed, 150 insertions(+), 16 deletions(-)

diff --git a/src/views/order/allDistributionCount.vue b/src/views/order/allDistributionCount.vue
index a849630..5e3bc5f 100644
--- a/src/views/order/allDistributionCount.vue
+++ b/src/views/order/allDistributionCount.vue
@@ -24,6 +24,16 @@
 
 							</el-form-item>
 
+							<el-form-item label="卡券类型">
+								<el-select v-model="page.params.cardType" filterable class="item_input" clearable
+									placeholder="请选择" style="width:100%" @change="cardTypeSelect">
+									<el-option v-for="item in cardTypeList" :key="item.text" :label="item.text"
+										:value="item.sid">
+									</el-option>
+								</el-select>
+							</el-form-item>
+
+
 						</el-form>
 						<div class="btn" style="text-align: center;">
 							<el-button type="primary" size="small" icon="el-icon-search"
@@ -48,7 +58,7 @@
 								<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">明细</el-button>
 							</template>
 						</el-table-column> -->
-							<el-table-column prop="cardType" label="卡券类型" align="center" />
+						<el-table-column prop="cardType" label="卡券类型" align="center" />
 						<el-table-column prop="reserveDate" label="预约日期" align="center" />
 						<el-table-column prop="goodsName" label="商品名称" align="center" />
 						<el-table-column prop="goodsNumber" label="数量(份)" align="center" />
@@ -117,10 +127,29 @@
 					params: {
 						startDate: "",
 						endDate: "",
-						store: ""
+						store: "",
+						cardType: ""
 					},
 				},
-				giftPackList: []
+				giftPackList: [],
+				cardTypeList: [{
+						text: "全部",
+						sid: ""
+					},
+					{
+						text: "家庭卡",
+						sid: "1"
+					},
+					{
+						text: "亲情卡",
+						sid: "2"
+					},
+					{
+						text: "企业卡",
+						sid: "3"
+					},
+
+				]
 			}
 		},
 		mounted() {
@@ -180,7 +209,10 @@
 				console.log('>>>>>>>>>giftPackSelect', val)
 				this.page.params.store = val
 			},
-
+			cardTypeSelect(val) {
+				console.log('>>>>>>>>>cardTypeSelect', val)
+				this.page.params.cardType = val
+			},
 			getAllStore() {
 				req.getAllStore().then((resp) => {
 					if (resp.success) {
@@ -225,7 +257,8 @@
 					params: {
 						startDate: "",
 						endDate: "",
-						store: ""
+						store: "",
+						cardType: ""
 					},
 				}
 				this.loadList()
diff --git a/src/views/order/distributionCount.vue b/src/views/order/distributionCount.vue
index 6ee8284..4fd184f 100644
--- a/src/views/order/distributionCount.vue
+++ b/src/views/order/distributionCount.vue
@@ -39,6 +39,15 @@
 									</el-option>
 								</el-select>
 							</el-form-item>
+							<el-form-item label="卡券类型">
+								<el-select v-model="page.params.cardType" filterable class="item_input" clearable
+									placeholder="请选择" style="width:100%" @change="cardTypeSelect">
+									<el-option v-for="item in cardTypeList" :key="item.text" :label="item.text"
+										:value="item.sid">
+									</el-option>
+								</el-select>
+							</el-form-item>
+
 
 						</el-form>
 						<div class="btn" style="text-align: center;">
@@ -64,7 +73,7 @@
 								<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">明细</el-button>
 							</template>
 						</el-table-column> -->
-							<el-table-column prop="cardType" label="卡券类型" align="center" />
+						<el-table-column prop="cardType" label="卡券类型" align="center" />
 						<el-table-column prop="reserveDate" label="预约日期" align="center" />
 						<el-table-column prop="bankName" label="所属支行" align="center" />
 						<el-table-column prop="store" label="提货地点" align="center" />
@@ -151,11 +160,30 @@
 						startDate: "",
 						endDate: "",
 						store: "",
-						bankSid: ""
+						bankSid: "",
+						cardType: ""
 					},
 				},
 				giftPackList: [],
 				bankList: [],
+				cardTypeList: [{
+						text: "全部",
+						sid: ""
+					},
+					{
+						text: "家庭卡",
+						sid: "1"
+					},
+					{
+						text: "亲情卡",
+						sid: "2"
+					},
+					{
+						text: "企业卡",
+						sid: "3"
+					},
+
+				]
 			}
 		},
 		mounted() {
@@ -230,7 +258,10 @@
 				console.log('>>>>>>>>>bankSelect', val)
 				this.page.params.bankSid = val
 			},
-
+			cardTypeSelect(val) {
+				console.log('>>>>>>>>>cardTypeSelect', val)
+				this.page.params.cardType = val
+			},
 			getAllStore() {
 				req.getAllStore().then((resp) => {
 					if (resp.success) {
@@ -276,7 +307,8 @@
 						startDate: "",
 						endDate: "",
 						store: "",
-						bankSid: ""
+						bankSid: "",
+						cardType: ""
 					},
 				}
 				this.loadList()
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index 4b36484..e943c9c 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -40,6 +40,17 @@
 									</el-option>
 								</el-select>
 							</el-form-item>
+							
+							
+							<el-form-item label="卡券类型">
+								<el-select v-model="page.params.cardType" filterable class="item_input" clearable
+									placeholder="请选择" style="width:100%" @change="cardTypeSelect">
+									<el-option v-for="item in cardTypeList" :key="item.text" :label="item.text"
+										:value="item.sid">
+									</el-option>
+								</el-select>
+							</el-form-item>
+							
 
 						</el-form>
 						<div class="btn" style="text-align: center;">
@@ -139,11 +150,31 @@
 						startDate: "",
 						endDate: "",
 						store: "",
-						bankSid:""
+						bankSid:"",
+						cardType:""
 					},
 				},
 				giftPackList: [],
 				bankList: [],
+				cardTypeList:[
+					{
+						text :"全部",
+						sid:""
+					},
+					{
+						text :"家庭卡",
+						sid:"1"
+					},
+					{
+						text :"亲情卡",
+						sid:"2"
+					},
+					{
+						text :"企业卡",
+						sid:"3"
+					},
+					
+				]
 			}
 		},
 		mounted() {
@@ -206,6 +237,10 @@
 				console.log('>>>>>>>>>bankSelect', val)
 				this.page.params.bankSid = val
 			},
+			cardTypeSelect(val){
+				console.log('>>>>>>>>>cardTypeSelect', val)
+				this.page.params.cardType = val
+			},
 			getAllStore() {
 				req.getAllStore().then((resp) => {
 					if (resp.success) {
@@ -251,7 +286,8 @@
 						startDate: "",
 						endDate: "",
 						store: "",
-						bankSid:""
+						bankSid:"",
+						cardType:""
 					},
 				}
 				this.loadList()
diff --git a/src/views/order/subBranch.vue b/src/views/order/subBranch.vue
index 30c8f14..919744c 100644
--- a/src/views/order/subBranch.vue
+++ b/src/views/order/subBranch.vue
@@ -33,6 +33,16 @@
 								</el-select>
 							</el-form-item>
 
+							<el-form-item label="卡券类型">
+								<el-select v-model="page.params.cardType" filterable class="item_input" clearable
+									placeholder="请选择" style="width:100%" @change="cardTypeSelect">
+									<el-option v-for="item in cardTypeList" :key="item.text" :label="item.text"
+										:value="item.sid">
+									</el-option>
+								</el-select>
+							</el-form-item>
+
+
 						</el-form>
 						<div class="btn" style="text-align: center;">
 							<el-button type="primary" size="small" icon="el-icon-search"
@@ -57,7 +67,7 @@
 								<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">明细</el-button>
 							</template>
 						</el-table-column> -->
-							<el-table-column prop="cardType" label="卡券类型" align="center" />
+						<el-table-column prop="cardType" label="卡券类型" align="center" />
 						<el-table-column prop="reserveDate" label="预约日期" align="center" />
 						<el-table-column prop="bankName" label="支行名称" align="center" />
 						<el-table-column prop="goodsName" label="商品名称" align="center" />
@@ -131,10 +141,29 @@
 					params: {
 						startDate: "",
 						endDate: "",
-						bankSid: ""
+						bankSid: "",
+						cardType: ""
 					},
 				},
-				bankList: []
+				bankList: [],
+				cardTypeList: [{
+						text: "全部",
+						sid: ""
+					},
+					{
+						text: "家庭卡",
+						sid: "1"
+					},
+					{
+						text: "亲情卡",
+						sid: "2"
+					},
+					{
+						text: "企业卡",
+						sid: "3"
+					},
+
+				]
 			}
 		},
 		mounted() {
@@ -195,7 +224,10 @@
 				console.log('>>>>>>>>>bankSelect', val)
 				this.page.params.bankSid = val
 			},
-
+			cardTypeSelect(val) {
+				console.log('>>>>>>>>>cardTypeSelect', val)
+				this.page.params.cardType = val
+			},
 			getAllStore() {
 				req2.bankSelect()
 					.then(resp => {
@@ -244,7 +276,8 @@
 					params: {
 						startDate: "",
 						endDate: "",
-						bankSid: ""
+						bankSid: "",
+						cardType: ""
 					},
 				}
 				this.loadList()