From 6d7925d7070e864616c868c3f290676853ffc48e Mon Sep 17 00:00:00 2001
From: wesley88 <9519127+wesley88@user.noreply.gitee.com>
Date: Thu, 10 Apr 2025 18:08:32 +0800
Subject: [PATCH] 1

---
 admin-web-master/src/components/add/addyixiang.vue                               |  2 +-
 admin-web-master/src/components/buscha/busCha.vue                                |  2 +-
 admin-web-master/src/components/buscha/busChanew.vue                             |  2 +-
 admin-web-master/src/components/chakan/cd.vue                                    |  2 +-
 admin-web-master/src/components/chakan/yx.vue                                    |  2 +-
 admin-web-master/src/components/chakan/zl.vue                                    |  2 +-
 admin-web-master/src/components/merchantInformation/index.vue                    |  2 +-
 admin-web-master/src/utils/request.js                                            |  6 +++---
 admin-web-master/src/views/ads/fangAudit/index.vue                               |  6 +-----
 admin-web-master/src/views/ads/fangli/index.vue                                  |  6 +-----
 admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue |  4 ++--
 admin-web-master/src/views/business/autd/index.vue                               | 16 +++++++++++++---
 admin-web-master/src/views/business/businessList/index.vue                       | 17 +++++++++++------
 admin-web-master/src/views/customer/icManagement/index.vue                       | 19 ++++++++++++-------
 admin-web-master/src/views/customer/icReview/index.vue                           |  4 ++--
 admin-web-master/src/views/customer/rUser/index.vue                              | 10 +++++-----
 admin-web-master/src/views/customer/rsaManagement/index.vue                      | 13 +++++++++----
 admin-web-master/src/views/customer/rsaReview/index.vue                          | 11 ++++++++---
 admin-web-master/src/views/customer/yixiang/index.vue                            |  4 ++--
 admin-web-master/src/views/detect/admap copy 4.vue                               |  6 +-----
 admin-web-master/src/views/detect/admap.vue                                      |  6 +-----
 admin-web-master/src/views/detect/information/index.vue                          |  5 -----
 admin-web-master/src/views/detect/map/index.vue                                  |  6 +-----
 admin-web-master/src/views/rent/audit/index.vue                                  |  5 -----
 admin-web-master/src/views/scheme/sam.vue                                        |  5 -----
 admin-web-master/src/views/shopRental/manage/index.vue                           | 14 +++++++++++---
 admin-web-master/src/views/shopRental/renewalMan/index.vue                       | 31 ++++++++++++++++++++++---------
 admin-web-master/src/views/shopRental/rentTermination/index.vue                  | 31 ++++++++++++++++++++++---------
 admin-web-master/src/views/shopRental/rentalMan/index.vue                        | 16 +++++++++++++++-
 29 files changed, 149 insertions(+), 106 deletions(-)

diff --git a/admin-web-master/src/components/add/addyixiang.vue b/admin-web-master/src/components/add/addyixiang.vue
index f67479c..1d3814d 100644
--- a/admin-web-master/src/components/add/addyixiang.vue
+++ b/admin-web-master/src/components/add/addyixiang.vue
@@ -396,7 +396,7 @@
         </el-form>
       </div>
     </div>
-    <div v-if="info.intentionStatus == '2' || info.intentionStatus == '3'">
+    <div v-if="(info.intentionStatus == '2' || info.intentionStatus == '3') && xiangTab=='first'">
       <TitleWithCircle title="审核结果"/>
       <div style="padding: 20px;">
         <el-form :model="info" label-width="100px" class="demo-ruleForm">
diff --git a/admin-web-master/src/components/buscha/busCha.vue b/admin-web-master/src/components/buscha/busCha.vue
index 904821d..aaabf86 100644
--- a/admin-web-master/src/components/buscha/busCha.vue
+++ b/admin-web-master/src/components/buscha/busCha.vue
@@ -251,7 +251,7 @@
           </el-form>
         </div>
       </div>
-      <div v-if="(info.dataStatus == '1' || info.dataStatus == '6')&& info.isInterior == '1'" style="margin-top: 20px;">
+      <div v-if="(info.dataStatus == '1' || info.dataStatus == '6')&& info.isInterior == '1' && xiangTab=='first'" style="margin-top: 20px;">
         <TitleWithCircle title="审核结果"/>
         <div style="padding: 20px;">
           <el-form :model="info" label-width="100px" class="demo-ruleForm">
diff --git a/admin-web-master/src/components/buscha/busChanew.vue b/admin-web-master/src/components/buscha/busChanew.vue
index 87472fc..411c8ef 100644
--- a/admin-web-master/src/components/buscha/busChanew.vue
+++ b/admin-web-master/src/components/buscha/busChanew.vue
@@ -177,7 +177,7 @@
           </el-form>
         </div>
       </div>
-      <div v-if="(newinfo.status == '2' || newinfo.status == '3')&& newinfo.isInterior == '1'" style="margin-top: 20px;">
+      <div v-if="(newinfo.status == '2' || newinfo.status == '3')&& newinfo.isInterior == '1' && xiangTab=='one'" style="margin-top: 20px;">
         <TitleWithCircle title="审核结果"/>
         <div style="padding: 20px;">
           <el-form :model="newinfo" label-width="100px" class="demo-ruleForm">
diff --git a/admin-web-master/src/components/chakan/cd.vue b/admin-web-master/src/components/chakan/cd.vue
index 9e0ed1a..e734962 100644
--- a/admin-web-master/src/components/chakan/cd.vue
+++ b/admin-web-master/src/components/chakan/cd.vue
@@ -251,7 +251,7 @@
         </el-form>
       </div>
     </div>
-    <div v-if="editbgid.publishStatus == '2' || editbgid.publishStatus == '3'">
+    <div v-if="(editbgid.publishStatus == '2' || editbgid.publishStatus == '3') && xiangTab == 'first'">
       <TitleWithCircle title="审核结果"/>
       <div style="padding: 20px;">
         <el-form :model="editbgid" label-width="100px" class="demo-ruleForm">
diff --git a/admin-web-master/src/components/chakan/yx.vue b/admin-web-master/src/components/chakan/yx.vue
index 025bff0..f38b010 100644
--- a/admin-web-master/src/components/chakan/yx.vue
+++ b/admin-web-master/src/components/chakan/yx.vue
@@ -134,7 +134,7 @@
         </el-form>
       </div>
     </div>
-    <div v-if="info.auditStatus == '2' || info.auditStatus == '3'">
+    <div v-if="(info.auditStatus == '2' || info.auditStatus == '3') && xiangTab=='first'">
       <TitleWithCircle title="审核结果"/>
       <div style="padding: 20px;">
         <el-form :model="info" label-width="100px" class="demo-ruleForm">
diff --git a/admin-web-master/src/components/chakan/zl.vue b/admin-web-master/src/components/chakan/zl.vue
index 41cb6da..ef406cd 100644
--- a/admin-web-master/src/components/chakan/zl.vue
+++ b/admin-web-master/src/components/chakan/zl.vue
@@ -403,7 +403,7 @@
         </el-form>
       </div>
     </div>
-    <div v-if="info.auditStatus == '2' || info.auditStatus == '3'">
+    <div v-if="(info.auditStatus == '2' || info.auditStatus == '3') && xiangTab == 'first'">
       <TitleWithCircle title="审核结果"/>
       <div style="padding: 20px;">
         <el-form :model="info" label-width="100px" class="demo-ruleForm">
diff --git a/admin-web-master/src/components/merchantInformation/index.vue b/admin-web-master/src/components/merchantInformation/index.vue
index e511cc0..e8a3b28 100644
--- a/admin-web-master/src/components/merchantInformation/index.vue
+++ b/admin-web-master/src/components/merchantInformation/index.vue
@@ -394,7 +394,7 @@
           </el-form>
         </div>
       </div>
-      <div v-if="info.checkState == '2' || info.checkState == '3'">
+      <div v-if="(info.checkState == '2' || info.checkState == '3') && xiangTab=='one'">
         <TitleWithCircle title="审核结果" />
         <div style="padding: 20px;">
           <el-form :model="info" label-width="100px" class="demo-ruleForm">
diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index 059c4ec..7e0de2e 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -17,13 +17,13 @@ let baseURL =  ''
 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529'  ) {
 
   // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
-  // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
+  baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
   
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
 
 
-  baseURL = 'http://128.10.249.21:9003';
-
+  // baseURL = 'http://128.10.249.21:9003';
+ 
 
 } else {
   console.error('---------------------')
diff --git a/admin-web-master/src/views/ads/fangAudit/index.vue b/admin-web-master/src/views/ads/fangAudit/index.vue
index dc0b8f1..59ca3ef 100644
--- a/admin-web-master/src/views/ads/fangAudit/index.vue
+++ b/admin-web-master/src/views/ads/fangAudit/index.vue
@@ -34,11 +34,7 @@
         <!-- 表格 -->
 
         <el-table :data="tableData" :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-          <el-table-column label="序号" width="50">
-            <template slot-scope="scope">
-              {{scope.$index +1 }}
-            </template>
-          </el-table-column>
+
           <el-table-column label="招商方案名称" prop="planName"  show-overflow-tooltip max-width="200"/>
           <el-table-column label="涵盖资源数" prop="createTime">
             <template slot-scope="scope">
diff --git a/admin-web-master/src/views/ads/fangli/index.vue b/admin-web-master/src/views/ads/fangli/index.vue
index 61f4b95..1d657d7 100644
--- a/admin-web-master/src/views/ads/fangli/index.vue
+++ b/admin-web-master/src/views/ads/fangli/index.vue
@@ -39,11 +39,7 @@
         <!-- 表格 -->
 
         <el-table :data="tableData" :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-          <el-table-column label="序号" width="50">
-            <template slot-scope="scope">
-              {{scope.$index +1 }}
-            </template>
-          </el-table-column>
+
           <el-table-column label="招商方案名称" prop="planName"  show-overflow-tooltip max-width="200"/>
           <el-table-column label="涵盖资源数" prop="createTime">
             <template slot-scope="scope">
diff --git a/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue b/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue
index 4e86afd..8d8fd26 100644
--- a/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue
+++ b/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue
@@ -39,11 +39,11 @@
         <!-- 表格 -->
         <el-table :data="tableData"
           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-          <el-table-column label="序号" width="50" prop="id">
+          <!-- <el-table-column label="序号" width="50" prop="id">
             <template slot-scope="scope">
               {{scope.$index + 1 }}
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="编号" prop="id">
           </el-table-column>
           <el-table-column label="所属端"  v-if="leixing == 1">
diff --git a/admin-web-master/src/views/business/autd/index.vue b/admin-web-master/src/views/business/autd/index.vue
index 2f2ae36..33a6349 100644
--- a/admin-web-master/src/views/business/autd/index.vue
+++ b/admin-web-master/src/views/business/autd/index.vue
@@ -13,6 +13,12 @@
             <el-form-item label="名称">
               <el-input v-model="pagequery.name" placeholder="请输入" style="width:168px;" />
             </el-form-item>
+            <el-form-item label="手机号">
+              <el-input v-model="pagequery.phone" placeholder="请输入" style="width:168px;" />
+            </el-form-item>
+            <el-form-item label="身份证号">
+              <el-input v-model="pagequery.idCardNumber" placeholder="请输入" style="width:168px;" />
+            </el-form-item>
           </el-form>
 
           <div>
@@ -27,11 +33,11 @@
 
         <el-table :data="tableData"
           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-          <el-table-column label="序号" width="80">
+          <!-- <el-table-column label="序号" width="80">
             <template slot-scope="scope">
               {{scope.$index + 1}}
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="姓名">
             <template slot-scope="scope">
               {{scope.row.name}}
@@ -176,6 +182,8 @@
           pageSize: 10,
           // checkState:'1',
           name: '',
+                    idCardNumber:'',
+          phone:''
 
         },
         tableData: [],
@@ -278,7 +286,9 @@
             pageNumber: 0,
             pageSize: 10,
             checkState:'1',
-            name: ''
+            name: '',
+                      idCardNumber:'',
+          phone:''
           },
           this.getAll()
       },
diff --git a/admin-web-master/src/views/business/businessList/index.vue b/admin-web-master/src/views/business/businessList/index.vue
index 3b0ef9f..9e8df61 100644
--- a/admin-web-master/src/views/business/businessList/index.vue
+++ b/admin-web-master/src/views/business/businessList/index.vue
@@ -13,6 +13,12 @@
             <el-form-item label="名称">
               <el-input v-model="pagequery.name" placeholder="请输入" style="width:168px;" />
             </el-form-item>
+            <el-form-item label="手机号">
+              <el-input v-model="pagequery.phone" placeholder="请输入" style="width:168px;" />
+            </el-form-item>
+            <el-form-item label="身份证号">
+              <el-input v-model="pagequery.idCardNumber" placeholder="请输入" style="width:168px;" />
+            </el-form-item>
           </el-form>
 
           <div>
@@ -32,11 +38,6 @@
 
         <el-table :data="tableData"
           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-          <el-table-column label="序号" width="80">
-            <template slot-scope="scope">
-              {{scope.$index + 1}}
-            </template>
-          </el-table-column>
           <el-table-column label="姓名">
             <template slot-scope="scope">
               {{scope.row.name}}
@@ -192,6 +193,8 @@
           pageSize: 10,
           checkState: '2',
           name: '',
+          idCardNumber:'',
+          phone:''
 
         },
         tableData: [],
@@ -295,7 +298,9 @@
             pageNumber: 0,
             pageSize: 10,
             checkState: '2',
-            name: ''
+            name: '',
+            idCardNumber:'',
+            phone:''
           },
           this.getAll()
       },
diff --git a/admin-web-master/src/views/customer/icManagement/index.vue b/admin-web-master/src/views/customer/icManagement/index.vue
index 48bb809..a12f394 100644
--- a/admin-web-master/src/views/customer/icManagement/index.vue
+++ b/admin-web-master/src/views/customer/icManagement/index.vue
@@ -16,6 +16,13 @@
             <el-form-item label="手机号" prop="phone">
               <el-input v-model="pagequery.phone" placeholder="请输入" maxlength="50"></el-input>
             </el-form-item>
+            <el-form-item label="意向租赁类型" prop="leaseType">
+              <el-select v-model="pagequery.leaseType" placeholder="请选择" style="width:100%">
+              <el-option label="商铺" value="商铺" />
+              <el-option label="场地" value="场地" />
+              <el-option label="广告位" value="广告位" />
+            </el-select>
+            </el-form-item>
           </el-form>
 
           <div>
@@ -34,11 +41,7 @@
         <!-- 表格 -->
 
         <el-table :data="tableData" :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-          <el-table-column label="序号" width="50">
-            <template slot-scope="scope">
-              {{scope.$index +1 }}
-            </template>
-          </el-table-column>
+
           <el-table-column label="意向客户名称" prop="intentCustomerName"/>
           <el-table-column label="手机号" prop="phone"/>
           <el-table-column label="意向租赁类型" prop="leaseType"/>
@@ -120,7 +123,8 @@
           pageNumber: 0,
           pageSize: 10,
           intentCustomerName:'',
-          phone:''
+          phone:'',
+          leaseType:''
         },
         tableData: [],
         total: 0,
@@ -177,7 +181,8 @@
             pageNumber: 0,
             pageSize: 10,
             intentCustomerName:'',
-            phone:''
+            phone:'',
+            leaseType:''
           },
           this.getAll()
       },
diff --git a/admin-web-master/src/views/customer/icReview/index.vue b/admin-web-master/src/views/customer/icReview/index.vue
index 332ba38..1201d7e 100644
--- a/admin-web-master/src/views/customer/icReview/index.vue
+++ b/admin-web-master/src/views/customer/icReview/index.vue
@@ -42,11 +42,11 @@
 
         <el-table :data="tableData"
           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-          <el-table-column label="序号" width="80">
+          <!-- <el-table-column label="序号" width="80">
             <template slot-scope="scope">
               {{scope.$index + 1}}
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="资源名称">
             <template slot-scope="scope">
               {{scope.row.cereAdvertisingInformation.id?scope.row.cereAdvertisingInformation.id:scope.row.cereBasicInformationShop.shopName?scope.row.cereBasicInformationShop.shopName:scope.row.cereBasicInformationVenue.venueName?scope.row.cereBasicInformationVenue.venueName:''}}
diff --git a/admin-web-master/src/views/customer/rUser/index.vue b/admin-web-master/src/views/customer/rUser/index.vue
index 4eb58e4..6af4905 100644
--- a/admin-web-master/src/views/customer/rUser/index.vue
+++ b/admin-web-master/src/views/customer/rUser/index.vue
@@ -20,9 +20,9 @@
               </el-select>
             </el-form-item>
             <!-- <el-form-item label="是否黑名单">
-              <el-select v-model="formSel.rating" placeholder="请选择" style="width:168px;margin-right: 15px">
-                <el-option label="否" value="0" />
-                <el-option label="是" value="1" />
+              <el-select v-model="pageindex.isBlackList" placeholder="请选择" style="width:168px;margin-right: 15px">
+                <el-option label="否" value="" />
+                <el-option label="是" value="0" />
               </el-select>
             </el-form-item> -->
           </el-form>
@@ -37,11 +37,11 @@
 
         <!-- 表格 -->
         <el-table :data="tableData" :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-          <el-table-column label="序号" min-width="100">
+          <!-- <el-table-column label="序号" min-width="100">
             <template slot-scope="scope">
               {{scope.$index+1}}
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="商家名称" prop="name" min-width="200" />
           <el-table-column label="当前评分等级" prop="rating" min-width="120">
 
diff --git a/admin-web-master/src/views/customer/rsaManagement/index.vue b/admin-web-master/src/views/customer/rsaManagement/index.vue
index 52d65e7..2e8bef2 100644
--- a/admin-web-master/src/views/customer/rsaManagement/index.vue
+++ b/admin-web-master/src/views/customer/rsaManagement/index.vue
@@ -12,6 +12,9 @@
             <el-form-item label="意向客户名称">
               <el-input v-model="formSel.intentCustomerName" placeholder="请输入" class="moren" style="width:168px" />
             </el-form-item>
+            <el-form-item label="手机号">
+              <el-input v-model="formSel.phone" placeholder="请输入" class="moren" style="width:168px" />
+            </el-form-item>
             <el-form-item label="意向资源类型">
               <el-select v-model="formSel.leaseType" placeholder="请选择" style="width:168px">
                 <el-option label="商铺" value="商铺" />
@@ -41,11 +44,11 @@
               currentPage * pageSize
             )
           " :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-          <el-table-column label="序号" min-width="80">
+          <!-- <el-table-column label="序号" min-width="80">
             <template slot-scope="scope">
               {{scope.$index+1}}
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="意向客户名称" prop="intentCustomerName" min-width="150" />
           <el-table-column label="手机号" prop="phone" min-width="180" />
           <el-table-column label="意向租赁类型" prop="leaseType" min-width="120" />
@@ -468,7 +471,8 @@
           leaseType: '',
           pageNumber: 0,
           pageSize: 10,
-          auditStatus: '1'
+          auditStatus: '1',
+          phone:''
         },
         ruleForm: {
           intentCustomerName: '', //意向客户名称
@@ -804,7 +808,8 @@
           leaseType: '',
           pageNumber: 0,
           pageSize: 10,
-          auditStatus: '1'
+          auditStatus: '1',
+          phone:''
         }
         this.currentPage = 1
         this.getAll()
diff --git a/admin-web-master/src/views/customer/rsaReview/index.vue b/admin-web-master/src/views/customer/rsaReview/index.vue
index a635ffe..2621f0d 100644
--- a/admin-web-master/src/views/customer/rsaReview/index.vue
+++ b/admin-web-master/src/views/customer/rsaReview/index.vue
@@ -1,4 +1,4 @@
-<template>
+ <template>
   <div style="background-color:#f7f7f7;padding:10px 10px;">
     <div class="zhuti" v-if="ggXin == false && detbox==false">
       <div style="height:58px;line-height:58px;">
@@ -12,6 +12,9 @@
             <el-form-item label="意向客户名称">
               <el-input v-model="formSel.intentCustomerName" placeholder="请输入" class="moren" style="width:168px" />
             </el-form-item>
+            <el-form-item label="手机号">
+              <el-input v-model="formSel.phone" placeholder="请输入" class="moren" style="width:168px" />
+            </el-form-item>
             <el-form-item label="意向资源类型">
               <el-select v-model="formSel.leaseType" placeholder="请选择" style="width:168px">
                 <el-option label="商铺" value="商铺" />
@@ -37,11 +40,11 @@
               currentPage * pageSize
             )
           " :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-          <el-table-column label="序号" min-width="80">
+          <!-- <el-table-column label="序号" min-width="80">
             <template slot-scope="scope">
               {{scope.$index+1}}
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="意向客户名称" prop="intentCustomerName" min-width="150" />
           <el-table-column label="手机号" prop="phone" min-width="180" />
           <el-table-column label="意向租赁类型" prop="leaseType" min-width="120" />
@@ -442,6 +445,7 @@
           leaseType: '',
           pageNumber: 0,
           pageSize: 10,
+          phone:''
         },
         ruleForm: {
           intentCustomerName: '', //意向客户名称
@@ -630,6 +634,7 @@
           leaseType: '',
           pageNumber: 0,
           pageSize: 10,
+          phone:''
         }
         this.currentPage = 1
         this.getAll()
diff --git a/admin-web-master/src/views/customer/yixiang/index.vue b/admin-web-master/src/views/customer/yixiang/index.vue
index b3192a4..00cede2 100644
--- a/admin-web-master/src/views/customer/yixiang/index.vue
+++ b/admin-web-master/src/views/customer/yixiang/index.vue
@@ -17,11 +17,11 @@
 				<!-- 表格 -->
 				<el-table :data="tableData"
 					:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-					<el-table-column label="序号" min-width="50">
+					<!-- <el-table-column label="序号" min-width="50">
 						<template slot-scope="scope">
 							{{scope.$index +1 }}
 						</template>
-					</el-table-column>
+					</el-table-column> -->
 					<el-table-column label="意向资源类型" prop="applicableResources"  min-width="150" show-overflow-tooltip>
 
 					</el-table-column>
diff --git a/admin-web-master/src/views/detect/admap copy 4.vue b/admin-web-master/src/views/detect/admap copy 4.vue
index db9c6f1..94c19bf 100644
--- a/admin-web-master/src/views/detect/admap copy 4.vue
+++ b/admin-web-master/src/views/detect/admap copy 4.vue
@@ -46,11 +46,7 @@
         <!-- 表格 -->
         <el-table v-if="ontype=='1'" :data="tableData"
           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-          <el-table-column label="序号" width="50">
-            <template slot-scope="scope">
-              {{scope.$index +1 }}
-            </template>
-          </el-table-column>
+
           <el-table-column label="商铺名称" prop="shopName" show-overflow-tooltip></el-table-column>
           <el-table-column label="商铺类型" prop="publishStatus" show-overflow-tooltip>
             <template slot-scope="scope">
diff --git a/admin-web-master/src/views/detect/admap.vue b/admin-web-master/src/views/detect/admap.vue
index 51a3db8..cc05a0d 100644
--- a/admin-web-master/src/views/detect/admap.vue
+++ b/admin-web-master/src/views/detect/admap.vue
@@ -178,11 +178,7 @@
         <!-- 表格 -->
         <el-table v-if="ontype=='1'" :data="tableData"
           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-          <el-table-column label="序号" width="50">
-            <template slot-scope="scope">
-              {{scope.$index +1 }}
-            </template>
-          </el-table-column>
+
           <el-table-column label="商铺名称" prop="shopName" show-overflow-tooltip></el-table-column>
           <el-table-column label="商铺类型" prop="publishStatus" show-overflow-tooltip>
             <template slot-scope="scope">
diff --git a/admin-web-master/src/views/detect/information/index.vue b/admin-web-master/src/views/detect/information/index.vue
index 157e209..0f9a6e3 100644
--- a/admin-web-master/src/views/detect/information/index.vue
+++ b/admin-web-master/src/views/detect/information/index.vue
@@ -58,11 +58,6 @@
 
         <el-table :data="tableData"
           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-          <el-table-column label="序号" width="50">
-            <template slot-scope="scope">
-              {{scope.$index +1 }}
-            </template>
-          </el-table-column>
           <el-table-column label="商铺名称" prop="shopName" show-overflow-tooltip></el-table-column>
           <el-table-column label="商铺类型" prop="publishStatus" show-overflow-tooltip>
             <template slot-scope="scope">
diff --git a/admin-web-master/src/views/detect/map/index.vue b/admin-web-master/src/views/detect/map/index.vue
index 099eaff..81d800f 100644
--- a/admin-web-master/src/views/detect/map/index.vue
+++ b/admin-web-master/src/views/detect/map/index.vue
@@ -59,11 +59,7 @@
         <!-- 表格 -->
         <el-table :data="tableData"
           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-          <el-table-column label="序号" width="50">
-            <template slot-scope="scope">
-              {{scope.$index +1 }}
-            </template>
-          </el-table-column>
+
           <el-table-column label="广告位名称"  prop="advertisingName"  show-overflow-tooltip>
           </el-table-column>
           <el-table-column label="广告位类型"  prop="advertisingType"  show-overflow-tooltip>
diff --git a/admin-web-master/src/views/rent/audit/index.vue b/admin-web-master/src/views/rent/audit/index.vue
index 1bc3031..475cf4b 100644
--- a/admin-web-master/src/views/rent/audit/index.vue
+++ b/admin-web-master/src/views/rent/audit/index.vue
@@ -51,11 +51,6 @@
 
         <el-table :data="tableData"
           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-          <el-table-column label="序号" width="80">
-            <template slot-scope="scope">
-              {{scope.$index + 1}}
-            </template>
-          </el-table-column>
           <el-table-column label="资源名称">
             <template slot-scope="scope">
               {{scope.row.cereAdvertisingInformation.id?scope.row.cereAdvertisingInformation.id:scope.row.cereBasicInformationShop.shopName?scope.row.cereBasicInformationShop.shopName:scope.row.cereBasicInformationVenue.venueName?scope.row.cereBasicInformationVenue.venueName:''}}
diff --git a/admin-web-master/src/views/scheme/sam.vue b/admin-web-master/src/views/scheme/sam.vue
index 5e17128..5d7ba19 100644
--- a/admin-web-master/src/views/scheme/sam.vue
+++ b/admin-web-master/src/views/scheme/sam.vue
@@ -49,11 +49,6 @@
         <!-- 表格 -->
         <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-          <el-table-column label="序号" min-width="100">
-            <template slot-scope="scope">
-              {{scope.$index +1}}
-            </template>
-          </el-table-column>
           <el-table-column label="策略名称" prop="policyName" min-width="200">
           </el-table-column>
           <el-table-column label="适用资源" prop="applicableResources" min-width="100">
diff --git a/admin-web-master/src/views/shopRental/manage/index.vue b/admin-web-master/src/views/shopRental/manage/index.vue
index 8f2367e..91775cf 100644
--- a/admin-web-master/src/views/shopRental/manage/index.vue
+++ b/admin-web-master/src/views/shopRental/manage/index.vue
@@ -18,7 +18,13 @@
                 <el-option label="使用中" value="1"></el-option>
                 <el-option label="往期合同" value="2"></el-option>
                 <el-option label="已终止" value="3"></el-option>
-                
+              </el-select>
+            </el-form-item>
+            <el-form-item label="合同类型" prop="contractType">
+              <el-select v-model="pagequery.contractType" clearable placeholder="请选择" style="width: 168px;margin-right: 15px">
+                <el-option label="商铺合同" value="商铺合同"></el-option>
+                <el-option label="广告位合同" value="广告位合同"></el-option>
+                <el-option label="场地合同" value="场地合同"></el-option>
               </el-select>
             </el-form-item>
           </el-form>
@@ -220,7 +226,8 @@
           // dataStatus:'1',
           pageNumber: 0,
           pageSize: 10,
-          contractName: ''
+          contractName: '',
+          contractType:''
         },
         tableData: [],
         total: 0,
@@ -501,7 +508,8 @@
             pageNumber: 0,
             pageSize: 10,
             dataStatus:'',
-            contractName: ''
+            contractName: '',
+            contractType:''
           },
           this.getAll()
       },
diff --git a/admin-web-master/src/views/shopRental/renewalMan/index.vue b/admin-web-master/src/views/shopRental/renewalMan/index.vue
index 4743449..4d20e2c 100644
--- a/admin-web-master/src/views/shopRental/renewalMan/index.vue
+++ b/admin-web-master/src/views/shopRental/renewalMan/index.vue
@@ -10,17 +10,20 @@
         <!-- 搜索 -->
         <div class="formSearch">
           <el-form :inline="true" :model="pagequery">
-            <!-- <el-form-item label="合同名称">
-              <el-input v-model="pagequery.contractName" placeholder="请输入" style="width:168px;" />
+            <el-form-item label="承租人名称">
+              <el-input v-model="pagequery.cereContractInformation.tenantName" placeholder="请输入" style="width:168px;" />
             </el-form-item>
-            <el-form-item label="合同状态" prop="status">
+            <el-form-item label="手机号">
+              <el-input v-model="pagequery.cereContractInformation.tenantTelephone" placeholder="请输入" style="width:168px;" />
+            </el-form-item>
+            <el-form-item label="状态" prop="status">
               <el-select v-model="pagequery.status" clearable placeholder="请选择" style="width: 168px;margin-right: 15px">
-                <el-option label="使用中" value="1"></el-option>
-                <el-option label="往期合同" value="2"></el-option>
-                <el-option label="已终止" value="3"></el-option>
+                <el-option label="待审核" value="1"></el-option>
+                <el-option label="已同意" value="2"></el-option>
+                <el-option label="已拒绝" value="3"></el-option>
                 
               </el-select>
-            </el-form-item> -->
+            </el-form-item>
           </el-form>
           
           <div>
@@ -200,7 +203,12 @@
           pageNumber: 0,
           pageSize: 10,
           contractType:'1',
-          contractName: ''
+          contractName: '',
+          cereContractInformation:{
+            tenantName:'',
+            tenantTelephone:'',
+          },
+          status:''
         },
         tableData: [],
         total: 0,
@@ -456,7 +464,12 @@
             pageSize: 10,
             status:'',
             contractType:'1',
-            contractName: ''
+            contractName: '',
+          cereContractInformation:{
+            tenantName:'',
+            tenantTelephone:'',
+          },
+          status:''
           },
           this.getAll()
       },
diff --git a/admin-web-master/src/views/shopRental/rentTermination/index.vue b/admin-web-master/src/views/shopRental/rentTermination/index.vue
index aa6572a..fa464e9 100644
--- a/admin-web-master/src/views/shopRental/rentTermination/index.vue
+++ b/admin-web-master/src/views/shopRental/rentTermination/index.vue
@@ -10,17 +10,20 @@
         <!-- 搜索 -->
         <div class="formSearch">
           <el-form :inline="true" :model="pagequery">
-            <!-- <el-form-item label="合同名称">
-              <el-input v-model="pagequery.contractName" placeholder="请输入" style="width:168px;" />
+            <el-form-item label="承租人名称">
+              <el-input v-model="pagequery.cereContractInformation.tenantName" placeholder="请输入" style="width:168px;" />
             </el-form-item>
-            <el-form-item label="合同状态" prop="status">
+            <el-form-item label="手机号">
+              <el-input v-model="pagequery.cereContractInformation.tenantTelephone" placeholder="请输入" style="width:168px;" />
+            </el-form-item>
+            <el-form-item label="状态" prop="status">
               <el-select v-model="pagequery.status" clearable placeholder="请选择" style="width: 168px;margin-right: 15px">
-                <el-option label="使用中" value="1"></el-option>
-                <el-option label="往期合同" value="2"></el-option>
-                <el-option label="已终止" value="3"></el-option>
+                <el-option label="待审核" value="1"></el-option>
+                <el-option label="已同意" value="2"></el-option>
+                <el-option label="已拒绝" value="3"></el-option>
                 
               </el-select>
-            </el-form-item> -->
+            </el-form-item>
           </el-form>
           
           <div>
@@ -200,7 +203,12 @@
           pageNumber: 0,
           pageSize: 10,
           contractType:'0',
-          contractName: ''
+          contractName: '',
+          cereContractInformation:{
+            tenantName:'',
+            tenantTelephone:'',
+          },
+          status:''
         },
         tableData: [],
         total: 0,
@@ -456,7 +464,12 @@
             pageSize: 10,
             status:'',
             contractType:'0',
-            contractName: ''
+            contractName: '',
+            cereContractInformation:{
+              tenantName:'',
+              tenantTelephone:'',
+            },
+            status:''
           },
           this.getAll()
       },
diff --git a/admin-web-master/src/views/shopRental/rentalMan/index.vue b/admin-web-master/src/views/shopRental/rentalMan/index.vue
index 2d8ee4e..158caee 100644
--- a/admin-web-master/src/views/shopRental/rentalMan/index.vue
+++ b/admin-web-master/src/views/shopRental/rentalMan/index.vue
@@ -10,9 +10,19 @@
         <!-- 搜索 -->
         <div class="formSearch">
           <el-form :inline="true" :model="pagequery">
+            <el-form-item label="承租人名称">
+              <el-input v-model="pagequery.tenantName" placeholder="请输入" style="width:168px;" />
+            </el-form-item>
             <el-form-item label="合同名称">
               <el-input v-model="pagequery.contractName" placeholder="请输入" style="width:168px;" />
             </el-form-item>
+            <el-form-item label="合同类型" prop="contractType">
+              <el-select v-model="pagequery.contractType" clearable placeholder="请选择" style="width: 168px;margin-right: 15px">
+                <el-option label="商铺合同" value="商铺合同"></el-option>
+                <el-option label="广告位合同" value="广告位合同"></el-option>
+                <el-option label="场地合同" value="场地合同"></el-option>
+              </el-select>
+            </el-form-item>
           </el-form>
 
           <div>
@@ -138,7 +148,9 @@
           dataStatus:'1',
           pageNumber: 0,
           pageSize: 10,
-          contractName: ''
+          contractName: '',
+          contractType:'',
+          tenantName:''
         },
         tableData: [],
         total: 0,
@@ -199,6 +211,8 @@
             pageSize: 10,
             contractName: '',
             dataStatus:'1',
+            contractType:'',
+            tenantName:''
           },
           this.getAll()
       },
--
libgit2 0.21.4