diff --git a/admin-web-master/src/api/newly.js b/admin-web-master/src/api/newly.js
index f2e788d..4edb7e6 100644
--- a/admin-web-master/src/api/newly.js
+++ b/admin-web-master/src/api/newly.js
@@ -1,5 +1,78 @@
 import request from '@/utils/request'
 // import request from '@/utils/request2'
+// 租赁信息
+export function cereContractInformationgetPages(data) {
+  return request({
+    url: '/cereContractInformation/getPages',
+    method: 'post',
+    data
+  })
+}
+// 物业缴费
+export function cerePaymentInfo(data) {
+  return request({
+    url: '/cerePaymentInfo/queryByPage',
+    method: 'post',
+    data
+  })
+}
+// 合同
+export function cereContractInformationgetPage(data) {
+  return request({
+    url: '/cereContractInformation/getPage',
+    method: 'post',
+    data
+  })
+}
+// 查看发票
+export function cereInvoiceTitlegetByTenementId(data) {
+  return request({
+    url: 'cereInvoiceTitle/getByTenementId/'+data.id,
+    method: 'GET',
+  })
+}
+// 上传发票
+export function cereInvoiceTitleadd(data) {
+  return request({
+    url: '/cereInvoiceTitle/add',
+    method: 'post',
+    data
+  })
+}
+// 复核
+export function editToRecheck(data) {
+  return request({
+    url: '/cerePropertyOrder/editToRecheck/'+data.id,
+    method: 'GET',
+  })
+}
+// 缴费记录-租赁缴费
+export function cerePropertyOrder(data) {
+  return request({
+    url: '/cerePropertyOrder/queryByContractId',
+    method: 'post',
+    data
+  })
+}
+// 招商过程信息-谈判记录,
+export function cereNegotiationDetails(data) {
+  return request({
+    url: '/cereNegotiationDetails/queryByPhone',
+    method: 'post',
+    data
+  })
+}
+// 招商过程信息-跟进日志
+export function cereFollowDetails(data) {
+  return request({
+    url: '/cereFollowDetails/queryByPage',
+    method: 'post',
+    data
+  })
+}
+
+
+
 // 资源数量增长趋势
 export function resourceQuantityGrowth(data) {
   return request({
diff --git a/admin-web-master/src/components/merchantInformation/index.vue b/admin-web-master/src/components/merchantInformation/index.vue
index f40ab82..4531636 100644
--- a/admin-web-master/src/components/merchantInformation/index.vue
+++ b/admin-web-master/src/components/merchantInformation/index.vue
@@ -1,164 +1,708 @@
 <template>
   <div>
-    <div >
-      <el-tabs v-model="xiangTab">
-        <el-tab-pane label="商家信息" name="first">
-          <div style="margin-top: 30px;" class="editcss">
-            <TitleWithCircle title="基础信息" />
-            <div style="padding: 20px;margin-top: 10px;">
-              <el-form :model="info" ref="ruleForm" label-width="140px" class="demo-ruleForm">
-                <el-row :gutter="20">
-                  <el-col :span="9">
-                    <el-form-item label="姓名" prop="name">
-                      <div class="duiqi">{{info.name}}</div>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="9">
-                    <el-form-item label="手机号" prop="phone">
-                      <div class="duiqi">{{info.phone}}</div>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row :gutter="20">
-                  <el-col :span="9">
-                    <el-form-item label="证件类型" prop="idCardType">
-                      <div class="duiqi">{{info.idCardType}}</div>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="9">
-                    <el-form-item label="身份证号码" prop="idCardNumber">
-                      <div class="duiqi">{{info.idCardNumber}}</div>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-form-item label="身份证照片（正）" prop="idCardFrontImage">
-                  <!-- <div style="margin-top: 10px;">
-                    <el-image style="width: 200px;" :src="$baseURL+info.idCardFrontImage" fit="contain"></el-image>
-                  </div> -->
-                  <div style="display: flex;">
-                    <allimg v-if="item" :src="item" fit="contain"  v-for="item in info.idCardFrontImage.split(',')" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
-                  </div>
-                </el-form-item>
-                <el-form-item label="身份证照片（反）" prop="idCardBackImage">
-                  <!-- <div style="margin-top: 10px;">
-                    <el-image style="width: 200px;" :src="$baseURL+info.idCardBackImage" fit="contain"></el-image>
-                  </div> -->
-                  <div style="display: flex;">
-                    <allimg v-if="item" :src="item" fit="contain"  v-for="item in info.idCardBackImage.split(',')" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
-                  </div>
-                </el-form-item>
-				<el-row :gutter="20">
-				  <el-col :span="9">
-				    <el-form-item label="评级" prop="rating">
-				      <div class="duiqi">{{info.rating || '-'}}</div>
-				    </el-form-item>
-				  </el-col>
-				  <el-col :span="9">
-				    <el-form-item label="是否黑名单" prop="idCardNumber">
-				      <div class="duiqi">{{info.isBlackList=='2'?'是':'否'}}</div>
-				    </el-form-item>
-				  </el-col>
-				</el-row>
-              </el-form>
+    <div v-if="ontype == '1'">
+      <div >
+        <el-tabs v-model="xiangTab">
+          <el-tab-pane label="商家信息" name="one">
+            <div style="margin-top: 30px;" class="editcss">
+              <TitleWithCircle title="基础信息" />
+              <div style="padding: 20px;margin-top: 10px;">
+                <el-form :model="info" ref="ruleForm" label-width="140px" class="demo-ruleForm">
+                  <el-row :gutter="20">
+                    <el-col :span="9">
+                      <el-form-item label="姓名" prop="name">
+                        <div class="duiqi">{{info.name}}</div>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="9">
+                      <el-form-item label="手机号" prop="phone">
+                        <div class="duiqi">{{info.phone}}</div>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row :gutter="20">
+                    <el-col :span="9">
+                      <el-form-item label="证件类型" prop="idCardType">
+                        <div class="duiqi">{{info.idCardType}}</div>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="9">
+                      <el-form-item label="身份证号码" prop="idCardNumber">
+                        <div class="duiqi">{{info.idCardNumber}}</div>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-form-item label="身份证照片（正）" prop="idCardFrontImage">
+                    <div style="display: flex;">
+                      <allimg v-if="item" :src="item" fit="contain" v-for="item in info.idCardFrontImage.split(',')"
+                        style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;" />
+                    </div>
+                  </el-form-item>
+                  <el-form-item label="身份证照片（反）" prop="idCardBackImage">
+                    <div style="display: flex;">
+                      <allimg v-if="item" :src="item" fit="contain" v-for="item in info.idCardBackImage.split(',')"
+                        style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;" />
+                    </div>
+                  </el-form-item>
+                  <el-row :gutter="20">
+                    <el-col :span="9">
+                      <el-form-item label="评级" prop="rating">
+                        <div class="duiqi">{{info.rating || '-'}}</div>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="9">
+                      <el-form-item label="是否黑名单" prop="idCardNumber">
+                        <div class="duiqi">{{info.isBlackList=='2'?'是':'否'}}</div>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                </el-form>
+              </div>
             </div>
-            <!-- <TitleWithCircle title="审核信息" />
-            <div style="padding: 20px;margin-top: 10px;">
-              <el-form :model="info" ref="ruleForm" label-width="140px" class="demo-ruleForm">
-                <el-row :gutter="20">
-                  <el-col :span="9">
-                    <el-form-item label="审核状态" prop="name">
-                      <div class="duiqi">
-                        <span v-if="info.checkState == '1'">待审核</span>
-                        <span v-else-if="info.checkState == '2'">同意</span>
-                        <span v-else-if="info.checkState == '3'">拒绝</span>
-                      </div>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="9" v-if="info.checkState != '1' && info.checkOpinion">
-                    <el-form-item label="审核意见" prop="phone">
-                      <div class="duiqi">{{info.checkOpinion}}</div>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-              </el-form>
-            </div> -->
-            <!-- <div style="padding: 20px;margin-top: 10px;">
-              <el-table :data="list"
-                :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-
-                <el-table-column label="审核时间">
-                  <template slot-scope="scope">
-                    {{scope.row.contractChangeReason}}
-
-                  </template>
-                </el-table-column>
-                <el-table-column label="审核结果">
-                  <template slot-scope="scope">
-                    {{scope.row.updateDate}}
-
-                  </template>
-                </el-table-column>
-                <el-table-column label="驳回意见">
-                  <template slot-scope="scope">
-                    {{scope.row.updateDate}}
-
-                  </template>
-                </el-table-column>
-              </el-table>
-
-            </div> -->
-          </div>
-        </el-tab-pane>
-      </el-tabs>
+          </el-tab-pane>
+          <el-tab-pane label="意向信息" name="two">
+            <div class="editcss"   >
+              <div style="padding: 20px;">
+                <el-table :data="datalistyx"
+                :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+                tooltip-effect="dark custom-tooltip-effect">
+                  <el-table-column label="序号" width="100">
+                    <template slot-scope="scope">
+                      {{scope.$index +1 }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="意向租赁类型" prop="leaseType"/>
+                  <el-table-column label="主体名称" prop="leaseCycle" />
+                  <el-table-column label="主体类型" prop="operationType" />
+                  <el-table-column label="经营范围" prop="idCardNumber"  />
+                </el-table>
+                <div style="display: flex;justify-content: space-between;" class="bom">
+                  <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{totalyx}}</span> 项数据</div>
+                  <el-pagination :current-page="pagequeryyx.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="pagequeryyx.pageSize"
+                    background small layout="prev, pager, next" :total="totalyx" @size-change="e => handleSizeChange(e,'pagequeryyx')"
+                    @current-change="e=> handleCurrentChange(e,'pagequeryyx')">
+                  </el-pagination>
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="招商过程信息" name="three">
+            <div class="editcss" style="margin-top: 30px;">
+              <TitleWithCircle title="跟进记录" />
+              <div style="padding: 20px;">
+                <el-table :data="datalistgg"
+                :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+                tooltip-effect="dark custom-tooltip-effect">
+                  <el-table-column label="序号" width="100">
+                    <template slot-scope="scope">
+                      {{scope.$index +1 }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="跟进时间" prop="followUpTime"/>
+                  <el-table-column label="跟进类型" prop="followUpType" />
+                  <el-table-column label="客户级别" prop="customerLevel" />
+                  <el-table-column label="当前阶段" prop="currentStage"  />
+                  <el-table-column label="下次更进时间" prop="plan_Time"  >
+                    <template slot-scope="scope">
+                      {{scope.row.nextFollowUpStartTime}} - {{scope.row.nextFollowUpEndTime}}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="操作" fixed="right">
+                    <template slot-scope="scope">
+                      <div @click="open1(scope.row,'1')" class="tableBtn greens">查看记录</div>
+                    </template>
+                  </el-table-column>
+                </el-table>
+                <div style="display: flex;justify-content: space-between;" class="bom">
+                  <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{totalgg}}</span> 项数据</div>
+                  <el-pagination :current-page="pagequerygg.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="pagequerygg.pageSize"
+                    background small layout="prev, pager, next" :total="totalgg" @size-change="e => handleSizeChange(e,'pagequerygg')"
+                    @current-change="e=> handleCurrentChange(e,'pagequerygg')">
+                  </el-pagination>
+                </div>
+              </div>
+              <TitleWithCircle title="谈判记录" />
+              <div style="padding: 20px;">
+                <el-table :data="datalisttp"
+                :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+                tooltip-effect="dark custom-tooltip-effect">
+                  <el-table-column label="序号" width="100">
+                    <template slot-scope="scope">
+                      {{scope.$index +1 }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="谈判时间" prop="negotiationTime"/>
+                  <el-table-column label="谈判主题" prop="negotiationTheme" />
+                  <el-table-column label="标段号" prop="bidSegmentNumber" />
+                  <el-table-column label="当前阶段" prop="currentStage"  />
+                  <el-table-column label="下次谈判时间" prop="plan_Time"  >
+                    <template slot-scope="scope">
+                      {{scope.row.nextNegotiationStartTime}} - {{scope.row.nextNegotiationEndTime}}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="操作" fixed="right">
+                    <template slot-scope="scope">
+                      <div @click="open1(scope.row,'2')" class="tableBtn greens">查看记录</div>
+                    </template>
+                  </el-table-column>
+                </el-table>
+                <div style="display: flex;justify-content: space-between;" class="bom">
+                  <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{totaltp}}</span> 项数据</div>
+                  <el-pagination :current-page="pagequerytp.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="pagequerytp.pageSize"
+                    background small layout="prev, pager, next" :total="totaltp" @size-change="e => handleSizeChange(e,'pagequerytp')"
+                    @current-change="e=> handleCurrentChange(e,'pagequerytp')">
+                  </el-pagination>
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="商户租赁信息" name="four">
+            <div class="editcss" style="margin-top: 30px;">
+              <TitleWithCircle title="商铺资源" />
+              <div style="padding: 20px;">
+                <el-table :data="zlsplist"
+                :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+                tooltip-effect="dark custom-tooltip-effect">
+                  <el-table-column label="序号" width="100">
+                    <template slot-scope="scope">
+                      {{scope.$index +1 }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="商铺名称" prop="followUpTime">
+                    <template slot-scope="scope">
+                      {{scope.row.cereBasicInformationShop.shopName?scope.row.cereBasicInformationShop.shopName:scope.row.cereAdvertisingInformation.advertisingName?scope.row.cereAdvertisingInformation.advertisingName:scope.row.cereBasicInformationVenue.venueName}}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="店铺名称" prop="followUpType" >
+                    <template slot-scope="scope">
+                      {{scope.row.cereBasicInformationShop?(scope.row.cereBasicInformationShop.storeName || '-'):'-'}}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="详细位置" prop="detailedLocation" >
+                    <template slot-scope="scope">
+                      {{scope.row.cereBasicInformationShop.detailedLocation || '-'}}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="租金（元）/周期" prop="currentStage" >
+                    <template slot-scope="scope">
+                      {{scope.row.contractAmount}}/{{ scope.row.paymentCycle }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="操作" fixed="right">
+                    <template slot-scope="scope">
+                      <div @click="open1(scope.row,'1')" class="tableBtn greens">查看</div>
+                    </template>
+                  </el-table-column>
+                </el-table>
+                <div style="display: flex;justify-content: space-between;" class="bom">
+                  <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{zlsplist.length}}</span> 项数据</div>
+                  <el-pagination :current-page="1" :page-sizes="[10, 20, 50, 100]" :page-size="50"
+                    background small layout="prev, pager, next" :total="zlsplist.length" >
+                  </el-pagination>
+                </div>
+              </div>
+              <TitleWithCircle title="广告位资源" />
+              <div style="padding: 20px;">
+                <el-table :data="zlgglist"
+                :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+                tooltip-effect="dark custom-tooltip-effect">
+                  <el-table-column label="序号" width="100">
+                    <template slot-scope="scope">
+                      {{scope.$index +1 }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="广告位名称" prop="followUpTime">
+                    <template slot-scope="scope">
+                      {{scope.row.cereBasicInformationShop.shopName?scope.row.cereBasicInformationShop.shopName:scope.row.cereAdvertisingInformation.advertisingName?scope.row.cereAdvertisingInformation.advertisingName:scope.row.cereBasicInformationVenue.venueName}}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="投放时间" prop="followUpTime">
+                    <template slot-scope="scope">
+                      {{scope.row.leaseStartDate}} 至 {{scope.row.contractTerminationDate}}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="广告位类型" prop="followUpTime">
+                    <template slot-scope="scope">
+                      {{scope.row.cereAdvertisingInformation.advertisingType}} 
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="操作" fixed="right">
+                    <template slot-scope="scope">
+                      <div @click="open1(scope.row,'2')" class="tableBtn greens">查看</div>
+                    </template>
+                  </el-table-column>
+                </el-table>
+                <div style="display: flex;justify-content: space-between;" class="bom">
+                  <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{zlgglist.length}}</span> 项数据</div>
+                  <el-pagination :current-page="1" :page-sizes="[10, 20, 50, 100]" :page-size="50"
+                    background small layout="prev, pager, next" :total="zlgglist.length" >
+                  </el-pagination>
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="缴费记录" name="five">
+            <div class="editcss" style="margin-top: 30px;">
+              <TitleWithCircle title="租赁缴费" />
+              <div style="padding: 20px;">
+                <el-table :data="datalistzljf"
+                :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+                tooltip-effect="dark custom-tooltip-effect">
+                  <el-table-column label="序号" width="100">
+                    <template slot-scope="scope">
+                      {{scope.$index +1 }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="资源名称" prop="shopName"/>
+                  <el-table-column label="租金/周期" >
+                    <template slot-scope="scope">
+                      {{ scope.row.paymentAmount  }} / {{ scope.row.payType=='1'?'日':scope.row.payType=='2'?'月':scope.row.payType=='3'?'季':scope.row.payType=='4'?'年':'' }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="付款日" prop="payDay"/>
+                  <el-table-column label="缴费时间" prop="paymentTime"/>
+                  <el-table-column label="付款类型" >
+                    <template slot-scope="scope">
+                      线上缴费
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column label="状态" prop="payState">
+                    <template slot-scope="scope">
+                      {{ scope.row.payState=='0'?'未缴费':scope.row.payState=='1'?'缴费成功':'' }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="财务复核" prop="isOpeningInvoice">
+                    <template slot-scope="scope">
+                      {{ scope.row.isOpeningInvoice=='0'?'待复核':scope.row.isOpeningInvoice=='1'?'待开发票':scope.row.isOpeningInvoice=='2'?'已开发票':'-'}}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="操作" fixed="right">
+                    <template slot-scope="scope">
+                      <div class="tableBtn greens">查看</div>
+                      <div @click="fhjf(scope.row)" class="tableBtn greens" v-if="scope.row.payState=='1' && scope.row.isOpeningInvoice=='0'">复核</div>
+                      <div @click ="openckfapinfo(scope.row)"  class="tableBtn greens" v-if="scope.row.isOpeningInvoice=='2'">查看开票信息</div>
+                      <div @click ="openaddfapinfo(scope.row)" class="tableBtn greens" v-if="scope.row.isOpeningInvoice=='1'">上传发票</div>
+                    </template>
+                  </el-table-column>
+                </el-table>
+                <div style="display: flex;justify-content: space-between;" class="bom">
+                  <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{totalzljf}}</span> 项数据</div>
+                  <el-pagination :current-page="pagequeryzljf.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="pagequeryzljf.pageSize"
+                    background small layout="prev, pager, next" :total="totalzljf" @size-change="e => handleSizeChange(e,'pagequeryzljf')"
+                    @current-change="e=> handleCurrentChange(e,'pagequeryzljf')">
+                  </el-pagination>
+                </div>
+              </div>
+              <TitleWithCircle title="物业缴费" />
+              <div style="padding: 20px;">
+                <el-table :data="datalistwyjf"
+                :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+                tooltip-effect="dark custom-tooltip-effect">
+                  <el-table-column label="序号" width="100">
+                    <template slot-scope="scope">
+                      {{scope.$index +1 }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="店铺" prop="merchantName"/>
+                  <el-table-column label="金额（元）" prop="actualPaymentFee">
+                    <template slot-scope="scope">
+                      {{ scope.row.actualPaymentFee/100}}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="付款时间" prop="paymentCompletionTime">
+                    <template slot-scope="scope">
+                      {{ scope.row.paymentCompletionTime || '-'}}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="备注" prop="paymentMethod">
+                    <template slot-scope="scope">
+                      {{ scope.row.paymentMethod || '-'}}
+                    </template>
+                  </el-table-column>
+                </el-table>
+                <div style="display: flex;justify-content: space-between;" class="bom">
+                  <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{totalwyjf}}</span> 项数据</div>
+                  <el-pagination :current-page="pagequerywyjf.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="pagequerywyjf.pageSize"
+                    background small layout="prev, pager, next" :total="totalwyjf" @size-change="e => handleSizeChange(e,'pagequerywyjf')"
+                    @current-change="e=> handleCurrentChange(e,'pagequerywyjf')">
+                  </el-pagination>
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="合同信息" name="six">
+            <div class="editcss"   >
+              <div style="padding: 20px;">
+                <el-table :data="datalistht"
+                :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+                tooltip-effect="dark custom-tooltip-effect">
+                  <el-table-column label="序号" width="100">
+                    <template slot-scope="scope">
+                      {{scope.$index +1 }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="合同名称" prop="contractName"/>
+                  <el-table-column label="合同金额（元）" prop="contractAmount"/>
+                  <el-table-column label="签订日期" prop="contractSigningDate"/>
+                  <el-table-column label="终止日期" prop="contractTerminationDate"/>
+                  <el-table-column label="合同类型" prop="contractType"/>
+                  <el-table-column label="状态" prop="dataStatus">
+                    <template slot-scope="scope">
+                      <span v-if='scope.row.dataStatus == 1'>使用中</span>
+                      <span v-else-if='scope.row.dataStatus == 2'>往期合同</span>
+                      <span v-else-if='scope.row.dataStatus == 3'>已终止</span>
+                      <span v-else-if='scope.row.dataStatus == 4'>待发起</span>
+                      <span v-else-if='scope.row.dataStatus == 5'>待审核</span>
+                      <span v-else-if='scope.row.dataStatus == 6'>已拒绝</span>
+                      <span v-else>-</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="操作" fixed="right">
+                    <template slot-scope="scope">
+                      <div @click="details(scope.row,'1')" class="tableBtn greens">查看</div>
+                      <div v-if='scope.row.dataStatus == 1' @click="removeinfo(scope.row,'合同变更')" class="tableBtn greens">合同变更</div>
+                      <div v-if='scope.row.dataStatus == 1' @click="removeinfo(scope.row,'合同续约')" class="tableBtn greens">合同续约</div>
+                      <div v-if='scope.row.dataStatus == 1' @click="removeinfozz(scope.row,'合同终止')" class="tableBtn greens">合同终止</div>
+                    </template>
+                  </el-table-column>
+                </el-table>
+                <div style="display: flex;justify-content: space-between;" class="bom">
+                  <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{totalht}}</span> 项数据</div>
+                  <el-pagination :current-page="pagequeryht.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="pagequeryht.pageSize"
+                    background small layout="prev, pager, next" :total="totalht" @size-change="e => handleSizeChange(e,'pagequeryht')"
+                    @current-change="e=> handleCurrentChange(e,'pagequeryht')">
+                  </el-pagination>
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+      <div v-if="info.checkState == '1' && issp == '2'">
+        <TitleWithCircle title="审核情况" />
+        <div style="padding: 20px;">
+          <el-form :model="info" label-width="100px" class="demo-ruleForm">
+            <el-form-item label="状态" style="align-items: center;">
+              <el-radio v-model="radio" label="2">通过</el-radio>
+              <el-radio v-model="radio" label="3">不通过</el-radio>
+            </el-form-item>
+            <el-form-item label="审核意见">
+              <el-input maxlength="200" show-word-limit rows="4" v-model="checkOpinion" placeholder="请输入审核意见"
+                type="textarea" />
+            </el-form-item>
+          </el-form>
+        </div>
+      </div>
+      <div v-if="info.checkState == '2' || info.checkState == '3'">
+        <TitleWithCircle title="审核结果" />
+        <div style="padding: 20px;">
+          <el-form :model="info" label-width="100px" class="demo-ruleForm">
+            <el-form-item label="状态">
+              <div class="duiqi">{{info.checkState=='2'?'已通过':info.checkState=='3'?'不通过':'无'}}</div>
+            </el-form-item>
+            <el-form-item label="审核意见">
+              <div class="duiqi">{{info.checkOpinion || '无'}}</div>
+            </el-form-item>
+          </el-form>
+        </div>
+      </div>
+      <div>
+        <el-button v-if="info.checkState == '1' && issp == '2'" @click="minSev"
+          style="background-color: #3F9B6A;color: #fff;">确定</el-button>
+        <el-button class="buttonHover"
+          style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;"
+          @click="changetype">返回</el-button>
+      </div>
     </div>
-    <div v-if="info.checkState == '1' && issp == '2'">
-      <TitleWithCircle title="审核情况"/>
-      <div style="padding: 20px;">
-        <el-form :model="info" label-width="100px" class="demo-ruleForm">
-          <el-form-item label="状态" style="align-items: center;">
-            <el-radio v-model="radio" label="2">通过</el-radio>
-            <el-radio v-model="radio" label="3">不通过</el-radio>
+    <div class="zhuti" v-if="ontype == '3'"  style="margin-top: 30px;">
+      <TitleWithCircle title="跟进日志" v-if="zstype == '1'"/>
+      <TitleWithCircle title="谈判日志" v-if="zstype == '2'"/>
+      <div style="padding: 20px;margin-top: 10px;" v-if="zstype == '1'">
+        <el-form :model="formInline" ref="formInline" label-width="120px" class="demo-ruleForm">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="跟进时间" prop="followUpTime">
+              <div class="duiqi">{{formInline.followUpTime  || '无'}}</div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="跟进类型" prop="followUpType" >
+              <div class="duiqi">{{formInline.followUpType  || '无'}}</div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="客户级别" prop="customerLevel" style="width: 100%;">
+              <div class="duiqi">{{formInline.customerLevel  || '无'}}</div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="当前阶段" prop="currentStage">
+              <div class="duiqi">{{formInline.currentStage  || '无'}}</div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="意向资源"  style="width: 100%;">
+          <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
+            <div style="padding: 15px;">
+              <div style="padding: 0px 20px 0px 0px">
+                <el-table :data="addziyuanData"
+                  :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+                  <el-table-column label="序号">
+                    <template slot-scope="scope">
+                      {{scope.$index + 1}}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="资源编号" prop="id" ></el-table-column>
+                  <el-table-column label="意向资源名称"  prop="name"   show-overflow-tooltip>
+                    <template slot-scope="scope">
+                      {{scope.row.shopName ? scope.row.shopName :  scope.row.advertisingName?scope.row.advertisingName:scope.row.venueName}}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="意向资源类型" prop="type" >
+                    <template slot-scope="scope">
+                      {{scope.row.shopName ? '商铺' : scope.row.advertisingType?scope.row.advertisingType:'场地'}}
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </div>
+            </div>
+          </div>
+        </el-form-item>
+        <el-form-item label="内容反馈" prop="contentFeedback">
+          <div class="duiqi">{{formInline.contentFeedback  || '无'}}</div>
+        </el-form-item>
+        <el-form-item label="现场照片">
+          <div style="display: flex;">
+            <allimg v-if="item" :src="item" fit="contain" v-for="item in imgList"
+              style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;" />
+          </div>
+        </el-form-item>
+        <el-form-item label="下次更进时间" prop="plan_Time">
+          <div class="duiqi">{{formInline.plan_Time?formInline.plan_Time.length>0?formInline.plan_Time[0]+' 至 '+formInline.plan_Time[1]:'无':'无'}}</div>
+        </el-form-item>
+      </el-form>
+      </div>
+      <div style="padding: 20px;margin-top: 10px;" v-if="zstype == '2'">
+        <el-form ref="tanform" :model="formInline"  label-width="120px">
+          <el-form-item label="谈判时间" prop="negotiationTime">
+            <div class="duiqi">{{formInline.negotiationTime  || '无'}}</div>
           </el-form-item>
-          <el-form-item label="审核意见">
-            <el-input maxlength="200" show-word-limit rows="4" v-model="checkOpinion" placeholder="请输入审核意见"
-              type="textarea" />
+          <el-form-item label="谈判主题" prop="negotiationTheme" >
+            <div class="duiqi">{{formInline.negotiationTheme  || '无'}}</div>
           </el-form-item>
-        </el-form>
-      </div>
-    </div>
-    <div v-if="info.checkState == '2' || info.checkState == '3'">
-      <TitleWithCircle title="审核结果"/>
-      <div style="padding: 20px;">
-        <el-form :model="info" label-width="100px" class="demo-ruleForm" >
-          <el-form-item label="状态">
-            <div class="duiqi">{{info.checkState=='2'?'已通过':info.checkState=='3'?'不通过':'无'}}</div>
+          <el-form-item label="标段号" prop="bidSegmentNumber" >
+            <div class="duiqi">{{formInline.bidSegmentNumber  || '无'}}</div>
+          </el-form-item>
+
+          <el-form-item label="会议纪要" prop="meetingMinutes">
+            <div class="duiqi">{{formInline.meetingMinutes  || '无'}}</div>
+          </el-form-item>
+          <el-form-item label="谈判内容" prop="negotiationContent">
+            <div class="duiqi">{{formInline.negotiationContent  || '无'}}</div>
+          </el-form-item>
+          <el-form-item label="谈判结果" prop="negotiationResult">
+            <div class="duiqi">{{formInline.negotiationResult  || '无'}}</div>
+          </el-form-item>
+          <el-form-item label="当前阶段" prop="currentStage">
+            <div class="duiqi">{{formInline.currentStage  || '无'}}</div>
           </el-form-item>
-          <el-form-item label="审核意见">
-            <div class="duiqi">{{info.checkOpinion || '无'}}</div>
+          <el-form-item label="其他附件" prop="otherAttachments">
+            <div class="duiqi greens"
+              @click="formInline.otherAttachments?openfile(formInline.otherAttachments):''">
+              {{formInline.otherAttachments?'查看详情':'暂无文件'}}</div>
+          </el-form-item>
+          <el-form-item label="现场照片">
+            <div style="display:flex;flex-wrap: wrap">
+              <div style="display: flex;">
+                <allimg v-if="item" :src="item" fit="contain" v-for="item in imgList"
+                  style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;" />
+              </div>
+            </div>
+          </el-form-item>
+          <el-form-item label="下次谈判时间" prop="plan_Time">
+            <div class="duiqi">{{formInline.plan_Time?formInline.plan_Time.length>0&&formInline.plan_Time[0]?formInline.plan_Time[0]+' 至 '+formInline.plan_Time[1]:'无':'无'}}</div>
           </el-form-item>
         </el-form>
       </div>
+      <div style="display: flex;">
+        <el-button @click="closeFn" class="buttonHover"
+          style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">返回</el-button>
+      </div>
     </div>
-    <div>
-      <el-button v-if="info.checkState == '1' && issp == '2'" @click="minSev"
-      style="background-color: #3F9B6A;color: #fff;">确定</el-button>
-      <el-button class="buttonHover"
-        style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;"
-        @click="changetype">返回</el-button>
+    <div class="zhuti" v-if="ontype == '4'">
+      <!-- <TitleWithCircle title="合同管理"/> -->
+      <div>
+        <busCha :issp="issp" :info="detailsinfo" @removeonaction="removeonaction"></busCha>
+      </div>
+    </div>
+    <div class="zhuti" v-if="ontype == '5'">
+      <!-- <TitleWithCircle :title="contractChangeReason"/> -->
+      <div style="padding: 20px 20px 20px 0;">
+        <add :info="detailsinfo" :contractChangeReason="contractChangeReason" @removeonaction="removeonaction"></add>
+      </div>
     </div>
+    <el-dialog :visible.sync="addfapinfo" title="上传发票" width="65%" append-to-body center :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
+      <el-form :model="fapinfo" :rules="rulesfapinfo" ref="fapForm" label-width="130px" class="demo-ruleForm">
+        <el-row :gutter="20" v-if="isaddshow">
+          <el-col :span="12">
+            <el-form-item label="商铺类型" prop="invoiceType">
+              <el-select v-model="fapinfo.invoiceType" placeholder="请选择" style="width: 100%;">
+                <el-option label="普通发票" value="普通发票"></el-option>
+                <el-option label="专用发票" value="专用发票"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="抬头类型" prop="titleType">
+              <el-select v-model="fapinfo.titleType" placeholder="请选择" style="width: 100%;" @change="changeTitleType">
+                <el-option label="个人" value="个人"></el-option>
+                <el-option label="单位" value="单位"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="发票抬头" prop="invoiceTitle">
+              <el-input v-model="fapinfo.invoiceTitle" placeholder="请输入"  maxlength="50"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="单位税号" prop="unitTaxNo">
+              <el-input v-model="fapinfo.unitTaxNo" placeholder="请输入"  maxlength="50"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="注册地址" prop="registerAddress">
+              <el-input v-model="fapinfo.registerAddress" placeholder="请输入"  maxlength="50"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="注册电话" prop="registerPhone">
+              <el-input v-model="fapinfo.registerPhone" placeholder="请输入"  maxlength="50"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="开户银行" prop="openingBank">
+              <el-input v-model="fapinfo.openingBank" placeholder="请输入"  maxlength="50"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="收票邮箱" prop="receiptEmail">
+              <el-input v-model="fapinfo.receiptEmail" placeholder="请输入"  maxlength="50"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        
+        <el-form-item  label="发票图片" prop="invoiceUrl">
+          <upimg :cmpOption="{disabled:false,isSetCover:false}" filePath="sp" inputtype="architecturalDrawings" :value="fapinfo.invoiceUrl"
+            @changimg="e=>changimg(e,'invoiceUrl')"></upimg>
+        </el-form-item>
+        <el-form-item>
+          <div style="margin-top: 20px;display: flex;flex-direction: row-reverse;">
+            <el-button @click="addfapinfo = false" class="buttonHover"
+              style="color: #606266;border: 1px solid #DBDBDB;background-color: #fff;margin-left: 15px;">取消</el-button>
+            <el-button @click="add()" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
+            
+          </div>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
+    <el-dialog :visible.sync="ckfapinfo" title="查看发票" width="65%" append-to-body center :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
+      <el-form :model="formInline" :rules="rulesfapinfo" ref="fapForm" label-width="130px" class="demo-ruleForm">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="发票类型" prop="invoiceType">
+              <div class="duiqi">{{formInline.invoiceType || '无'}}</div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="抬头类型" prop="titleType">
+              <div class="duiqi">{{formInline.titleType || '无'}}</div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="发票抬头" prop="invoiceTitle">
+              <div class="duiqi">{{formInline.invoiceTitle || '无'}}</div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="单位税号" prop="unitTaxNo">
+              <div class="duiqi">{{formInline.unitTaxNo || '无'}}</div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="注册地址" prop="registerAddress">
+              <div class="duiqi">{{formInline.registerAddress || '无'}}</div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="注册电话" prop="registerPhone">
+              <div class="duiqi">{{formInline.registerPhone || '无'}}</div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="开户银行" prop="openingBank">
+              <div class="duiqi">{{formInline.openingBank || '无'}}</div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="收票邮箱" prop="receiptEmail">
+              <div class="duiqi">{{formInline.receiptEmail || '无'}}</div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="发票图片" prop="invoiceUrl">
+          <div v-if="formInline.invoiceUrl">
+              <div style="display: flex;">
+                <allimg v-if="item" :src="item" fit="contain"  v-for="item in formInline.invoiceUrl.split(',')" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
+              </div>
+          </div>
+          <div  class="duiqi" v-else>无</div>
+        </el-form-item>
+        <el-form-item>
+          <div style="margin-top: 20px;display: flex;flex-direction: row-reverse;">
+            <el-button @click="ckfapinfo = false" class="buttonHover"
+              style="color: #606266;border: 1px solid #DBDBDB;background-color: #fff;margin-left: 15px;">关闭</el-button>
+          </div>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
   </div>
 </template>
 
 <script>
+  import upimg from "@/components/ImageUpload/index"
   import {
-    cerePlatformMerchantedit
+    cerePlatformMerchantedit,
+
+    cereNegotiationDetails,
+    cereFollowDetails,
+    cerePropertyOrder,
+    editToRecheck,
+    cereInvoiceTitleadd,
+    cereInvoiceTitlegetByTenementId,
+    cereContractInformationgetPage,
+    cerePaymentInfo,
+    cereContractInformationgetPages
   } from '@/api/newly.js'
+  import {
+    icManAll
+  } from '@/api/icManagement.js'
   import TitleWithCircle from '@/components/top/index';
   import allimg from '@/components/chakan/allimg.vue';
+  import busCha from '@/components/buscha/busCha'
+  import add from '@/components/add/addht.vue'
   export default {
     components: {
       TitleWithCircle,
-      allimg
+      allimg,
+      upimg,
+      busCha,
+      add
     },
     props: {
       info: {
@@ -176,18 +720,365 @@
     },
     data() {
       return {
-        checkOpinion:'',
+        // 合同
+        contractChangeReason:'',
+        issp:'1',
+        detailsinfo:{},
+
+        isaddshow:true,
+        fapinfo: {
+          invoiceType: '', // 发票类型，例如 '普通发票' 或 '专用发票'
+          titleType: '', // 抬头类型，例如 '个人' 或 '单位'
+          invoiceTitle: '', // 发票抬头
+          unitTaxNo: '', // 单位税号
+          registerAddress: '', // 注册地址
+          registerPhone: '', // 注册电话
+          openingBank: '', // 开户银行
+          receiptEmail: '', // 收票邮箱
+          invoiceUrl: '' // 发票图片的 URL
+        },
+        ckfapinfo:false,
+        addfapinfo:false,
+        rulesfapinfo:{
+          invoiceType: [{
+            required: true,
+            message: '请选择商铺类型',
+            trigger: 'blur'
+          }, ],
+          titleType: [{
+            required: true,
+            message: '请选择抬头类型',
+            trigger: 'blur'
+          }, ],
+          invoiceTitle: [{
+            required: true,
+            message: '请输入发票抬头',
+            trigger: 'blur'
+          }, ],
+        },
+        addziyuanData:[],
+        formInline:{},
+        ontype:'1',
+        totalyx: 0,
+        pagequeryyx:{
+          pageNumber: 0,
+          pageSize: 10,
+        },
+        datalistyx:[],
+
+        totalwyjf: 0,
+        pagequerywyjf:{
+          pageNumber: 0,
+          pageSize: 10,
+        },
+        datalistwyjf:[],
+
+        totalzljf: 0,
+        pagequeryzljf:{
+          pageNumber: 0,
+          pageSize: 10,
+          "relatedMerchants":"27"
+        },
+        datalistzljf:[],
+
+        totalgg: 0,
+        pagequerygg:{
+          pageNumber: 0,
+          pageSize: 10,
+        },
+        datalistgg:[],
+
+
+        totalht: 0,
+        pagequeryht:{
+          pageNumber: 0,
+          pageSize: 10,
+        },
+        datalistht:[],
+
+        totaltp: 0,
+        pagequerytp:{
+          pageNumber: 0,
+          pageSize: 10,
+        },
+        datalisttp:[],
+
+        pagequeryzl:{
+          pageNumber: 0,
+          pageSize: 100,
+          relatedMerchants:'28'
+        },
+        zlgglist:[],
+        zlsplist:[],
+
+        checkOpinion: '',
         radio: '2',
-        xiangTab: 'first',
+        xiangTab: 'one',
         list: [],
+        zstype:"1"
       }
     },
     created() {
+      this.getAllyx()
+      this.getAlltp()
+      this.getAllgg()
+      this.getAllzljf()
+      this.getAllht()
+      this.getAllwyjf()
+      this.getAllzl()
     },
     computed: {
 
     },
     methods: {
+      changeTitleType(e) {
+        console.error(e)
+        this.isaddshow = false
+        if(e == '个人') {
+          this.rulesfapinfo={
+            invoiceType: [{
+              required: true,
+              message: '请选择商铺类型',
+              trigger: 'blur'
+            }, ],
+            titleType: [{
+              required: true,
+              message: '请选择抬头类型',
+              trigger: 'blur'
+            }, ],
+            invoiceTitle: [{
+              required: true,
+              message: '请输入发票抬头',
+              trigger: 'blur'
+            }, ],
+          }
+        } else if(e == '单位') {
+          this.rulesfapinfo={
+            invoiceType: [{
+              required: true,
+              message: '请选择商铺类型',
+              trigger: 'blur'
+            }, ],
+            titleType: [{
+              required: true,
+              message: '请选择抬头类型',
+              trigger: 'blur'
+            }, ],
+            invoiceTitle: [{
+              required: true,
+              message: '请输入发票抬头',
+              trigger: 'blur'
+            }, ],
+            unitTaxNo: [{
+              required: true,
+              message: '请输入单位税号',
+              trigger: 'blur'
+            }, ],
+            registerAddress: [{
+              required: true,
+              message: '请输入注册地址',
+              trigger: 'blur'
+            }, ],
+            registerPhone: [{
+              required: true,
+              message: '请输入注册电话',
+              trigger: 'blur'
+            }, ],
+            openingBank: [{
+              required: true,
+              message: '请输入开户银行',
+              trigger: 'blur'
+            }, ],
+            bankAccount: [{
+              required: true,
+              message: '请输入银行账号',
+              trigger: 'blur'
+            }, ],
+          }
+        }
+        this.$nextTick(() => {
+            this.isaddshow =  true
+          })
+      },
+      openckfapinfo(item) {
+        cereInvoiceTitlegetByTenementId({id:item.id}).then(res => {
+          // console.error(res.data)
+          this.formInline = res.data
+          this.ckfapinfo = true
+        })
+      },
+      openaddfapinfo(item) {
+        this.formInline = item
+        this.addfapinfo = true
+      },
+      add(){
+        this.fapinfo.tenementId = this.formInline.id
+        console.error({...this.fapinfo})
+        this.$refs.fapForm.validate((valid) => {
+          console.log(valid)
+          if (valid) {
+            cereInvoiceTitleadd(this.fapinfo).then(res => {
+              if (res.code == 200) {
+                this.$message({
+                  message: '上传成功',
+                  type: 'success'
+                })
+                this.addfapinfo = false
+                this.pagequeryzljf.pageNumber = 0
+                this.getAllzljf()
+              } else {
+                this.$message({
+                  message: res.msg,
+                  type: 'error'
+                })
+              }
+            })
+          } else {
+            this.$message({
+              message: '请填写完整信息',
+              type: 'error'
+            })
+          }
+
+
+        })
+      },
+      changimg(e, type) {
+        this.fapinfo[type] = e
+      },
+      closeFn(){
+        this.ontype = '1'
+      },
+      open1(item,type){
+        this.formInline = {}
+        this.formInline = item
+        this.formInline.plan_Time = [item.nextFollowUpStartTime, item.nextFollowUpEndTime]
+        if (typeof item.intendedResource == 'string' && item.intendedResource != '') {
+          this.addziyuanData = JSON.parse(item.intendedResource)
+        }
+
+        if (typeof item.onSitePhotos == 'string') {
+          this.imgList = item.onSitePhotos.split(',') || []
+        }
+        this.zstype = type
+        this.ontype = '3'
+      },
+      getAllzl() {
+        cereContractInformationgetPages(this.pagequeryzl).then(res => {
+          console.error(res)
+          if (!Array.isArray(res.data.content)) {
+            this.datalistht= [];
+            return;
+          }
+          console.error('[[[[[[[[[[]]]]]]]]]]')
+          this.zlsplist = res.data.content.filter( item => {
+            return item.cereBasicInformationShop.id || item.cereBasicInformationVenue.id
+          })
+          this.zlgglist = res.data.content.filter( item => {
+            return item.cereAdvertisingInformation.id
+          })
+          console.error(res.data.content)
+        })
+      },
+      getAllht() {
+        cereContractInformationgetPage(this.pagequeryht).then(res => {
+          console.error(res)
+          if (!Array.isArray(res.data.content)) {
+            this.datalistht= [];
+            return;
+          }
+          this.datalistht = res.data.content
+          this.totalht = res.data.totalElements
+        })
+      },
+      getAllwyjf() {
+        cerePaymentInfo(this.pagequerywyjf).then(res => {
+          console.error(res)
+          if (!Array.isArray(res.data.content)) {
+            this.datalistwyjf= [];
+            return;
+          }
+          this.datalistwyjf = res.data.content
+          this.totalwyjf = res.data.totalElements
+        })
+      },
+      getAllzljf() {
+        cerePropertyOrder(this.pagequeryzljf).then(res => {
+          console.error(res)
+          if (!Array.isArray(res.data.content)) {
+            this.datalistzljf= [];
+            return;
+          }
+          this.datalistzljf = res.data.content
+          this.totalzljf = res.data.totalElements
+        })
+      },
+      getAllgg() {
+        cereFollowDetails(this.pagequerygg).then(res => {
+          console.error(res)
+          if (!Array.isArray(res.data.content)) {
+            this.datalistgg = [];
+            return;
+          }
+          this.datalistgg = res.data.content
+          this.totalgg = res.data.totalElements
+        })
+      },
+      getAlltp() {
+        cereNegotiationDetails(this.pagequerytp).then(res => {
+          console.error(res)
+          if (!Array.isArray(res.data.content)) {
+            this.datalisttp= [];
+            return;
+          }
+          this.datalisttp = res.data.content
+          this.totaltp = res.data.totalElements
+        })
+      },
+      getAllyx() {
+        icManAll(this.pagequeryyx).then(res => {
+          console.error(res)
+          if (!Array.isArray(res.data.content)) {
+            this.datalistyx = [];
+            return;
+          }
+          this.datalistyx = res.data.content
+          this.totalyx = res.data.totalElements
+        })
+      },
+      handleCurrentChange(val,type) {
+        this[type].pageNumber = val - 1
+        if(type == 'pagequeryyx') {
+          this.getAllyx()
+        } else if(type == 'pagequerytp') {
+          this.getAlltp()
+        } else if(type == 'pagequerygg') {
+          this.getAllgg()
+        } else if(type == 'pagequeryzljf') {
+          this.getAllzljf()
+        } else if(type == 'pagequeryht') {
+          this.getAllht()
+        } else if(type == 'pagequerywyjf') {
+          this.getAllwyjf()
+        }
+      },
+      handleSizeChange(val,type) {
+        this[type].pageSize = val
+        this[type].pageNumber = 0
+        if(type == 'pagequeryyx') {
+          this.getAllyx()
+        } else if(type == 'pagequerytp') {
+          this.getAlltp()
+        } else if(type == 'pagequerygg') {
+          this.getAllgg()
+        } else if(type == 'pagequeryzljf') {
+          this.getAllzljf()
+        } else if(type == 'pagequeryht') {
+          this.getAllht()
+        } else if(type == 'pagequerywyjf') {
+          this.getAllwyjf()
+        }
+      },
       minSev() {
         let that = this
         console.error(this.info)
@@ -195,7 +1086,7 @@
         cerePlatformMerchantedit({
           ...this.info,
           'checkState': this.radio,
-          checkOpinion: this.checkOpinion?this.checkOpinion:null
+          checkOpinion: this.checkOpinion ? this.checkOpinion : null
         }).then(res => {
           console.error(res)
           if (res.code == 200) {
@@ -214,22 +1105,111 @@
           }
         })
       },
-     async setmsg() {
+      async setmsg() {
         let info = {
-          type:'通知消息',
-          phone:this.info.phone,
-          content:{
-            type:'1',
-            title:this.radio=='2'?'商家审核已通过':this.radio=='3'?'商家审核已驳回':'商家',
-            content:this.checkOpinion
+          type: '通知消息',
+          phone: this.info.phone,
+          content: {
+            type: '1',
+            title: this.radio == '2' ? '商家审核已通过' : this.radio == '3' ? '商家审核已驳回' : '商家',
+            content: this.checkOpinion
           },
         }
         await this.$setmsg(info);
       },
-      changetype(){
-        this.xiangTab= 'first'
+      changetype() {
+        this.xiangTab = 'first'
         this.$emit('removeonaction', '1')
       },
+      //复核
+      fhjf(item) {
+        const h = this.$createElement;
+        this.$msgbox({
+          title: '消息',
+          message: h('p', null, [
+            h('span', null, '是否复核 '),
+          ]),
+          showCancelButton: true,
+          showClose: false,
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          customClass: 'oe-dialog-btn',
+          beforeClose: (action, instance, done) => {
+            if (action === 'confirm') {
+              editToRecheck({
+                id: item.id
+              }).then(res => {
+                this.$message({
+                  message: '复核成功',
+                  type: 'success'
+                })
+                this.pagequeryzljf.pageNumber = 0
+                this.getAllzljf()
+                done();
+              })
+            } else {
+              done();
+            }
+          }
+        })
+      },
+      //合同操作
+      details(row,e) {
+        this.issp = e
+        this.detailsinfo = row
+        this.ontype = '4'
+      },
+      removeonaction(e) {
+        this.ontype = '1'
+      },
+      removeinfo(row, e) {
+        this.contractChangeReason = e
+        // console.error(this.contractChangeReason)
+        this.detailsinfo = row
+        this.ontype = '5'
+      },
+      removeinfozz(row, e) {
+        let that = this
+        this.$confirm('确定要终止合同吗？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          cereContractInformation({
+            ...row,
+            contractChangeReason: e,
+            dataStatus: '3',
+            originalContractCode: row.contractNumber,
+            updateDate: that.gettime(),
+            createDate: that.gettime(),
+            contractChangeTime: that.gettime(),
+            updateUser:localStorage.getItem('roleName')
+          }).then(res => {
+            console.error(res)
+            if (res.code == 200) {
+              this.$message({
+                message: '终止成功',
+                type: 'success'
+              })
+              let c1 = row.shopNumber
+              modifyResourceStatus({
+                resourcesId: c1,
+                status:"0"
+              }).then(res => {
+                console.error(res)
+              })
+              // this.$emit('removeonaction', '1')
+              this.getAll()
+            } else {
+              this.$message({
+                message: res.msg,
+                type: 'error'
+              })
+            }
+
+          })
+        })
+      },
     }
   }
 </script>
@@ -237,7 +1217,7 @@
   .el-form-item__label {
     color: #a2a2a2;
   }
-  
+
   .greens {
     color: #3F9B6A;
   }
diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index d6aaf1a..81a06f1 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -17,12 +17,12 @@ 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.44:9003';
+  baseURL = 'http://128.10.249.41:9003';
 
 
 } else {
diff --git a/admin-web-master/src/utils/request2.js b/admin-web-master/src/utils/request2.js
index e3e1f58..e383806 100644
--- a/admin-web-master/src/utils/request2.js
+++ b/admin-web-master/src/utils/request2.js
@@ -17,10 +17,10 @@ let baseURL =  ''
 // || host === 'localhost:9528'
 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529'  ) {
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
-  // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/business-server';
+  baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/business-server';
   // baseURL = 'http://172.16.61.125:9004';
   // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
-    baseURL = 'http://128.10.249.44:9004';
+    // baseURL = 'http://128.10.249.44:9004';
 } else {
   console.error('---------------------')
   console.error(hostall)
diff --git a/admin-web-master/src/views/business/businessList/index.vue b/admin-web-master/src/views/business/businessList/index.vue
index 6db36e0..ac9e969 100644
--- a/admin-web-master/src/views/business/businessList/index.vue
+++ b/admin-web-master/src/views/business/businessList/index.vue
@@ -23,10 +23,11 @@
             </el-button>
           </div>
         </div>
-      <div style="margin-bottom:20px;">
-        <el-button @click="removeonaction('2')" icon="el-icon-circle-plus-outline" style="background-color: #3F9B6A;color: #fff;">新增
-        </el-button>
-      </div>
+        <div style="margin-bottom:20px;">
+          <el-button @click="removeonaction('2')" icon="el-icon-circle-plus-outline"
+            style="background-color: #3F9B6A;color: #fff;">新增
+          </el-button>
+        </div>
         <!-- 表格 -->
 
         <el-table :data="tableData"
@@ -76,8 +77,8 @@
           <el-table-column label="操作" fixed="right">
             <template slot-scope="scope">
               <div @click="details(scope.row)" class="tableBtn greens">查看</div>
-			  <div @click="bianji(scope.row)" class="tableBtn greens">编辑</div>
-			  <div @click="delmsg(scope.row.id)" class="tableBtn greens">删除</div>
+              <div @click="bianji(scope.row)" class="tableBtn greens">编辑</div>
+              <div @click="delmsg(scope.row.id)" class="tableBtn greens">删除</div>
               <!-- <div @click="openyujingSet(scope.row)" class="tableBtn greens">审核</div> -->
             </template>
           </el-table-column>
@@ -99,7 +100,8 @@
 
 
 
-    <el-dialog title="审核" :visible.sync="yujingSet" style="padding: 0;" width="60%" center :close-on-click-modal="false" :show-close="false" top="20vh">
+    <el-dialog title="审核" :visible.sync="yujingSet" style="padding: 0;" width="60%" center :close-on-click-modal="false"
+      :show-close="false" top="20vh">
       <div>
         <div style="margin-bottom: 20px;">
           <el-form ref="form" :model="detailsinfo" label-width="120px">
@@ -111,7 +113,8 @@
               </el-select>
             </el-form-item>
             <el-form-item label="审核意见">
-              <el-input maxlength="200" show-word-limit rows="4" v-model="detailsinfo.checkOpinion" placeholder="请输入审核意见" type="textarea" />
+              <el-input maxlength="200" show-word-limit rows="4" v-model="detailsinfo.checkOpinion"
+                placeholder="请输入审核意见" type="textarea" />
             </el-form-item>
           </el-form>
 
@@ -147,16 +150,16 @@
           @click="removeonaction('1')">返回</el-button>
       </div> -->
     </div>
-	<div class="zhuti" v-if="onaction == '4'">
-	  <div style="height:58px;line-height:58px;">
-	    <div style="color:#0006"> <span>合同管理</span> <span style="padding:0 5px;">></span> <span
-	        style="color:#000000e6">编辑</span></div>
-	  </div>
-	
-	  <div style="padding: 20px 20px 20px 0;">
-	    <add :info="bianinfo" @removeonaction="removeonaction"></add>
-	  </div>
-	</div>
+    <div class="zhuti" v-if="onaction == '4'">
+      <div style="height:58px;line-height:58px;">
+        <div style="color:#0006"> <span>合同管理</span> <span style="padding:0 5px;">></span> <span
+            style="color:#000000e6">编辑</span></div>
+      </div>
+
+      <div style="padding: 20px 20px 20px 0;">
+        <add :info="bianinfo" @removeonaction="removeonaction"></add>
+      </div>
+    </div>
 
   </div>
   <!-- </div> -->
@@ -166,7 +169,9 @@
 <script>
   import add from '@/components/add/addss.vue'
   import {
-    cerePlatformMerchant,cerePlatformMerchantedit,cerePlatformMerchantdelet
+    cerePlatformMerchant,
+    cerePlatformMerchantedit,
+    cerePlatformMerchantdelet
   } from '../../../api/newly.js'
   import {
     cereReminderSet,
@@ -185,7 +190,7 @@
         pagequery: {
           pageNumber: 0,
           pageSize: 10,
-          checkState:'2',
+          checkState: '2',
           name: '',
 
         },
@@ -193,7 +198,7 @@
         total: 0,
         onaction: '1',
         info: {},
-		bianinfo:{}
+        bianinfo: {}
       }
     },
     components: {
@@ -207,12 +212,12 @@
     },
     methods: {
       calculateDaysUntilExpiration(endDateString) {
-            const endDate = new Date(endDateString);
-            const today = new Date();
-            const timeDifference = endDate - today;
-            const daysDifference = Math.ceil(timeDifference / (1000 * 60 * 60 * 24));
-            return daysDifference >= 0 ? daysDifference : '已过期';
-        },
+        const endDate = new Date(endDateString);
+        const today = new Date();
+        const timeDifference = endDate - today;
+        const daysDifference = Math.ceil(timeDifference / (1000 * 60 * 60 * 24));
+        return daysDifference >= 0 ? daysDifference : '已过期';
+      },
       yuclose() {
         this.yujingSet = false
       },
@@ -233,7 +238,7 @@
             })
           }
         })
-        
+
       },
       openyujingSet(row) {
         // cereReminderSet({
@@ -249,10 +254,10 @@
         this.detailsinfo = row
         this.onaction = '3'
       },
-	  bianji(row){
-		this.bianinfo = row
-		this.onaction = '4'  
-	  },
+      bianji(row) {
+        this.bianinfo = row
+        this.onaction = '4'
+      },
       biangeng(row) {
         alert(`合同变更 - 店铺ID: ${row.id}`);
       },
@@ -289,42 +294,42 @@
         this.pagequery = {
             pageNumber: 0,
             pageSize: 10,
-            checkState:'2',
+            checkState: '2',
             name: ''
           },
           this.getAll()
       },
-	  delmsg(ids){
-		    const h = this.$createElement;
-		    this.$msgbox({
-		      title: '消息',
-		      message: h('p', null, [
-		        h('span', null, '是否删除 '),
-		      ]),
-		      showCancelButton: true,
-		      showClose: false,
-		      confirmButtonText: '确定',
-		      cancelButtonText: '取消',
-		      customClass: 'oe-dialog-btn',
-		      beforeClose: (action, instance, done) => {
-		        if (action === 'confirm') {
-		          cerePlatformMerchantdelet({
-		            id: ids
-		          }).then(res => {
-		            this.$message({
-		              message: '删除成功',
-		              type: 'success'
-		            })
-		            this.getAll()
-		            done();
-		          })
-		        } else {
-		          done();
-		        }
-		      }
-		    })
-		  
-	  },
+      delmsg(ids) {
+        const h = this.$createElement;
+        this.$msgbox({
+          title: '消息',
+          message: h('p', null, [
+            h('span', null, '是否删除 '),
+          ]),
+          showCancelButton: true,
+          showClose: false,
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          customClass: 'oe-dialog-btn',
+          beforeClose: (action, instance, done) => {
+            if (action === 'confirm') {
+              cerePlatformMerchantdelet({
+                id: ids
+              }).then(res => {
+                this.$message({
+                  message: '删除成功',
+                  type: 'success'
+                })
+                this.getAll()
+                done();
+              })
+            } else {
+              done();
+            }
+          }
+        })
+
+      },
     }
 
   }
@@ -332,20 +337,23 @@
 
 <style scoped>
   .zhuti {
-    padding: 0  20px 20px 20px;
+    padding: 0 20px 20px 20px;
     min-height: calc(100vh - 50px - 20px);
     background-color: #Fff;
 
   }
-  .chengeXia{
-    border-bottom: 6px solid #3F9B6A;padding-bottom: 4px;color: #3F9B6A;
+
+  .chengeXia {
+    border-bottom: 6px solid #3F9B6A;
+    padding-bottom: 4px;
+    color: #3F9B6A;
   }
 
   /deep/ .el-form-item__content {
     /* line-height: 0; */
   }
 
- 
+
 
   .formSearch {
     display: flex;
@@ -362,8 +370,8 @@
 
   /deep/ .el-table__row {
     font-size: 14px;
-    color:#000000e6;
-    height:42px;
+    color: #000000e6;
+    height: 42px;
   }
 
   .fenye {
@@ -414,21 +422,25 @@
     background: #fff;
     height: 50px;
   }
-    /deep/ .bg-purple[data-v-3bebae82]{
+
+  /deep/ .bg-purple[data-v-3bebae82] {
     background: #fff;
     height: 50px;
   }
 
-::v-deep .bg-purple{
+  ::v-deep .bg-purple {
     background: #fff;
     height: 50px;
   }
+
   /deep/ .el-form--label-top .el-form-item__label {
     padding: 0;
   }
-::v-deep .el-form-item{
-  margin-bottom:16px;
-}
+
+  ::v-deep .el-form-item {
+    margin-bottom: 16px;
+  }
+
   .device-form .el-form-item__label::after {
     content: "*";
     color: #1A1A1A;
@@ -442,133 +454,156 @@
       background-color: #FAFAFA;
     }
   }
- ::v-deep .el-input__inner:focus {
-      border: #3F9B6A 1px solid;
-   }
+
+  ::v-deep .el-input__inner:focus {
+    border: #3F9B6A 1px solid;
+  }
+
   .dialog-footer {
     display: flex;
     justify-content: flex-end;
     border-top: solid rgba(209, 209, 209, 0.2) 2px;
     padding-top: 20px;
   }
- ::v-deep .el-input__inner:focus {
-      border: #3F9B6A 1px solid;
-   }
-   ::v-deep .el-input__inner:hover {
-        border: #3F9B6A 1px solid;
-     }
-     ::v-deep .el-select .el-input.is-focus .el-input__inner{
-         border-color:#3F9B6A
-     }
-::v-deep .btn .el-button:focus,
-.el-button:hover {
-  border: 1px solid #3F9B6A;
-}
-.el-select-dropdown__item.selected{
+
+  ::v-deep .el-input__inner:focus {
+    border: #3F9B6A 1px solid;
+  }
+
+  ::v-deep .el-input__inner:hover {
+    border: #3F9B6A 1px solid;
+  }
+
+  ::v-deep .el-select .el-input.is-focus .el-input__inner {
+    border-color: #3F9B6A
+  }
+
+  ::v-deep .btn .el-button:focus,
+  .el-button:hover {
+    border: 1px solid #3F9B6A;
+  }
+
+  .el-select-dropdown__item.selected {
     color: #3F9B6A;
-}
+  }
 
-.el-pagination__sizes .el-input .el-input__inner:hover{
+  .el-pagination__sizes .el-input .el-input__inner:hover {
     border-color: #3F9B6A;
-}
-::v-deep .el-dialog__wrapper{
+  }
+
+  ::v-deep .el-dialog__wrapper {
 
-  .dialog_css{
+    .dialog_css {
       margin-right: 12px;
-      margin-top:61px !important;
+      margin-top: 61px !important;
+
       .el-dialog__title {
         font-size: 16px !important;
         font-weight: 600;
         color: #000;
       }
+    }
+
+    .diaslog_zhong {
+      margin-left: 20%;
+      margin-top: 61px !important;
+    }
+
   }
-  .diaslog_zhong{
-     margin-left: 20%;
-     margin-top:61px !important;
-  }
-
-}
- ::v-deep .diaslog_zhong{
-     margin-left: 20%;
-     margin-top:61px !important;
-     .el-dialog__header{
-       background-color:#fff;
-       border-bottom:1px solid #EFEFEF;
-       .el-dialog__title{
-         font-size: 14px;
-          color: #000000e6;
-       }
-     }
-     .el-dialog__body{
-       padding:10px 20px 30px 20px
-     }
-  }
-
- /deep/ .el-table_1_column_8 .hetong{
-   color:#7DBB9A;
-   text-decoration: underline;
-}
-/deep/ .first-column-bg {
+
+  ::v-deep .diaslog_zhong {
+    margin-left: 20%;
+    margin-top: 61px !important;
+
+    .el-dialog__header {
+      background-color: #fff;
+      border-bottom: 1px solid #EFEFEF;
+
+      .el-dialog__title {
+        font-size: 14px;
+        color: #000000e6;
+      }
+    }
+
+    .el-dialog__body {
+      padding: 10px 20px 30px 20px
+    }
+  }
+
+  /deep/ .el-table_1_column_8 .hetong {
+    color: #7DBB9A;
+    text-decoration: underline;
+  }
+
+  /deep/ .first-column-bg {
     background-color: #FAFAFA !important;
   }
 
-.el-table tr{
-  height:56px;
-}
+  .el-table tr {
+    height: 56px;
+  }
 
-::v-deep .table3{
-  .el-table__empty-block{
-    display:none;
+  ::v-deep .table3 {
+    .el-table__empty-block {
+      display: none;
+    }
   }
-}
-::v-deep .textarea{
-  width: 85%;
-   .el-textarea__inner{
-    width: 100%;
+
+  ::v-deep .textarea {
+    width: 85%;
+
+    .el-textarea__inner {
+      width: 100%;
+    }
+  }
+
+  ::v-deep .el-button--mini {
+    padding: 7px 10px;
   }
-}
-::v-deep .el-button--mini{
-  padding: 7px 10px;
-}
-::v-deep .pass_input{
+
+  ::v-deep .pass_input {
     width: 100%;
+
     .el-input__inner {
       border: none;
-       padding:0;
-       }
-  }
-::v-deep .pass_select{
-  width: 100%;
- .el-input__inner {
-   border: none;
-   padding:0;
+      padding: 0;
     }
-  .el-icon-arrow-up:before{
-    content:''
   }
 
-}
- /deep/ .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell{
-  background-color: #fff;
-}
+  ::v-deep .pass_select {
+    width: 100%;
+
+    .el-input__inner {
+      border: none;
+      padding: 0;
+    }
+
+    .el-icon-arrow-up:before {
+      content: ''
+    }
 
+  }
 
+  /deep/ .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
+    background-color: #fff;
+  }
 </style>
 <style lang="scss" scoped>
-  ::v-deep .bian_css{
-    .el-dialog__header{
-      padding:0px;
+  ::v-deep .bian_css {
+    .el-dialog__header {
+      padding: 0px;
     }
   }
-  ::v-deep .buttonHover:hover{
-    color:#3f9b6a !important;
+
+  ::v-deep .buttonHover:hover {
+    color: #3f9b6a !important;
     border-color: #c5e1d2 !important;
     background-color: #ecf5f0 !important;
     outline: none;
   }
-  ::v-deep .el-pagination__total{
-        position: absolute;
-        left: 33px;
+
+  ::v-deep .el-pagination__total {
+    position: absolute;
+    left: 33px;
   }
 </style>
-