From 675e9a064fcee01f6981f9683ab54ff53d46b31c Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Tue, 28 Nov 2023 14:28:52 +0800
Subject: [PATCH] 2023-11-28

---
 src/layout/components/Sidebar/index.vue   |  84 ++++-----
 src/views/marketingCard/pickupCardSet.vue | 220 +++++++++++-----------
 2 files changed, 154 insertions(+), 150 deletions(-)

diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 3918590..3f18321 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -121,49 +121,49 @@
 						name: "/order/index",
 						path: "/order/index"
 					},
-					{
-						alwaysShow: true,
-						component: "statisticalReport",
-						meta: {
-							icon: "el-icon-menu",
-							title: "统计报表",
-						},
-						name: "/statisticalReport/index",
-						path: "/statisticalReport/index",
-						children: [
+					// {
+					// 	alwaysShow: true,
+					// 	component: "statisticalReport",
+					// 	meta: {
+					// 		icon: "el-icon-menu",
+					// 		title: "统计报表",
+					// 	},
+					// 	name: "/statisticalReport/index",
+					// 	path: "/statisticalReport/index",
+					// 	children: [
 						
-							{
-								alwaysShow: true,
-								component: "index",
-								meta: {
-									icon: "el-icon-help",
-									title: "提货卡汇总",
-								},
-								name: "/statisticalReport/index",
-								path: "/statisticalReport/index",
-							},
-							{
-								alwaysShow: true,
-								component: "collectionSummary",
-								meta: {
-									icon: "el-icon-help",
-									title: "提货汇总",
-								},
-								name: "/statisticalReport/collectionSummary",
-								path: "/statisticalReport/collectionSummary",
-							},
-							{
-								alwaysShow: true,
-								component: "deliveryDetails",
-								meta: {
-									icon: "el-icon-help",
-									title: "客户提货明细",
-								},
-								name: "/statisticalReport/deliveryDetails",
-								path: "/statisticalReport/deliveryDetails",
-							},
-						]
-					},
+					// 		{
+					// 			alwaysShow: true,
+					// 			component: "index",
+					// 			meta: {
+					// 				icon: "el-icon-help",
+					// 				title: "提货卡汇总",
+					// 			},
+					// 			name: "/statisticalReport/index",
+					// 			path: "/statisticalReport/index",
+					// 		},
+					// 		{
+					// 			alwaysShow: true,
+					// 			component: "collectionSummary",
+					// 			meta: {
+					// 				icon: "el-icon-help",
+					// 				title: "提货汇总",
+					// 			},
+					// 			name: "/statisticalReport/collectionSummary",
+					// 			path: "/statisticalReport/collectionSummary",
+					// 		},
+					// 		{
+					// 			alwaysShow: true,
+					// 			component: "deliveryDetails",
+					// 			meta: {
+					// 				icon: "el-icon-help",
+					// 				title: "客户提货明细",
+					// 			},
+					// 			name: "/statisticalReport/deliveryDetails",
+					// 			path: "/statisticalReport/deliveryDetails",
+					// 		},
+					// 	]
+					// },
 				],
 			};
 		},
diff --git a/src/views/marketingCard/pickupCardSet.vue b/src/views/marketingCard/pickupCardSet.vue
index 94931a2..e0aa577 100644
--- a/src/views/marketingCard/pickupCardSet.vue
+++ b/src/views/marketingCard/pickupCardSet.vue
@@ -3,117 +3,120 @@
 		<el-tabs v-model="activeName" class="my-tabs" type="card" @tab-click="handleClick" style="margin-top: 20px;">
 
 			<el-tab-pane label="提货卡记录" name="roleList">
+				<div class="main-content">
+					<div class="container" v-show="viewState == 1">
+						<div class="tab-header">
+							<el-form :inline="true" :model="page.params" class="demo-form-inline">
+								<el-row :gutter="20">
+									<el-col :span="21">
+										<el-form-item label="发行开始日期">
+											<el-date-picker v-model="page.params.startDate" @change="selectTime1"
+												type="date" placeholder="选择日期" format="yyyy-MM-dd"
+												value-format="yyyy-MM-dd" style="width: 200px;">
+											</el-date-picker>
+
+										</el-form-item>
+										<el-form-item label="发行结束日期">
+											<el-date-picker v-model="page.params.endDate" @change="selectTime2"
+												type="date" placeholder="选择日期" format="yyyy-MM-dd"
+												value-format="yyyy-MM-dd" style="width: 200px;">
+											</el-date-picker>
+
+										</el-form-item>
+										<el-button type="primary" @click="getPageList()">查 询</el-button>
+									</el-col>
+								</el-row>
+							</el-form>
+						</div>
 
-				<div class="container" v-show="viewState == 1">
-					<div class="tab-header">
-						<el-form :inline="true" :model="page.params" class="demo-form-inline">
-							<el-row :gutter="20">
-								<el-col :span="21">
-									<el-form-item label="发行开始日期">
-										<el-date-picker v-model="page.params.startDate" @change="selectTime1"
-											type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-											style="width: 200px;">
-										</el-date-picker>
-
-									</el-form-item>
-									<el-form-item label="发行结束日期">
-										<el-date-picker v-model="page.params.endDate" @change="selectTime2" type="date"
-											placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-											style="width: 200px;">
-										</el-date-picker>
-
-									</el-form-item>
-									<el-button type="primary" @click="getPageList()">查 询</el-button>
-								</el-col>
-							</el-row>
-						</el-form>
+						<el-table :data="tableData" border style="width: 100%; margin-top: 20px;"
+							:row-style="{height: '40px'}">
+							<el-table-column label="序号" width="70px" type="index" align="center">
+							</el-table-column>
+							<el-table-column label="操作" width="150px" align="center">
+								<template slot-scope="scope">
+									<el-button type="primary" size="mini" @click="showRow(scope.row)">
+										明细
+									</el-button>
+								</template>
+							</el-table-column>
+							<el-table-column prop="startNumber" label="序列起始号" align="center">
+							</el-table-column>
+							<el-table-column prop="endNumber" label="序列结束号" align="center">
+							</el-table-column>
+							<el-table-column prop="buildDate" label="发行时间" align="center">
+							</el-table-column>
+							<el-table-column prop="countNumber" label="发行总数" align="center">
+							</el-table-column>
+							<el-table-column prop="bagName" label="绑定礼包" align="center">
+							</el-table-column>
+						</el-table>
+
+						<pagination :total="page.total" :page.sync="page.current" :limit.sync="page.size"
+							@pagination="pagination" style="padding-bottom: 100px;"/>
 					</div>
 
-					<el-table :data="tableData" border style="width: 100%; margin-top: 20px;"
-						:row-style="{height: '40px'}">
-						<el-table-column label="序号" width="70px" type="index" align="center">
-						</el-table-column>
-						<el-table-column label="操作" width="150px" align="center">
-							<template slot-scope="scope">
-								<el-button type="primary" size="mini" @click="showRow(scope.row)">
-									明细
-								</el-button>
-							</template>
-						</el-table-column>
-						<el-table-column prop="startNumber" label="序列起始号" align="center">
-						</el-table-column>
-						<el-table-column prop="endNumber" label="序列结束号" align="center">
-						</el-table-column>
-						<el-table-column prop="buildDate" label="发行时间" align="center">
-						</el-table-column>
-						<el-table-column prop="countNumber" label="发行总数" align="center">
-						</el-table-column>
-						<el-table-column prop="bagName" label="绑定礼包" align="center">
-						</el-table-column>
-					</el-table>
-
-					<pagination :total="page.total" :page.sync="page.current" :limit.sync="page.size"
-						@pagination="pagination" />
-				</div>
-
-				<div class="container" v-show="viewState == 2">
-					<div class="tab-header">
-						<el-form :inline="true" :model="listQuery.params" class="demo-form-inline">
-							<el-row :gutter="20">
-								<el-col :span="20">
-									<el-form-item label="卡片序列号">
-										<el-input v-model="listQuery.params.number" placeholder="" clearable />
-
-									</el-form-item>
-									<el-form-item label="卡片状态">
-										<el-select v-model="listQuery.params.state" placeholder="请选择">
-											<el-option v-for="(item,i) in stateList" :key="i" :label="item.name"
-												:value="item.sid">
-											</el-option>
-										</el-select>
-
-									</el-form-item>
-									<el-button type="primary" @click="getPageList2()">查 询</el-button>
-									<el-button type="primary" @click="returnView()">返 回</el-button>
-								</el-col>
-								<el-col :span="2">
-									<el-form-item style="float: right;">
-										<el-button type="primary" @click="exportExcel()">导出Excel</el-button>
-									</el-form-item>
-								</el-col <el-col :span="2">
-								<el-form-item style="float: right;">
-									<el-button type="primary" @click="downloadQR()">下载二维码</el-button>
-								</el-form-item>
-								</el-col>
-							</el-row>
-						</el-form>
-					</div>
+					<div class="container" v-show="viewState == 2" >
+						<div class="tab-header">
+							<el-form :inline="true" :model="listQuery.params" class="demo-form-inline">
+								<el-row :gutter="20">
+									<el-col :span="20">
+										<el-form-item label="卡片序列号">
+											<el-input v-model="listQuery.params.number" placeholder="" clearable />
+
+										</el-form-item>
+										<el-form-item label="卡片状态">
+											<el-select v-model="listQuery.params.state" placeholder="请选择">
+												<el-option v-for="(item,i) in stateList" :key="i" :label="item.name"
+													:value="item.sid">
+												</el-option>
+											</el-select>
+
+										</el-form-item>
+										<el-button type="primary" @click="getPageList2()">查 询</el-button>
+										<el-button type="primary" @click="returnView()">返 回</el-button>
+									</el-col>
+									<el-col :span="4">
+										<el-form-item style="float: right;">
+											<div
+												style="display: flex;flex-direction: row;align-items: center;justify-content: space-between;">
+												<el-button type="primary" @click="exportExcel()">导出Excel</el-button>
+												<el-button type="primary" @click="downloadQR()"
+													style="margin-left: 10px;">下载二维码</el-button>
+											</div>
+
+										</el-form-item>
+									</el-col>
+								</el-row>
+							</el-form>
+						</div>
 
-					<el-table :data="tableData2" border style="width: 100%; margin-top: 20px;"
-						:row-style="{height: '40px'}">
-						<el-table-column label="序号" width="70px" type="index" align="center">
-						</el-table-column>
-						<!-- <el-table-column label="操作" width="150px" align="center">
+						<el-table :data="tableData2" border style="width: 100%; margin-top: 20px;"
+							:row-style="{height: '40px'}">
+							<el-table-column label="序号" width="70px" type="index" align="center">
+							</el-table-column>
+							<!-- <el-table-column label="操作" width="150px" align="center">
 							<template slot-scope="scope">
 								<el-button type="primary" size="mini" @click="editRow(scope.row)">
 									明细
 								</el-button>
 							</template>
 						</el-table-column> -->
-						<el-table-column prop="serialNumber" label="序列号" align="center">
-						</el-table-column>
-						<el-table-column prop="code" label="提货码" align="center">
-						</el-table-column>
-						<el-table-column prop="codeKey" label="提货密码" align="center">
-						</el-table-column>
-						<el-table-column prop="state" label="卡片状态" align="center">
-						</el-table-column>
-						<el-table-column prop="customerMobile" label="客户手机号" align="center">
-						</el-table-column>
-					</el-table>
-
-					<pagination :total="page.total" :page.sync="page.current" :limit.sync="page.size"
-						@pagination="pagination" />
+							<el-table-column prop="serialNumber" label="序列号" align="center">
+							</el-table-column>
+							<el-table-column prop="code" label="提货码" align="center">
+							</el-table-column>
+							<el-table-column prop="codeKey" label="提货密码" align="center">
+							</el-table-column>
+							<el-table-column prop="state" label="卡片状态" align="center">
+							</el-table-column>
+							<el-table-column prop="customerMobile" label="客户手机号" align="center">
+							</el-table-column>
+						</el-table>
+
+						<pagination :total="page.total" :page.sync="page.current" :limit.sync="page.size"
+							@pagination="pagination" style="padding-bottom: 100px;" />
+					</div>
 				</div>
 			</el-tab-pane>
 
@@ -278,8 +281,8 @@
 					.then(resp => {
 						console.log('>>>>>>>>>recordDetails', resp.data)
 						this.tableData2 = resp.data.records
-					this.recordId = resp.data.records[0].recordId
-					this.listQuery.total = resp.data.total
+						this.recordId = resp.data.records[0].recordId
+						this.listQuery.total = resp.data.total
 					})
 					.catch(() => {
 
@@ -292,12 +295,12 @@
 				this.viewState = 2
 				req.recordDetails(this.listQuery)
 					.then(resp => {
-				
+
 						console.log('>>>>>>>>>recordDetails', resp.data)
 						this.tableData2 = resp.data.records
-					
-					this.recordId = resp.data.records[0].recordId
-					this.listQuery.total = resp.data.total
+
+						this.recordId = resp.data.records[0].recordId
+						this.listQuery.total = resp.data.total
 					})
 					.catch(() => {
 
@@ -350,7 +353,7 @@
 						loading.close()
 					})
 			},
-			downloadQR(){
+			downloadQR() {
 				this.$message({
 					showClose: true,
 					type: 'success',
@@ -407,6 +410,7 @@
 		margin-right: 60px;
 		min-width: 70%;
 		margin-top: 20px;
+		margin-bottom: 50px;
 
 		.item {
 			display: flex;