2023-11-28

src/layout/components/Sidebar/index.vue

@@ -121,49 +121,49 @@
 						name: "/order/index",
 						path: "/order/index"
 					},
-					{
+					// {
-						alwaysShow: true,
+					// 	alwaysShow: true,
-						component: "statisticalReport",
+					// 	component: "statisticalReport",
-						meta: {
+					// 	meta: {
-							icon: "el-icon-menu",
+					// 		icon: "el-icon-menu",
-							title: "统计报表",
+					// 		title: "统计报表",
-						},
+					// 	},
-						name: "/statisticalReport/index",
+					// 	name: "/statisticalReport/index",
-						path: "/statisticalReport/index",
+					// 	path: "/statisticalReport/index",
-						children: [
+					// 	children: [
 						
-							{
+					// 		{
-								alwaysShow: true,
+					// 			alwaysShow: true,
-								component: "index",
+					// 			component: "index",
-								meta: {
+					// 			meta: {
-									icon: "el-icon-help",
+					// 				icon: "el-icon-help",
-									title: "提货卡汇总",
+					// 				title: "提货卡汇总",
-								},
+					// 			},
-								name: "/statisticalReport/index",
+					// 			name: "/statisticalReport/index",
-								path: "/statisticalReport/index",
+					// 			path: "/statisticalReport/index",
-							},
+					// 		},
-							{
+					// 		{
-								alwaysShow: true,
+					// 			alwaysShow: true,
-								component: "collectionSummary",
+					// 			component: "collectionSummary",
-								meta: {
+					// 			meta: {
-									icon: "el-icon-help",
+					// 				icon: "el-icon-help",
-									title: "提货汇总",
+					// 				title: "提货汇总",
-								},
+					// 			},
-								name: "/statisticalReport/collectionSummary",
+					// 			name: "/statisticalReport/collectionSummary",
-								path: "/statisticalReport/collectionSummary",
+					// 			path: "/statisticalReport/collectionSummary",
-							},
+					// 		},
-							{
+					// 		{
-								alwaysShow: true,
+					// 			alwaysShow: true,
-								component: "deliveryDetails",
+					// 			component: "deliveryDetails",
-								meta: {
+					// 			meta: {
-									icon: "el-icon-help",
+					// 				icon: "el-icon-help",
-									title: "客户提货明细",
+					// 				title: "客户提货明细",
-								},
+					// 			},
-								name: "/statisticalReport/deliveryDetails",
+					// 			name: "/statisticalReport/deliveryDetails",
-								path: "/statisticalReport/deliveryDetails",
+					// 			path: "/statisticalReport/deliveryDetails",
-							},
+					// 		},
-						]
+					// 	]
-					},
+					// },
 				],
 			};
 		},

src/views/marketingCard/pickupCardSet.vue

@@ -3,7 +3,7 @@
 		<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">
@@ -11,15 +11,15 @@
 									<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"
+												type="date" placeholder="选择日期" format="yyyy-MM-dd"
-											style="width: 200px;">
+												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"
+											<el-date-picker v-model="page.params.endDate" @change="selectTime2"
-											placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
+												type="date" placeholder="选择日期" format="yyyy-MM-dd"
-											style="width: 200px;">
+												value-format="yyyy-MM-dd" style="width: 200px;">
 											</el-date-picker>
 
 										</el-form-item>
@@ -53,10 +53,10 @@
 						</el-table>
 
 						<pagination :total="page.total" :page.sync="page.current" :limit.sync="page.size"
-						@pagination="pagination" />
+							@pagination="pagination" style="padding-bottom: 100px;"/>
 					</div>
 
-				<div class="container" v-show="viewState == 2">
+					<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">
@@ -76,13 +76,15 @@
 										<el-button type="primary" @click="getPageList2()">查 询</el-button>
 										<el-button type="primary" @click="returnView()">返 回</el-button>
 									</el-col>
-								<el-col :span="2">
+									<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-form-item>
+												<el-button type="primary" @click="downloadQR()"
-								</el-col <el-col :span="2">
+													style="margin-left: 10px;">下载二维码</el-button>
-								<el-form-item style="float: right;">
+											</div>
-									<el-button type="primary" @click="downloadQR()">下载二维码</el-button>
+
 										</el-form-item>
 									</el-col>
 								</el-row>
@@ -113,7 +115,8 @@
 						</el-table>
 
 						<pagination :total="page.total" :page.sync="page.current" :limit.sync="page.size"
-						@pagination="pagination" />
+							@pagination="pagination" style="padding-bottom: 100px;" />
+					</div>
 				</div>
 			</el-tab-pane>
 
@@ -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;