From a67407bcb87d4ffa90cedf314fbe8d442ef34494 Mon Sep 17 00:00:00 2001
From: yangxin <2509699647@qq.com>
Date: Thu, 10 Apr 2025 18:08:16 +0800
Subject: [PATCH] 最新

---
 admin-web-master/src/App.vue                                     |   2 +-
 admin-web-master/src/views/activity/activityBian.vue             |   8 ++++----
 admin-web-master/src/views/activity/activityBz.vue               |   8 ++++----
 admin-web-master/src/views/activity/activityHis.vue              |  57 ++++++++++++++++++++++++++++++++++++---------------------
 admin-web-master/src/views/activity/activitySp.vue               |  76 ++++++++++++++++++++++++++++++++--------------------------------------------
 admin-web-master/src/views/activity/index.vue                    |  82 ++++++++++++++++++++++++++++++----------------------------------------------------
 admin-web-master/src/views/atmosphere/atmosphereBian.vue         |   8 ++++----
 admin-web-master/src/views/atmosphere/atmosphereBz.vue           |   8 ++++----
 admin-web-master/src/views/atmosphere/atmosphereGl.vue           |  75 +++++++++++++++++++++++++++++++--------------------------------------------
 admin-web-master/src/views/atmosphere/atmosphereHis.vue          |  61 +++++++++++++++++++++++++++++++++++++------------------------
 admin-web-master/src/views/atmosphere/atmosphereSp.vue           |  72 +++++++++++++++++++++++++++++++-----------------------------------------
 admin-web-master/src/views/media/mediaMana.vue                   |  39 +++++++++++++++++++++++++--------------
 admin-web-master/src/views/promotion/account.vue                 |  40 ++++++++++++++++++++--------------------
 admin-web-master/src/views/promotion/audit.vue                   |  43 +++++++++++++++++++++++++++----------------
 admin-web-master/src/views/promotion/contentMant.vue             |  49 +++++++++++++++++++++++++++++++++----------------
 admin-web-master/src/views/serve/MarkActivity/index.vue          |  23 +++++++++--------------
 admin-web-master/src/views/serve/Merchant/index.vue              |  14 +++++---------
 admin-web-master/src/views/serve/PerWorkstation/index.vue        |   8 ++------
 admin-web-master/src/views/serve/actSp.vue                       |  21 +++++++++++++--------
 admin-web-master/src/views/serve/kefuServe/index.vue             |   8 ++++----
 admin-web-master/src/views/serve/procedure.vue                   | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------
 admin-web-master/src/views/serve/salesReport.vue                 |   4 ++--
 admin-web-master/src/views/stockControl/stocksForewarn/index.vue |  10 +---------
 23 files changed, 430 insertions(+), 390 deletions(-)

diff --git a/admin-web-master/src/App.vue b/admin-web-master/src/App.vue
index d3fd07e..3075539 100644
--- a/admin-web-master/src/App.vue
+++ b/admin-web-master/src/App.vue
@@ -77,7 +77,7 @@
             this.$router.push({
               path: '/investigation/index'
             })
-
+ 
           })
  
       },
diff --git a/admin-web-master/src/views/activity/activityBian.vue b/admin-web-master/src/views/activity/activityBian.vue
index 2e508b0..e84d0ef 100644
--- a/admin-web-master/src/views/activity/activityBian.vue
+++ b/admin-web-master/src/views/activity/activityBian.vue
@@ -110,11 +110,11 @@
           <el-table :data="tableDa"
           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
              style="width: 100%">
-            <el-table-column label="序号" width="auto" min-width="5%" prop="date" align="center">
+            <!-- <el-table-column label="序号" width="auto" min-width="5%" prop="date" align="center">
               <template slot-scope="scope">
                 {{scope.$index + 1}}
                 </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column label="明细项名称" prop="detailLtemName" width="auto" min-width="22%">
 
             </el-table-column>
@@ -264,11 +264,11 @@
           <el-table :data="dataList"
           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
              style="width: 100%">
-            <el-table-column label="序号" width="auto" min-width="7%" prop="date" align="center">
+            <!-- <el-table-column label="序号" width="auto" min-width="7%" prop="date" align="center">
               <template slot-scope="scope">
                 {{scope.$index +1}}
                </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column label="附件名称" prop="attachmentName" width="auto" min-width="75%">
             </el-table-column>
             <el-table-column label="操作" width="auto" min-width="18%">
diff --git a/admin-web-master/src/views/activity/activityBz.vue b/admin-web-master/src/views/activity/activityBz.vue
index e2d7f78..adaa99f 100644
--- a/admin-web-master/src/views/activity/activityBz.vue
+++ b/admin-web-master/src/views/activity/activityBz.vue
@@ -145,11 +145,11 @@
 								<el-table :data="tableData"
 									:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
 									style="width: 100%">
-									<el-table-column label="序号" width="auto" min-width="5%" align="center">
+									<!-- <el-table-column label="序号" width="auto" min-width="5%" align="center">
 										<template slot-scope="scope">
 											{{scope.$index + 1}}
 										</template>
-									</el-table-column>
+									</el-table-column> -->
 									<el-table-column label="明细项名称" prop="detailLtemName" width="auto" min-width="22%">
 
 									</el-table-column>
@@ -317,11 +317,11 @@
 								<el-table :data="dataList"
 									:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
 									style="width: 100%">
-									<el-table-column label="序号" width="auto" min-width="7%" align="center">
+									<!-- <el-table-column label="序号" width="auto" min-width="7%" align="center">
 										<template slot-scope="scope">
 											{{scope.$index + 1}}
 										</template>
-									</el-table-column>
+									</el-table-column> -->
 									<el-table-column label="附件名称" prop="name" width="auto" min-width="75%">
 										<template slot-scope="scope">
 											{{scope.row.name}}
diff --git a/admin-web-master/src/views/activity/activityHis.vue b/admin-web-master/src/views/activity/activityHis.vue
index 159b910..6739777 100644
--- a/admin-web-master/src/views/activity/activityHis.vue
+++ b/admin-web-master/src/views/activity/activityHis.vue
@@ -9,11 +9,20 @@
 				<!-- 搜索 -->
 				<div class="formSearch">
 					<div class="demo-input-suffix">
-						<div v-if="searPei.name" style="display: flex;">
+						<!-- <div v-if="searPei.name" style="display: flex;">
 							<div style="width: 68px;height:36px;line-height:36px;">方案名称</div>
 							<el-input placeholder="请输入" v-model="formSear.planName" style="width:168px;">
 							</el-input>
-						</div>
+						</div> -->
+						<div style="width: 68px;height:36px;line-height:36px;">方案名称</div>
+						<el-input placeholder="请输入" v-model="pageindex.planName" style="width:168px;">
+						</el-input>
+						<div style="width: 68px;height:36px;line-height:36px;margin-left: 10px;">活动地点</div>
+						<el-input placeholder="请输入" v-model="pageindex.eventAddrs" style="width:168px;">
+						</el-input>
+						<div style="width: 75px;height:36px;line-height:36px;margin-left: 10px;">活动主办方</div>
+						<el-input placeholder="请输入" v-model="pageindex.sponsor" style="width:168px;">
+						</el-input>
 						<!-- <div v-if="searPei.lei" style="display: flex;">
               <div style="width: 68px;height:36px;line-height:36px;">方案类型</div>
               <el-input placeholder="请输入"  v-model="planName" style="width:168px;">
@@ -193,11 +202,11 @@
 									<el-table :data="tableData2"
 					:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
 										style="width: 100%;margin: auto;">
-										<el-table-column label="序号" min-width="5%" align='center'>
+										<!-- <el-table-column label="序号" min-width="5%" align='center'>
 											<template slot-scope="scope">
 												<span style="">{{ scope.$index +1}}</span>
 											</template>
-										</el-table-column>
+										</el-table-column> -->
 										<el-table-column label="明细项名称" prop="detailLtemName" min-width="28%">
 										</el-table-column>
 										<el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%">
@@ -265,11 +274,11 @@
 									<el-table :data="tableData6"
 							:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
 										style="width: 100%;margin: auto;">
-										<el-table-column label="序号" min-width="5%" align='center'>
+										<!-- <el-table-column label="序号" min-width="5%" align='center'>
 											<template slot-scope="scope">
 												<span style="">{{ scope.$index + 1 }}</span>
 											</template>
-										</el-table-column>
+										</el-table-column> -->
 										<el-table-column label="附件名称" prop="attachmentName" min-width="75%">
 										</el-table-column>
 										<el-table-column label="操作" min-width="20%">
@@ -846,11 +855,11 @@
 								<el-table :data="tableData2"
 									:header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
 									style="width: 100%;margin: auto;">
-									<el-table-column label="序号" min-width="7%" align='center'>
+									<!-- <el-table-column label="序号" min-width="7%" align='center'>
 										<template slot-scope="scope">
 											<span style="">{{ scope.$index +1}}</span>
 										</template>
-									</el-table-column>
+									</el-table-column> -->
 									<el-table-column label="明细项名称" prop="detailLtemName" min-width="25%">
 									</el-table-column>
 									<el-table-column label="预估数量" prop="estimatedQuantity" min-width="18%">
@@ -917,11 +926,11 @@
 								<el-table :data="tableData6"
 									:header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
 									style="width: 100%;margin: auto;">
-									<el-table-column label="序号" min-width="7%" align='center'>
+									<!-- <el-table-column label="序号" min-width="7%" align='center'>
 										<template slot-scope="scope">
 											<span style="">{{ scope.$index + 1 }}</span>
 										</template>
-									</el-table-column>
+									</el-table-column> -->
 									<el-table-column label="附件名称" prop="attachmentName" min-width="70%">
 									</el-table-column>
 									<el-table-column label="操作" min-width="20%">
@@ -1047,11 +1056,11 @@
 								<el-table :data="tableData2"
 									:header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
 									style="width: 100%;margin: auto;">
-									<el-table-column label="序号" min-width="7%" align='center'>
+									<!-- <el-table-column label="序号" min-width="7%" align='center'>
 										<template slot-scope="scope">
 											<span style="">{{ scope.$index +1}}</span>
 										</template>
-									</el-table-column>
+									</el-table-column> -->
 									<el-table-column label="明细项名称" prop="detailLtemName" min-width="25%">
 									</el-table-column>
 									<el-table-column label="预估数量" prop="estimatedQuantity" min-width="18%">
@@ -1159,11 +1168,11 @@
 								<el-table :data="tableData6"
 									:header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
 									style="width: 100%;margin: auto;">
-									<el-table-column label="序号" min-width="7%" align='center'>
+									<!-- <el-table-column label="序号" min-width="7%" align='center'>
 										<template slot-scope="scope">
 											<span style="">{{ scope.$index + 1 }}</span>
 										</template>
-									</el-table-column>
+									</el-table-column> -->
 									<el-table-column label="附件名称" prop="attachmentName" min-width="70%">
 									</el-table-column>
 									<el-table-column label="操作" min-width="20%">
@@ -1778,6 +1787,9 @@
 					feedbackContent: ''
 				}, //执行效果列表
 				pageindex: {
+					planName:'',
+					eventAddrs:'',
+					sponsor:'',
 					pageNumber: 1,
 					pageSize: 10,
 					dataOwnership: '1',
@@ -1970,9 +1982,10 @@
 
 			},
 			//查询
-			async onSubmit() {
-				const res = await danqueryById(this.formSear)
-				this.tableData = res.data.content
+			 onSubmit() {
+					 this.currentPage = 1
+					this.getAll()
+				
 			},
 			formatTimestampToDate(timestamp) {
 				console.log(timestamp,'timestamp')
@@ -1990,15 +2003,17 @@
 			},
 			//重置按钮
 			resetting() {
-				this.formSear = {
-					planName: '',
-					state: null,
-					dataOwnership: '1',
+				this.pageindex={
+					planName:'',
+					eventAddrs:'',
+					sponsor:'',
 					pageNumber: 1,
 					pageSize: 10,
+					dataOwnership: '1',
 					isDraft: 0,
 					state: '5'
 				}
+				this.currentPage = 1
 				this.getAll()
 			},
 			//编辑页
diff --git a/admin-web-master/src/views/activity/activitySp.vue b/admin-web-master/src/views/activity/activitySp.vue
index c9f8c23..f209290 100644
--- a/admin-web-master/src/views/activity/activitySp.vue
+++ b/admin-web-master/src/views/activity/activitySp.vue
@@ -9,8 +9,14 @@
 				<!-- 搜索 -->
 				<div class="formSearch">
 					<div class="demo-input-suffix">
-						<div style="width: 68px;height:36px;line-height:32px;">方案名称</div>
-						<el-input placeholder="请输入" v-model="planName" style="width:168px;">
+						<div style="width: 68px;height:36px;line-height:36px;">方案名称</div>
+						<el-input placeholder="请输入" v-model="pageindex.planName" style="width:168px;">
+						</el-input>
+						<div style="width: 68px;height:36px;line-height:36px;margin-left: 10px;">活动地点</div>
+						<el-input placeholder="请输入" v-model="pageindex.eventAddrs" style="width:168px;">
+						</el-input>
+						<div style="width: 75px;height:36px;line-height:36px;margin-left: 10px;">活动主办方</div>
+						<el-input placeholder="请输入" v-model="pageindex.sponsor" style="width:168px;">
 						</el-input>
 					</div>
 					<div>
@@ -647,11 +653,11 @@
 								<el-table :data="tableData2"
 									:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
 									style="width: 100%;margin: auto;">
-									<el-table-column label="序号" min-width="5%" align='center'>
+									<!-- <el-table-column label="序号" min-width="5%" align='center'>
 										<template slot-scope="scope">
 											<span style="">{{ scope.$index +1}}</span>
 										</template>
-									</el-table-column>
+									</el-table-column> -->
 									<el-table-column label="明细项名称" prop="detailLtemName" min-width="28%">
 									</el-table-column>
 									<el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%">
@@ -719,11 +725,11 @@
 								<el-table :data="tableData6"
 									:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
 									style="width: 100%;margin: auto;">
-									<el-table-column label="序号" min-width="5%" align='center'>
+									<!-- <el-table-column label="序号" min-width="5%" align='center'>
 										<template slot-scope="scope">
 											<span style="">{{ scope.$index + 1 }}</span>
 										</template>
-									</el-table-column>
+									</el-table-column> -->
 									<el-table-column label="附件名称" prop="attachmentName" min-width="75%">
 									</el-table-column>
 									<el-table-column label="操作" min-width="20%">
@@ -838,12 +844,12 @@
 								<el-table :data="tableDa"
 									:header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
 									style="width: 100%">
-									<el-table-column label="序号" width="auto" min-width="5%" prop="date"
+									<!-- <el-table-column label="序号" width="auto" min-width="5%" prop="date"
 										align="center">
 										<template slot-scope="scope">
 											{{scope.$index +1}}
 										</template>
-									</el-table-column>
+									</el-table-column> -->
 									<el-table-column label="明细项名称" prop="detailLtemName" width="auto"
 										min-width="22%">
 		
@@ -1215,7 +1221,10 @@
 					pageSize: 10,
 					dataOwnership: '1',
 					isDraft:0,
-					state:'待提交'
+					state:'待提交',
+					planName:'',
+					eventAddrs:'',
+					sponsor:'',
 				},
 				multipleSelection: [],
 				options: [{
@@ -1319,39 +1328,8 @@
 			},
 			//查询
 			async onSubmit() {
-				if (this.planName != '' && this.eventTheme == '') {
-					const res = await danqueryById({
-						planName: this.planName,
-						dataOwnership: '1',
-						pageNumber: 1,
-						pageSize: 10,
-						isDraft: 0,
-						state: '待提交'
-					})
-					this.tableData = res.data.content
-				} else if (this.planName == '' && this.eventTheme != '') {
-					const res = await danqueryById({
-						eventTheme: this.eventTheme,
-						dataOwnership: '1',
-						pageNumber: 1,
-						pageSize: 10,
-						isDraft: 0,
-						state: '待提交'
-					})
-					this.tableData = res.data.content
-				} else {
-					const res = await danqueryById({
-						planName: this.planName,
-						eventTheme: this.eventTheme,
-						dataOwnership: '1',
-						pageNumber: 1,
-						pageSize: 10,
-						isDraft: 0,
-						state: '待提交'
-					})
-					this.tableData = res.data.content
-				}
-
+				this.currentPage = 1
+				this.getAll()
 			},
 
 			removeEmptyValues(obj) {
@@ -1400,8 +1378,18 @@
 			},
 			//重置按钮
 			resetting() {
-				this.planName = ''
-				this.eventTheme = ''
+				this.pageindex={
+						pageNumber: 1,
+						pageSize: 10,
+						dataOwnership: '1',
+						isDraft:0,
+						state:'待提交',
+						planName:'',
+						eventAddrs:'',
+						sponsor:'',
+					
+				}
+				this.currentPage = 1
 				this.getAll()
 			},
 			handleSelectionChange(val) {
diff --git a/admin-web-master/src/views/activity/index.vue b/admin-web-master/src/views/activity/index.vue
index eb6435f..d5f74f8 100644
--- a/admin-web-master/src/views/activity/index.vue
+++ b/admin-web-master/src/views/activity/index.vue
@@ -10,7 +10,13 @@
 				<div class="formSearch">
 					<div class="demo-input-suffix">
 						<div style="width: 68px;height:36px;line-height:36px;">方案名称</div>
-						<el-input placeholder="请输入" v-model="planName" style="width:168px;">
+						<el-input placeholder="请输入" v-model="pageindex.planName" style="width:168px;">
+						</el-input>
+						<div style="width: 68px;height:36px;line-height:36px;margin-left: 10px;">活动地点</div>
+						<el-input placeholder="请输入" v-model="pageindex.eventAddrs" style="width:168px;">
+						</el-input>
+						<div style="width: 75px;height:36px;line-height:36px;margin-left: 10px;">活动主办方</div>
+						<el-input placeholder="请输入" v-model="pageindex.sponsor" style="width:168px;">
 						</el-input>
 					</div>
 					<div>
@@ -650,11 +656,11 @@
 								<el-table :data="tableData2"
 						:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
 									style="width: 100%;margin: auto;">
-									<el-table-column label="序号" min-width="5%" align='center'>
+									<!-- <el-table-column label="序号" min-width="5%" align='center'>
 										<template slot-scope="scope">
 											<span style="">{{ scope.$index +1}}</span>
 										</template>
-									</el-table-column>
+									</el-table-column> -->
 									<el-table-column label="明细项名称" prop="detailLtemName" min-width="28%">
 									</el-table-column>
 									<el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%">
@@ -721,11 +727,11 @@
 								<el-table :data="tableData6"
 						:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
 									style="width: 100%;margin: auto;">
-									<el-table-column label="序号" min-width="5%" align='center'>
+									<!-- <el-table-column label="序号" min-width="5%" align='center'>
 										<template slot-scope="scope">
 											<span style="">{{ scope.$index + 1 }}</span>
 										</template>
-									</el-table-column>
+									</el-table-column> -->
 									<el-table-column label="附件名称" prop="attachmentName" min-width="75%">
 									</el-table-column>
 									<el-table-column label="操作" min-width="20%">
@@ -840,11 +846,11 @@
 								<el-table :data="tableDa"
 									:header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
 									style="width: 100%">
-									<el-table-column label="序号" width="auto" min-width="5%" prop="date" align="center">
+									<!-- <el-table-column label="序号" width="auto" min-width="5%" prop="date" align="center">
 										<template slot-scope="scope">
 											{{scope.$index +1}}
 										</template>
-									</el-table-column>
+									</el-table-column> -->
 									<el-table-column label="明细项名称" prop="detailLtemName" width="auto" min-width="22%">
 
 									</el-table-column>
@@ -1094,7 +1100,6 @@
 				fenlei: [],
 				cascaderList: [],
 				secondData: {},
-				planName: '',
 				planFen: '',
 				eventTheme: '',
 				currentPage: 1,
@@ -1124,14 +1129,6 @@
 
 					],
 				},
-				formInline: {
-					merchantName: '', // 商家名称
-					storeId: '', // 编码
-					contacts: '', // 联系人
-					businessEntity: '', //经营主体
-					page: 1, // 当前页
-					pageSize: 10 // 每页记录数
-				},
 				tableData: [],
 				id: '',
 				text: '123',
@@ -1242,6 +1239,9 @@
 					feedbackContent: ''
 				}, //执行效果列表
 				pageindex: {
+					planName:'',
+					eventAddrs:'',
+					sponsor:'',
 					pageNumber: 1,
 					pageSize: 10,
 					dataOwnership: '1',
@@ -1437,40 +1437,9 @@
 			},
 
 			//查询
-			async onSubmit() {
-				if (this.planName != '' && this.eventTheme == '') {
-					const res = await danqueryById({
-						planName: this.planName,
-						dataOwnership: '1',
-						pageNumber: 1,
-						pageSize: 10,
-						auditTime: 0,
-						isDraft: 0
-					})
-					this.tableData = res.data.content
-				} else if (this.planName == '' && this.eventTheme != '') {
-					const res = await danqueryById({
-						eventTheme: this.eventTheme,
-						dataOwnership: '1',
-						pageNumber: 1,
-						pageSize: 10,
-						auditTime: 0,
-						isDraft: 0
-					})
-					this.tableData = res.data.content
-				} else {
-					const res = await danqueryById({
-						planName: this.planName,
-						eventTheme: this.eventTheme,
-						dataOwnership: '1',
-						pageNumber: 1,
-						pageSize: 10,
-						auditTime: 0,
-						isDraft: 0
-					})
-					this.tableData = res.data.content
-				}
-
+			 onSubmit() {
+				 this.currentPage = 1
+				this.getAll()
 			},
 			//详情点击
 			handleEditForm(item, val, flag) {
@@ -1743,8 +1712,17 @@
 			},
 			//重置按钮
 			resetting() {
-				this.planName = ''
-				this.eventTheme = ''
+				this.pageindex={
+						planName:'',
+						eventAddrs:'',
+						sponsor:'',
+						pageNumber: 1,
+						pageSize: 10,
+						dataOwnership: '1',
+						isDraft: 0,
+					
+				}
+				this.currentPage = 1
 				this.getAll()
 			},
 			handleSelectionChange(val) {
diff --git a/admin-web-master/src/views/atmosphere/atmosphereBian.vue b/admin-web-master/src/views/atmosphere/atmosphereBian.vue
index 4bfce25..6eca41d 100644
--- a/admin-web-master/src/views/atmosphere/atmosphereBian.vue
+++ b/admin-web-master/src/views/atmosphere/atmosphereBian.vue
@@ -107,11 +107,11 @@
           <el-table :data="tableDa"
             :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
              style="width: 100%">
-            <el-table-column label="序号" width="auto" min-width="5%" align="center">
+            <!-- <el-table-column label="序号" width="auto" min-width="5%" align="center">
               <template slot-scope="scope">
                 {{scope.$index + 1}}
                 </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column label="明细项名称" prop="detailLtemName" width="auto" min-width="22%">
 
             </el-table-column>
@@ -258,11 +258,11 @@
           <el-table :data="dataList"
             :header-cell-style="{fontSize: '12px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
              style="width: 100%">
-            <el-table-column label="序号" width="auto" min-width="7%" align="center">
+            <!-- <el-table-column label="序号" width="auto" min-width="7%" align="center">
               <template slot-scope="scope">
                 {{scope.$index +1}}
                </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column label="附件名称" prop="attachmentName" width="auto" min-width="75%">
             </el-table-column>
             <el-table-column label="操作" width="auto" min-width="18%">
diff --git a/admin-web-master/src/views/atmosphere/atmosphereBz.vue b/admin-web-master/src/views/atmosphere/atmosphereBz.vue
index fa0d014..3f229f9 100644
--- a/admin-web-master/src/views/atmosphere/atmosphereBz.vue
+++ b/admin-web-master/src/views/atmosphere/atmosphereBz.vue
@@ -144,11 +144,11 @@
 								<el-table :data="tableData"
 									:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
 									style="width: 100%">
-									<el-table-column label="序号" width="auto" min-width="5%" align="center">
+									<!-- <el-table-column label="序号" width="auto" min-width="5%" align="center">
 										<template slot-scope="scope">
 											{{scope.$index + 1}}
 										</template>
-									</el-table-column>
+									</el-table-column> -->
 									<el-table-column label="明细项名称" prop="detailLtemName" width="auto" min-width="22%">
 
 									</el-table-column>
@@ -312,11 +312,11 @@
 								<el-table :data="dataList"
 									:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
 									style="width: 100%">
-									<el-table-column label="序号" width="auto" min-width="7%" align="center">
+									<!-- <el-table-column label="序号" width="auto" min-width="7%" align="center">
 										<template slot-scope="scope">
 											{{scope.$index + 1}}
 										</template>
-									</el-table-column>
+									</el-table-column> -->
 									<el-table-column label="附件名称" prop="name" width="auto" min-width="75%">
 										<template slot-scope="scope">
 											{{scope.row.name}}
diff --git a/admin-web-master/src/views/atmosphere/atmosphereGl.vue b/admin-web-master/src/views/atmosphere/atmosphereGl.vue
index ac8fdf0..c0cc421 100644
--- a/admin-web-master/src/views/atmosphere/atmosphereGl.vue
+++ b/admin-web-master/src/views/atmosphere/atmosphereGl.vue
@@ -9,8 +9,14 @@
 				<!-- 搜索 -->
 				<div class="formSearch">
 					<div class="demo-input-suffix">
-						<div style="width: 68px;height:36px;line-height:32px;">方案名称</div>
-						<el-input placeholder="请输入" v-model="planName" style="width:168px;">
+						<div style="width: 68px;height:36px;line-height:36px;">方案名称</div>
+						<el-input placeholder="请输入" v-model="pageindex.planName" style="width:168px;">
+						</el-input>
+						<div style="width: 68px;height:36px;line-height:36px;margin-left: 10px;">活动地点</div>
+						<el-input placeholder="请输入" v-model="pageindex.eventAddrs" style="width:168px;">
+						</el-input>
+						<div style="width: 75px;height:36px;line-height:36px;margin-left: 10px;">活动主办方</div>
+						<el-input placeholder="请输入" v-model="pageindex.sponsor" style="width:168px;">
 						</el-input>
 					</div>
 					<div>
@@ -643,11 +649,11 @@
 								<el-table :data="tableData2"
 									:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
 									style="width: 100%;margin: auto;">
-									<el-table-column label="序号" min-width="5%" align='center'>
+									<!-- <el-table-column label="序号" min-width="5%" align='center'>
 										<template slot-scope="scope">
 											<span style="">{{ scope.$index +1}}</span>
 										</template>
-									</el-table-column>
+									</el-table-column> -->
 									<el-table-column label="明细项名称" prop="detailLtemName" min-width="28%">
 									</el-table-column>
 									<el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%">
@@ -714,11 +720,11 @@
 								<el-table :data="tableData6"
 									:header-cell-style="{fontSize: '14px',color:'#000000e6',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
 									style="width: 100%;margin: auto;">
-									<el-table-column label="序号" min-width="5%" align='center'>
+									<!-- <el-table-column label="序号" min-width="5%" align='center'>
 										<template slot-scope="scope">
 											<span style="">{{ scope.$index + 1 }}</span>
 										</template>
-									</el-table-column>
+									</el-table-column> -->
 									<el-table-column label="附件名称" prop="attachmentName" min-width="75%">
 
 									</el-table-column>
@@ -899,11 +905,11 @@
 								<el-table :data="tableDa"
 									:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
 									style="width: 100%">
-									<el-table-column label="序号" width="auto" min-width="5%" align="center">
+									<!-- <el-table-column label="序号" width="auto" min-width="5%" align="center">
 										<template slot-scope="scope">
 											{{scope.$index +1}}
 										</template>
-									</el-table-column>
+									</el-table-column> -->
 									<el-table-column label="明细项名称" prop="detailLtemName" width="auto" min-width="22%">
 
 									</el-table-column>
@@ -1285,10 +1291,13 @@
 				secondData: {},
 				planTime: [],
 				pageindex: {
+					planName:'',
+					eventAddrs:'',
+					sponsor:'',
 					pageNumber: 1,
 					pageSize: 10,
 					dataOwnership: '2',
-					isDraft: 0
+					isDraft: 0,
 				},
 				multipleSelection: [], //选择的数据
 				options: [],
@@ -1479,39 +1488,8 @@
 			},
 			//查询
 			async onSubmit() {
-				if (this.planName != '' && this.eventTheme == '') {
-					const res = await danqueryById({
-						planName: this.planName,
-						dataOwnership: '2',
-						pageNumber: 1,
-						pageSize: 10,
-						auditTime: 0,
-						isDraft: 0
-					})
-					this.tableData = res.data.content
-				} else if (this.planName == '' && this.eventTheme != '') {
-					const res = await danqueryById({
-						eventTheme: this.eventTheme,
-						dataOwnership: '2',
-						pageNumber: 1,
-						pageSize: 10,
-						auditTime: 0,
-						isDraft: 0
-					})
-					this.tableData = res.data.content
-				} else {
-					const res = await danqueryById({
-						planName: this.planName,
-						eventTheme: this.eventTheme,
-						dataOwnership: '2',
-						pageNumber: 1,
-						pageSize: 10,
-						auditTime: 0,
-						isDraft: 0
-					})
-					this.tableData = res.data.content
-				}
-
+				this.currentPage = 1
+				this.getAll()
 			},
 			//获取当前时间
 			updateCurrentTime() {
@@ -1793,8 +1771,17 @@
 			},
 			//重置按钮
 			resetting() {
-				this.planName = ''
-				this.eventTheme = ''
+				this.pageindex={
+						planName:'',
+						eventAddrs:'',
+						sponsor:'',
+						pageNumber: 1,
+						pageSize: 10,
+						dataOwnership: '2',
+						isDraft: 0,
+					
+				}
+				this.currentPage = 1
 				this.getAll()
 			},
 			handleSelectionChange(val) {
diff --git a/admin-web-master/src/views/atmosphere/atmosphereHis.vue b/admin-web-master/src/views/atmosphere/atmosphereHis.vue
index 200bc00..249d98a 100644
--- a/admin-web-master/src/views/atmosphere/atmosphereHis.vue
+++ b/admin-web-master/src/views/atmosphere/atmosphereHis.vue
@@ -9,11 +9,20 @@
 				<!-- 搜索 -->
 				<div class="formSearch">
 					<div class="demo-input-suffix">
-						<div v-if="searPei.name" style="display: flex;">
+						<!-- <div v-if="searPei.name" style="display: flex;">
 							<div style="width: 68px;height:36px;line-height:36px;">方案名称</div>
 							<el-input placeholder="请输入" v-model="formSear.planName" style="width:168px;">
 							</el-input>
-						</div>
+						</div> -->
+						<div style="width: 68px;height:36px;line-height:36px;">方案名称</div>
+						<el-input placeholder="请输入" v-model="pageindex.planName" style="width:168px;">
+						</el-input>
+						<div style="width: 68px;height:36px;line-height:36px;margin-left: 10px;">活动地点</div>
+						<el-input placeholder="请输入" v-model="pageindex.eventAddrs" style="width:168px;">
+						</el-input>
+						<div style="width: 75px;height:36px;line-height:36px;margin-left: 10px;">活动主办方</div>
+						<el-input placeholder="请输入" v-model="pageindex.sponsor" style="width:168px;">
+						</el-input>
 						<!-- <div v-if="searPei.lei" style="display: flex;">
               <div style="width: 68px;height:36px;line-height:36px;">方案类型</div>
               <el-input placeholder="请输入"  v-model="planName" style="width:168px;">
@@ -193,11 +202,11 @@
 									<el-table :data="tableData2"
 								:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
 										style="width: 100%;margin: auto;">
-										<el-table-column label="序号" min-width="5%" align='center'>
+										<!-- <el-table-column label="序号" min-width="5%" align='center'>
 											<template slot-scope="scope">
 												<span style="">{{ scope.$index +1}}</span>
 											</template>
-										</el-table-column>
+										</el-table-column> -->
 										<el-table-column label="明细项名称" prop="detailLtemName" min-width="28%">
 										</el-table-column>
 										<el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%">
@@ -265,11 +274,11 @@
 									<el-table :data="tableData6"
 							:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
 										style="width: 100%;margin: auto;">
-										<el-table-column label="序号" min-width="5%" align='center'>
+										<!-- <el-table-column label="序号" min-width="5%" align='center'>
 											<template slot-scope="scope">
 												<span style="">{{ scope.$index + 1 }}</span>
 											</template>
-										</el-table-column>
+										</el-table-column> -->
 										<el-table-column label="附件名称" prop="attachmentName" min-width="75%">
 										</el-table-column>
 										<el-table-column label="操作" min-width="20%">
@@ -380,12 +389,12 @@
 									<el-table :data="tableDa"
 										:header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
 										style="width: 100%">
-										<el-table-column label="序号" width="auto" min-width="5%" prop="date"
+										<!-- <el-table-column label="序号" width="auto" min-width="5%" prop="date"
 											align="center">
 											<template slot-scope="scope">
 												{{scope.$index +1}}
 											</template>
-										</el-table-column>
+										</el-table-column> -->
 										<el-table-column label="明细项名称" prop="detailLtemName" width="auto"
 											min-width="22%">
 
@@ -1017,11 +1026,11 @@
 								<el-table :data="tableData2"
 									:header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
 									style="width: 100%;margin: auto;">
-									<el-table-column label="序号" min-width="7%" align='center'>
+									<!-- <el-table-column label="序号" min-width="7%" align='center'>
 										<template slot-scope="scope">
 											<span style="">{{ scope.$index +1}}</span>
 										</template>
-									</el-table-column>
+									</el-table-column> -->
 									<el-table-column label="明细项名称" prop="detailLtemName" min-width="25%">
 									</el-table-column>
 									<el-table-column label="预估数量" prop="estimatedQuantity" min-width="18%">
@@ -1088,11 +1097,11 @@
 								<el-table :data="tableData6"
 									:header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
 									style="width: 100%;margin: auto;">
-									<el-table-column label="序号" min-width="7%" align='center'>
+									<!-- <el-table-column label="序号" min-width="7%" align='center'>
 										<template slot-scope="scope">
 											<span style="">{{ scope.$index + 1 }}</span>
 										</template>
-									</el-table-column>
+									</el-table-column> -->
 									<el-table-column label="附件名称" prop="attachmentName" min-width="70%">
 									</el-table-column>
 									<el-table-column label="操作" min-width="20%">
@@ -1218,11 +1227,11 @@
 								<el-table :data="tableData2"
 									:header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
 									style="width: 100%;margin: auto;">
-									<el-table-column label="序号" min-width="7%" align='center'>
+									<!-- <el-table-column label="序号" min-width="7%" align='center'>
 										<template slot-scope="scope">
 											<span style="">{{ scope.$index +1}}</span>
 										</template>
-									</el-table-column>
+									</el-table-column> -->
 									<el-table-column label="明细项名称" prop="detailLtemName" min-width="25%">
 									</el-table-column>
 									<el-table-column label="预估数量" prop="estimatedQuantity" min-width="18%">
@@ -1330,11 +1339,11 @@
 								<el-table :data="tableData6"
 									:header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
 									style="width: 100%;margin: auto;">
-									<el-table-column label="序号" min-width="7%" align='center'>
+									<!-- <el-table-column label="序号" min-width="7%" align='center'>
 										<template slot-scope="scope">
 											<span style="">{{ scope.$index + 1 }}</span>
 										</template>
-									</el-table-column>
+									</el-table-column> -->
 									<el-table-column label="附件名称" prop="attachmentName" min-width="70%">
 									</el-table-column>
 									<el-table-column label="操作" min-width="20%">
@@ -1947,6 +1956,9 @@
 					feedbackContent: ''
 				}, //执行效果列表
 				pageindex: {
+					planName:'',
+					eventAddrs:'',
+					sponsor:'',
 					pageNumber: 1,
 					pageSize: 10,
 					dataOwnership: '2',
@@ -2139,22 +2151,23 @@
 
 			},
 			//查询
-			async onSubmit() {
-				const res = await danqueryById(this.formSear)
-				this.tableData = res.data.content
+			 onSubmit() {
+			this.currentPage = 1
+			this.getAll()
 			},
 			//重置按钮
 			resetting() {
-				this.formSear = {
-					planName: '',
-					state: null,
-					dataOwnership: '2',
+				this.pageindex={
+					planName:'',
+					eventAddrs:'',
+					sponsor:'',
 					pageNumber: 1,
 					pageSize: 10,
+					dataOwnership: '2',
 					isDraft: 0,
 					state: '5'
-
 				}
+				this.currentPage = 1
 				this.getAll()
 			},
 			//编辑页
diff --git a/admin-web-master/src/views/atmosphere/atmosphereSp.vue b/admin-web-master/src/views/atmosphere/atmosphereSp.vue
index 4a5c5e2..6b40445 100644
--- a/admin-web-master/src/views/atmosphere/atmosphereSp.vue
+++ b/admin-web-master/src/views/atmosphere/atmosphereSp.vue
@@ -8,9 +8,15 @@
         <!-- 搜索 -->
         <div class="formSearch">
           <div class="demo-input-suffix">
-            <div style="width: 68px;height:36px;line-height:32px;">方案名称</div>
-            <el-input placeholder="请输入" size="mini" v-model="planName" style="width:168px;">
-            </el-input>
+          <div style="width: 68px;height:36px;line-height:36px;">方案名称</div>
+          <el-input placeholder="请输入" v-model="pageindex.planName" style="width:168px;">
+          </el-input>
+          <div style="width: 68px;height:36px;line-height:36px;margin-left: 10px;">活动地点</div>
+          <el-input placeholder="请输入" v-model="pageindex.eventAddrs" style="width:168px;">
+          </el-input>
+          <div style="width: 75px;height:36px;line-height:36px;margin-left: 10px;">活动主办方</div>
+          <el-input placeholder="请输入" v-model="pageindex.sponsor" style="width:168px;">
+          </el-input>
           </div>
           <div>
             <el-button @click="onSubmit" size="mini" style="background-color: #3F9B6A;color: #fff">查询
@@ -1311,6 +1317,9 @@
             createDate:'',//创建时间
         },//执行效果列表
         pageindex: {
+			planName:'',
+			eventAddrs:'',
+			sponsor:'',
           pageNumber: 1,
           pageSize: 10,
           dataOwnership: '2',
@@ -1409,40 +1418,11 @@
       },
       //查询
       async onSubmit() {
-        if (this.planName != '' && this.eventTheme == '') {
-          const res = await danqueryById({
-            planName: this.planName,
-            dataOwnership: '2',
-            pageNumber: 1,
-            pageSize: 10,
-            isDraft:0,
-            state:'待提交'
-          })
-          this.tableData = res.data.content
-        } else if (this.planName == '' && this.eventTheme != '') {
-          const res = await danqueryById({
-            eventTheme: this.eventTheme,
-            dataOwnership: '2',
-            pageNumber: 1,
-            pageSize: 10,
-            isDraft:0,
-            state:'待提交'
-          })
-          this.tableData = res.data.content
-        } else {
-          const res = await danqueryById({
-            planName: this.planName,
-            eventTheme: this.eventTheme,
-            dataOwnership: '2',
-            pageNumber: 1,
-            pageSize: 10,
-            isDraft:0,
-            state:'待提交'
-          })
-          this.tableData = res.data.content
-        }
-
-      },
+		  
+		  	this.currentPage = 1
+		  	this.getAll()
+		  
+	  },
       removeEmptyValues(obj) {
         if (typeof obj !== 'object' || obj === null) {
           return obj;
@@ -1484,10 +1464,20 @@
 
       //重置按钮
       resetting() {
-        this.planName = ''
-        this.eventTheme = ''
-        this.getAll()
-      },
+				this.pageindex={
+						pageNumber: 1,
+						pageSize: 10,
+						dataOwnership: '2',
+						isDraft:0,
+						state:'待提交',
+						planName:'',
+						eventAddrs:'',
+						sponsor:'',
+					
+				}
+				this.currentPage = 1
+				this.getAll()
+			},
       handleSelectionChange(val) {
         this.multipleSelection = val;
         console.log(val)
diff --git a/admin-web-master/src/views/media/mediaMana.vue b/admin-web-master/src/views/media/mediaMana.vue
index d0ea23c..09f8244 100644
--- a/admin-web-master/src/views/media/mediaMana.vue
+++ b/admin-web-master/src/views/media/mediaMana.vue
@@ -9,8 +9,19 @@
         <div class="formSearch">
           <div class="demo-input-suffix">
             <div style="width: 68px;height:36px;line-height:32px;">方案名称</div>
-            <el-input placeholder="请输入" v-model="planName" style="width:168px;">
+            <el-input placeholder="请输入" v-model="pageindex.schemeTitle" style="width:168px;">
             </el-input>
+			<div style="width: 52px;height:36px;line-height:36px;margin-left: 10px;">创建人</div>
+			<el-input placeholder="请输入" v-model="pageindex.createUser" style="width:168px;">
+			</el-input>
+			<div style="width: 38px;height:36px;line-height:36px;margin-left: 10px;">状态</div>
+			<el-select v-model="pageindex.state" placeholder="请选择"
+			   style="width:168px">
+			  <el-option label="待提交" value="1"></el-option>
+			  <el-option label="待审批" value="2"></el-option>
+			  <el-option label="上架" value="5"></el-option>
+			  <el-option label="已下架" value="6"></el-option>
+			</el-select>
           </div>
           <div>
             <el-button @click="onSubmit"  style="background-color: #3F9B6A;color: #fff">查询
@@ -546,6 +557,9 @@ components: { addAct,wangEditor,upimg},
         tableData: [],
         multipleSelection:[],
         pageindex: {
+			schemeTitle:'',
+			createUser:'',
+			state:'',
           pageNumber: 0,
           pageSize: 10,
         },
@@ -702,17 +716,9 @@ components: { addAct,wangEditor,upimg},
             }
       },
       //查询
-      async onSubmit() {
-        if (this.planName != '') {
-          const res = await tuiGetAll({
-            schemeTitle: this.planName,
-            pageNumber: 0,
-            pageSize: 10,
-          })
-          this.tableData = res.data.content
-		  this.total = res.data.totalElements
-        }
-      },
+       onSubmit() {
+		  this.getAll()
+	  },
       //详情点击
       handleEditForm(item,val) {
         //1详情  2编辑
@@ -779,8 +785,13 @@ components: { addAct,wangEditor,upimg},
       },
       //重置按钮
       resetting() {
-        this.planName = ''
-        this.eventTheme = ''
+        this.pageindex = {
+			schemeTitle:'',
+			createUser:'',
+			state:'',
+          pageNumber: 0,
+          pageSize: 10,
+        }
         this.getAll()
       },
       handleSelectionChange(val) {
diff --git a/admin-web-master/src/views/promotion/account.vue b/admin-web-master/src/views/promotion/account.vue
index ab6a7bb..6742508 100644
--- a/admin-web-master/src/views/promotion/account.vue
+++ b/admin-web-master/src/views/promotion/account.vue
@@ -8,8 +8,11 @@
 			<!-- 搜索 -->
 			<div class="formSearch">
 				<div class="demo-input-suffix">
-					<div style="width: 68px;height:36px;line-height:32px;">渠道名称</div>
-					<el-input placeholder="请输入" v-model="channelName" style="width:168px;">
+					<div style="width: 68px;height:36px;line-height:36px;">渠道名称</div>
+					<el-input placeholder="请输入" v-model="pageindex.channelName" style="width:168px;">
+					</el-input>
+					<div style="width: 38px;height:36px;line-height:36px;margin-left: 10px;">备注</div>
+					<el-input placeholder="请输入" v-model="pageindex.notes" style="width:168px;">
 					</el-input>
 				</div>
 				</el-form-item>
@@ -76,11 +79,11 @@
 						<el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
 							:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
 							align="left">
-							<el-table-column label="序号" min-width="100" prop="id">
+							<!-- <el-table-column label="序号" min-width="100" prop="id">
 								<template slot-scope="scope">
 									{{scope.$index +1 }}
 								</template>
-							</el-table-column>
+							</el-table-column> -->
 							<el-table-column label="渠道名称" prop="channelName" min-width="150" show-overflow-tooltip>
 							</el-table-column>
 							<!-- <el-table-column label="类型" prop="channelType" min-width="120">
@@ -104,8 +107,9 @@
 							</el-table-column>
 						</el-table>
 						<div class="fenye">
-							<el-pagination class="pagination" :hide-on-single-page="flag" background small
-								:current-page="currentPage" :page-size="pageSize" layout="total,->,prev, pager,next"
+							<div style="line-height: 200%;">共{{total}}条</div>
+							<el-pagination class="pagination" :hide-on-single-page="flag" background 
+								:current-page="currentPage" :page-size="pageSize" layout="prev, pager,next"
 								:total="total " @size-change="handleSizeChange" @current-change="handleCurrentChange" />
 						</div>
 					</div>
@@ -301,7 +305,7 @@
 		data() {
 			return {
 				currentPage: 1,
-				total: 100,
+				total: 0,
 				flag: false,
 				pageSize: 10,
 				ggXin: false,
@@ -318,8 +322,6 @@
 					appKey: '', //appkey
 					notes: '', //备注
 				},
-				planName: '',
-				channelName: '', //查询
 				fenrules: {
 					classificationName: [{
 							required: true,
@@ -358,6 +360,8 @@
 				},
 				tableData: [],
 				pageindex: {
+					channelName:'',
+					notes:'',
 					pageNumber: 1,
 					pageSize: 10
 				},
@@ -506,14 +510,9 @@
 				)
 
 			},
-			async onSubmit() {
-				let num = this.fenleiInex
-				this.pageindex.channelName = this.channelName
+			 onSubmit() {
+				this.currentPage = 1
 				this.getAll(this.pageindex)
-				// this.pageindex.channelClassification = this.fenlei[num]
-				// let res = await 
-				// this.tableData = res.data.content
-				// this.total = res.data.content.length
 			},
 			handleSizeChange(val) {
 				this.pageSize = val
@@ -559,10 +558,12 @@ this.currentPage = val
 			},
 			chong() {
 				this.pageindex = {
+					channelName:'',
+					notes:'',
 					pageNumber: 1,
 					pageSize: 10
 				}
-				this.channelName = ''
+				this.currentPage = 1
 				this.getAll()
 			},
 			handleClick(tab, event) {
@@ -768,6 +769,8 @@ this.currentPage = val
 	.fenye {
 		margin-top: 20px;
 		position: relative;
+		display: flex;
+		justify-content: space-between;
 	}
 
 	/deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
@@ -807,9 +810,6 @@ this.currentPage = val
 		line-height: 20px;
 	}
 
-	/deep/ .el-pagination__total {
-		float: left;
-	}
 
 	/deep/ .bg-purple {
 		background: #fff;
diff --git a/admin-web-master/src/views/promotion/audit.vue b/admin-web-master/src/views/promotion/audit.vue
index 6e7e2f3..779fd1f 100644
--- a/admin-web-master/src/views/promotion/audit.vue
+++ b/admin-web-master/src/views/promotion/audit.vue
@@ -8,9 +8,20 @@
         <!-- 搜索 -->
         <div class="formSearch">
           <div class="demo-input-suffix">
-            <div style="width: 70px;line-height:26px;">方案名称</div>
-            <el-input placeholder="请输入"  v-model="planName" style="width:168px;">
-            </el-input>
+       <div style="width: 68px;height:36px;line-height:32px;">方案名称</div>
+       <el-input placeholder="请输入" v-model="pageindex.schemeTitle" style="width:168px;">
+       </el-input>
+       <div style="width: 52px;height:36px;line-height:36px;margin-left: 10px;">创建人</div>
+       <el-input placeholder="请输入" v-model="pageindex.createUser" style="width:168px;">
+       </el-input>
+       <div style="width: 38px;height:36px;line-height:36px;margin-left: 10px;">状态</div>
+       <el-select v-model="pageindex.state" placeholder="请选择"
+          style="width:168px">
+         <el-option label="待提交" value="1"></el-option>
+         <el-option label="待审批" value="2"></el-option>
+         <el-option label="审核通过" value="5"></el-option>
+         <el-option label="已驳回" value="6"></el-option>
+       </el-select>
           </div>
           <div>
             <el-button @click="onSubmit"  style="background-color: #3F9B6A;color: #fff">查询
@@ -501,6 +512,9 @@ components: { wangEditor},
         }],
         tableData2: [],
         pageindex: {
+			schemeTitle:'',
+			createUser:'',
+			state:'',
           pageNumber: 0,
           pageSize: 10,
         },
@@ -562,17 +576,9 @@ components: { wangEditor},
 
       },
       //查询
-      async onSubmit() {
-        if (this.planName != '') {
-       const res = await tuiGetAll({
-         schemeTitle: this.planName,
-         pageNumber: 0,
-         pageSize: 10,
-       })
-          this.tableData = res.data.content
-		  this.total = res.data.totalElements
-        }
-      },
+       onSubmit() {
+		  this.getAll()
+	  },
       transformData(data) {
           return data.map(item => ({
             ...item.cereClassification,
@@ -660,8 +666,13 @@ components: { wangEditor},
      },
       //重置按钮
       resetting() {
-        this.planName = ''
-        this.eventTheme = ''
+        this.pageindex = {
+			schemeTitle:'',
+			createUser:'',
+			state:'',
+          pageNumber: 0,
+          pageSize: 10,
+        }
         this.getAll()
       },
 actSp(item){
diff --git a/admin-web-master/src/views/promotion/contentMant.vue b/admin-web-master/src/views/promotion/contentMant.vue
index 63c9e8f..c4e7267 100644
--- a/admin-web-master/src/views/promotion/contentMant.vue
+++ b/admin-web-master/src/views/promotion/contentMant.vue
@@ -8,8 +8,18 @@
     <div class="formSearch">
       <div class="demo-input-suffix">
         <div style="width: 68px;height:36px;line-height:32px;">渠道分类</div>
-        <el-input placeholder="请输入" v-model="chaName" style="width:168px;">
+        <el-input placeholder="请输入" v-model="pageindex.channelCategory" style="width:168px;">
         </el-input>
+		<div style="width: 68px;height:36px;line-height:36px;margin-left: 10px;">内容分类</div>
+			<el-select v-model="pageindex.contentCategory" placeholder="请选择"
+			  style="width:168px">
+			  <el-option v-for="(item,index) in contentClassificationList" :key="index" :label="item.label" :value="item.value"></el-option>
+			</el-select>
+		<div style="width: 68px;height:36px;line-height:36px;margin-left: 10px;">渠道类型</div>
+			<el-select v-model="pageindex.channelType" placeholder="请选择"
+			   style="width:168px">
+			  <el-option v-for="(item,index) in channelTypeList" :key="index" :label="item.label" :value="item.value"></el-option>
+			</el-select>
       </div>
       </el-form-item>
       </el-form>
@@ -63,11 +73,11 @@
 	     <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
 	        :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
 	        align="left">
-	       <el-table-column label="序号"  min-width="100" prop="id" >
+	       <!-- <el-table-column label="序号"  min-width="100" prop="id" >
 	         <template slot-scope="scope">
 	           {{scope.$index +1 }}
 	           </template>
-	       </el-table-column>
+	       </el-table-column> -->
 	       <el-table-column label="渠道分类" prop="channelCategory"  show-overflow-tooltip  min-width="150">
 	       </el-table-column>
 	       <el-table-column label="内容分类" prop="contentCategory"  min-width="120">
@@ -82,7 +92,7 @@
 	 
 	       </el-table-column>
 	 
-	       <el-table-column label="操作"  min-width="250" fixed="right">
+	       <el-table-column label="操作"  min-width="150" fixed="right">
 	         <template slot-scope="scope">
 	           <div @click="addbuss(2,scope.row)" class="tableBtn greens">查看</div>
 	           <div @click="addbuss(3,scope.row)" class="tableBtn greens">修改</div>
@@ -91,7 +101,8 @@
 	       </el-table-column>
 	     </el-table>
 	     <div class="fenye">
-	       <el-pagination class="pagination" :hide-on-single-page="flag" background small :current-page="currentPage" :page-size="pageSize" layout="total,->,prev, pager,next" :total="total "
+			 <div style="line-height: 200%;">共{{total}}条</div>
+	       <el-pagination class="pagination" :hide-on-single-page="flag" background  :current-page="currentPage" :page-size="pageSize" layout="prev, pager,next" :total="total"
 	         @size-change="handleSizeChange" @current-change="handleCurrentChange" />
 	     </div>
 	   </div>
@@ -125,7 +136,7 @@
 
             </el-table-column>
 
-            <el-table-column label="操作" min-width="250" fixed="right">
+            <el-table-column label="操作" min-width="180" fixed="right">
               <template slot-scope="scope">
                 <div @click="shiyong(1,scope.row)" class="tableBtn greens">使用</div>
                 <div @click="addbuss(2,scope.row)" class="tableBtn greens">查看</div>
@@ -324,7 +335,7 @@
       return {
         uploadFileUrl: uploadUrl, // 请求地址
         currentPage: 1,
-        total: 100,
+        total: 0,
         flag: false,
         pageSize: 10,
         ggXin: false,
@@ -365,6 +376,9 @@
         },
         tableData: [],
         pageindex: {
+			channelCategory:'',
+			contentCategory:'',
+			channelType:'',
           pageNumber: 1,
           pageSize: 10,
 		  draftStatus:1,
@@ -569,11 +583,9 @@
         )
 
       },
-      async onSubmit() {
-      this.pageindex.channelCategory = this.chaName
-        let res = await contentAll(this.pageindex)
-        this.tableData = res.data.content
-        this.total = res.data.content.length
+       onSubmit() {
+		  this.currentPage = 1
+		  this.getAll(this.pageindex)
       },
       handleSizeChange(val) {
 
@@ -619,11 +631,14 @@ this.currentPage  =val
       },
       chong() {
         this.pageindex = {
+			channelCategory:'',
+			contentCategory:'',
+			channelType:'',
           pageNumber: 1,
           pageSize: 10,
 		  draftStatus:1,
         }
-        this.chaName = ''
+        this.currentPage = 1
         this.getAll()
       },
       handleClick(tab, event){
@@ -837,9 +852,11 @@ this.currentPage  =val
   }
 
   .fenye {
-    margin-top: 20px;
-    position: relative;
-  }
+		margin-top: 20px;
+		position: relative;
+		display: flex;
+		justify-content: space-between;
+	}
 
   /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
     background-color: #3F9B6A;
diff --git a/admin-web-master/src/views/serve/MarkActivity/index.vue b/admin-web-master/src/views/serve/MarkActivity/index.vue
index 28dc3f2..4423a3b 100644
--- a/admin-web-master/src/views/serve/MarkActivity/index.vue
+++ b/admin-web-master/src/views/serve/MarkActivity/index.vue
@@ -43,11 +43,6 @@
 
         <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-          <el-table-column label="序号" min-width="150">
-            <template slot-scope="scope">
-              {{scope.$index +1 }}
-            </template>
-          </el-table-column>
           <el-table-column label="活动标题" min-width="200" prop="title">
           </el-table-column>
           <el-table-column label="场地名称" min-width="150" >
@@ -90,7 +85,7 @@
           </el-table-column>
         </el-table>
         <div class="fenye">
-          <el-pagination :hide-on-single-page='flag' background small size="mini" :current-page="currentPage"
+          <el-pagination :hide-on-single-page='flag' background  :current-page="currentPage"
              layout="prev, pager, next,total" :total="total "
              @current-change="handleCurrentChange" />
         </div>
@@ -151,11 +146,11 @@
                     <div style="padding:20px;">
                       <el-table :data="addziyuanData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
                         :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-                        <el-table-column label="序号" width="80">
+                        <!-- <el-table-column label="序号" width="80">
                           <template slot-scope="scope">
                             {{scope.$index + 1}}
                           </template>
-                        </el-table-column>
+                        </el-table-column> -->
 
                         <el-table-column label="场地名称" prop="venueName" >
 
@@ -255,11 +250,11 @@
                   <div style="padding:20px;">
                     <el-table :data="addziyuanData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
                       :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-                      <el-table-column label="序号" width="80">
+                      <!-- <el-table-column label="序号" width="80">
                         <template slot-scope="scope">
                           {{scope.$index + 1}}
                         </template>
-                      </el-table-column>
+                      </el-table-column> -->
                       <el-table-column label="场地名称" prop="venueName" >
                       </el-table-column>
                       <el-table-column label="所属区域" prop="district" >
@@ -330,11 +325,11 @@
             <el-radio v-model="selectedRow" inert :label="scope.row" >&nbsp;</el-radio>
           </template>
         </el-table-column>
-                  <el-table-column label="序号" width="80">
+                  <!-- <el-table-column label="序号" width="80">
                     <template slot-scope="scope">
                       {{scope.$index + 1}}
                     </template>
-                  </el-table-column>
+                  </el-table-column> -->
 
                   <el-table-column label="场地名称" prop="venueName">
 
@@ -387,11 +382,11 @@
         <div style="padding:20px;">
           <el-table :data="mingList.slice((mingPage - 1) * pageSize, mingPage * pageSize)"
             :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-            <el-table-column label="序号" min-width="150">
+            <!-- <el-table-column label="序号" min-width="150">
               <template slot-scope="scope">
                 {{scope.$index +1 }}
               </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column label="联系人" prop="userName" min-width="150">
 
             </el-table-column>
diff --git a/admin-web-master/src/views/serve/Merchant/index.vue b/admin-web-master/src/views/serve/Merchant/index.vue
index 7ed987f..f28b9d3 100644
--- a/admin-web-master/src/views/serve/Merchant/index.vue
+++ b/admin-web-master/src/views/serve/Merchant/index.vue
@@ -46,11 +46,7 @@
 
         <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-          <el-table-column label="序号" min-width="150">
-            <template slot-scope="scope">
-              {{scope.$index +1 }}
-            </template>
-          </el-table-column>
+          
           <el-table-column label="商务合作标题" min-width="150" prop="title">
           </el-table-column>
           <el-table-column label="场地名称" min-width="150">
@@ -150,11 +146,11 @@
                     <div style="padding: 15px;">
                       <div style="padding: 0px 20px 0px 0px">
                         <el-table :data="addziyuanData" :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-                          <el-table-column label="序号" width="50">
+                          <!-- <el-table-column label="序号" width="50">
                             <template slot-scope="scope">
                               {{scope.$index + 1}}
                             </template>
-                          </el-table-column>
+                          </el-table-column> -->
                           <el-table-column label="场地名称" prop="venueName">
                           </el-table-column>
                           <el-table-column label="所属区域" prop="district">
@@ -273,11 +269,11 @@
                     <div style="padding: 15px;">
                       <div style="padding: 0px 20px 0px 0px">
                         <el-table :data="addziyuanData" :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-                          <el-table-column label="序号" width="50">
+                          <!-- <el-table-column label="序号" width="50">
                             <template slot-scope="scope">
                               {{scope.$index + 1}}
                             </template>
-                          </el-table-column>
+                          </el-table-column> -->
                           <el-table-column label="场地名称" prop="venueName">
                           </el-table-column>
                           <el-table-column label="所属区域" prop="district">
diff --git a/admin-web-master/src/views/serve/PerWorkstation/index.vue b/admin-web-master/src/views/serve/PerWorkstation/index.vue
index aae4d1a..4dcb346 100644
--- a/admin-web-master/src/views/serve/PerWorkstation/index.vue
+++ b/admin-web-master/src/views/serve/PerWorkstation/index.vue
@@ -35,11 +35,7 @@
             )
           " :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
           style="width: 100%">
-          <el-table-column label="序号" width="80px" align="center">
-            <template slot-scope="scope">
-              {{scope.$index+1}}
-            </template>
-          </el-table-column>
+          
           <el-table-column label="标题" prop="title"  />
           <el-table-column label="接收商家" prop="receiverMerchant" />
           <!--  <el-table-column label="发布类型" prop="postType" width="auto" min-width="12%" />
@@ -194,7 +190,7 @@
         </el-dialog>
 
         <div class="fenye">
-          <el-pagination class="pagination" :hide-on-single-page="flag" background small :current-page="currentPage"
+          <el-pagination class="pagination" :hide-on-single-page="flag" background  :current-page="currentPage"
             :page-sizes="[10, 20, 50, 100]" layout="prev, pager, next,total" :total="total"
             @size-change="handleSizeChange" @current-change="handleCurrentChange" />
         </div>
diff --git a/admin-web-master/src/views/serve/actSp.vue b/admin-web-master/src/views/serve/actSp.vue
index 0f1b164..989e269 100644
--- a/admin-web-master/src/views/serve/actSp.vue
+++ b/admin-web-master/src/views/serve/actSp.vue
@@ -9,13 +9,16 @@
         <!-- 搜索 -->
         <div class="formSearch">
           <div class="demo-input-suffix">
-            <div style="width: 68px;height:36px;line-height:32px;">活动时间</div>
+			  <div style="width: 68px;height:36px;line-height:32px;">活动名称</div>
+			  <el-input v-model="formSel.activityName" placeholder="请输入" style="width:168px;" />
+			  <div style="width: 68px;height:36px;line-height:32px;margin-left: 10px;">举办区域</div>
+			  <el-input v-model="formSel.region" placeholder="请输入" style="width:168px;" />
+            <div style="width: 68px;height:36px;line-height:32px;margin-left: 10px;">活动时间</div>
             <el-date-picker style="width:200px;margin-right:15px;" v-model="plan_Time"
               value-format="yyyy-MM-dd HH:mm:ss" prefix-icon="none" type="datetimerange" range-separator="-"
               start-placeholder="开始日期" end-placeholder="结束日期">
             </el-date-picker>
-            <div style="width: 68px;height:36px;line-height:32px;">举办区域</div>
-            <el-input v-model="formSel.region" placeholder="请输入" style="width:168px;" />
+           
           </div>
           <div>
             <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询
@@ -28,11 +31,11 @@
         <!-- 表格 -->
         <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-          <el-table-column label="序号" width="100">
+          <!-- <el-table-column label="序号" width="100">
             <template slot-scope="scope">
               {{scope.$index + 1}}
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="活动名称" prop="activityName" min-width="200">
 
           </el-table-column>
@@ -65,7 +68,7 @@
         </el-table>
         <div class="fenye">
           <div style="line-height: 200%;">共{{total}}条</div>
-          <el-pagination class="pagination" :hide-on-single-page="flag" background small :current-page="currentPage"
+          <el-pagination class="pagination" :hide-on-single-page="flag" background  :current-page="currentPage"
             :page-sizes="[10, 20, 50, 100]" layout="prev, pager,next" :total="total " @size-change="handleSizeChange"
             @current-change="handleCurrentChange" />
         </div>
@@ -289,11 +292,11 @@
         <div style="padding:20px;">
           <el-table :data="mingList"
             :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-            <el-table-column label="序号" min-width="150">
+            <!-- <el-table-column label="序号" min-width="150">
               <template slot-scope="scope">
                 {{scope.$index +1 }}
               </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column label="联系人" prop="signUpName" min-width="150">
 
             </el-table-column>
@@ -350,6 +353,7 @@
         upload: uploadUrl,
         plan_Time: [],
         formSel: {
+			activityName:'',
           region: '',
           pageNumber: 0,
           pageSize: 10,
@@ -439,6 +443,7 @@
       //重置按钮
       resetting() {
         this.formSel = {
+			activityName:'',
           region: '',
           pageNumber: 1,
           pageSize: 10,
diff --git a/admin-web-master/src/views/serve/kefuServe/index.vue b/admin-web-master/src/views/serve/kefuServe/index.vue
index bf5c9d1..24fb555 100644
--- a/admin-web-master/src/views/serve/kefuServe/index.vue
+++ b/admin-web-master/src/views/serve/kefuServe/index.vue
@@ -22,11 +22,11 @@
                 )
               " :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
               style="width: 100%">
-              <el-table-column label="序号" width="auto" min-width="6%" align="center">
+              <!-- <el-table-column label="序号" width="auto" min-width="6%" align="center">
                 <template slot-scope="scope">
                   {{scope.$index+1}}
                 </template>
-              </el-table-column>
+              </el-table-column> -->
               <el-table-column label="报修类型" prop="deviceType" width="auto" min-width="12%" />
               <el-table-column label="问题描述" prop="warrantyIssue" width="auto" min-width="12%" />
     <el-table-column label="设备名称" prop="deviceName" width="auto" min-width="12%" />
@@ -64,11 +64,11 @@
                 )
               " :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
               style="width: 100%">
-              <el-table-column label="序号" width="auto" min-width="6%" align="center">
+              <!-- <el-table-column label="序号" width="auto" min-width="6%" align="center">
                 <template slot-scope="scope">
                   {{scope.$index+1}}
                 </template>
-              </el-table-column>
+              </el-table-column> -->
               <el-table-column label="投诉类型" prop="complaintType" width="auto" min-width="12%" />
               <el-table-column label="问题描述" prop="problemDescription" width="auto" min-width="12%" />
               <el-table-column label="备注" prop="remark" width="auto" min-width="12%" />
diff --git a/admin-web-master/src/views/serve/procedure.vue b/admin-web-master/src/views/serve/procedure.vue
index 3d3f33d..8019f4f 100644
--- a/admin-web-master/src/views/serve/procedure.vue
+++ b/admin-web-master/src/views/serve/procedure.vue
@@ -5,6 +5,41 @@
 				<div style="color:#0006"> <span>客服服务管理</span> <span style="padding:0 5px;">></span> <span
 						style="color:#000000e6">公告通知发布</span></div>
 			</div>
+			<div class="formSearch">
+			  <el-form
+			    :inline="true"
+			    :model="pageindex"
+			    label-position="left"
+			  >
+			  <el-form-item label="标题" >
+			   <el-input
+			     placeholder="请输入"
+			  
+			     v-model="pageindex.announcementTitle">
+			   </el-input>
+			  </el-form-item>
+
+			    <el-form-item label="信息类型">
+			     <el-select v-model="pageindex.informationType" placeholder="请选择" style="width:168px;" >
+			     	<el-option v-for="(item,index) in informationTypeList" :key="index" :label="item.label" :value="item.value"></el-option>
+			     </el-select>
+			    </el-form-item>
+			
+			  </el-form>
+			  <div>
+			    <el-button
+			      style="background-color: #3F9B6A;color: #fff;"
+			      @click="search"
+			      >查询
+			    </el-button>
+			    <el-button
+			     class="buttonHover"
+			       style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
+			      @click="resetting"
+			      >重置
+			    </el-button>
+			  </div>
+			</div>
 			<div>
 				<!-- 搜索 -->
 				<div style="margin-bottom:20px;">
@@ -20,16 +55,16 @@
             )
           " :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
 					style="width: 100%">
-					<el-table-column label="序号" width="auto" min-width="6%" align="center">
+					<!-- <el-table-column label="序号" width="auto" min-width="6%" align="center">
 						<template slot-scope="scope">
 							{{scope.$index+1}}
 						</template>
-					</el-table-column>
+					</el-table-column> -->
 					<el-table-column label="标题" prop="announcementTitle" width="auto" min-width="12%" />
 					<el-table-column label="信息类型" prop="informationType" width="auto" min-width="12%" />
 					<el-table-column label="创建时间" prop="releaseTime" width="auto" min-width="12%" />
 
-					<el-table-column label="操作" width="auto" min-width="17%">
+					<el-table-column label="操作" width="auto" min-width="8%">
 						<template slot-scope="scope">
 							<div class="tableBtn greens" @click="handleEditForm(scope.row)">
 								查看
@@ -114,13 +149,14 @@
                               ">
 													{{secondData.informationType}}
 												</div>
-												<el-select v-model="secondData.informationType" placeholder="请选择"
-													style="width:100%;" v-else>
-													<el-option label="通知" value="通知" />
+												<el-select v-model="secondData.informationType" placeholder="请选择" style="width:100%;" v-else>
+													<!-- <el-option label="通知" value="通知" />
 													<el-option label="热点租赁信息" value="热点租赁信息" />
 													<el-option label="广告信息" value="广告信息" />
-													<el-option label="活动信息" value="活动信息" />
+													<el-option label="活动信息" value="活动信息" /> -->
+													<el-option v-for="(item,index) in informationTypeList" :key="index" :label="item.label" :value="item.value"></el-option>
 												</el-select>
+												
 											</el-form-item>
 										</el-form>
 									</el-col>
@@ -224,7 +260,7 @@
 				</el-dialog>
 
 				<div class="fenye">
-					<el-pagination class="pagination" :hide-on-single-page="flag" background small
+					<el-pagination class="pagination" :hide-on-single-page="flag" background 
 						:current-page="currentPage" :page-sizes="[10, 20, 50, 100]" layout="prev, pager, next,total"
 						:total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
 				</div>
@@ -269,12 +305,14 @@
 					releaseTime: '' //时间
 				},
 				currentPage: 1,
-				total: 100,
+				total: 0,
 				flag: false,
 				pageSize: 10,
 				tableData: [],
 				msgid: '',
 				pageindex: {
+					announcementTitle:'',
+					informationType:'',
 					pageNumber: 1,
 					pageSize: 10,
 				},
@@ -333,6 +371,20 @@
 				this.tableData = res.data.content
 				this.total = res.data.content.length
 			},
+			search(){
+				this.currentPage = 1
+				this.getAll()
+			},
+			resetting(){
+				this.pageindex =  {
+					announcementTitle:'',
+					informationType:'',
+					pageNumber: 1,
+					pageSize: 10,
+				}
+				this.currentPage = 1
+				this.getAll()
+			},
 			// 编辑
 			bianji() {
 				if (this.edit) {
@@ -349,8 +401,7 @@
 				}
 			},
 
-			// 查询
-			async onSubmit() {},
+		
 
 			// 详情点击
 			async handleEditForm(item) {
@@ -431,16 +482,6 @@
 				console.log(file, fileList);
 			},
 
-			// 重置按钮
-			resetting() {
-				this.formSel = {
-					affiliation: '',
-					createUser: '',
-					createDate: '',
-					contacts: '',
-				};
-				this.getAll();
-			}
 		},
 	};
 </script>
@@ -456,21 +497,26 @@
 		background-color: #fff;
 	}
 
-	/deep/ .el-form-item__content {
+/* 	/deep/ .el-form-item__content {
 		width: 80%;
-	}
+	} */
 
 	.tableBtn {
 		display: inline-block;
 		margin-right: 10px;
 	}
 
-	.formSearch {
-		display: flex;
-		width: 100%;
-		font-size: 14px;
-		justify-content: space-between;
-	}
+::v-deep .formSearch {
+  position: relative;
+  display: flex;
+  width: 100%;
+  font-size: 14px;
+  justify-content: space-between;
+  .el-form-item__label{
+    font-size: 14px;
+    color: #000;
+  }
+}
 
 	.greens {
 		color: #3f9b6a;
diff --git a/admin-web-master/src/views/serve/salesReport.vue b/admin-web-master/src/views/serve/salesReport.vue
index 5fd50ac..62d3afb 100644
--- a/admin-web-master/src/views/serve/salesReport.vue
+++ b/admin-web-master/src/views/serve/salesReport.vue
@@ -58,9 +58,9 @@
             tooltip-effect="dark"
 
           >
-            <el-table-column label="序号" width="50">
+            <!-- <el-table-column label="序号" width="50">
               <template slot-scope="scope">{{ scope.$index +1 }}</template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column prop="productName" label="商品名称" width="180" />
             <el-table-column prop="brand" label="品牌" width="180" show-overflow-tooltip />
             <el-table-column prop="productType" label="商品类型" show-overflow-tooltip />
diff --git a/admin-web-master/src/views/stockControl/stocksForewarn/index.vue b/admin-web-master/src/views/stockControl/stocksForewarn/index.vue
index 2ed54b9..2ff46f7 100644
--- a/admin-web-master/src/views/stockControl/stocksForewarn/index.vue
+++ b/admin-web-master/src/views/stockControl/stocksForewarn/index.vue
@@ -60,15 +60,7 @@
             </template>
           </el-table-column>
           <el-table-column prop="productName" label="商品名称" min-width="10%" />
-          <el-table-column
-            prop="stockNumber"
-            label="属性"
-            show-overflow-tooltip
-            min-width="8%">
-          <template slot-scope="scope">
-            属性:1
-            </template>
-              </el-table-column>
+          
           <el-table-column
             prop="stockNumber"
             label="库存数量"
--
libgit2 0.21.4