Commit 6d7925d7070e864616c868c3f290676853ffc48e
1 parent
e3b80de2
1
Showing
29 changed files
with
149 additions
and
106 deletions
admin-web-master/src/components/add/addyixiang.vue
| ... | ... | @@ -396,7 +396,7 @@ |
| 396 | 396 | </el-form> |
| 397 | 397 | </div> |
| 398 | 398 | </div> |
| 399 | - <div v-if="info.intentionStatus == '2' || info.intentionStatus == '3'"> | |
| 399 | + <div v-if="(info.intentionStatus == '2' || info.intentionStatus == '3') && xiangTab=='first'"> | |
| 400 | 400 | <TitleWithCircle title="审核结果"/> |
| 401 | 401 | <div style="padding: 20px;"> |
| 402 | 402 | <el-form :model="info" label-width="100px" class="demo-ruleForm"> | ... | ... |
admin-web-master/src/components/buscha/busCha.vue
| ... | ... | @@ -251,7 +251,7 @@ |
| 251 | 251 | </el-form> |
| 252 | 252 | </div> |
| 253 | 253 | </div> |
| 254 | - <div v-if="(info.dataStatus == '1' || info.dataStatus == '6')&& info.isInterior == '1'" style="margin-top: 20px;"> | |
| 254 | + <div v-if="(info.dataStatus == '1' || info.dataStatus == '6')&& info.isInterior == '1' && xiangTab=='first'" style="margin-top: 20px;"> | |
| 255 | 255 | <TitleWithCircle title="审核结果"/> |
| 256 | 256 | <div style="padding: 20px;"> |
| 257 | 257 | <el-form :model="info" label-width="100px" class="demo-ruleForm"> | ... | ... |
admin-web-master/src/components/buscha/busChanew.vue
| ... | ... | @@ -177,7 +177,7 @@ |
| 177 | 177 | </el-form> |
| 178 | 178 | </div> |
| 179 | 179 | </div> |
| 180 | - <div v-if="(newinfo.status == '2' || newinfo.status == '3')&& newinfo.isInterior == '1'" style="margin-top: 20px;"> | |
| 180 | + <div v-if="(newinfo.status == '2' || newinfo.status == '3')&& newinfo.isInterior == '1' && xiangTab=='one'" style="margin-top: 20px;"> | |
| 181 | 181 | <TitleWithCircle title="审核结果"/> |
| 182 | 182 | <div style="padding: 20px;"> |
| 183 | 183 | <el-form :model="newinfo" label-width="100px" class="demo-ruleForm"> | ... | ... |
admin-web-master/src/components/chakan/cd.vue
| ... | ... | @@ -251,7 +251,7 @@ |
| 251 | 251 | </el-form> |
| 252 | 252 | </div> |
| 253 | 253 | </div> |
| 254 | - <div v-if="editbgid.publishStatus == '2' || editbgid.publishStatus == '3'"> | |
| 254 | + <div v-if="(editbgid.publishStatus == '2' || editbgid.publishStatus == '3') && xiangTab == 'first'"> | |
| 255 | 255 | <TitleWithCircle title="审核结果"/> |
| 256 | 256 | <div style="padding: 20px;"> |
| 257 | 257 | <el-form :model="editbgid" label-width="100px" class="demo-ruleForm"> | ... | ... |
admin-web-master/src/components/chakan/yx.vue
| ... | ... | @@ -134,7 +134,7 @@ |
| 134 | 134 | </el-form> |
| 135 | 135 | </div> |
| 136 | 136 | </div> |
| 137 | - <div v-if="info.auditStatus == '2' || info.auditStatus == '3'"> | |
| 137 | + <div v-if="(info.auditStatus == '2' || info.auditStatus == '3') && xiangTab=='first'"> | |
| 138 | 138 | <TitleWithCircle title="审核结果"/> |
| 139 | 139 | <div style="padding: 20px;"> |
| 140 | 140 | <el-form :model="info" label-width="100px" class="demo-ruleForm"> | ... | ... |
admin-web-master/src/components/chakan/zl.vue
| ... | ... | @@ -403,7 +403,7 @@ |
| 403 | 403 | </el-form> |
| 404 | 404 | </div> |
| 405 | 405 | </div> |
| 406 | - <div v-if="info.auditStatus == '2' || info.auditStatus == '3'"> | |
| 406 | + <div v-if="(info.auditStatus == '2' || info.auditStatus == '3') && xiangTab == 'first'"> | |
| 407 | 407 | <TitleWithCircle title="审核结果"/> |
| 408 | 408 | <div style="padding: 20px;"> |
| 409 | 409 | <el-form :model="info" label-width="100px" class="demo-ruleForm"> | ... | ... |
admin-web-master/src/components/merchantInformation/index.vue
| ... | ... | @@ -394,7 +394,7 @@ |
| 394 | 394 | </el-form> |
| 395 | 395 | </div> |
| 396 | 396 | </div> |
| 397 | - <div v-if="info.checkState == '2' || info.checkState == '3'"> | |
| 397 | + <div v-if="(info.checkState == '2' || info.checkState == '3') && xiangTab=='one'"> | |
| 398 | 398 | <TitleWithCircle title="审核结果" /> |
| 399 | 399 | <div style="padding: 20px;"> |
| 400 | 400 | <el-form :model="info" label-width="100px" class="demo-ruleForm"> | ... | ... |
admin-web-master/src/utils/request.js
| ... | ... | @@ -17,13 +17,13 @@ let baseURL = '' |
| 17 | 17 | if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { |
| 18 | 18 | |
| 19 | 19 | // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; |
| 20 | - // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'; | |
| 20 | + baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'; | |
| 21 | 21 | |
| 22 | 22 | // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; |
| 23 | 23 | |
| 24 | 24 | |
| 25 | - baseURL = 'http://128.10.249.21:9003'; | |
| 26 | - | |
| 25 | + // baseURL = 'http://128.10.249.21:9003'; | |
| 26 | + | |
| 27 | 27 | |
| 28 | 28 | } else { |
| 29 | 29 | console.error('---------------------') | ... | ... |
admin-web-master/src/views/ads/fangAudit/index.vue
| ... | ... | @@ -34,11 +34,7 @@ |
| 34 | 34 | <!-- 表格 --> |
| 35 | 35 | |
| 36 | 36 | <el-table :data="tableData" :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> |
| 37 | - <el-table-column label="序号" width="50"> | |
| 38 | - <template slot-scope="scope"> | |
| 39 | - {{scope.$index +1 }} | |
| 40 | - </template> | |
| 41 | - </el-table-column> | |
| 37 | + | |
| 42 | 38 | <el-table-column label="招商方案名称" prop="planName" show-overflow-tooltip max-width="200"/> |
| 43 | 39 | <el-table-column label="涵盖资源数" prop="createTime"> |
| 44 | 40 | <template slot-scope="scope"> | ... | ... |
admin-web-master/src/views/ads/fangli/index.vue
| ... | ... | @@ -39,11 +39,7 @@ |
| 39 | 39 | <!-- 表格 --> |
| 40 | 40 | |
| 41 | 41 | <el-table :data="tableData" :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> |
| 42 | - <el-table-column label="序号" width="50"> | |
| 43 | - <template slot-scope="scope"> | |
| 44 | - {{scope.$index +1 }} | |
| 45 | - </template> | |
| 46 | - </el-table-column> | |
| 42 | + | |
| 47 | 43 | <el-table-column label="招商方案名称" prop="planName" show-overflow-tooltip max-width="200"/> |
| 48 | 44 | <el-table-column label="涵盖资源数" prop="createTime"> |
| 49 | 45 | <template slot-scope="scope"> | ... | ... |
admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue
| ... | ... | @@ -39,11 +39,11 @@ |
| 39 | 39 | <!-- 表格 --> |
| 40 | 40 | <el-table :data="tableData" |
| 41 | 41 | :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> |
| 42 | - <el-table-column label="序号" width="50" prop="id"> | |
| 42 | + <!-- <el-table-column label="序号" width="50" prop="id"> | |
| 43 | 43 | <template slot-scope="scope"> |
| 44 | 44 | {{scope.$index + 1 }} |
| 45 | 45 | </template> |
| 46 | - </el-table-column> | |
| 46 | + </el-table-column> --> | |
| 47 | 47 | <el-table-column label="编号" prop="id"> |
| 48 | 48 | </el-table-column> |
| 49 | 49 | <el-table-column label="所属端" v-if="leixing == 1"> | ... | ... |
admin-web-master/src/views/business/autd/index.vue
| ... | ... | @@ -13,6 +13,12 @@ |
| 13 | 13 | <el-form-item label="名称"> |
| 14 | 14 | <el-input v-model="pagequery.name" placeholder="请输入" style="width:168px;" /> |
| 15 | 15 | </el-form-item> |
| 16 | + <el-form-item label="手机号"> | |
| 17 | + <el-input v-model="pagequery.phone" placeholder="请输入" style="width:168px;" /> | |
| 18 | + </el-form-item> | |
| 19 | + <el-form-item label="身份证号"> | |
| 20 | + <el-input v-model="pagequery.idCardNumber" placeholder="请输入" style="width:168px;" /> | |
| 21 | + </el-form-item> | |
| 16 | 22 | </el-form> |
| 17 | 23 | |
| 18 | 24 | <div> |
| ... | ... | @@ -27,11 +33,11 @@ |
| 27 | 33 | |
| 28 | 34 | <el-table :data="tableData" |
| 29 | 35 | :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> |
| 30 | - <el-table-column label="序号" width="80"> | |
| 36 | + <!-- <el-table-column label="序号" width="80"> | |
| 31 | 37 | <template slot-scope="scope"> |
| 32 | 38 | {{scope.$index + 1}} |
| 33 | 39 | </template> |
| 34 | - </el-table-column> | |
| 40 | + </el-table-column> --> | |
| 35 | 41 | <el-table-column label="姓名"> |
| 36 | 42 | <template slot-scope="scope"> |
| 37 | 43 | {{scope.row.name}} |
| ... | ... | @@ -176,6 +182,8 @@ |
| 176 | 182 | pageSize: 10, |
| 177 | 183 | // checkState:'1', |
| 178 | 184 | name: '', |
| 185 | + idCardNumber:'', | |
| 186 | + phone:'' | |
| 179 | 187 | |
| 180 | 188 | }, |
| 181 | 189 | tableData: [], |
| ... | ... | @@ -278,7 +286,9 @@ |
| 278 | 286 | pageNumber: 0, |
| 279 | 287 | pageSize: 10, |
| 280 | 288 | checkState:'1', |
| 281 | - name: '' | |
| 289 | + name: '', | |
| 290 | + idCardNumber:'', | |
| 291 | + phone:'' | |
| 282 | 292 | }, |
| 283 | 293 | this.getAll() |
| 284 | 294 | }, | ... | ... |
admin-web-master/src/views/business/businessList/index.vue
| ... | ... | @@ -13,6 +13,12 @@ |
| 13 | 13 | <el-form-item label="名称"> |
| 14 | 14 | <el-input v-model="pagequery.name" placeholder="请输入" style="width:168px;" /> |
| 15 | 15 | </el-form-item> |
| 16 | + <el-form-item label="手机号"> | |
| 17 | + <el-input v-model="pagequery.phone" placeholder="请输入" style="width:168px;" /> | |
| 18 | + </el-form-item> | |
| 19 | + <el-form-item label="身份证号"> | |
| 20 | + <el-input v-model="pagequery.idCardNumber" placeholder="请输入" style="width:168px;" /> | |
| 21 | + </el-form-item> | |
| 16 | 22 | </el-form> |
| 17 | 23 | |
| 18 | 24 | <div> |
| ... | ... | @@ -32,11 +38,6 @@ |
| 32 | 38 | |
| 33 | 39 | <el-table :data="tableData" |
| 34 | 40 | :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> |
| 35 | - <el-table-column label="序号" width="80"> | |
| 36 | - <template slot-scope="scope"> | |
| 37 | - {{scope.$index + 1}} | |
| 38 | - </template> | |
| 39 | - </el-table-column> | |
| 40 | 41 | <el-table-column label="姓名"> |
| 41 | 42 | <template slot-scope="scope"> |
| 42 | 43 | {{scope.row.name}} |
| ... | ... | @@ -192,6 +193,8 @@ |
| 192 | 193 | pageSize: 10, |
| 193 | 194 | checkState: '2', |
| 194 | 195 | name: '', |
| 196 | + idCardNumber:'', | |
| 197 | + phone:'' | |
| 195 | 198 | |
| 196 | 199 | }, |
| 197 | 200 | tableData: [], |
| ... | ... | @@ -295,7 +298,9 @@ |
| 295 | 298 | pageNumber: 0, |
| 296 | 299 | pageSize: 10, |
| 297 | 300 | checkState: '2', |
| 298 | - name: '' | |
| 301 | + name: '', | |
| 302 | + idCardNumber:'', | |
| 303 | + phone:'' | |
| 299 | 304 | }, |
| 300 | 305 | this.getAll() |
| 301 | 306 | }, | ... | ... |
admin-web-master/src/views/customer/icManagement/index.vue
| ... | ... | @@ -16,6 +16,13 @@ |
| 16 | 16 | <el-form-item label="手机号" prop="phone"> |
| 17 | 17 | <el-input v-model="pagequery.phone" placeholder="请输入" maxlength="50"></el-input> |
| 18 | 18 | </el-form-item> |
| 19 | + <el-form-item label="意向租赁类型" prop="leaseType"> | |
| 20 | + <el-select v-model="pagequery.leaseType" placeholder="请选择" style="width:100%"> | |
| 21 | + <el-option label="商铺" value="商铺" /> | |
| 22 | + <el-option label="场地" value="场地" /> | |
| 23 | + <el-option label="广告位" value="广告位" /> | |
| 24 | + </el-select> | |
| 25 | + </el-form-item> | |
| 19 | 26 | </el-form> |
| 20 | 27 | |
| 21 | 28 | <div> |
| ... | ... | @@ -34,11 +41,7 @@ |
| 34 | 41 | <!-- 表格 --> |
| 35 | 42 | |
| 36 | 43 | <el-table :data="tableData" :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> |
| 37 | - <el-table-column label="序号" width="50"> | |
| 38 | - <template slot-scope="scope"> | |
| 39 | - {{scope.$index +1 }} | |
| 40 | - </template> | |
| 41 | - </el-table-column> | |
| 44 | + | |
| 42 | 45 | <el-table-column label="意向客户名称" prop="intentCustomerName"/> |
| 43 | 46 | <el-table-column label="手机号" prop="phone"/> |
| 44 | 47 | <el-table-column label="意向租赁类型" prop="leaseType"/> |
| ... | ... | @@ -120,7 +123,8 @@ |
| 120 | 123 | pageNumber: 0, |
| 121 | 124 | pageSize: 10, |
| 122 | 125 | intentCustomerName:'', |
| 123 | - phone:'' | |
| 126 | + phone:'', | |
| 127 | + leaseType:'' | |
| 124 | 128 | }, |
| 125 | 129 | tableData: [], |
| 126 | 130 | total: 0, |
| ... | ... | @@ -177,7 +181,8 @@ |
| 177 | 181 | pageNumber: 0, |
| 178 | 182 | pageSize: 10, |
| 179 | 183 | intentCustomerName:'', |
| 180 | - phone:'' | |
| 184 | + phone:'', | |
| 185 | + leaseType:'' | |
| 181 | 186 | }, |
| 182 | 187 | this.getAll() |
| 183 | 188 | }, | ... | ... |
admin-web-master/src/views/customer/icReview/index.vue
| ... | ... | @@ -42,11 +42,11 @@ |
| 42 | 42 | |
| 43 | 43 | <el-table :data="tableData" |
| 44 | 44 | :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> |
| 45 | - <el-table-column label="序号" width="80"> | |
| 45 | + <!-- <el-table-column label="序号" width="80"> | |
| 46 | 46 | <template slot-scope="scope"> |
| 47 | 47 | {{scope.$index + 1}} |
| 48 | 48 | </template> |
| 49 | - </el-table-column> | |
| 49 | + </el-table-column> --> | |
| 50 | 50 | <el-table-column label="资源名称"> |
| 51 | 51 | <template slot-scope="scope"> |
| 52 | 52 | {{scope.row.cereAdvertisingInformation.id?scope.row.cereAdvertisingInformation.id:scope.row.cereBasicInformationShop.shopName?scope.row.cereBasicInformationShop.shopName:scope.row.cereBasicInformationVenue.venueName?scope.row.cereBasicInformationVenue.venueName:''}} | ... | ... |
admin-web-master/src/views/customer/rUser/index.vue
| ... | ... | @@ -20,9 +20,9 @@ |
| 20 | 20 | </el-select> |
| 21 | 21 | </el-form-item> |
| 22 | 22 | <!-- <el-form-item label="是否黑名单"> |
| 23 | - <el-select v-model="formSel.rating" placeholder="请选择" style="width:168px;margin-right: 15px"> | |
| 24 | - <el-option label="否" value="0" /> | |
| 25 | - <el-option label="是" value="1" /> | |
| 23 | + <el-select v-model="pageindex.isBlackList" placeholder="请选择" style="width:168px;margin-right: 15px"> | |
| 24 | + <el-option label="否" value="" /> | |
| 25 | + <el-option label="是" value="0" /> | |
| 26 | 26 | </el-select> |
| 27 | 27 | </el-form-item> --> |
| 28 | 28 | </el-form> |
| ... | ... | @@ -37,11 +37,11 @@ |
| 37 | 37 | |
| 38 | 38 | <!-- 表格 --> |
| 39 | 39 | <el-table :data="tableData" :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> |
| 40 | - <el-table-column label="序号" min-width="100"> | |
| 40 | + <!-- <el-table-column label="序号" min-width="100"> | |
| 41 | 41 | <template slot-scope="scope"> |
| 42 | 42 | {{scope.$index+1}} |
| 43 | 43 | </template> |
| 44 | - </el-table-column> | |
| 44 | + </el-table-column> --> | |
| 45 | 45 | <el-table-column label="商家名称" prop="name" min-width="200" /> |
| 46 | 46 | <el-table-column label="当前评分等级" prop="rating" min-width="120"> |
| 47 | 47 | ... | ... |
admin-web-master/src/views/customer/rsaManagement/index.vue
| ... | ... | @@ -12,6 +12,9 @@ |
| 12 | 12 | <el-form-item label="意向客户名称"> |
| 13 | 13 | <el-input v-model="formSel.intentCustomerName" placeholder="请输入" class="moren" style="width:168px" /> |
| 14 | 14 | </el-form-item> |
| 15 | + <el-form-item label="手机号"> | |
| 16 | + <el-input v-model="formSel.phone" placeholder="请输入" class="moren" style="width:168px" /> | |
| 17 | + </el-form-item> | |
| 15 | 18 | <el-form-item label="意向资源类型"> |
| 16 | 19 | <el-select v-model="formSel.leaseType" placeholder="请选择" style="width:168px"> |
| 17 | 20 | <el-option label="商铺" value="商铺" /> |
| ... | ... | @@ -41,11 +44,11 @@ |
| 41 | 44 | currentPage * pageSize |
| 42 | 45 | ) |
| 43 | 46 | " :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> |
| 44 | - <el-table-column label="序号" min-width="80"> | |
| 47 | + <!-- <el-table-column label="序号" min-width="80"> | |
| 45 | 48 | <template slot-scope="scope"> |
| 46 | 49 | {{scope.$index+1}} |
| 47 | 50 | </template> |
| 48 | - </el-table-column> | |
| 51 | + </el-table-column> --> | |
| 49 | 52 | <el-table-column label="意向客户名称" prop="intentCustomerName" min-width="150" /> |
| 50 | 53 | <el-table-column label="手机号" prop="phone" min-width="180" /> |
| 51 | 54 | <el-table-column label="意向租赁类型" prop="leaseType" min-width="120" /> |
| ... | ... | @@ -468,7 +471,8 @@ |
| 468 | 471 | leaseType: '', |
| 469 | 472 | pageNumber: 0, |
| 470 | 473 | pageSize: 10, |
| 471 | - auditStatus: '1' | |
| 474 | + auditStatus: '1', | |
| 475 | + phone:'' | |
| 472 | 476 | }, |
| 473 | 477 | ruleForm: { |
| 474 | 478 | intentCustomerName: '', //意向客户名称 |
| ... | ... | @@ -804,7 +808,8 @@ |
| 804 | 808 | leaseType: '', |
| 805 | 809 | pageNumber: 0, |
| 806 | 810 | pageSize: 10, |
| 807 | - auditStatus: '1' | |
| 811 | + auditStatus: '1', | |
| 812 | + phone:'' | |
| 808 | 813 | } |
| 809 | 814 | this.currentPage = 1 |
| 810 | 815 | this.getAll() | ... | ... |
admin-web-master/src/views/customer/rsaReview/index.vue
| 1 | -<template> | |
| 1 | + <template> | |
| 2 | 2 | <div style="background-color:#f7f7f7;padding:10px 10px;"> |
| 3 | 3 | <div class="zhuti" v-if="ggXin == false && detbox==false"> |
| 4 | 4 | <div style="height:58px;line-height:58px;"> |
| ... | ... | @@ -12,6 +12,9 @@ |
| 12 | 12 | <el-form-item label="意向客户名称"> |
| 13 | 13 | <el-input v-model="formSel.intentCustomerName" placeholder="请输入" class="moren" style="width:168px" /> |
| 14 | 14 | </el-form-item> |
| 15 | + <el-form-item label="手机号"> | |
| 16 | + <el-input v-model="formSel.phone" placeholder="请输入" class="moren" style="width:168px" /> | |
| 17 | + </el-form-item> | |
| 15 | 18 | <el-form-item label="意向资源类型"> |
| 16 | 19 | <el-select v-model="formSel.leaseType" placeholder="请选择" style="width:168px"> |
| 17 | 20 | <el-option label="商铺" value="商铺" /> |
| ... | ... | @@ -37,11 +40,11 @@ |
| 37 | 40 | currentPage * pageSize |
| 38 | 41 | ) |
| 39 | 42 | " :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> |
| 40 | - <el-table-column label="序号" min-width="80"> | |
| 43 | + <!-- <el-table-column label="序号" min-width="80"> | |
| 41 | 44 | <template slot-scope="scope"> |
| 42 | 45 | {{scope.$index+1}} |
| 43 | 46 | </template> |
| 44 | - </el-table-column> | |
| 47 | + </el-table-column> --> | |
| 45 | 48 | <el-table-column label="意向客户名称" prop="intentCustomerName" min-width="150" /> |
| 46 | 49 | <el-table-column label="手机号" prop="phone" min-width="180" /> |
| 47 | 50 | <el-table-column label="意向租赁类型" prop="leaseType" min-width="120" /> |
| ... | ... | @@ -442,6 +445,7 @@ |
| 442 | 445 | leaseType: '', |
| 443 | 446 | pageNumber: 0, |
| 444 | 447 | pageSize: 10, |
| 448 | + phone:'' | |
| 445 | 449 | }, |
| 446 | 450 | ruleForm: { |
| 447 | 451 | intentCustomerName: '', //意向客户名称 |
| ... | ... | @@ -630,6 +634,7 @@ |
| 630 | 634 | leaseType: '', |
| 631 | 635 | pageNumber: 0, |
| 632 | 636 | pageSize: 10, |
| 637 | + phone:'' | |
| 633 | 638 | } |
| 634 | 639 | this.currentPage = 1 |
| 635 | 640 | this.getAll() | ... | ... |
admin-web-master/src/views/customer/yixiang/index.vue
| ... | ... | @@ -17,11 +17,11 @@ |
| 17 | 17 | <!-- 表格 --> |
| 18 | 18 | <el-table :data="tableData" |
| 19 | 19 | :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> |
| 20 | - <el-table-column label="序号" min-width="50"> | |
| 20 | + <!-- <el-table-column label="序号" min-width="50"> | |
| 21 | 21 | <template slot-scope="scope"> |
| 22 | 22 | {{scope.$index +1 }} |
| 23 | 23 | </template> |
| 24 | - </el-table-column> | |
| 24 | + </el-table-column> --> | |
| 25 | 25 | <el-table-column label="意向资源类型" prop="applicableResources" min-width="150" show-overflow-tooltip> |
| 26 | 26 | |
| 27 | 27 | </el-table-column> | ... | ... |
admin-web-master/src/views/detect/admap copy 4.vue
| ... | ... | @@ -46,11 +46,7 @@ |
| 46 | 46 | <!-- 表格 --> |
| 47 | 47 | <el-table v-if="ontype=='1'" :data="tableData" |
| 48 | 48 | :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> |
| 49 | - <el-table-column label="序号" width="50"> | |
| 50 | - <template slot-scope="scope"> | |
| 51 | - {{scope.$index +1 }} | |
| 52 | - </template> | |
| 53 | - </el-table-column> | |
| 49 | + | |
| 54 | 50 | <el-table-column label="商铺名称" prop="shopName" show-overflow-tooltip></el-table-column> |
| 55 | 51 | <el-table-column label="商铺类型" prop="publishStatus" show-overflow-tooltip> |
| 56 | 52 | <template slot-scope="scope"> | ... | ... |
admin-web-master/src/views/detect/admap.vue
| ... | ... | @@ -178,11 +178,7 @@ |
| 178 | 178 | <!-- 表格 --> |
| 179 | 179 | <el-table v-if="ontype=='1'" :data="tableData" |
| 180 | 180 | :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> |
| 181 | - <el-table-column label="序号" width="50"> | |
| 182 | - <template slot-scope="scope"> | |
| 183 | - {{scope.$index +1 }} | |
| 184 | - </template> | |
| 185 | - </el-table-column> | |
| 181 | + | |
| 186 | 182 | <el-table-column label="商铺名称" prop="shopName" show-overflow-tooltip></el-table-column> |
| 187 | 183 | <el-table-column label="商铺类型" prop="publishStatus" show-overflow-tooltip> |
| 188 | 184 | <template slot-scope="scope"> | ... | ... |
admin-web-master/src/views/detect/information/index.vue
| ... | ... | @@ -58,11 +58,6 @@ |
| 58 | 58 | |
| 59 | 59 | <el-table :data="tableData" |
| 60 | 60 | :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> |
| 61 | - <el-table-column label="序号" width="50"> | |
| 62 | - <template slot-scope="scope"> | |
| 63 | - {{scope.$index +1 }} | |
| 64 | - </template> | |
| 65 | - </el-table-column> | |
| 66 | 61 | <el-table-column label="商铺名称" prop="shopName" show-overflow-tooltip></el-table-column> |
| 67 | 62 | <el-table-column label="商铺类型" prop="publishStatus" show-overflow-tooltip> |
| 68 | 63 | <template slot-scope="scope"> | ... | ... |
admin-web-master/src/views/detect/map/index.vue
| ... | ... | @@ -59,11 +59,7 @@ |
| 59 | 59 | <!-- 表格 --> |
| 60 | 60 | <el-table :data="tableData" |
| 61 | 61 | :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> |
| 62 | - <el-table-column label="序号" width="50"> | |
| 63 | - <template slot-scope="scope"> | |
| 64 | - {{scope.$index +1 }} | |
| 65 | - </template> | |
| 66 | - </el-table-column> | |
| 62 | + | |
| 67 | 63 | <el-table-column label="广告位名称" prop="advertisingName" show-overflow-tooltip> |
| 68 | 64 | </el-table-column> |
| 69 | 65 | <el-table-column label="广告位类型" prop="advertisingType" show-overflow-tooltip> | ... | ... |
admin-web-master/src/views/rent/audit/index.vue
| ... | ... | @@ -51,11 +51,6 @@ |
| 51 | 51 | |
| 52 | 52 | <el-table :data="tableData" |
| 53 | 53 | :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> |
| 54 | - <el-table-column label="序号" width="80"> | |
| 55 | - <template slot-scope="scope"> | |
| 56 | - {{scope.$index + 1}} | |
| 57 | - </template> | |
| 58 | - </el-table-column> | |
| 59 | 54 | <el-table-column label="资源名称"> |
| 60 | 55 | <template slot-scope="scope"> |
| 61 | 56 | {{scope.row.cereAdvertisingInformation.id?scope.row.cereAdvertisingInformation.id:scope.row.cereBasicInformationShop.shopName?scope.row.cereBasicInformationShop.shopName:scope.row.cereBasicInformationVenue.venueName?scope.row.cereBasicInformationVenue.venueName:''}} | ... | ... |
admin-web-master/src/views/scheme/sam.vue
| ... | ... | @@ -49,11 +49,6 @@ |
| 49 | 49 | <!-- 表格 --> |
| 50 | 50 | <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)" |
| 51 | 51 | :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> |
| 52 | - <el-table-column label="序号" min-width="100"> | |
| 53 | - <template slot-scope="scope"> | |
| 54 | - {{scope.$index +1}} | |
| 55 | - </template> | |
| 56 | - </el-table-column> | |
| 57 | 52 | <el-table-column label="策略名称" prop="policyName" min-width="200"> |
| 58 | 53 | </el-table-column> |
| 59 | 54 | <el-table-column label="适用资源" prop="applicableResources" min-width="100"> | ... | ... |
admin-web-master/src/views/shopRental/manage/index.vue
| ... | ... | @@ -18,7 +18,13 @@ |
| 18 | 18 | <el-option label="使用中" value="1"></el-option> |
| 19 | 19 | <el-option label="往期合同" value="2"></el-option> |
| 20 | 20 | <el-option label="已终止" value="3"></el-option> |
| 21 | - | |
| 21 | + </el-select> | |
| 22 | + </el-form-item> | |
| 23 | + <el-form-item label="合同类型" prop="contractType"> | |
| 24 | + <el-select v-model="pagequery.contractType" clearable placeholder="请选择" style="width: 168px;margin-right: 15px"> | |
| 25 | + <el-option label="商铺合同" value="商铺合同"></el-option> | |
| 26 | + <el-option label="广告位合同" value="广告位合同"></el-option> | |
| 27 | + <el-option label="场地合同" value="场地合同"></el-option> | |
| 22 | 28 | </el-select> |
| 23 | 29 | </el-form-item> |
| 24 | 30 | </el-form> |
| ... | ... | @@ -220,7 +226,8 @@ |
| 220 | 226 | // dataStatus:'1', |
| 221 | 227 | pageNumber: 0, |
| 222 | 228 | pageSize: 10, |
| 223 | - contractName: '' | |
| 229 | + contractName: '', | |
| 230 | + contractType:'' | |
| 224 | 231 | }, |
| 225 | 232 | tableData: [], |
| 226 | 233 | total: 0, |
| ... | ... | @@ -501,7 +508,8 @@ |
| 501 | 508 | pageNumber: 0, |
| 502 | 509 | pageSize: 10, |
| 503 | 510 | dataStatus:'', |
| 504 | - contractName: '' | |
| 511 | + contractName: '', | |
| 512 | + contractType:'' | |
| 505 | 513 | }, |
| 506 | 514 | this.getAll() |
| 507 | 515 | }, | ... | ... |
admin-web-master/src/views/shopRental/renewalMan/index.vue
| ... | ... | @@ -10,17 +10,20 @@ |
| 10 | 10 | <!-- 搜索 --> |
| 11 | 11 | <div class="formSearch"> |
| 12 | 12 | <el-form :inline="true" :model="pagequery"> |
| 13 | - <!-- <el-form-item label="合同名称"> | |
| 14 | - <el-input v-model="pagequery.contractName" placeholder="请输入" style="width:168px;" /> | |
| 13 | + <el-form-item label="承租人名称"> | |
| 14 | + <el-input v-model="pagequery.cereContractInformation.tenantName" placeholder="请输入" style="width:168px;" /> | |
| 15 | 15 | </el-form-item> |
| 16 | - <el-form-item label="合同状态" prop="status"> | |
| 16 | + <el-form-item label="手机号"> | |
| 17 | + <el-input v-model="pagequery.cereContractInformation.tenantTelephone" placeholder="请输入" style="width:168px;" /> | |
| 18 | + </el-form-item> | |
| 19 | + <el-form-item label="状态" prop="status"> | |
| 17 | 20 | <el-select v-model="pagequery.status" clearable placeholder="请选择" style="width: 168px;margin-right: 15px"> |
| 18 | - <el-option label="使用中" value="1"></el-option> | |
| 19 | - <el-option label="往期合同" value="2"></el-option> | |
| 20 | - <el-option label="已终止" value="3"></el-option> | |
| 21 | + <el-option label="待审核" value="1"></el-option> | |
| 22 | + <el-option label="已同意" value="2"></el-option> | |
| 23 | + <el-option label="已拒绝" value="3"></el-option> | |
| 21 | 24 | |
| 22 | 25 | </el-select> |
| 23 | - </el-form-item> --> | |
| 26 | + </el-form-item> | |
| 24 | 27 | </el-form> |
| 25 | 28 | |
| 26 | 29 | <div> |
| ... | ... | @@ -200,7 +203,12 @@ |
| 200 | 203 | pageNumber: 0, |
| 201 | 204 | pageSize: 10, |
| 202 | 205 | contractType:'1', |
| 203 | - contractName: '' | |
| 206 | + contractName: '', | |
| 207 | + cereContractInformation:{ | |
| 208 | + tenantName:'', | |
| 209 | + tenantTelephone:'', | |
| 210 | + }, | |
| 211 | + status:'' | |
| 204 | 212 | }, |
| 205 | 213 | tableData: [], |
| 206 | 214 | total: 0, |
| ... | ... | @@ -456,7 +464,12 @@ |
| 456 | 464 | pageSize: 10, |
| 457 | 465 | status:'', |
| 458 | 466 | contractType:'1', |
| 459 | - contractName: '' | |
| 467 | + contractName: '', | |
| 468 | + cereContractInformation:{ | |
| 469 | + tenantName:'', | |
| 470 | + tenantTelephone:'', | |
| 471 | + }, | |
| 472 | + status:'' | |
| 460 | 473 | }, |
| 461 | 474 | this.getAll() |
| 462 | 475 | }, | ... | ... |
admin-web-master/src/views/shopRental/rentTermination/index.vue
| ... | ... | @@ -10,17 +10,20 @@ |
| 10 | 10 | <!-- 搜索 --> |
| 11 | 11 | <div class="formSearch"> |
| 12 | 12 | <el-form :inline="true" :model="pagequery"> |
| 13 | - <!-- <el-form-item label="合同名称"> | |
| 14 | - <el-input v-model="pagequery.contractName" placeholder="请输入" style="width:168px;" /> | |
| 13 | + <el-form-item label="承租人名称"> | |
| 14 | + <el-input v-model="pagequery.cereContractInformation.tenantName" placeholder="请输入" style="width:168px;" /> | |
| 15 | 15 | </el-form-item> |
| 16 | - <el-form-item label="合同状态" prop="status"> | |
| 16 | + <el-form-item label="手机号"> | |
| 17 | + <el-input v-model="pagequery.cereContractInformation.tenantTelephone" placeholder="请输入" style="width:168px;" /> | |
| 18 | + </el-form-item> | |
| 19 | + <el-form-item label="状态" prop="status"> | |
| 17 | 20 | <el-select v-model="pagequery.status" clearable placeholder="请选择" style="width: 168px;margin-right: 15px"> |
| 18 | - <el-option label="使用中" value="1"></el-option> | |
| 19 | - <el-option label="往期合同" value="2"></el-option> | |
| 20 | - <el-option label="已终止" value="3"></el-option> | |
| 21 | + <el-option label="待审核" value="1"></el-option> | |
| 22 | + <el-option label="已同意" value="2"></el-option> | |
| 23 | + <el-option label="已拒绝" value="3"></el-option> | |
| 21 | 24 | |
| 22 | 25 | </el-select> |
| 23 | - </el-form-item> --> | |
| 26 | + </el-form-item> | |
| 24 | 27 | </el-form> |
| 25 | 28 | |
| 26 | 29 | <div> |
| ... | ... | @@ -200,7 +203,12 @@ |
| 200 | 203 | pageNumber: 0, |
| 201 | 204 | pageSize: 10, |
| 202 | 205 | contractType:'0', |
| 203 | - contractName: '' | |
| 206 | + contractName: '', | |
| 207 | + cereContractInformation:{ | |
| 208 | + tenantName:'', | |
| 209 | + tenantTelephone:'', | |
| 210 | + }, | |
| 211 | + status:'' | |
| 204 | 212 | }, |
| 205 | 213 | tableData: [], |
| 206 | 214 | total: 0, |
| ... | ... | @@ -456,7 +464,12 @@ |
| 456 | 464 | pageSize: 10, |
| 457 | 465 | status:'', |
| 458 | 466 | contractType:'0', |
| 459 | - contractName: '' | |
| 467 | + contractName: '', | |
| 468 | + cereContractInformation:{ | |
| 469 | + tenantName:'', | |
| 470 | + tenantTelephone:'', | |
| 471 | + }, | |
| 472 | + status:'' | |
| 460 | 473 | }, |
| 461 | 474 | this.getAll() |
| 462 | 475 | }, | ... | ... |
admin-web-master/src/views/shopRental/rentalMan/index.vue
| ... | ... | @@ -10,9 +10,19 @@ |
| 10 | 10 | <!-- 搜索 --> |
| 11 | 11 | <div class="formSearch"> |
| 12 | 12 | <el-form :inline="true" :model="pagequery"> |
| 13 | + <el-form-item label="承租人名称"> | |
| 14 | + <el-input v-model="pagequery.tenantName" placeholder="请输入" style="width:168px;" /> | |
| 15 | + </el-form-item> | |
| 13 | 16 | <el-form-item label="合同名称"> |
| 14 | 17 | <el-input v-model="pagequery.contractName" placeholder="请输入" style="width:168px;" /> |
| 15 | 18 | </el-form-item> |
| 19 | + <el-form-item label="合同类型" prop="contractType"> | |
| 20 | + <el-select v-model="pagequery.contractType" clearable placeholder="请选择" style="width: 168px;margin-right: 15px"> | |
| 21 | + <el-option label="商铺合同" value="商铺合同"></el-option> | |
| 22 | + <el-option label="广告位合同" value="广告位合同"></el-option> | |
| 23 | + <el-option label="场地合同" value="场地合同"></el-option> | |
| 24 | + </el-select> | |
| 25 | + </el-form-item> | |
| 16 | 26 | </el-form> |
| 17 | 27 | |
| 18 | 28 | <div> |
| ... | ... | @@ -138,7 +148,9 @@ |
| 138 | 148 | dataStatus:'1', |
| 139 | 149 | pageNumber: 0, |
| 140 | 150 | pageSize: 10, |
| 141 | - contractName: '' | |
| 151 | + contractName: '', | |
| 152 | + contractType:'', | |
| 153 | + tenantName:'' | |
| 142 | 154 | }, |
| 143 | 155 | tableData: [], |
| 144 | 156 | total: 0, |
| ... | ... | @@ -199,6 +211,8 @@ |
| 199 | 211 | pageSize: 10, |
| 200 | 212 | contractName: '', |
| 201 | 213 | dataStatus:'1', |
| 214 | + contractType:'', | |
| 215 | + tenantName:'' | |
| 202 | 216 | }, |
| 203 | 217 | this.getAll() |
| 204 | 218 | }, | ... | ... |