Commit 0e3c53e7b7eac97337408ef7cbc853a41fada968

Authored by 杨鑫
2 parents 87ad6aac bfb3e196

Merge branch 'master' of http://39.98.150.180/webapp/GreenwayWeb

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