webapp / GreenwayWeb

Commit a67407bcb87d4ffa90cedf314fbe8d442ef34494

Authored by 杨鑫
1 parent 981fc108

最新

Inline Side-by-side
Showing 23 changed files with 430 additions and 390 deletions
admin-web-master/src/App.vue
  View file @a67407b
@@ -77,7 +77,7 @@ @@ -77,7 +77,7 @@
77 this.$router.push({ 77 this.$router.push({
78 path: '/investigation/index' 78 path: '/investigation/index'
79 }) 79 })
80 - 80 +
81 }) 81 })
82 82
83 }, 83 },
admin-web-master/src/views/activity/activityBian.vue
  View file @a67407b
@@ -110,11 +110,11 @@ @@ -110,11 +110,11 @@
110 <el-table :data="tableDa" 110 <el-table :data="tableDa"
111 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" 111 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
112 style="width: 100%"> 112 style="width: 100%">
113 - <el-table-column label="序号" width="auto" min-width="5%" prop="date" align="center"> 113 + <!-- <el-table-column label="序号" width="auto" min-width="5%" prop="date" align="center">
114 <template slot-scope="scope"> 114 <template slot-scope="scope">
115 {{scope.$index + 1}} 115 {{scope.$index + 1}}
116 </template> 116 </template>
117 - </el-table-column> 117 + </el-table-column> -->
118 <el-table-column label="明细项名称" prop="detailLtemName" width="auto" min-width="22%"> 118 <el-table-column label="明细项名称" prop="detailLtemName" width="auto" min-width="22%">
119 119
120 </el-table-column> 120 </el-table-column>
@@ -264,11 +264,11 @@ @@ -264,11 +264,11 @@
264 <el-table :data="dataList" 264 <el-table :data="dataList"
265 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" 265 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
266 style="width: 100%"> 266 style="width: 100%">
267 - <el-table-column label="序号" width="auto" min-width="7%" prop="date" align="center"> 267 + <!-- <el-table-column label="序号" width="auto" min-width="7%" prop="date" align="center">
268 <template slot-scope="scope"> 268 <template slot-scope="scope">
269 {{scope.$index +1}} 269 {{scope.$index +1}}
270 </template> 270 </template>
271 - </el-table-column> 271 + </el-table-column> -->
272 <el-table-column label="附件名称" prop="attachmentName" width="auto" min-width="75%"> 272 <el-table-column label="附件名称" prop="attachmentName" width="auto" min-width="75%">
273 </el-table-column> 273 </el-table-column>
274 <el-table-column label="操作" width="auto" min-width="18%"> 274 <el-table-column label="操作" width="auto" min-width="18%">
admin-web-master/src/views/activity/activityBz.vue
  View file @a67407b
@@ -145,11 +145,11 @@ @@ -145,11 +145,11 @@
145 <el-table :data="tableData" 145 <el-table :data="tableData"
146 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" 146 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
147 style="width: 100%"> 147 style="width: 100%">
148 - <el-table-column label="序号" width="auto" min-width="5%" align="center"> 148 + <!-- <el-table-column label="序号" width="auto" min-width="5%" align="center">
149 <template slot-scope="scope"> 149 <template slot-scope="scope">
150 {{scope.$index + 1}} 150 {{scope.$index + 1}}
151 </template> 151 </template>
152 - </el-table-column> 152 + </el-table-column> -->
153 <el-table-column label="明细项名称" prop="detailLtemName" width="auto" min-width="22%"> 153 <el-table-column label="明细项名称" prop="detailLtemName" width="auto" min-width="22%">
154 154
155 </el-table-column> 155 </el-table-column>
@@ -317,11 +317,11 @@ @@ -317,11 +317,11 @@
317 <el-table :data="dataList" 317 <el-table :data="dataList"
318 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" 318 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
319 style="width: 100%"> 319 style="width: 100%">
320 - <el-table-column label="序号" width="auto" min-width="7%" align="center"> 320 + <!-- <el-table-column label="序号" width="auto" min-width="7%" align="center">
321 <template slot-scope="scope"> 321 <template slot-scope="scope">
322 {{scope.$index + 1}} 322 {{scope.$index + 1}}
323 </template> 323 </template>
324 - </el-table-column> 324 + </el-table-column> -->
325 <el-table-column label="附件名称" prop="name" width="auto" min-width="75%"> 325 <el-table-column label="附件名称" prop="name" width="auto" min-width="75%">
326 <template slot-scope="scope"> 326 <template slot-scope="scope">
327 {{scope.row.name}} 327 {{scope.row.name}}
admin-web-master/src/views/activity/activityHis.vue
  View file @a67407b
@@ -9,11 +9,20 @@ @@ -9,11 +9,20 @@
9 <!-- 搜索 --> 9 <!-- 搜索 -->
10 <div class="formSearch"> 10 <div class="formSearch">
11 <div class="demo-input-suffix"> 11 <div class="demo-input-suffix">
12 - <div v-if="searPei.name" style="display: flex;"> 12 + <!-- <div v-if="searPei.name" style="display: flex;">
13 <div style="width: 68px;height:36px;line-height:36px;">方案名称</div> 13 <div style="width: 68px;height:36px;line-height:36px;">方案名称</div>
14 <el-input placeholder="请输入" v-model="formSear.planName" style="width:168px;"> 14 <el-input placeholder="请输入" v-model="formSear.planName" style="width:168px;">
15 </el-input> 15 </el-input>
16 - </div> 16 + </div> -->
  17 + <div style="width: 68px;height:36px;line-height:36px;">方案名称</div>
  18 + <el-input placeholder="请输入" v-model="pageindex.planName" style="width:168px;">
  19 + </el-input>
  20 + <div style="width: 68px;height:36px;line-height:36px;margin-left: 10px;">活动地点</div>
  21 + <el-input placeholder="请输入" v-model="pageindex.eventAddrs" style="width:168px;">
  22 + </el-input>
  23 + <div style="width: 75px;height:36px;line-height:36px;margin-left: 10px;">活动主办方</div>
  24 + <el-input placeholder="请输入" v-model="pageindex.sponsor" style="width:168px;">
  25 + </el-input>
17 <!-- <div v-if="searPei.lei" style="display: flex;"> 26 <!-- <div v-if="searPei.lei" style="display: flex;">
18 <div style="width: 68px;height:36px;line-height:36px;">方案类型</div> 27 <div style="width: 68px;height:36px;line-height:36px;">方案类型</div>
19 <el-input placeholder="请输入" v-model="planName" style="width:168px;"> 28 <el-input placeholder="请输入" v-model="planName" style="width:168px;">
@@ -193,11 +202,11 @@ @@ -193,11 +202,11 @@
193 <el-table :data="tableData2" 202 <el-table :data="tableData2"
194 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" 203 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
195 style="width: 100%;margin: auto;"> 204 style="width: 100%;margin: auto;">
196 - <el-table-column label="序号" min-width="5%" align='center'> 205 + <!-- <el-table-column label="序号" min-width="5%" align='center'>
197 <template slot-scope="scope"> 206 <template slot-scope="scope">
198 <span style="">{{ scope.$index +1}}</span> 207 <span style="">{{ scope.$index +1}}</span>
199 </template> 208 </template>
200 - </el-table-column> 209 + </el-table-column> -->
201 <el-table-column label="明细项名称" prop="detailLtemName" min-width="28%"> 210 <el-table-column label="明细项名称" prop="detailLtemName" min-width="28%">
202 </el-table-column> 211 </el-table-column>
203 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%"> 212 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%">
@@ -265,11 +274,11 @@ @@ -265,11 +274,11 @@
265 <el-table :data="tableData6" 274 <el-table :data="tableData6"
266 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" 275 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
267 style="width: 100%;margin: auto;"> 276 style="width: 100%;margin: auto;">
268 - <el-table-column label="序号" min-width="5%" align='center'> 277 + <!-- <el-table-column label="序号" min-width="5%" align='center'>
269 <template slot-scope="scope"> 278 <template slot-scope="scope">
270 <span style="">{{ scope.$index + 1 }}</span> 279 <span style="">{{ scope.$index + 1 }}</span>
271 </template> 280 </template>
272 - </el-table-column> 281 + </el-table-column> -->
273 <el-table-column label="附件名称" prop="attachmentName" min-width="75%"> 282 <el-table-column label="附件名称" prop="attachmentName" min-width="75%">
274 </el-table-column> 283 </el-table-column>
275 <el-table-column label="操作" min-width="20%"> 284 <el-table-column label="操作" min-width="20%">
@@ -846,11 +855,11 @@ @@ -846,11 +855,11 @@
846 <el-table :data="tableData2" 855 <el-table :data="tableData2"
847 :header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}" 856 :header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
848 style="width: 100%;margin: auto;"> 857 style="width: 100%;margin: auto;">
849 - <el-table-column label="序号" min-width="7%" align='center'> 858 + <!-- <el-table-column label="序号" min-width="7%" align='center'>
850 <template slot-scope="scope"> 859 <template slot-scope="scope">
851 <span style="">{{ scope.$index +1}}</span> 860 <span style="">{{ scope.$index +1}}</span>
852 </template> 861 </template>
853 - </el-table-column> 862 + </el-table-column> -->
854 <el-table-column label="明细项名称" prop="detailLtemName" min-width="25%"> 863 <el-table-column label="明细项名称" prop="detailLtemName" min-width="25%">
855 </el-table-column> 864 </el-table-column>
856 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="18%"> 865 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="18%">
@@ -917,11 +926,11 @@ @@ -917,11 +926,11 @@
917 <el-table :data="tableData6" 926 <el-table :data="tableData6"
918 :header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}" 927 :header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
919 style="width: 100%;margin: auto;"> 928 style="width: 100%;margin: auto;">
920 - <el-table-column label="序号" min-width="7%" align='center'> 929 + <!-- <el-table-column label="序号" min-width="7%" align='center'>
921 <template slot-scope="scope"> 930 <template slot-scope="scope">
922 <span style="">{{ scope.$index + 1 }}</span> 931 <span style="">{{ scope.$index + 1 }}</span>
923 </template> 932 </template>
924 - </el-table-column> 933 + </el-table-column> -->
925 <el-table-column label="附件名称" prop="attachmentName" min-width="70%"> 934 <el-table-column label="附件名称" prop="attachmentName" min-width="70%">
926 </el-table-column> 935 </el-table-column>
927 <el-table-column label="操作" min-width="20%"> 936 <el-table-column label="操作" min-width="20%">
@@ -1047,11 +1056,11 @@ @@ -1047,11 +1056,11 @@
1047 <el-table :data="tableData2" 1056 <el-table :data="tableData2"
1048 :header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}" 1057 :header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
1049 style="width: 100%;margin: auto;"> 1058 style="width: 100%;margin: auto;">
1050 - <el-table-column label="序号" min-width="7%" align='center'> 1059 + <!-- <el-table-column label="序号" min-width="7%" align='center'>
1051 <template slot-scope="scope"> 1060 <template slot-scope="scope">
1052 <span style="">{{ scope.$index +1}}</span> 1061 <span style="">{{ scope.$index +1}}</span>
1053 </template> 1062 </template>
1054 - </el-table-column> 1063 + </el-table-column> -->
1055 <el-table-column label="明细项名称" prop="detailLtemName" min-width="25%"> 1064 <el-table-column label="明细项名称" prop="detailLtemName" min-width="25%">
1056 </el-table-column> 1065 </el-table-column>
1057 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="18%"> 1066 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="18%">
@@ -1159,11 +1168,11 @@ @@ -1159,11 +1168,11 @@
1159 <el-table :data="tableData6" 1168 <el-table :data="tableData6"
1160 :header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}" 1169 :header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
1161 style="width: 100%;margin: auto;"> 1170 style="width: 100%;margin: auto;">
1162 - <el-table-column label="序号" min-width="7%" align='center'> 1171 + <!-- <el-table-column label="序号" min-width="7%" align='center'>
1163 <template slot-scope="scope"> 1172 <template slot-scope="scope">
1164 <span style="">{{ scope.$index + 1 }}</span> 1173 <span style="">{{ scope.$index + 1 }}</span>
1165 </template> 1174 </template>
1166 - </el-table-column> 1175 + </el-table-column> -->
1167 <el-table-column label="附件名称" prop="attachmentName" min-width="70%"> 1176 <el-table-column label="附件名称" prop="attachmentName" min-width="70%">
1168 </el-table-column> 1177 </el-table-column>
1169 <el-table-column label="操作" min-width="20%"> 1178 <el-table-column label="操作" min-width="20%">
@@ -1778,6 +1787,9 @@ @@ -1778,6 +1787,9 @@
1778 feedbackContent: '' 1787 feedbackContent: ''
1779 }, //执行效果列表 1788 }, //执行效果列表
1780 pageindex: { 1789 pageindex: {
  1790 + planName:'',
  1791 + eventAddrs:'',
  1792 + sponsor:'',
1781 pageNumber: 1, 1793 pageNumber: 1,
1782 pageSize: 10, 1794 pageSize: 10,
1783 dataOwnership: '1', 1795 dataOwnership: '1',
@@ -1970,9 +1982,10 @@ @@ -1970,9 +1982,10 @@
1970 1982
1971 }, 1983 },
1972 //查询 1984 //查询
1973 - async onSubmit() {  
1974 - const res = await danqueryById(this.formSear)  
1975 - this.tableData = res.data.content 1985 + onSubmit() {
  1986 + this.currentPage = 1
  1987 + this.getAll()
  1988 +
1976 }, 1989 },
1977 formatTimestampToDate(timestamp) { 1990 formatTimestampToDate(timestamp) {
1978 console.log(timestamp,'timestamp') 1991 console.log(timestamp,'timestamp')
@@ -1990,15 +2003,17 @@ @@ -1990,15 +2003,17 @@
1990 }, 2003 },
1991 //重置按钮 2004 //重置按钮
1992 resetting() { 2005 resetting() {
1993 - this.formSear = {  
1994 - planName: '',  
1995 - state: null,  
1996 - dataOwnership: '1', 2006 + this.pageindex={
  2007 + planName:'',
  2008 + eventAddrs:'',
  2009 + sponsor:'',
1997 pageNumber: 1, 2010 pageNumber: 1,
1998 pageSize: 10, 2011 pageSize: 10,
  2012 + dataOwnership: '1',
1999 isDraft: 0, 2013 isDraft: 0,
2000 state: '5' 2014 state: '5'
2001 } 2015 }
  2016 + this.currentPage = 1
2002 this.getAll() 2017 this.getAll()
2003 }, 2018 },
2004 //编辑页 2019 //编辑页
admin-web-master/src/views/activity/activitySp.vue
  View file @a67407b
@@ -9,8 +9,14 @@ @@ -9,8 +9,14 @@
9 <!-- 搜索 --> 9 <!-- 搜索 -->
10 <div class="formSearch"> 10 <div class="formSearch">
11 <div class="demo-input-suffix"> 11 <div class="demo-input-suffix">
12 - <div style="width: 68px;height:36px;line-height:32px;">方案名称</div>  
13 - <el-input placeholder="请输入" v-model="planName" style="width:168px;"> 12 + <div style="width: 68px;height:36px;line-height:36px;">方案名称</div>
  13 + <el-input placeholder="请输入" v-model="pageindex.planName" style="width:168px;">
  14 + </el-input>
  15 + <div style="width: 68px;height:36px;line-height:36px;margin-left: 10px;">活动地点</div>
  16 + <el-input placeholder="请输入" v-model="pageindex.eventAddrs" style="width:168px;">
  17 + </el-input>
  18 + <div style="width: 75px;height:36px;line-height:36px;margin-left: 10px;">活动主办方</div>
  19 + <el-input placeholder="请输入" v-model="pageindex.sponsor" style="width:168px;">
14 </el-input> 20 </el-input>
15 </div> 21 </div>
16 <div> 22 <div>
@@ -647,11 +653,11 @@ @@ -647,11 +653,11 @@
647 <el-table :data="tableData2" 653 <el-table :data="tableData2"
648 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" 654 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
649 style="width: 100%;margin: auto;"> 655 style="width: 100%;margin: auto;">
650 - <el-table-column label="序号" min-width="5%" align='center'> 656 + <!-- <el-table-column label="序号" min-width="5%" align='center'>
651 <template slot-scope="scope"> 657 <template slot-scope="scope">
652 <span style="">{{ scope.$index +1}}</span> 658 <span style="">{{ scope.$index +1}}</span>
653 </template> 659 </template>
654 - </el-table-column> 660 + </el-table-column> -->
655 <el-table-column label="明细项名称" prop="detailLtemName" min-width="28%"> 661 <el-table-column label="明细项名称" prop="detailLtemName" min-width="28%">
656 </el-table-column> 662 </el-table-column>
657 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%"> 663 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%">
@@ -719,11 +725,11 @@ @@ -719,11 +725,11 @@
719 <el-table :data="tableData6" 725 <el-table :data="tableData6"
720 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" 726 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
721 style="width: 100%;margin: auto;"> 727 style="width: 100%;margin: auto;">
722 - <el-table-column label="序号" min-width="5%" align='center'> 728 + <!-- <el-table-column label="序号" min-width="5%" align='center'>
723 <template slot-scope="scope"> 729 <template slot-scope="scope">
724 <span style="">{{ scope.$index + 1 }}</span> 730 <span style="">{{ scope.$index + 1 }}</span>
725 </template> 731 </template>
726 - </el-table-column> 732 + </el-table-column> -->
727 <el-table-column label="附件名称" prop="attachmentName" min-width="75%"> 733 <el-table-column label="附件名称" prop="attachmentName" min-width="75%">
728 </el-table-column> 734 </el-table-column>
729 <el-table-column label="操作" min-width="20%"> 735 <el-table-column label="操作" min-width="20%">
@@ -838,12 +844,12 @@ @@ -838,12 +844,12 @@
838 <el-table :data="tableDa" 844 <el-table :data="tableDa"
839 :header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}" 845 :header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
840 style="width: 100%"> 846 style="width: 100%">
841 - <el-table-column label="序号" width="auto" min-width="5%" prop="date" 847 + <!-- <el-table-column label="序号" width="auto" min-width="5%" prop="date"
842 align="center"> 848 align="center">
843 <template slot-scope="scope"> 849 <template slot-scope="scope">
844 {{scope.$index +1}} 850 {{scope.$index +1}}
845 </template> 851 </template>
846 - </el-table-column> 852 + </el-table-column> -->
847 <el-table-column label="明细项名称" prop="detailLtemName" width="auto" 853 <el-table-column label="明细项名称" prop="detailLtemName" width="auto"
848 min-width="22%"> 854 min-width="22%">
849 855
@@ -1215,7 +1221,10 @@ @@ -1215,7 +1221,10 @@
1215 pageSize: 10, 1221 pageSize: 10,
1216 dataOwnership: '1', 1222 dataOwnership: '1',
1217 isDraft:0, 1223 isDraft:0,
1218 - state:'待提交' 1224 + state:'待提交',
  1225 + planName:'',
  1226 + eventAddrs:'',
  1227 + sponsor:'',
1219 }, 1228 },
1220 multipleSelection: [], 1229 multipleSelection: [],
1221 options: [{ 1230 options: [{
@@ -1319,39 +1328,8 @@ @@ -1319,39 +1328,8 @@
1319 }, 1328 },
1320 //查询 1329 //查询
1321 async onSubmit() { 1330 async onSubmit() {
1322 - if (this.planName != '' && this.eventTheme == '') {  
1323 - const res = await danqueryById({  
1324 - planName: this.planName,  
1325 - dataOwnership: '1',  
1326 - pageNumber: 1,  
1327 - pageSize: 10,  
1328 - isDraft: 0,  
1329 - state: '待提交'  
1330 - })  
1331 - this.tableData = res.data.content  
1332 - } else if (this.planName == '' && this.eventTheme != '') {  
1333 - const res = await danqueryById({  
1334 - eventTheme: this.eventTheme,  
1335 - dataOwnership: '1',  
1336 - pageNumber: 1,  
1337 - pageSize: 10,  
1338 - isDraft: 0,  
1339 - state: '待提交'  
1340 - })  
1341 - this.tableData = res.data.content  
1342 - } else {  
1343 - const res = await danqueryById({  
1344 - planName: this.planName,  
1345 - eventTheme: this.eventTheme,  
1346 - dataOwnership: '1',  
1347 - pageNumber: 1,  
1348 - pageSize: 10,  
1349 - isDraft: 0,  
1350 - state: '待提交'  
1351 - })  
1352 - this.tableData = res.data.content  
1353 - }  
1354 - 1331 + this.currentPage = 1
  1332 + this.getAll()
1355 }, 1333 },
1356 1334
1357 removeEmptyValues(obj) { 1335 removeEmptyValues(obj) {
@@ -1400,8 +1378,18 @@ @@ -1400,8 +1378,18 @@
1400 }, 1378 },
1401 //重置按钮 1379 //重置按钮
1402 resetting() { 1380 resetting() {
1403 - this.planName = ''  
1404 - this.eventTheme = '' 1381 + this.pageindex={
  1382 + pageNumber: 1,
  1383 + pageSize: 10,
  1384 + dataOwnership: '1',
  1385 + isDraft:0,
  1386 + state:'待提交',
  1387 + planName:'',
  1388 + eventAddrs:'',
  1389 + sponsor:'',
  1390 +
  1391 + }
  1392 + this.currentPage = 1
1405 this.getAll() 1393 this.getAll()
1406 }, 1394 },
1407 handleSelectionChange(val) { 1395 handleSelectionChange(val) {
admin-web-master/src/views/activity/index.vue
  View file @a67407b
@@ -10,7 +10,13 @@ @@ -10,7 +10,13 @@
10 <div class="formSearch"> 10 <div class="formSearch">
11 <div class="demo-input-suffix"> 11 <div class="demo-input-suffix">
12 <div style="width: 68px;height:36px;line-height:36px;">方案名称</div> 12 <div style="width: 68px;height:36px;line-height:36px;">方案名称</div>
13 - <el-input placeholder="请输入" v-model="planName" style="width:168px;"> 13 + <el-input placeholder="请输入" v-model="pageindex.planName" style="width:168px;">
  14 + </el-input>
  15 + <div style="width: 68px;height:36px;line-height:36px;margin-left: 10px;">活动地点</div>
  16 + <el-input placeholder="请输入" v-model="pageindex.eventAddrs" style="width:168px;">
  17 + </el-input>
  18 + <div style="width: 75px;height:36px;line-height:36px;margin-left: 10px;">活动主办方</div>
  19 + <el-input placeholder="请输入" v-model="pageindex.sponsor" style="width:168px;">
14 </el-input> 20 </el-input>
15 </div> 21 </div>
16 <div> 22 <div>
@@ -650,11 +656,11 @@ @@ -650,11 +656,11 @@
650 <el-table :data="tableData2" 656 <el-table :data="tableData2"
651 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" 657 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
652 style="width: 100%;margin: auto;"> 658 style="width: 100%;margin: auto;">
653 - <el-table-column label="序号" min-width="5%" align='center'> 659 + <!-- <el-table-column label="序号" min-width="5%" align='center'>
654 <template slot-scope="scope"> 660 <template slot-scope="scope">
655 <span style="">{{ scope.$index +1}}</span> 661 <span style="">{{ scope.$index +1}}</span>
656 </template> 662 </template>
657 - </el-table-column> 663 + </el-table-column> -->
658 <el-table-column label="明细项名称" prop="detailLtemName" min-width="28%"> 664 <el-table-column label="明细项名称" prop="detailLtemName" min-width="28%">
659 </el-table-column> 665 </el-table-column>
660 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%"> 666 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%">
@@ -721,11 +727,11 @@ @@ -721,11 +727,11 @@
721 <el-table :data="tableData6" 727 <el-table :data="tableData6"
722 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" 728 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
723 style="width: 100%;margin: auto;"> 729 style="width: 100%;margin: auto;">
724 - <el-table-column label="序号" min-width="5%" align='center'> 730 + <!-- <el-table-column label="序号" min-width="5%" align='center'>
725 <template slot-scope="scope"> 731 <template slot-scope="scope">
726 <span style="">{{ scope.$index + 1 }}</span> 732 <span style="">{{ scope.$index + 1 }}</span>
727 </template> 733 </template>
728 - </el-table-column> 734 + </el-table-column> -->
729 <el-table-column label="附件名称" prop="attachmentName" min-width="75%"> 735 <el-table-column label="附件名称" prop="attachmentName" min-width="75%">
730 </el-table-column> 736 </el-table-column>
731 <el-table-column label="操作" min-width="20%"> 737 <el-table-column label="操作" min-width="20%">
@@ -840,11 +846,11 @@ @@ -840,11 +846,11 @@
840 <el-table :data="tableDa" 846 <el-table :data="tableDa"
841 :header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}" 847 :header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
842 style="width: 100%"> 848 style="width: 100%">
843 - <el-table-column label="序号" width="auto" min-width="5%" prop="date" align="center"> 849 + <!-- <el-table-column label="序号" width="auto" min-width="5%" prop="date" align="center">
844 <template slot-scope="scope"> 850 <template slot-scope="scope">
845 {{scope.$index +1}} 851 {{scope.$index +1}}
846 </template> 852 </template>
847 - </el-table-column> 853 + </el-table-column> -->
848 <el-table-column label="明细项名称" prop="detailLtemName" width="auto" min-width="22%"> 854 <el-table-column label="明细项名称" prop="detailLtemName" width="auto" min-width="22%">
849 855
850 </el-table-column> 856 </el-table-column>
@@ -1094,7 +1100,6 @@ @@ -1094,7 +1100,6 @@
1094 fenlei: [], 1100 fenlei: [],
1095 cascaderList: [], 1101 cascaderList: [],
1096 secondData: {}, 1102 secondData: {},
1097 - planName: '',  
1098 planFen: '', 1103 planFen: '',
1099 eventTheme: '', 1104 eventTheme: '',
1100 currentPage: 1, 1105 currentPage: 1,
@@ -1124,14 +1129,6 @@ @@ -1124,14 +1129,6 @@
1124 1129
1125 ], 1130 ],
1126 }, 1131 },
1127 - formInline: {  
1128 - merchantName: '', // 商家名称  
1129 - storeId: '', // 编码  
1130 - contacts: '', // 联系人  
1131 - businessEntity: '', //经营主体  
1132 - page: 1, // 当前页  
1133 - pageSize: 10 // 每页记录数  
1134 - },  
1135 tableData: [], 1132 tableData: [],
1136 id: '', 1133 id: '',
1137 text: '123', 1134 text: '123',
@@ -1242,6 +1239,9 @@ @@ -1242,6 +1239,9 @@
1242 feedbackContent: '' 1239 feedbackContent: ''
1243 }, //执行效果列表 1240 }, //执行效果列表
1244 pageindex: { 1241 pageindex: {
  1242 + planName:'',
  1243 + eventAddrs:'',
  1244 + sponsor:'',
1245 pageNumber: 1, 1245 pageNumber: 1,
1246 pageSize: 10, 1246 pageSize: 10,
1247 dataOwnership: '1', 1247 dataOwnership: '1',
@@ -1437,40 +1437,9 @@ @@ -1437,40 +1437,9 @@
1437 }, 1437 },
1438 1438
1439 //查询 1439 //查询
1440 - async onSubmit() {  
1441 - if (this.planName != '' && this.eventTheme == '') {  
1442 - const res = await danqueryById({  
1443 - planName: this.planName,  
1444 - dataOwnership: '1',  
1445 - pageNumber: 1,  
1446 - pageSize: 10,  
1447 - auditTime: 0,  
1448 - isDraft: 0  
1449 - })  
1450 - this.tableData = res.data.content  
1451 - } else if (this.planName == '' && this.eventTheme != '') {  
1452 - const res = await danqueryById({  
1453 - eventTheme: this.eventTheme,  
1454 - dataOwnership: '1',  
1455 - pageNumber: 1,  
1456 - pageSize: 10,  
1457 - auditTime: 0,  
1458 - isDraft: 0  
1459 - })  
1460 - this.tableData = res.data.content  
1461 - } else {  
1462 - const res = await danqueryById({  
1463 - planName: this.planName,  
1464 - eventTheme: this.eventTheme,  
1465 - dataOwnership: '1',  
1466 - pageNumber: 1,  
1467 - pageSize: 10,  
1468 - auditTime: 0,  
1469 - isDraft: 0  
1470 - })  
1471 - this.tableData = res.data.content  
1472 - }  
1473 - 1440 + onSubmit() {
  1441 + this.currentPage = 1
  1442 + this.getAll()
1474 }, 1443 },
1475 //详情点击 1444 //详情点击
1476 handleEditForm(item, val, flag) { 1445 handleEditForm(item, val, flag) {
@@ -1743,8 +1712,17 @@ @@ -1743,8 +1712,17 @@
1743 }, 1712 },
1744 //重置按钮 1713 //重置按钮
1745 resetting() { 1714 resetting() {
1746 - this.planName = ''  
1747 - this.eventTheme = '' 1715 + this.pageindex={
  1716 + planName:'',
  1717 + eventAddrs:'',
  1718 + sponsor:'',
  1719 + pageNumber: 1,
  1720 + pageSize: 10,
  1721 + dataOwnership: '1',
  1722 + isDraft: 0,
  1723 +
  1724 + }
  1725 + this.currentPage = 1
1748 this.getAll() 1726 this.getAll()
1749 }, 1727 },
1750 handleSelectionChange(val) { 1728 handleSelectionChange(val) {
admin-web-master/src/views/atmosphere/atmosphereBian.vue
  View file @a67407b
@@ -107,11 +107,11 @@ @@ -107,11 +107,11 @@
107 <el-table :data="tableDa" 107 <el-table :data="tableDa"
108 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" 108 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
109 style="width: 100%"> 109 style="width: 100%">
110 - <el-table-column label="序号" width="auto" min-width="5%" align="center"> 110 + <!-- <el-table-column label="序号" width="auto" min-width="5%" align="center">
111 <template slot-scope="scope"> 111 <template slot-scope="scope">
112 {{scope.$index + 1}} 112 {{scope.$index + 1}}
113 </template> 113 </template>
114 - </el-table-column> 114 + </el-table-column> -->
115 <el-table-column label="明细项名称" prop="detailLtemName" width="auto" min-width="22%"> 115 <el-table-column label="明细项名称" prop="detailLtemName" width="auto" min-width="22%">
116 116
117 </el-table-column> 117 </el-table-column>
@@ -258,11 +258,11 @@ @@ -258,11 +258,11 @@
258 <el-table :data="dataList" 258 <el-table :data="dataList"
259 :header-cell-style="{fontSize: '12px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}" 259 :header-cell-style="{fontSize: '12px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
260 style="width: 100%"> 260 style="width: 100%">
261 - <el-table-column label="序号" width="auto" min-width="7%" align="center"> 261 + <!-- <el-table-column label="序号" width="auto" min-width="7%" align="center">
262 <template slot-scope="scope"> 262 <template slot-scope="scope">
263 {{scope.$index +1}} 263 {{scope.$index +1}}
264 </template> 264 </template>
265 - </el-table-column> 265 + </el-table-column> -->
266 <el-table-column label="附件名称" prop="attachmentName" width="auto" min-width="75%"> 266 <el-table-column label="附件名称" prop="attachmentName" width="auto" min-width="75%">
267 </el-table-column> 267 </el-table-column>
268 <el-table-column label="操作" width="auto" min-width="18%"> 268 <el-table-column label="操作" width="auto" min-width="18%">
admin-web-master/src/views/atmosphere/atmosphereBz.vue
  View file @a67407b
@@ -144,11 +144,11 @@ @@ -144,11 +144,11 @@
144 <el-table :data="tableData" 144 <el-table :data="tableData"
145 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" 145 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
146 style="width: 100%"> 146 style="width: 100%">
147 - <el-table-column label="序号" width="auto" min-width="5%" align="center"> 147 + <!-- <el-table-column label="序号" width="auto" min-width="5%" align="center">
148 <template slot-scope="scope"> 148 <template slot-scope="scope">
149 {{scope.$index + 1}} 149 {{scope.$index + 1}}
150 </template> 150 </template>
151 - </el-table-column> 151 + </el-table-column> -->
152 <el-table-column label="明细项名称" prop="detailLtemName" width="auto" min-width="22%"> 152 <el-table-column label="明细项名称" prop="detailLtemName" width="auto" min-width="22%">
153 153
154 </el-table-column> 154 </el-table-column>
@@ -312,11 +312,11 @@ @@ -312,11 +312,11 @@
312 <el-table :data="dataList" 312 <el-table :data="dataList"
313 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" 313 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
314 style="width: 100%"> 314 style="width: 100%">
315 - <el-table-column label="序号" width="auto" min-width="7%" align="center"> 315 + <!-- <el-table-column label="序号" width="auto" min-width="7%" align="center">
316 <template slot-scope="scope"> 316 <template slot-scope="scope">
317 {{scope.$index + 1}} 317 {{scope.$index + 1}}
318 </template> 318 </template>
319 - </el-table-column> 319 + </el-table-column> -->
320 <el-table-column label="附件名称" prop="name" width="auto" min-width="75%"> 320 <el-table-column label="附件名称" prop="name" width="auto" min-width="75%">
321 <template slot-scope="scope"> 321 <template slot-scope="scope">
322 {{scope.row.name}} 322 {{scope.row.name}}
admin-web-master/src/views/atmosphere/atmosphereGl.vue
  View file @a67407b
@@ -9,8 +9,14 @@ @@ -9,8 +9,14 @@
9 <!-- 搜索 --> 9 <!-- 搜索 -->
10 <div class="formSearch"> 10 <div class="formSearch">
11 <div class="demo-input-suffix"> 11 <div class="demo-input-suffix">
12 - <div style="width: 68px;height:36px;line-height:32px;">方案名称</div>  
13 - <el-input placeholder="请输入" v-model="planName" style="width:168px;"> 12 + <div style="width: 68px;height:36px;line-height:36px;">方案名称</div>
  13 + <el-input placeholder="请输入" v-model="pageindex.planName" style="width:168px;">
  14 + </el-input>
  15 + <div style="width: 68px;height:36px;line-height:36px;margin-left: 10px;">活动地点</div>
  16 + <el-input placeholder="请输入" v-model="pageindex.eventAddrs" style="width:168px;">
  17 + </el-input>
  18 + <div style="width: 75px;height:36px;line-height:36px;margin-left: 10px;">活动主办方</div>
  19 + <el-input placeholder="请输入" v-model="pageindex.sponsor" style="width:168px;">
14 </el-input> 20 </el-input>
15 </div> 21 </div>
16 <div> 22 <div>
@@ -643,11 +649,11 @@ @@ -643,11 +649,11 @@
643 <el-table :data="tableData2" 649 <el-table :data="tableData2"
644 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" 650 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
645 style="width: 100%;margin: auto;"> 651 style="width: 100%;margin: auto;">
646 - <el-table-column label="序号" min-width="5%" align='center'> 652 + <!-- <el-table-column label="序号" min-width="5%" align='center'>
647 <template slot-scope="scope"> 653 <template slot-scope="scope">
648 <span style="">{{ scope.$index +1}}</span> 654 <span style="">{{ scope.$index +1}}</span>
649 </template> 655 </template>
650 - </el-table-column> 656 + </el-table-column> -->
651 <el-table-column label="明细项名称" prop="detailLtemName" min-width="28%"> 657 <el-table-column label="明细项名称" prop="detailLtemName" min-width="28%">
652 </el-table-column> 658 </el-table-column>
653 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%"> 659 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%">
@@ -714,11 +720,11 @@ @@ -714,11 +720,11 @@
714 <el-table :data="tableData6" 720 <el-table :data="tableData6"
715 :header-cell-style="{fontSize: '14px',color:'#000000e6',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" 721 :header-cell-style="{fontSize: '14px',color:'#000000e6',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
716 style="width: 100%;margin: auto;"> 722 style="width: 100%;margin: auto;">
717 - <el-table-column label="序号" min-width="5%" align='center'> 723 + <!-- <el-table-column label="序号" min-width="5%" align='center'>
718 <template slot-scope="scope"> 724 <template slot-scope="scope">
719 <span style="">{{ scope.$index + 1 }}</span> 725 <span style="">{{ scope.$index + 1 }}</span>
720 </template> 726 </template>
721 - </el-table-column> 727 + </el-table-column> -->
722 <el-table-column label="附件名称" prop="attachmentName" min-width="75%"> 728 <el-table-column label="附件名称" prop="attachmentName" min-width="75%">
723 729
724 </el-table-column> 730 </el-table-column>
@@ -899,11 +905,11 @@ @@ -899,11 +905,11 @@
899 <el-table :data="tableDa" 905 <el-table :data="tableDa"
900 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" 906 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
901 style="width: 100%"> 907 style="width: 100%">
902 - <el-table-column label="序号" width="auto" min-width="5%" align="center"> 908 + <!-- <el-table-column label="序号" width="auto" min-width="5%" align="center">
903 <template slot-scope="scope"> 909 <template slot-scope="scope">
904 {{scope.$index +1}} 910 {{scope.$index +1}}
905 </template> 911 </template>
906 - </el-table-column> 912 + </el-table-column> -->
907 <el-table-column label="明细项名称" prop="detailLtemName" width="auto" min-width="22%"> 913 <el-table-column label="明细项名称" prop="detailLtemName" width="auto" min-width="22%">
908 914
909 </el-table-column> 915 </el-table-column>
@@ -1285,10 +1291,13 @@ @@ -1285,10 +1291,13 @@
1285 secondData: {}, 1291 secondData: {},
1286 planTime: [], 1292 planTime: [],
1287 pageindex: { 1293 pageindex: {
  1294 + planName:'',
  1295 + eventAddrs:'',
  1296 + sponsor:'',
1288 pageNumber: 1, 1297 pageNumber: 1,
1289 pageSize: 10, 1298 pageSize: 10,
1290 dataOwnership: '2', 1299 dataOwnership: '2',
1291 - isDraft: 0 1300 + isDraft: 0,
1292 }, 1301 },
1293 multipleSelection: [], //选择的数据 1302 multipleSelection: [], //选择的数据
1294 options: [], 1303 options: [],
@@ -1479,39 +1488,8 @@ @@ -1479,39 +1488,8 @@
1479 }, 1488 },
1480 //查询 1489 //查询
1481 async onSubmit() { 1490 async onSubmit() {
1482 - if (this.planName != '' && this.eventTheme == '') {  
1483 - const res = await danqueryById({  
1484 - planName: this.planName,  
1485 - dataOwnership: '2',  
1486 - pageNumber: 1,  
1487 - pageSize: 10,  
1488 - auditTime: 0,  
1489 - isDraft: 0  
1490 - })  
1491 - this.tableData = res.data.content  
1492 - } else if (this.planName == '' && this.eventTheme != '') {  
1493 - const res = await danqueryById({  
1494 - eventTheme: this.eventTheme,  
1495 - dataOwnership: '2',  
1496 - pageNumber: 1,  
1497 - pageSize: 10,  
1498 - auditTime: 0,  
1499 - isDraft: 0  
1500 - })  
1501 - this.tableData = res.data.content  
1502 - } else {  
1503 - const res = await danqueryById({  
1504 - planName: this.planName,  
1505 - eventTheme: this.eventTheme,  
1506 - dataOwnership: '2',  
1507 - pageNumber: 1,  
1508 - pageSize: 10,  
1509 - auditTime: 0,  
1510 - isDraft: 0  
1511 - })  
1512 - this.tableData = res.data.content  
1513 - }  
1514 - 1491 + this.currentPage = 1
  1492 + this.getAll()
1515 }, 1493 },
1516 //获取当前时间 1494 //获取当前时间
1517 updateCurrentTime() { 1495 updateCurrentTime() {
@@ -1793,8 +1771,17 @@ @@ -1793,8 +1771,17 @@
1793 }, 1771 },
1794 //重置按钮 1772 //重置按钮
1795 resetting() { 1773 resetting() {
1796 - this.planName = ''  
1797 - this.eventTheme = '' 1774 + this.pageindex={
  1775 + planName:'',
  1776 + eventAddrs:'',
  1777 + sponsor:'',
  1778 + pageNumber: 1,
  1779 + pageSize: 10,
  1780 + dataOwnership: '2',
  1781 + isDraft: 0,
  1782 +
  1783 + }
  1784 + this.currentPage = 1
1798 this.getAll() 1785 this.getAll()
1799 }, 1786 },
1800 handleSelectionChange(val) { 1787 handleSelectionChange(val) {
admin-web-master/src/views/atmosphere/atmosphereHis.vue
  View file @a67407b
@@ -9,11 +9,20 @@ @@ -9,11 +9,20 @@
9 <!-- 搜索 --> 9 <!-- 搜索 -->
10 <div class="formSearch"> 10 <div class="formSearch">
11 <div class="demo-input-suffix"> 11 <div class="demo-input-suffix">
12 - <div v-if="searPei.name" style="display: flex;"> 12 + <!-- <div v-if="searPei.name" style="display: flex;">
13 <div style="width: 68px;height:36px;line-height:36px;">方案名称</div> 13 <div style="width: 68px;height:36px;line-height:36px;">方案名称</div>
14 <el-input placeholder="请输入" v-model="formSear.planName" style="width:168px;"> 14 <el-input placeholder="请输入" v-model="formSear.planName" style="width:168px;">
15 </el-input> 15 </el-input>
16 - </div> 16 + </div> -->
  17 + <div style="width: 68px;height:36px;line-height:36px;">方案名称</div>
  18 + <el-input placeholder="请输入" v-model="pageindex.planName" style="width:168px;">
  19 + </el-input>
  20 + <div style="width: 68px;height:36px;line-height:36px;margin-left: 10px;">活动地点</div>
  21 + <el-input placeholder="请输入" v-model="pageindex.eventAddrs" style="width:168px;">
  22 + </el-input>
  23 + <div style="width: 75px;height:36px;line-height:36px;margin-left: 10px;">活动主办方</div>
  24 + <el-input placeholder="请输入" v-model="pageindex.sponsor" style="width:168px;">
  25 + </el-input>
17 <!-- <div v-if="searPei.lei" style="display: flex;"> 26 <!-- <div v-if="searPei.lei" style="display: flex;">
18 <div style="width: 68px;height:36px;line-height:36px;">方案类型</div> 27 <div style="width: 68px;height:36px;line-height:36px;">方案类型</div>
19 <el-input placeholder="请输入" v-model="planName" style="width:168px;"> 28 <el-input placeholder="请输入" v-model="planName" style="width:168px;">
@@ -193,11 +202,11 @@ @@ -193,11 +202,11 @@
193 <el-table :data="tableData2" 202 <el-table :data="tableData2"
194 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" 203 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
195 style="width: 100%;margin: auto;"> 204 style="width: 100%;margin: auto;">
196 - <el-table-column label="序号" min-width="5%" align='center'> 205 + <!-- <el-table-column label="序号" min-width="5%" align='center'>
197 <template slot-scope="scope"> 206 <template slot-scope="scope">
198 <span style="">{{ scope.$index +1}}</span> 207 <span style="">{{ scope.$index +1}}</span>
199 </template> 208 </template>
200 - </el-table-column> 209 + </el-table-column> -->
201 <el-table-column label="明细项名称" prop="detailLtemName" min-width="28%"> 210 <el-table-column label="明细项名称" prop="detailLtemName" min-width="28%">
202 </el-table-column> 211 </el-table-column>
203 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%"> 212 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%">
@@ -265,11 +274,11 @@ @@ -265,11 +274,11 @@
265 <el-table :data="tableData6" 274 <el-table :data="tableData6"
266 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" 275 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
267 style="width: 100%;margin: auto;"> 276 style="width: 100%;margin: auto;">
268 - <el-table-column label="序号" min-width="5%" align='center'> 277 + <!-- <el-table-column label="序号" min-width="5%" align='center'>
269 <template slot-scope="scope"> 278 <template slot-scope="scope">
270 <span style="">{{ scope.$index + 1 }}</span> 279 <span style="">{{ scope.$index + 1 }}</span>
271 </template> 280 </template>
272 - </el-table-column> 281 + </el-table-column> -->
273 <el-table-column label="附件名称" prop="attachmentName" min-width="75%"> 282 <el-table-column label="附件名称" prop="attachmentName" min-width="75%">
274 </el-table-column> 283 </el-table-column>
275 <el-table-column label="操作" min-width="20%"> 284 <el-table-column label="操作" min-width="20%">
@@ -380,12 +389,12 @@ @@ -380,12 +389,12 @@
380 <el-table :data="tableDa" 389 <el-table :data="tableDa"
381 :header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}" 390 :header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
382 style="width: 100%"> 391 style="width: 100%">
383 - <el-table-column label="序号" width="auto" min-width="5%" prop="date" 392 + <!-- <el-table-column label="序号" width="auto" min-width="5%" prop="date"
384 align="center"> 393 align="center">
385 <template slot-scope="scope"> 394 <template slot-scope="scope">
386 {{scope.$index +1}} 395 {{scope.$index +1}}
387 </template> 396 </template>
388 - </el-table-column> 397 + </el-table-column> -->
389 <el-table-column label="明细项名称" prop="detailLtemName" width="auto" 398 <el-table-column label="明细项名称" prop="detailLtemName" width="auto"
390 min-width="22%"> 399 min-width="22%">
391 400
@@ -1017,11 +1026,11 @@ @@ -1017,11 +1026,11 @@
1017 <el-table :data="tableData2" 1026 <el-table :data="tableData2"
1018 :header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}" 1027 :header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
1019 style="width: 100%;margin: auto;"> 1028 style="width: 100%;margin: auto;">
1020 - <el-table-column label="序号" min-width="7%" align='center'> 1029 + <!-- <el-table-column label="序号" min-width="7%" align='center'>
1021 <template slot-scope="scope"> 1030 <template slot-scope="scope">
1022 <span style="">{{ scope.$index +1}}</span> 1031 <span style="">{{ scope.$index +1}}</span>
1023 </template> 1032 </template>
1024 - </el-table-column> 1033 + </el-table-column> -->
1025 <el-table-column label="明细项名称" prop="detailLtemName" min-width="25%"> 1034 <el-table-column label="明细项名称" prop="detailLtemName" min-width="25%">
1026 </el-table-column> 1035 </el-table-column>
1027 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="18%"> 1036 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="18%">
@@ -1088,11 +1097,11 @@ @@ -1088,11 +1097,11 @@
1088 <el-table :data="tableData6" 1097 <el-table :data="tableData6"
1089 :header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}" 1098 :header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
1090 style="width: 100%;margin: auto;"> 1099 style="width: 100%;margin: auto;">
1091 - <el-table-column label="序号" min-width="7%" align='center'> 1100 + <!-- <el-table-column label="序号" min-width="7%" align='center'>
1092 <template slot-scope="scope"> 1101 <template slot-scope="scope">
1093 <span style="">{{ scope.$index + 1 }}</span> 1102 <span style="">{{ scope.$index + 1 }}</span>
1094 </template> 1103 </template>
1095 - </el-table-column> 1104 + </el-table-column> -->
1096 <el-table-column label="附件名称" prop="attachmentName" min-width="70%"> 1105 <el-table-column label="附件名称" prop="attachmentName" min-width="70%">
1097 </el-table-column> 1106 </el-table-column>
1098 <el-table-column label="操作" min-width="20%"> 1107 <el-table-column label="操作" min-width="20%">
@@ -1218,11 +1227,11 @@ @@ -1218,11 +1227,11 @@
1218 <el-table :data="tableData2" 1227 <el-table :data="tableData2"
1219 :header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}" 1228 :header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
1220 style="width: 100%;margin: auto;"> 1229 style="width: 100%;margin: auto;">
1221 - <el-table-column label="序号" min-width="7%" align='center'> 1230 + <!-- <el-table-column label="序号" min-width="7%" align='center'>
1222 <template slot-scope="scope"> 1231 <template slot-scope="scope">
1223 <span style="">{{ scope.$index +1}}</span> 1232 <span style="">{{ scope.$index +1}}</span>
1224 </template> 1233 </template>
1225 - </el-table-column> 1234 + </el-table-column> -->
1226 <el-table-column label="明细项名称" prop="detailLtemName" min-width="25%"> 1235 <el-table-column label="明细项名称" prop="detailLtemName" min-width="25%">
1227 </el-table-column> 1236 </el-table-column>
1228 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="18%"> 1237 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="18%">
@@ -1330,11 +1339,11 @@ @@ -1330,11 +1339,11 @@
1330 <el-table :data="tableData6" 1339 <el-table :data="tableData6"
1331 :header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}" 1340 :header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
1332 style="width: 100%;margin: auto;"> 1341 style="width: 100%;margin: auto;">
1333 - <el-table-column label="序号" min-width="7%" align='center'> 1342 + <!-- <el-table-column label="序号" min-width="7%" align='center'>
1334 <template slot-scope="scope"> 1343 <template slot-scope="scope">
1335 <span style="">{{ scope.$index + 1 }}</span> 1344 <span style="">{{ scope.$index + 1 }}</span>
1336 </template> 1345 </template>
1337 - </el-table-column> 1346 + </el-table-column> -->
1338 <el-table-column label="附件名称" prop="attachmentName" min-width="70%"> 1347 <el-table-column label="附件名称" prop="attachmentName" min-width="70%">
1339 </el-table-column> 1348 </el-table-column>
1340 <el-table-column label="操作" min-width="20%"> 1349 <el-table-column label="操作" min-width="20%">
@@ -1947,6 +1956,9 @@ @@ -1947,6 +1956,9 @@
1947 feedbackContent: '' 1956 feedbackContent: ''
1948 }, //执行效果列表 1957 }, //执行效果列表
1949 pageindex: { 1958 pageindex: {
  1959 + planName:'',
  1960 + eventAddrs:'',
  1961 + sponsor:'',
1950 pageNumber: 1, 1962 pageNumber: 1,
1951 pageSize: 10, 1963 pageSize: 10,
1952 dataOwnership: '2', 1964 dataOwnership: '2',
@@ -2139,22 +2151,23 @@ @@ -2139,22 +2151,23 @@
2139 2151
2140 }, 2152 },
2141 //查询 2153 //查询
2142 - async onSubmit() {  
2143 - const res = await danqueryById(this.formSear)  
2144 - this.tableData = res.data.content 2154 + onSubmit() {
  2155 + this.currentPage = 1
  2156 + this.getAll()
2145 }, 2157 },
2146 //重置按钮 2158 //重置按钮
2147 resetting() { 2159 resetting() {
2148 - this.formSear = {  
2149 - planName: '',  
2150 - state: null,  
2151 - dataOwnership: '2', 2160 + this.pageindex={
  2161 + planName:'',
  2162 + eventAddrs:'',
  2163 + sponsor:'',
2152 pageNumber: 1, 2164 pageNumber: 1,
2153 pageSize: 10, 2165 pageSize: 10,
  2166 + dataOwnership: '2',
2154 isDraft: 0, 2167 isDraft: 0,
2155 state: '5' 2168 state: '5'
2156 -  
2157 } 2169 }
  2170 + this.currentPage = 1
2158 this.getAll() 2171 this.getAll()
2159 }, 2172 },
2160 //编辑页 2173 //编辑页
admin-web-master/src/views/atmosphere/atmosphereSp.vue
  View file @a67407b
@@ -8,9 +8,15 @@ @@ -8,9 +8,15 @@
8 <!-- 搜索 --> 8 <!-- 搜索 -->
9 <div class="formSearch"> 9 <div class="formSearch">
10 <div class="demo-input-suffix"> 10 <div class="demo-input-suffix">
11 - <div style="width: 68px;height:36px;line-height:32px;">方案名称</div>  
12 - <el-input placeholder="请输入" size="mini" v-model="planName" style="width:168px;">  
13 - </el-input> 11 + <div style="width: 68px;height:36px;line-height:36px;">方案名称</div>
  12 + <el-input placeholder="请输入" v-model="pageindex.planName" style="width:168px;">
  13 + </el-input>
  14 + <div style="width: 68px;height:36px;line-height:36px;margin-left: 10px;">活动地点</div>
  15 + <el-input placeholder="请输入" v-model="pageindex.eventAddrs" style="width:168px;">
  16 + </el-input>
  17 + <div style="width: 75px;height:36px;line-height:36px;margin-left: 10px;">活动主办方</div>
  18 + <el-input placeholder="请输入" v-model="pageindex.sponsor" style="width:168px;">
  19 + </el-input>
14 </div> 20 </div>
15 <div> 21 <div>
16 <el-button @click="onSubmit" size="mini" style="background-color: #3F9B6A;color: #fff">查询 22 <el-button @click="onSubmit" size="mini" style="background-color: #3F9B6A;color: #fff">查询
@@ -1311,6 +1317,9 @@ @@ -1311,6 +1317,9 @@
1311 createDate:'',//创建时间 1317 createDate:'',//创建时间
1312 },//执行效果列表 1318 },//执行效果列表
1313 pageindex: { 1319 pageindex: {
  1320 + planName:'',
  1321 + eventAddrs:'',
  1322 + sponsor:'',
1314 pageNumber: 1, 1323 pageNumber: 1,
1315 pageSize: 10, 1324 pageSize: 10,
1316 dataOwnership: '2', 1325 dataOwnership: '2',
@@ -1409,40 +1418,11 @@ @@ -1409,40 +1418,11 @@
1409 }, 1418 },
1410 //查询 1419 //查询
1411 async onSubmit() { 1420 async onSubmit() {
1412 - if (this.planName != '' && this.eventTheme == '') {  
1413 - const res = await danqueryById({  
1414 - planName: this.planName,  
1415 - dataOwnership: '2',  
1416 - pageNumber: 1,  
1417 - pageSize: 10,  
1418 - isDraft:0,  
1419 - state:'待提交'  
1420 - })  
1421 - this.tableData = res.data.content  
1422 - } else if (this.planName == '' && this.eventTheme != '') {  
1423 - const res = await danqueryById({  
1424 - eventTheme: this.eventTheme,  
1425 - dataOwnership: '2',  
1426 - pageNumber: 1,  
1427 - pageSize: 10,  
1428 - isDraft:0,  
1429 - state:'待提交'  
1430 - })  
1431 - this.tableData = res.data.content  
1432 - } else {  
1433 - const res = await danqueryById({  
1434 - planName: this.planName,  
1435 - eventTheme: this.eventTheme,  
1436 - dataOwnership: '2',  
1437 - pageNumber: 1,  
1438 - pageSize: 10,  
1439 - isDraft:0,  
1440 - state:'待提交'  
1441 - })  
1442 - this.tableData = res.data.content  
1443 - }  
1444 -  
1445 - }, 1421 +
  1422 + this.currentPage = 1
  1423 + this.getAll()
  1424 +
  1425 + },
1446 removeEmptyValues(obj) { 1426 removeEmptyValues(obj) {
1447 if (typeof obj !== 'object' || obj === null) { 1427 if (typeof obj !== 'object' || obj === null) {
1448 return obj; 1428 return obj;
@@ -1484,10 +1464,20 @@ @@ -1484,10 +1464,20 @@
1484 1464
1485 //重置按钮 1465 //重置按钮
1486 resetting() { 1466 resetting() {
1487 - this.planName = ''  
1488 - this.eventTheme = ''  
1489 - this.getAll()  
1490 - }, 1467 + this.pageindex={
  1468 + pageNumber: 1,
  1469 + pageSize: 10,
  1470 + dataOwnership: '2',
  1471 + isDraft:0,
  1472 + state:'待提交',
  1473 + planName:'',
  1474 + eventAddrs:'',
  1475 + sponsor:'',
  1476 +
  1477 + }
  1478 + this.currentPage = 1
  1479 + this.getAll()
  1480 + },
1491 handleSelectionChange(val) { 1481 handleSelectionChange(val) {
1492 this.multipleSelection = val; 1482 this.multipleSelection = val;
1493 console.log(val) 1483 console.log(val)
admin-web-master/src/views/media/mediaMana.vue
  View file @a67407b
@@ -9,8 +9,19 @@ @@ -9,8 +9,19 @@
9 <div class="formSearch"> 9 <div class="formSearch">
10 <div class="demo-input-suffix"> 10 <div class="demo-input-suffix">
11 <div style="width: 68px;height:36px;line-height:32px;">方案名称</div> 11 <div style="width: 68px;height:36px;line-height:32px;">方案名称</div>
12 - <el-input placeholder="请输入" v-model="planName" style="width:168px;"> 12 + <el-input placeholder="请输入" v-model="pageindex.schemeTitle" style="width:168px;">
13 </el-input> 13 </el-input>
  14 + <div style="width: 52px;height:36px;line-height:36px;margin-left: 10px;">创建人</div>
  15 + <el-input placeholder="请输入" v-model="pageindex.createUser" style="width:168px;">
  16 + </el-input>
  17 + <div style="width: 38px;height:36px;line-height:36px;margin-left: 10px;">状态</div>
  18 + <el-select v-model="pageindex.state" placeholder="请选择"
  19 + style="width:168px">
  20 + <el-option label="待提交" value="1"></el-option>
  21 + <el-option label="待审批" value="2"></el-option>
  22 + <el-option label="上架" value="5"></el-option>
  23 + <el-option label="已下架" value="6"></el-option>
  24 + </el-select>
14 </div> 25 </div>
15 <div> 26 <div>
16 <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询 27 <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询
@@ -546,6 +557,9 @@ components: { addAct,wangEditor,upimg}, @@ -546,6 +557,9 @@ components: { addAct,wangEditor,upimg},
546 tableData: [], 557 tableData: [],
547 multipleSelection:[], 558 multipleSelection:[],
548 pageindex: { 559 pageindex: {
  560 + schemeTitle:'',
  561 + createUser:'',
  562 + state:'',
549 pageNumber: 0, 563 pageNumber: 0,
550 pageSize: 10, 564 pageSize: 10,
551 }, 565 },
@@ -702,17 +716,9 @@ components: { addAct,wangEditor,upimg}, @@ -702,17 +716,9 @@ components: { addAct,wangEditor,upimg},
702 } 716 }
703 }, 717 },
704 //查询 718 //查询
705 - async onSubmit() {  
706 - if (this.planName != '') {  
707 - const res = await tuiGetAll({  
708 - schemeTitle: this.planName,  
709 - pageNumber: 0,  
710 - pageSize: 10,  
711 - })  
712 - this.tableData = res.data.content  
713 - this.total = res.data.totalElements  
714 - }  
715 - }, 719 + onSubmit() {
  720 + this.getAll()
  721 + },
716 //详情点击 722 //详情点击
717 handleEditForm(item,val) { 723 handleEditForm(item,val) {
718 //1详情 2编辑 724 //1详情 2编辑
@@ -779,8 +785,13 @@ components: { addAct,wangEditor,upimg}, @@ -779,8 +785,13 @@ components: { addAct,wangEditor,upimg},
779 }, 785 },
780 //重置按钮 786 //重置按钮
781 resetting() { 787 resetting() {
782 - this.planName = ''  
783 - this.eventTheme = '' 788 + this.pageindex = {
  789 + schemeTitle:'',
  790 + createUser:'',
  791 + state:'',
  792 + pageNumber: 0,
  793 + pageSize: 10,
  794 + }
784 this.getAll() 795 this.getAll()
785 }, 796 },
786 handleSelectionChange(val) { 797 handleSelectionChange(val) {
admin-web-master/src/views/promotion/account.vue
  View file @a67407b
@@ -8,8 +8,11 @@ @@ -8,8 +8,11 @@
8 <!-- 搜索 --> 8 <!-- 搜索 -->
9 <div class="formSearch"> 9 <div class="formSearch">
10 <div class="demo-input-suffix"> 10 <div class="demo-input-suffix">
11 - <div style="width: 68px;height:36px;line-height:32px;">渠道名称</div>  
12 - <el-input placeholder="请输入" v-model="channelName" style="width:168px;"> 11 + <div style="width: 68px;height:36px;line-height:36px;">渠道名称</div>
  12 + <el-input placeholder="请输入" v-model="pageindex.channelName" style="width:168px;">
  13 + </el-input>
  14 + <div style="width: 38px;height:36px;line-height:36px;margin-left: 10px;">备注</div>
  15 + <el-input placeholder="请输入" v-model="pageindex.notes" style="width:168px;">
13 </el-input> 16 </el-input>
14 </div> 17 </div>
15 </el-form-item> 18 </el-form-item>
@@ -76,11 +79,11 @@ @@ -76,11 +79,11 @@
76 <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)" 79 <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
77 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" 80 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
78 align="left"> 81 align="left">
79 - <el-table-column label="序号" min-width="100" prop="id"> 82 + <!-- <el-table-column label="序号" min-width="100" prop="id">
80 <template slot-scope="scope"> 83 <template slot-scope="scope">
81 {{scope.$index +1 }} 84 {{scope.$index +1 }}
82 </template> 85 </template>
83 - </el-table-column> 86 + </el-table-column> -->
84 <el-table-column label="渠道名称" prop="channelName" min-width="150" show-overflow-tooltip> 87 <el-table-column label="渠道名称" prop="channelName" min-width="150" show-overflow-tooltip>
85 </el-table-column> 88 </el-table-column>
86 <!-- <el-table-column label="类型" prop="channelType" min-width="120"> 89 <!-- <el-table-column label="类型" prop="channelType" min-width="120">
@@ -104,8 +107,9 @@ @@ -104,8 +107,9 @@
104 </el-table-column> 107 </el-table-column>
105 </el-table> 108 </el-table>
106 <div class="fenye"> 109 <div class="fenye">
107 - <el-pagination class="pagination" :hide-on-single-page="flag" background small  
108 - :current-page="currentPage" :page-size="pageSize" layout="total,->,prev, pager,next" 110 + <div style="line-height: 200%;">共{{total}}条</div>
  111 + <el-pagination class="pagination" :hide-on-single-page="flag" background
  112 + :current-page="currentPage" :page-size="pageSize" layout="prev, pager,next"
109 :total="total " @size-change="handleSizeChange" @current-change="handleCurrentChange" /> 113 :total="total " @size-change="handleSizeChange" @current-change="handleCurrentChange" />
110 </div> 114 </div>
111 </div> 115 </div>
@@ -301,7 +305,7 @@ @@ -301,7 +305,7 @@
301 data() { 305 data() {
302 return { 306 return {
303 currentPage: 1, 307 currentPage: 1,
304 - total: 100, 308 + total: 0,
305 flag: false, 309 flag: false,
306 pageSize: 10, 310 pageSize: 10,
307 ggXin: false, 311 ggXin: false,
@@ -318,8 +322,6 @@ @@ -318,8 +322,6 @@
318 appKey: '', //appkey 322 appKey: '', //appkey
319 notes: '', //备注 323 notes: '', //备注
320 }, 324 },
321 - planName: '',  
322 - channelName: '', //查询  
323 fenrules: { 325 fenrules: {
324 classificationName: [{ 326 classificationName: [{
325 required: true, 327 required: true,
@@ -358,6 +360,8 @@ @@ -358,6 +360,8 @@
358 }, 360 },
359 tableData: [], 361 tableData: [],
360 pageindex: { 362 pageindex: {
  363 + channelName:'',
  364 + notes:'',
361 pageNumber: 1, 365 pageNumber: 1,
362 pageSize: 10 366 pageSize: 10
363 }, 367 },
@@ -506,14 +510,9 @@ @@ -506,14 +510,9 @@
506 ) 510 )
507 511
508 }, 512 },
509 - async onSubmit() {  
510 - let num = this.fenleiInex  
511 - this.pageindex.channelName = this.channelName 513 + onSubmit() {
  514 + this.currentPage = 1
512 this.getAll(this.pageindex) 515 this.getAll(this.pageindex)
513 - // this.pageindex.channelClassification = this.fenlei[num]  
514 - // let res = await  
515 - // this.tableData = res.data.content  
516 - // this.total = res.data.content.length  
517 }, 516 },
518 handleSizeChange(val) { 517 handleSizeChange(val) {
519 this.pageSize = val 518 this.pageSize = val
@@ -559,10 +558,12 @@ this.currentPage = val @@ -559,10 +558,12 @@ this.currentPage = val
559 }, 558 },
560 chong() { 559 chong() {
561 this.pageindex = { 560 this.pageindex = {
  561 + channelName:'',
  562 + notes:'',
562 pageNumber: 1, 563 pageNumber: 1,
563 pageSize: 10 564 pageSize: 10
564 } 565 }
565 - this.channelName = '' 566 + this.currentPage = 1
566 this.getAll() 567 this.getAll()
567 }, 568 },
568 handleClick(tab, event) { 569 handleClick(tab, event) {
@@ -768,6 +769,8 @@ this.currentPage = val @@ -768,6 +769,8 @@ this.currentPage = val
768 .fenye { 769 .fenye {
769 margin-top: 20px; 770 margin-top: 20px;
770 position: relative; 771 position: relative;
  772 + display: flex;
  773 + justify-content: space-between;
771 } 774 }
772 775
773 /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active { 776 /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
@@ -807,9 +810,6 @@ this.currentPage = val @@ -807,9 +810,6 @@ this.currentPage = val
807 line-height: 20px; 810 line-height: 20px;
808 } 811 }
809 812
810 - /deep/ .el-pagination__total {  
811 - float: left;  
812 - }  
813 813
814 /deep/ .bg-purple { 814 /deep/ .bg-purple {
815 background: #fff; 815 background: #fff;
admin-web-master/src/views/promotion/audit.vue
  View file @a67407b
@@ -8,9 +8,20 @@ @@ -8,9 +8,20 @@
8 <!-- 搜索 --> 8 <!-- 搜索 -->
9 <div class="formSearch"> 9 <div class="formSearch">
10 <div class="demo-input-suffix"> 10 <div class="demo-input-suffix">
11 - <div style="width: 70px;line-height:26px;">方案名称</div>  
12 - <el-input placeholder="请输入" v-model="planName" style="width:168px;">  
13 - </el-input> 11 + <div style="width: 68px;height:36px;line-height:32px;">方案名称</div>
  12 + <el-input placeholder="请输入" v-model="pageindex.schemeTitle" style="width:168px;">
  13 + </el-input>
  14 + <div style="width: 52px;height:36px;line-height:36px;margin-left: 10px;">创建人</div>
  15 + <el-input placeholder="请输入" v-model="pageindex.createUser" style="width:168px;">
  16 + </el-input>
  17 + <div style="width: 38px;height:36px;line-height:36px;margin-left: 10px;">状态</div>
  18 + <el-select v-model="pageindex.state" placeholder="请选择"
  19 + style="width:168px">
  20 + <el-option label="待提交" value="1"></el-option>
  21 + <el-option label="待审批" value="2"></el-option>
  22 + <el-option label="审核通过" value="5"></el-option>
  23 + <el-option label="已驳回" value="6"></el-option>
  24 + </el-select>
14 </div> 25 </div>
15 <div> 26 <div>
16 <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询 27 <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询
@@ -501,6 +512,9 @@ components: { wangEditor}, @@ -501,6 +512,9 @@ components: { wangEditor},
501 }], 512 }],
502 tableData2: [], 513 tableData2: [],
503 pageindex: { 514 pageindex: {
  515 + schemeTitle:'',
  516 + createUser:'',
  517 + state:'',
504 pageNumber: 0, 518 pageNumber: 0,
505 pageSize: 10, 519 pageSize: 10,
506 }, 520 },
@@ -562,17 +576,9 @@ components: { wangEditor}, @@ -562,17 +576,9 @@ components: { wangEditor},
562 576
563 }, 577 },
564 //查询 578 //查询
565 - async onSubmit() {  
566 - if (this.planName != '') {  
567 - const res = await tuiGetAll({  
568 - schemeTitle: this.planName,  
569 - pageNumber: 0,  
570 - pageSize: 10,  
571 - })  
572 - this.tableData = res.data.content  
573 - this.total = res.data.totalElements  
574 - }  
575 - }, 579 + onSubmit() {
  580 + this.getAll()
  581 + },
576 transformData(data) { 582 transformData(data) {
577 return data.map(item => ({ 583 return data.map(item => ({
578 ...item.cereClassification, 584 ...item.cereClassification,
@@ -660,8 +666,13 @@ components: { wangEditor}, @@ -660,8 +666,13 @@ components: { wangEditor},
660 }, 666 },
661 //重置按钮 667 //重置按钮
662 resetting() { 668 resetting() {
663 - this.planName = ''  
664 - this.eventTheme = '' 669 + this.pageindex = {
  670 + schemeTitle:'',
  671 + createUser:'',
  672 + state:'',
  673 + pageNumber: 0,
  674 + pageSize: 10,
  675 + }
665 this.getAll() 676 this.getAll()
666 }, 677 },
667 actSp(item){ 678 actSp(item){
admin-web-master/src/views/promotion/contentMant.vue
  View file @a67407b
@@ -8,8 +8,18 @@ @@ -8,8 +8,18 @@
8 <div class="formSearch"> 8 <div class="formSearch">
9 <div class="demo-input-suffix"> 9 <div class="demo-input-suffix">
10 <div style="width: 68px;height:36px;line-height:32px;">渠道分类</div> 10 <div style="width: 68px;height:36px;line-height:32px;">渠道分类</div>
11 - <el-input placeholder="请输入" v-model="chaName" style="width:168px;"> 11 + <el-input placeholder="请输入" v-model="pageindex.channelCategory" style="width:168px;">
12 </el-input> 12 </el-input>
  13 + <div style="width: 68px;height:36px;line-height:36px;margin-left: 10px;">内容分类</div>
  14 + <el-select v-model="pageindex.contentCategory" placeholder="请选择"
  15 + style="width:168px">
  16 + <el-option v-for="(item,index) in contentClassificationList" :key="index" :label="item.label" :value="item.value"></el-option>
  17 + </el-select>
  18 + <div style="width: 68px;height:36px;line-height:36px;margin-left: 10px;">渠道类型</div>
  19 + <el-select v-model="pageindex.channelType" placeholder="请选择"
  20 + style="width:168px">
  21 + <el-option v-for="(item,index) in channelTypeList" :key="index" :label="item.label" :value="item.value"></el-option>
  22 + </el-select>
13 </div> 23 </div>
14 </el-form-item> 24 </el-form-item>
15 </el-form> 25 </el-form>
@@ -63,11 +73,11 @@ @@ -63,11 +73,11 @@
63 <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)" 73 <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
64 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" 74 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
65 align="left"> 75 align="left">
66 - <el-table-column label="序号" min-width="100" prop="id" > 76 + <!-- <el-table-column label="序号" min-width="100" prop="id" >
67 <template slot-scope="scope"> 77 <template slot-scope="scope">
68 {{scope.$index +1 }} 78 {{scope.$index +1 }}
69 </template> 79 </template>
70 - </el-table-column> 80 + </el-table-column> -->
71 <el-table-column label="渠道分类" prop="channelCategory" show-overflow-tooltip min-width="150"> 81 <el-table-column label="渠道分类" prop="channelCategory" show-overflow-tooltip min-width="150">
72 </el-table-column> 82 </el-table-column>
73 <el-table-column label="内容分类" prop="contentCategory" min-width="120"> 83 <el-table-column label="内容分类" prop="contentCategory" min-width="120">
@@ -82,7 +92,7 @@ @@ -82,7 +92,7 @@
82 92
83 </el-table-column> 93 </el-table-column>
84 94
85 - <el-table-column label="操作" min-width="250" fixed="right"> 95 + <el-table-column label="操作" min-width="150" fixed="right">
86 <template slot-scope="scope"> 96 <template slot-scope="scope">
87 <div @click="addbuss(2,scope.row)" class="tableBtn greens">查看</div> 97 <div @click="addbuss(2,scope.row)" class="tableBtn greens">查看</div>
88 <div @click="addbuss(3,scope.row)" class="tableBtn greens">修改</div> 98 <div @click="addbuss(3,scope.row)" class="tableBtn greens">修改</div>
@@ -91,7 +101,8 @@ @@ -91,7 +101,8 @@
91 </el-table-column> 101 </el-table-column>
92 </el-table> 102 </el-table>
93 <div class="fenye"> 103 <div class="fenye">
94 - <el-pagination class="pagination" :hide-on-single-page="flag" background small :current-page="currentPage" :page-size="pageSize" layout="total,->,prev, pager,next" :total="total " 104 + <div style="line-height: 200%;">共{{total}}条</div>
  105 + <el-pagination class="pagination" :hide-on-single-page="flag" background :current-page="currentPage" :page-size="pageSize" layout="prev, pager,next" :total="total"
95 @size-change="handleSizeChange" @current-change="handleCurrentChange" /> 106 @size-change="handleSizeChange" @current-change="handleCurrentChange" />
96 </div> 107 </div>
97 </div> 108 </div>
@@ -125,7 +136,7 @@ @@ -125,7 +136,7 @@
125 136
126 </el-table-column> 137 </el-table-column>
127 138
128 - <el-table-column label="操作" min-width="250" fixed="right"> 139 + <el-table-column label="操作" min-width="180" fixed="right">
129 <template slot-scope="scope"> 140 <template slot-scope="scope">
130 <div @click="shiyong(1,scope.row)" class="tableBtn greens">使用</div> 141 <div @click="shiyong(1,scope.row)" class="tableBtn greens">使用</div>
131 <div @click="addbuss(2,scope.row)" class="tableBtn greens">查看</div> 142 <div @click="addbuss(2,scope.row)" class="tableBtn greens">查看</div>
@@ -324,7 +335,7 @@ @@ -324,7 +335,7 @@
324 return { 335 return {
325 uploadFileUrl: uploadUrl, // 请求地址 336 uploadFileUrl: uploadUrl, // 请求地址
326 currentPage: 1, 337 currentPage: 1,
327 - total: 100, 338 + total: 0,
328 flag: false, 339 flag: false,
329 pageSize: 10, 340 pageSize: 10,
330 ggXin: false, 341 ggXin: false,
@@ -365,6 +376,9 @@ @@ -365,6 +376,9 @@
365 }, 376 },
366 tableData: [], 377 tableData: [],
367 pageindex: { 378 pageindex: {
  379 + channelCategory:'',
  380 + contentCategory:'',
  381 + channelType:'',
368 pageNumber: 1, 382 pageNumber: 1,
369 pageSize: 10, 383 pageSize: 10,
370 draftStatus:1, 384 draftStatus:1,
@@ -569,11 +583,9 @@ @@ -569,11 +583,9 @@
569 ) 583 )
570 584
571 }, 585 },
572 - async onSubmit() {  
573 - this.pageindex.channelCategory = this.chaName  
574 - let res = await contentAll(this.pageindex)  
575 - this.tableData = res.data.content  
576 - this.total = res.data.content.length 586 + onSubmit() {
  587 + this.currentPage = 1
  588 + this.getAll(this.pageindex)
577 }, 589 },
578 handleSizeChange(val) { 590 handleSizeChange(val) {
579 591
@@ -619,11 +631,14 @@ this.currentPage =val @@ -619,11 +631,14 @@ this.currentPage =val
619 }, 631 },
620 chong() { 632 chong() {
621 this.pageindex = { 633 this.pageindex = {
  634 + channelCategory:'',
  635 + contentCategory:'',
  636 + channelType:'',
622 pageNumber: 1, 637 pageNumber: 1,
623 pageSize: 10, 638 pageSize: 10,
624 draftStatus:1, 639 draftStatus:1,
625 } 640 }
626 - this.chaName = '' 641 + this.currentPage = 1
627 this.getAll() 642 this.getAll()
628 }, 643 },
629 handleClick(tab, event){ 644 handleClick(tab, event){
@@ -837,9 +852,11 @@ this.currentPage =val @@ -837,9 +852,11 @@ this.currentPage =val
837 } 852 }
838 853
839 .fenye { 854 .fenye {
840 - margin-top: 20px;  
841 - position: relative;  
842 - } 855 + margin-top: 20px;
  856 + position: relative;
  857 + display: flex;
  858 + justify-content: space-between;
  859 + }
843 860
844 /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active { 861 /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
845 background-color: #3F9B6A; 862 background-color: #3F9B6A;
admin-web-master/src/views/serve/MarkActivity/index.vue
  View file @a67407b
@@ -43,11 +43,6 @@ @@ -43,11 +43,6 @@
43 43
44 <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)" 44 <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
45 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> 45 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
46 - <el-table-column label="序号" min-width="150">  
47 - <template slot-scope="scope">  
48 - {{scope.$index +1 }}  
49 - </template>  
50 - </el-table-column>  
51 <el-table-column label="活动标题" min-width="200" prop="title"> 46 <el-table-column label="活动标题" min-width="200" prop="title">
52 </el-table-column> 47 </el-table-column>
53 <el-table-column label="场地名称" min-width="150" > 48 <el-table-column label="场地名称" min-width="150" >
@@ -90,7 +85,7 @@ @@ -90,7 +85,7 @@
90 </el-table-column> 85 </el-table-column>
91 </el-table> 86 </el-table>
92 <div class="fenye"> 87 <div class="fenye">
93 - <el-pagination :hide-on-single-page='flag' background small size="mini" :current-page="currentPage" 88 + <el-pagination :hide-on-single-page='flag' background :current-page="currentPage"
94 layout="prev, pager, next,total" :total="total " 89 layout="prev, pager, next,total" :total="total "
95 @current-change="handleCurrentChange" /> 90 @current-change="handleCurrentChange" />
96 </div> 91 </div>
@@ -151,11 +146,11 @@ @@ -151,11 +146,11 @@
151 <div style="padding:20px;"> 146 <div style="padding:20px;">
152 <el-table :data="addziyuanData.slice((currentPage - 1) * pageSize, currentPage * pageSize)" 147 <el-table :data="addziyuanData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
153 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> 148 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
154 - <el-table-column label="序号" width="80"> 149 + <!-- <el-table-column label="序号" width="80">
155 <template slot-scope="scope"> 150 <template slot-scope="scope">
156 {{scope.$index + 1}} 151 {{scope.$index + 1}}
157 </template> 152 </template>
158 - </el-table-column> 153 + </el-table-column> -->
159 154
160 <el-table-column label="场地名称" prop="venueName" > 155 <el-table-column label="场地名称" prop="venueName" >
161 156
@@ -255,11 +250,11 @@ @@ -255,11 +250,11 @@
255 <div style="padding:20px;"> 250 <div style="padding:20px;">
256 <el-table :data="addziyuanData.slice((currentPage - 1) * pageSize, currentPage * pageSize)" 251 <el-table :data="addziyuanData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
257 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> 252 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
258 - <el-table-column label="序号" width="80"> 253 + <!-- <el-table-column label="序号" width="80">
259 <template slot-scope="scope"> 254 <template slot-scope="scope">
260 {{scope.$index + 1}} 255 {{scope.$index + 1}}
261 </template> 256 </template>
262 - </el-table-column> 257 + </el-table-column> -->
263 <el-table-column label="场地名称" prop="venueName" > 258 <el-table-column label="场地名称" prop="venueName" >
264 </el-table-column> 259 </el-table-column>
265 <el-table-column label="所属区域" prop="district" > 260 <el-table-column label="所属区域" prop="district" >
@@ -330,11 +325,11 @@ @@ -330,11 +325,11 @@
330 <el-radio v-model="selectedRow" inert :label="scope.row" >&nbsp;</el-radio> 325 <el-radio v-model="selectedRow" inert :label="scope.row" >&nbsp;</el-radio>
331 </template> 326 </template>
332 </el-table-column> 327 </el-table-column>
333 - <el-table-column label="序号" width="80"> 328 + <!-- <el-table-column label="序号" width="80">
334 <template slot-scope="scope"> 329 <template slot-scope="scope">
335 {{scope.$index + 1}} 330 {{scope.$index + 1}}
336 </template> 331 </template>
337 - </el-table-column> 332 + </el-table-column> -->
338 333
339 <el-table-column label="场地名称" prop="venueName"> 334 <el-table-column label="场地名称" prop="venueName">
340 335
@@ -387,11 +382,11 @@ @@ -387,11 +382,11 @@
387 <div style="padding:20px;"> 382 <div style="padding:20px;">
388 <el-table :data="mingList.slice((mingPage - 1) * pageSize, mingPage * pageSize)" 383 <el-table :data="mingList.slice((mingPage - 1) * pageSize, mingPage * pageSize)"
389 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> 384 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
390 - <el-table-column label="序号" min-width="150"> 385 + <!-- <el-table-column label="序号" min-width="150">
391 <template slot-scope="scope"> 386 <template slot-scope="scope">
392 {{scope.$index +1 }} 387 {{scope.$index +1 }}
393 </template> 388 </template>
394 - </el-table-column> 389 + </el-table-column> -->
395 <el-table-column label="联系人" prop="userName" min-width="150"> 390 <el-table-column label="联系人" prop="userName" min-width="150">
396 391
397 </el-table-column> 392 </el-table-column>
admin-web-master/src/views/serve/Merchant/index.vue
  View file @a67407b
@@ -46,11 +46,7 @@ @@ -46,11 +46,7 @@
46 46
47 <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)" 47 <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
48 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> 48 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
49 - <el-table-column label="序号" min-width="150">  
50 - <template slot-scope="scope">  
51 - {{scope.$index +1 }}  
52 - </template>  
53 - </el-table-column> 49 +
54 <el-table-column label="商务合作标题" min-width="150" prop="title"> 50 <el-table-column label="商务合作标题" min-width="150" prop="title">
55 </el-table-column> 51 </el-table-column>
56 <el-table-column label="场地名称" min-width="150"> 52 <el-table-column label="场地名称" min-width="150">
@@ -150,11 +146,11 @@ @@ -150,11 +146,11 @@
150 <div style="padding: 15px;"> 146 <div style="padding: 15px;">
151 <div style="padding: 0px 20px 0px 0px"> 147 <div style="padding: 0px 20px 0px 0px">
152 <el-table :data="addziyuanData" :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> 148 <el-table :data="addziyuanData" :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
153 - <el-table-column label="序号" width="50"> 149 + <!-- <el-table-column label="序号" width="50">
154 <template slot-scope="scope"> 150 <template slot-scope="scope">
155 {{scope.$index + 1}} 151 {{scope.$index + 1}}
156 </template> 152 </template>
157 - </el-table-column> 153 + </el-table-column> -->
158 <el-table-column label="场地名称" prop="venueName"> 154 <el-table-column label="场地名称" prop="venueName">
159 </el-table-column> 155 </el-table-column>
160 <el-table-column label="所属区域" prop="district"> 156 <el-table-column label="所属区域" prop="district">
@@ -273,11 +269,11 @@ @@ -273,11 +269,11 @@
273 <div style="padding: 15px;"> 269 <div style="padding: 15px;">
274 <div style="padding: 0px 20px 0px 0px"> 270 <div style="padding: 0px 20px 0px 0px">
275 <el-table :data="addziyuanData" :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> 271 <el-table :data="addziyuanData" :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
276 - <el-table-column label="序号" width="50"> 272 + <!-- <el-table-column label="序号" width="50">
277 <template slot-scope="scope"> 273 <template slot-scope="scope">
278 {{scope.$index + 1}} 274 {{scope.$index + 1}}
279 </template> 275 </template>
280 - </el-table-column> 276 + </el-table-column> -->
281 <el-table-column label="场地名称" prop="venueName"> 277 <el-table-column label="场地名称" prop="venueName">
282 </el-table-column> 278 </el-table-column>
283 <el-table-column label="所属区域" prop="district"> 279 <el-table-column label="所属区域" prop="district">
admin-web-master/src/views/serve/PerWorkstation/index.vue
  View file @a67407b
@@ -35,11 +35,7 @@ @@ -35,11 +35,7 @@
35 ) 35 )
36 " :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" 36 " :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
37 style="width: 100%"> 37 style="width: 100%">
38 - <el-table-column label="序号" width="80px" align="center">  
39 - <template slot-scope="scope">  
40 - {{scope.$index+1}}  
41 - </template>  
42 - </el-table-column> 38 +
43 <el-table-column label="标题" prop="title" /> 39 <el-table-column label="标题" prop="title" />
44 <el-table-column label="接收商家" prop="receiverMerchant" /> 40 <el-table-column label="接收商家" prop="receiverMerchant" />
45 <!-- <el-table-column label="发布类型" prop="postType" width="auto" min-width="12%" /> 41 <!-- <el-table-column label="发布类型" prop="postType" width="auto" min-width="12%" />
@@ -194,7 +190,7 @@ @@ -194,7 +190,7 @@
194 </el-dialog> 190 </el-dialog>
195 191
196 <div class="fenye"> 192 <div class="fenye">
197 - <el-pagination class="pagination" :hide-on-single-page="flag" background small :current-page="currentPage" 193 + <el-pagination class="pagination" :hide-on-single-page="flag" background :current-page="currentPage"
198 :page-sizes="[10, 20, 50, 100]" layout="prev, pager, next,total" :total="total" 194 :page-sizes="[10, 20, 50, 100]" layout="prev, pager, next,total" :total="total"
199 @size-change="handleSizeChange" @current-change="handleCurrentChange" /> 195 @size-change="handleSizeChange" @current-change="handleCurrentChange" />
200 </div> 196 </div>
admin-web-master/src/views/serve/actSp.vue
  View file @a67407b
@@ -9,13 +9,16 @@ @@ -9,13 +9,16 @@
9 <!-- 搜索 --> 9 <!-- 搜索 -->
10 <div class="formSearch"> 10 <div class="formSearch">
11 <div class="demo-input-suffix"> 11 <div class="demo-input-suffix">
12 - <div style="width: 68px;height:36px;line-height:32px;">活动时间</div> 12 + <div style="width: 68px;height:36px;line-height:32px;">活动名称</div>
  13 + <el-input v-model="formSel.activityName" placeholder="请输入" style="width:168px;" />
  14 + <div style="width: 68px;height:36px;line-height:32px;margin-left: 10px;">举办区域</div>
  15 + <el-input v-model="formSel.region" placeholder="请输入" style="width:168px;" />
  16 + <div style="width: 68px;height:36px;line-height:32px;margin-left: 10px;">活动时间</div>
13 <el-date-picker style="width:200px;margin-right:15px;" v-model="plan_Time" 17 <el-date-picker style="width:200px;margin-right:15px;" v-model="plan_Time"
14 value-format="yyyy-MM-dd HH:mm:ss" prefix-icon="none" type="datetimerange" range-separator="-" 18 value-format="yyyy-MM-dd HH:mm:ss" prefix-icon="none" type="datetimerange" range-separator="-"
15 start-placeholder="开始日期" end-placeholder="结束日期"> 19 start-placeholder="开始日期" end-placeholder="结束日期">
16 </el-date-picker> 20 </el-date-picker>
17 - <div style="width: 68px;height:36px;line-height:32px;">举办区域</div>  
18 - <el-input v-model="formSel.region" placeholder="请输入" style="width:168px;" /> 21 +
19 </div> 22 </div>
20 <div> 23 <div>
21 <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询 24 <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询
@@ -28,11 +31,11 @@ @@ -28,11 +31,11 @@
28 <!-- 表格 --> 31 <!-- 表格 -->
29 <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)" 32 <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
30 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> 33 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
31 - <el-table-column label="序号" width="100"> 34 + <!-- <el-table-column label="序号" width="100">
32 <template slot-scope="scope"> 35 <template slot-scope="scope">
33 {{scope.$index + 1}} 36 {{scope.$index + 1}}
34 </template> 37 </template>
35 - </el-table-column> 38 + </el-table-column> -->
36 <el-table-column label="活动名称" prop="activityName" min-width="200"> 39 <el-table-column label="活动名称" prop="activityName" min-width="200">
37 40
38 </el-table-column> 41 </el-table-column>
@@ -65,7 +68,7 @@ @@ -65,7 +68,7 @@
65 </el-table> 68 </el-table>
66 <div class="fenye"> 69 <div class="fenye">
67 <div style="line-height: 200%;">共{{total}}条</div> 70 <div style="line-height: 200%;">共{{total}}条</div>
68 - <el-pagination class="pagination" :hide-on-single-page="flag" background small :current-page="currentPage" 71 + <el-pagination class="pagination" :hide-on-single-page="flag" background :current-page="currentPage"
69 :page-sizes="[10, 20, 50, 100]" layout="prev, pager,next" :total="total " @size-change="handleSizeChange" 72 :page-sizes="[10, 20, 50, 100]" layout="prev, pager,next" :total="total " @size-change="handleSizeChange"
70 @current-change="handleCurrentChange" /> 73 @current-change="handleCurrentChange" />
71 </div> 74 </div>
@@ -289,11 +292,11 @@ @@ -289,11 +292,11 @@
289 <div style="padding:20px;"> 292 <div style="padding:20px;">
290 <el-table :data="mingList" 293 <el-table :data="mingList"
291 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> 294 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
292 - <el-table-column label="序号" min-width="150"> 295 + <!-- <el-table-column label="序号" min-width="150">
293 <template slot-scope="scope"> 296 <template slot-scope="scope">
294 {{scope.$index +1 }} 297 {{scope.$index +1 }}
295 </template> 298 </template>
296 - </el-table-column> 299 + </el-table-column> -->
297 <el-table-column label="联系人" prop="signUpName" min-width="150"> 300 <el-table-column label="联系人" prop="signUpName" min-width="150">
298 301
299 </el-table-column> 302 </el-table-column>
@@ -350,6 +353,7 @@ @@ -350,6 +353,7 @@
350 upload: uploadUrl, 353 upload: uploadUrl,
351 plan_Time: [], 354 plan_Time: [],
352 formSel: { 355 formSel: {
  356 + activityName:'',
353 region: '', 357 region: '',
354 pageNumber: 0, 358 pageNumber: 0,
355 pageSize: 10, 359 pageSize: 10,
@@ -439,6 +443,7 @@ @@ -439,6 +443,7 @@
439 //重置按钮 443 //重置按钮
440 resetting() { 444 resetting() {
441 this.formSel = { 445 this.formSel = {
  446 + activityName:'',
442 region: '', 447 region: '',
443 pageNumber: 1, 448 pageNumber: 1,
444 pageSize: 10, 449 pageSize: 10,
admin-web-master/src/views/serve/kefuServe/index.vue
  View file @a67407b
@@ -22,11 +22,11 @@ @@ -22,11 +22,11 @@
22 ) 22 )
23 " :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" 23 " :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
24 style="width: 100%"> 24 style="width: 100%">
25 - <el-table-column label="序号" width="auto" min-width="6%" align="center"> 25 + <!-- <el-table-column label="序号" width="auto" min-width="6%" align="center">
26 <template slot-scope="scope"> 26 <template slot-scope="scope">
27 {{scope.$index+1}} 27 {{scope.$index+1}}
28 </template> 28 </template>
29 - </el-table-column> 29 + </el-table-column> -->
30 <el-table-column label="报修类型" prop="deviceType" width="auto" min-width="12%" /> 30 <el-table-column label="报修类型" prop="deviceType" width="auto" min-width="12%" />
31 <el-table-column label="问题描述" prop="warrantyIssue" width="auto" min-width="12%" /> 31 <el-table-column label="问题描述" prop="warrantyIssue" width="auto" min-width="12%" />
32 <el-table-column label="设备名称" prop="deviceName" width="auto" min-width="12%" /> 32 <el-table-column label="设备名称" prop="deviceName" width="auto" min-width="12%" />
@@ -64,11 +64,11 @@ @@ -64,11 +64,11 @@
64 ) 64 )
65 " :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" 65 " :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
66 style="width: 100%"> 66 style="width: 100%">
67 - <el-table-column label="序号" width="auto" min-width="6%" align="center"> 67 + <!-- <el-table-column label="序号" width="auto" min-width="6%" align="center">
68 <template slot-scope="scope"> 68 <template slot-scope="scope">
69 {{scope.$index+1}} 69 {{scope.$index+1}}
70 </template> 70 </template>
71 - </el-table-column> 71 + </el-table-column> -->
72 <el-table-column label="投诉类型" prop="complaintType" width="auto" min-width="12%" /> 72 <el-table-column label="投诉类型" prop="complaintType" width="auto" min-width="12%" />
73 <el-table-column label="问题描述" prop="problemDescription" width="auto" min-width="12%" /> 73 <el-table-column label="问题描述" prop="problemDescription" width="auto" min-width="12%" />
74 <el-table-column label="备注" prop="remark" width="auto" min-width="12%" /> 74 <el-table-column label="备注" prop="remark" width="auto" min-width="12%" />
admin-web-master/src/views/serve/procedure.vue
  View file @a67407b
@@ -5,6 +5,41 @@ @@ -5,6 +5,41 @@
5 <div style="color:#0006"> <span>客服服务管理</span> <span style="padding:0 5px;">></span> <span 5 <div style="color:#0006"> <span>客服服务管理</span> <span style="padding:0 5px;">></span> <span
6 style="color:#000000e6">公告通知发布</span></div> 6 style="color:#000000e6">公告通知发布</span></div>
7 </div> 7 </div>
  8 + <div class="formSearch">
  9 + <el-form
  10 + :inline="true"
  11 + :model="pageindex"
  12 + label-position="left"
  13 + >
  14 + <el-form-item label="标题" >
  15 + <el-input
  16 + placeholder="请输入"
  17 +
  18 + v-model="pageindex.announcementTitle">
  19 + </el-input>
  20 + </el-form-item>
  21 +
  22 + <el-form-item label="信息类型">
  23 + <el-select v-model="pageindex.informationType" placeholder="请选择" style="width:168px;" >
  24 + <el-option v-for="(item,index) in informationTypeList" :key="index" :label="item.label" :value="item.value"></el-option>
  25 + </el-select>
  26 + </el-form-item>
  27 +
  28 + </el-form>
  29 + <div>
  30 + <el-button
  31 + style="background-color: #3F9B6A;color: #fff;"
  32 + @click="search"
  33 + >查询
  34 + </el-button>
  35 + <el-button
  36 + class="buttonHover"
  37 + style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
  38 + @click="resetting"
  39 + >重置
  40 + </el-button>
  41 + </div>
  42 + </div>
8 <div> 43 <div>
9 <!-- 搜索 --> 44 <!-- 搜索 -->
10 <div style="margin-bottom:20px;"> 45 <div style="margin-bottom:20px;">
@@ -20,16 +55,16 @@ @@ -20,16 +55,16 @@
20 ) 55 )
21 " :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" 56 " :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
22 style="width: 100%"> 57 style="width: 100%">
23 - <el-table-column label="序号" width="auto" min-width="6%" align="center"> 58 + <!-- <el-table-column label="序号" width="auto" min-width="6%" align="center">
24 <template slot-scope="scope"> 59 <template slot-scope="scope">
25 {{scope.$index+1}} 60 {{scope.$index+1}}
26 </template> 61 </template>
27 - </el-table-column> 62 + </el-table-column> -->
28 <el-table-column label="标题" prop="announcementTitle" width="auto" min-width="12%" /> 63 <el-table-column label="标题" prop="announcementTitle" width="auto" min-width="12%" />
29 <el-table-column label="信息类型" prop="informationType" width="auto" min-width="12%" /> 64 <el-table-column label="信息类型" prop="informationType" width="auto" min-width="12%" />
30 <el-table-column label="创建时间" prop="releaseTime" width="auto" min-width="12%" /> 65 <el-table-column label="创建时间" prop="releaseTime" width="auto" min-width="12%" />
31 66
32 - <el-table-column label="操作" width="auto" min-width="17%"> 67 + <el-table-column label="操作" width="auto" min-width="8%">
33 <template slot-scope="scope"> 68 <template slot-scope="scope">
34 <div class="tableBtn greens" @click="handleEditForm(scope.row)"> 69 <div class="tableBtn greens" @click="handleEditForm(scope.row)">
35 查看 70 查看
@@ -114,13 +149,14 @@ @@ -114,13 +149,14 @@
114 "> 149 ">
115 {{secondData.informationType}} 150 {{secondData.informationType}}
116 </div> 151 </div>
117 - <el-select v-model="secondData.informationType" placeholder="请选择"  
118 - style="width:100%;" v-else>  
119 - <el-option label="通知" value="通知" /> 152 + <el-select v-model="secondData.informationType" placeholder="请选择" style="width:100%;" v-else>
  153 + <!-- <el-option label="通知" value="通知" />
120 <el-option label="热点租赁信息" value="热点租赁信息" /> 154 <el-option label="热点租赁信息" value="热点租赁信息" />
121 <el-option label="广告信息" value="广告信息" /> 155 <el-option label="广告信息" value="广告信息" />
122 - <el-option label="活动信息" value="活动信息" /> 156 + <el-option label="活动信息" value="活动信息" /> -->
  157 + <el-option v-for="(item,index) in informationTypeList" :key="index" :label="item.label" :value="item.value"></el-option>
123 </el-select> 158 </el-select>
  159 +
124 </el-form-item> 160 </el-form-item>
125 </el-form> 161 </el-form>
126 </el-col> 162 </el-col>
@@ -224,7 +260,7 @@ @@ -224,7 +260,7 @@
224 </el-dialog> 260 </el-dialog>
225 261
226 <div class="fenye"> 262 <div class="fenye">
227 - <el-pagination class="pagination" :hide-on-single-page="flag" background small 263 + <el-pagination class="pagination" :hide-on-single-page="flag" background
228 :current-page="currentPage" :page-sizes="[10, 20, 50, 100]" layout="prev, pager, next,total" 264 :current-page="currentPage" :page-sizes="[10, 20, 50, 100]" layout="prev, pager, next,total"
229 :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" /> 265 :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
230 </div> 266 </div>
@@ -269,12 +305,14 @@ @@ -269,12 +305,14 @@
269 releaseTime: '' //时间 305 releaseTime: '' //时间
270 }, 306 },
271 currentPage: 1, 307 currentPage: 1,
272 - total: 100, 308 + total: 0,
273 flag: false, 309 flag: false,
274 pageSize: 10, 310 pageSize: 10,
275 tableData: [], 311 tableData: [],
276 msgid: '', 312 msgid: '',
277 pageindex: { 313 pageindex: {
  314 + announcementTitle:'',
  315 + informationType:'',
278 pageNumber: 1, 316 pageNumber: 1,
279 pageSize: 10, 317 pageSize: 10,
280 }, 318 },
@@ -333,6 +371,20 @@ @@ -333,6 +371,20 @@
333 this.tableData = res.data.content 371 this.tableData = res.data.content
334 this.total = res.data.content.length 372 this.total = res.data.content.length
335 }, 373 },
  374 + search(){
  375 + this.currentPage = 1
  376 + this.getAll()
  377 + },
  378 + resetting(){
  379 + this.pageindex = {
  380 + announcementTitle:'',
  381 + informationType:'',
  382 + pageNumber: 1,
  383 + pageSize: 10,
  384 + }
  385 + this.currentPage = 1
  386 + this.getAll()
  387 + },
336 // 编辑 388 // 编辑
337 bianji() { 389 bianji() {
338 if (this.edit) { 390 if (this.edit) {
@@ -349,8 +401,7 @@ @@ -349,8 +401,7 @@
349 } 401 }
350 }, 402 },
351 403
352 - // 查询  
353 - async onSubmit() {}, 404 +
354 405
355 // 详情点击 406 // 详情点击
356 async handleEditForm(item) { 407 async handleEditForm(item) {
@@ -431,16 +482,6 @@ @@ -431,16 +482,6 @@
431 console.log(file, fileList); 482 console.log(file, fileList);
432 }, 483 },
433 484
434 - // 重置按钮  
435 - resetting() {  
436 - this.formSel = {  
437 - affiliation: '',  
438 - createUser: '',  
439 - createDate: '',  
440 - contacts: '',  
441 - };  
442 - this.getAll();  
443 - }  
444 }, 485 },
445 }; 486 };
446 </script> 487 </script>
@@ -456,21 +497,26 @@ @@ -456,21 +497,26 @@
456 background-color: #fff; 497 background-color: #fff;
457 } 498 }
458 499
459 - /deep/ .el-form-item__content { 500 +/* /deep/ .el-form-item__content {
460 width: 80%; 501 width: 80%;
461 - } 502 + } */
462 503
463 .tableBtn { 504 .tableBtn {
464 display: inline-block; 505 display: inline-block;
465 margin-right: 10px; 506 margin-right: 10px;
466 } 507 }
467 508
468 - .formSearch {  
469 - display: flex;  
470 - width: 100%;  
471 - font-size: 14px;  
472 - justify-content: space-between;  
473 - } 509 +::v-deep .formSearch {
  510 + position: relative;
  511 + display: flex;
  512 + width: 100%;
  513 + font-size: 14px;
  514 + justify-content: space-between;
  515 + .el-form-item__label{
  516 + font-size: 14px;
  517 + color: #000;
  518 + }
  519 +}
474 520
475 .greens { 521 .greens {
476 color: #3f9b6a; 522 color: #3f9b6a;
admin-web-master/src/views/serve/salesReport.vue
  View file @a67407b
@@ -58,9 +58,9 @@ @@ -58,9 +58,9 @@
58 tooltip-effect="dark" 58 tooltip-effect="dark"
59 59
60 > 60 >
61 - <el-table-column label="序号" width="50"> 61 + <!-- <el-table-column label="序号" width="50">
62 <template slot-scope="scope">{{ scope.$index +1 }}</template> 62 <template slot-scope="scope">{{ scope.$index +1 }}</template>
63 - </el-table-column> 63 + </el-table-column> -->
64 <el-table-column prop="productName" label="商品名称" width="180" /> 64 <el-table-column prop="productName" label="商品名称" width="180" />
65 <el-table-column prop="brand" label="品牌" width="180" show-overflow-tooltip /> 65 <el-table-column prop="brand" label="品牌" width="180" show-overflow-tooltip />
66 <el-table-column prop="productType" label="商品类型" show-overflow-tooltip /> 66 <el-table-column prop="productType" label="商品类型" show-overflow-tooltip />
admin-web-master/src/views/stockControl/stocksForewarn/index.vue
  View file @a67407b
@@ -60,15 +60,7 @@ @@ -60,15 +60,7 @@
60 </template> 60 </template>
61 </el-table-column> 61 </el-table-column>
62 <el-table-column prop="productName" label="商品名称" min-width="10%" /> 62 <el-table-column prop="productName" label="商品名称" min-width="10%" />
63 - <el-table-column  
64 - prop="stockNumber"  
65 - label="属性"  
66 - show-overflow-tooltip  
67 - min-width="8%">  
68 - <template slot-scope="scope">  
69 - 属性:1  
70 - </template>  
71 - </el-table-column> 63 +
72 <el-table-column 64 <el-table-column
73 prop="stockNumber" 65 prop="stockNumber"
74 label="库存数量" 66 label="库存数量"