diff --git a/admin-web-master/src/views/ads/fangAudit/bianform.vue b/admin-web-master/src/views/ads/fangAudit/bianform.vue
index fb4bd48..3d10958 100644
--- a/admin-web-master/src/views/ads/fangAudit/bianform.vue
+++ b/admin-web-master/src/views/ads/fangAudit/bianform.vue
@@ -28,38 +28,40 @@
         <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
           <div style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;">
             <div>招商内容</div>
-            <!-- <div style="color: #2d8a58;margin-left: 10px;" @click="addMing = true">
-              添加
-            </div> -->
+
           </div>
           <div style="padding: 15px;">
             <div style="padding: 0px 20px 0px 0px">
-              <el-table :data="ruleForm.resourceManagement"
-                :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-                 style="width: 100%">
-                <el-table-column label="序号" width="auto" min-width="8%" >
-                  <template slot-scope="scope">
-                    {{scope.$index + 1}}
-                  </template>
-                </el-table-column>
-                <el-table-column label="资源编号" prop="id" width="auto" min-width="22%">
-
-                </el-table-column>
-                <el-table-column label="资源名称"  width="auto" min-width="15%">
-<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="资源类型" width="auto" min-width="15%">
-                  <template slot-scope="scope">
-                    {{scope.row.shopName ? '商铺' : scope.row.advertisingType?scope.row.advertisingType:'场地'}}
-                  </template>
-                </el-table-column>
-                <el-table-column prop="notes" label="策略描述" width="auto" min-width="15%">
-                </el-table-column>
-                <el-table-column prop="policyName" label="策略名称" width="auto" min-width="15%">
-                </el-table-column>
-              </el-table>
+              <el-table :data="ruleForm.cereResourceStrategy"
+                              :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+                               style="width: 100%">
+                              <el-table-column label="序号" width="auto" min-width="8%" >
+                                <template slot-scope="scope">
+                                  {{scope.$index + 1}}
+                                </template>
+                              </el-table-column>
+                              <el-table-column label="资源编号" prop="id" width="auto" min-width="22%">
+
+                              </el-table-column>
+                              <el-table-column label="资源名称" width="auto" min-width="15%">
+              <template slot-scope="scope">
+                                                {{scope.row.resources.shopIds[0]?scope.row.resources.shopIds[0].shopName:scope.row.resources.siteIds[0]?scope.row.resources.siteIds[0].venueName:scope.row.resources.advIds[0].advertisingName}}
+                                              </template>
+                              </el-table-column>
+                              <el-table-column label="资源类型" width="auto" min-width="15%">
+                                <template slot-scope="scope">
+                                 {{scope.row.resources.shopIds[0]?'商铺':scope.row.resources.siteIds[0]?'场地':'广告位'}}
+                                </template>
+                              </el-table-column>
+                              <el-table-column prop="notes" label="策略描述" width="auto" min-width="15%">
+                              </el-table-column>
+                              <el-table-column  label="策略名称" width="auto" min-width="15%">
+                                <template slot-scope="scope">
+                                                {{scope.row.resources.cereRentalPolicies.policyName}}
+                                              </template>
+                              </el-table-column>
+
+                            </el-table>
             </div>
           </div>
         </div>
@@ -84,7 +86,7 @@
   :rows="4"/>
                         </el-form-item>
          </el-form>
-         <div  v-if="steat==false">
+         <!-- <div  v-if="steat==false">
            <div style="width:129px;font-weight: 100;
     font-size: 14px;
     color: #000000e6;text-align:right">审核信息</div>
@@ -109,7 +111,7 @@
                </el-table-column>
              </el-table>
            </div>
-         </div>
+         </div> -->
         <div style="display: flex;justify-content: flex-end;padding: 10px 20px 10px 0">
           <el-button  @click="close" class="buttonHover"
               style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消
diff --git a/admin-web-master/src/views/ads/fangAudit/index.vue b/admin-web-master/src/views/ads/fangAudit/index.vue
index d485ff6..ae1ea1e 100644
--- a/admin-web-master/src/views/ads/fangAudit/index.vue
+++ b/admin-web-master/src/views/ads/fangAudit/index.vue
@@ -84,8 +84,8 @@
                       min-width="120"
           >
           <template slot-scope="scope">
-                      1
-                    </template>
+              {{ scope.row.cereResourceStrategy.length }}
+            </template>
                     </el-table-column>
                     <el-table-column
                       label="资源编号"
@@ -213,7 +213,7 @@
                     <div style="padding:20px 15px 15px 15px;">
                          <el-tabs v-model="actCard"  @tab-click="handleClick">
                             <el-tab-pane label="表单信息" name='1'>
-                              <div style="margin:0 0 10px 30%">方案文件 {{itemXiang.planName}}</div>
+                              <div style="margin:0 0 10px 30%">方案名称 {{itemXiang.planName}}</div>
                               <div style="margin:15px 0;padding:0 20%; padding-bottom:20px;border-bottom: 1px solid #E1EEEF;">
                                 <el-button @click="MsgShen(1)"  style="background-color: #3F9B6A;color: #fff;">基本信息查看</el-button>
                               </div>
@@ -240,28 +240,28 @@
                                             基本信息
                                            </div>
                                            <div style="padding: 15px;">
-                                            <el-form label-position="right" :model="shenhe" label-width="140px"
+                                            <el-form label-position="right" :model="itemXiang" label-width="140px"
                                                       style="position: relative">
                                                           <el-form-item label="招商方案名称" class="grid-content bg-purple device-from" prop="planName" >
-                                                            <el-input v-model="shenhe.planName" placeholder="请输入" disabled/>
+                                                            <el-input v-model="itemXiang.planName" placeholder="请输入" disabled/>
                                                           </el-form-item>
                                                           <el-form-item label="规划方案" class="grid-content bg-purple device-from" prop="planningScheme">
-                                                            <el-select v-model="shenhe.planningScheme"  style="width: 100%" disabled>
+                                                            <el-select v-model="itemXiang.planningScheme"  style="width: 100%" disabled>
                                                               <el-option :label="item.planningName" :value="item.id" v-for="(item,index) in guihuaDate "></el-option>
                                                             </el-select>
                                                           </el-form-item>
 
                                                           <el-form-item label="招商政策与条件" class="grid-content bg-purple" prop="investmentPolicy">
 
-                                                            <div style="border: 1px solid #dddfe5;padding:20px;" v-html="shenhe.investmentPolicy"></div>
+                                                            <div style="border: 1px solid #dddfe5;padding:20px;" v-html="itemXiang.investmentPolicy"></div>
                                                           </el-form-item>
                                                           <el-form-item label="方案概述" prop="summary" class="grid-content bg-purple">
 
-                                                            <div style="border: 1px solid #dddfe5;padding:20px;" v-html="shenhe.summary"></div>
+                                                            <div style="border: 1px solid #dddfe5;padding:20px;" v-html="itemXiang.summary"></div>
                                                           </el-form-item>
                                                             <el-form-item label="财务分析与投资回报" prop="financialAnalysis" class="grid-content bg-purple">
 
-                                                              <div style="border: 1px solid #dddfe5;padding:20px;" v-html="shenhe.financialAnalysis"></div>
+                                                              <div style="border: 1px solid #dddfe5;padding:20px;" v-html="itemXiang.financialAnalysis"></div>
                                                             </el-form-item>
                                                     <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
                                                       <div style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;">
@@ -272,43 +272,40 @@
                                                       </div>
                                                       <div style="padding: 15px;">
                                                         <div style="padding: 0px 20px 0px 0px">
-                                                          <el-table :data="shenhe.resourceManagement"
+                                                          <el-table :data="itemXiang.cereResourceStrategy"
                                                             :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
                                                              style="width: 100%">
                                                             <el-table-column label="序号" width="auto" min-width="8%" >
-                                                              <template slot-scope="scope">
-                                                                {{scope.$index + 1}}
-                                                              </template>
-                                                            </el-table-column>
-                                                            <el-table-column label="资源编号" prop="id" width="auto" min-width="22%">
-
-                                                            </el-table-column>
-                                                            <el-table-column label="资源名称" width="auto" min-width="15%">
+                                                                              <template slot-scope="scope">
+                                                                                {{scope.$index + 1}}
+                                                                              </template>
+                                                                            </el-table-column>
+                                                                            <el-table-column label="资源编号" prop="id" width="auto" min-width="22%">
+
+                                                                            </el-table-column>
+                                                                            <el-table-column label="资源名称" width="auto" min-width="15%">
                                                             <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="资源类型" width="auto" min-width="15%">
-                                                              <template slot-scope="scope">
-                                                                {{scope.row.shopName ? '商铺' : scope.row.advertisingType?scope.row.advertisingType:'场地'}}
-                                                              </template>
-                                                            </el-table-column>
-                                                            <el-table-column prop="notes" label="策略描述" width="auto" min-width="15%">
-                                                            </el-table-column>
-                                                            <el-table-column prop="policyName" label="策略名称" width="auto" min-width="15%">
-                                                            </el-table-column>
+                                                                                              {{scope.row.resources.shopIds[0]?scope.row.resources.shopIds[0].shopName:scope.row.resources.siteIds[0]?scope.row.resources.siteIds[0].venueName:scope.row.resources.advIds[0].advertisingName}}
+                                                                                            </template>
+                                                                            </el-table-column>
+                                                                            <el-table-column label="资源类型" width="auto" min-width="15%">
+                                                                              <template slot-scope="scope">
+                                                                               {{scope.row.resources.shopIds[0]?'商铺':scope.row.resources.siteIds[0]?'场地':'广告位'}}
+                                                                              </template>
+                                                                            </el-table-column>
+                                                                            <el-table-column prop="notes" label="策略描述" width="auto" min-width="15%">
+                                                                            </el-table-column>
+                                                                            <el-table-column  label="策略名称" width="auto" min-width="15%">
+                                                                              <template slot-scope="scope">
+                                                                                              {{scope.row.resources.cereRentalPolicies.policyName}}
+                                                                                            </template>
+                                                                            </el-table-column>
                                                           </el-table>
                                                         </div>
                                                       </div>
                                                     </div>
                                                         <el-form-item label="附件信息" prop="mainPurpose" class="grid-content bg-purple">
-                                              <!-- <el-upload class="upload-demo" ref="upload" :on-preview="handlePreview" :on-remove="handleRemove"
-                                                                :action="uploadFileUrl" :on-success="handleUploadSuccess" :file-list="fileData"
-                                                                :show-file-list="false">
-                                                                <div style="color: #2d8a58;margin-left: 10px;" slot="trigger">
-                                                                  上传附件
-                                                                </div>
-                                                              </el-upload> -->
+
                                              <div style="padding:10px 0;line-height:20px;color:#3F9B6A" v-if="shenhe.attachmentInfo.name">{{shenhe.attachmentInfo.name}}</div>
                                                         </el-form-item>
 
@@ -552,7 +549,7 @@ export default {
         card: 'first', // 切换
       },
       currentPage: 1,
-      total: 100,
+      total: 0,
       flag: false,
       pageSize: 10,
       tableData: [],
@@ -665,10 +662,6 @@ export default {
         }
         this.itemXiang = item
 
-
-        if(item.resourceManagement != ''){
-           item.resourceManagement = JSON.parse(item.resourceManagement)
-        }
  if ( item.attachmentInfo != '') {
                 item.attachmentInfo = JSON.parse(item.attachmentInfo)
                 this.fileData.push(item.attachmentInfo)
diff --git a/admin-web-master/src/views/ads/fangli/addform.vue b/admin-web-master/src/views/ads/fangli/addform.vue
index fbdc432..58030f5 100644
--- a/admin-web-master/src/views/ads/fangli/addform.vue
+++ b/admin-web-master/src/views/ads/fangli/addform.vue
@@ -15,7 +15,7 @@
       <el-form label-position="right" ref="jibenFrom" :model="ruleForm" :rules="rules" label-width="140px"
         style="position: relative">
             <el-form-item label="招商方案名称" class="grid-content bg-purple device-from" prop="planName">
-              <el-input v-model="ruleForm.planName" placeholder="请输入" />
+              <el-input v-model="ruleForm.planName" placeholder="请输入" maxlength="100"/>
             </el-form-item>
             <el-form-item label="规划方案" class="grid-content bg-purple device-from" prop="planningScheme">
               <el-select v-model="ruleForm.planningScheme" placeholder="请选择"  style="width: 100%">
diff --git a/admin-web-master/src/views/ads/fangli/bianform.vue b/admin-web-master/src/views/ads/fangli/bianform.vue
index b83bbdc..62824ab 100644
--- a/admin-web-master/src/views/ads/fangli/bianform.vue
+++ b/admin-web-master/src/views/ads/fangli/bianform.vue
@@ -5,7 +5,7 @@
      <el-form label-position="right" ref="jibenFrom" :model="ruleForm" :rules="rules" label-width="140px"
        style="position: relative">
               <el-form-item label="招商方案名称" class="grid-content bg-purple device-from" prop="planName" >
-                <el-input v-model="ruleForm.planName" placeholder="请输入" :disabled="steat == false?true:false"/>
+                <el-input v-model="ruleForm.planName" placeholder="请输入" :disabled="steat == false?true:false" maxlength="100"/>
               </el-form-item>
               <el-form-item label="规划方案" class="grid-content bg-purple device-from" prop="planningScheme">
                 <el-select v-model="ruleForm.planningScheme"  style="width: 100%" :disabled="steat == false?true:false">
@@ -28,9 +28,9 @@
         <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
           <div style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;">
             <div><span style="color:red;margin-right:3px;">*</span>招商资源管理</div>
-            <div style="color: #2d8a58;margin-left: 10px;" @click="addziyuan" v-if="steat">
+            <!-- <div style="color: #2d8a58;margin-left: 10px;" @click="addziyuan" v-if="steat">
               添加
-            </div>
+            </div> -->
           </div>
           <div style="padding: 15px;">
             <div style="padding: 0px 20px 0px 0px">
@@ -47,25 +47,28 @@
                 </el-table-column>
                 <el-table-column label="资源名称" width="auto" min-width="15%">
 <template slot-scope="scope">
-                {{scope.row.shopName ? scope.row.shopName :  scope.row.advertisingName?scope.row.advertisingName:scope.row.venueName}}
-              </template>
+                                  {{scope.row.resources.shopIds[0]?scope.row.resources.shopIds[0].shopName:scope.row.resources.siteIds[0]?scope.row.resources.siteIds[0].venueName:scope.row.resources.advIds[0].advertisingName}}
+                                </template>
                 </el-table-column>
                 <el-table-column label="资源类型" width="auto" min-width="15%">
                   <template slot-scope="scope">
-                    {{scope.row.shopName ? '商铺' : scope.row.advertisingType?scope.row.advertisingType:'场地'}}
+                   {{scope.row.resources.shopIds[0]?'商铺':scope.row.resources.siteIds[0]?'场地':'广告位'}}
                   </template>
                 </el-table-column>
                 <el-table-column prop="notes" label="策略描述" width="auto" min-width="15%">
                 </el-table-column>
-                <el-table-column prop="policyName" label="策略名称" width="auto" min-width="15%">
+                <el-table-column  label="策略名称" width="auto" min-width="15%">
+                  <template slot-scope="scope">
+                                  {{scope.row.resources.cereRentalPolicies.policyName}}
+                                </template>
                 </el-table-column>
-                <el-table-column label="操作" width="auto" min-width="18%" v-if="steat">
+                <!-- <el-table-column label="操作" width="auto" min-width="18%" v-if="steat">
                   <template slot-scope="scope">
-                    <!-- <div @click="ceSel(scope.$index)" class="tableBtn greens">策略选择</div> -->
-                    <!-- <div @click="MingEd(scope.row)" class="tableBtn greens">编辑</div> -->
-                    <div @click="MingDelete(scope.$index)" class="tableBtn greens">删除</div>
+                    <div @click="ceSel(scope.$index)" class="tableBtn greens">策略选择</div>
+
+                    <div @click="MingDelete(scope.row.id,scope.$index)" class="tableBtn greens">删除</div>
                   </template>
-                </el-table-column>
+                </el-table-column> -->
               </el-table>
             </div>
           </div>
@@ -417,8 +420,40 @@ guihuaDate:[],
 
 
       },
-      MingDelete(item) {
-        this.ruleForm.resourceManagement.splice(item, 1);
+      MingDelete(items,index) {
+
+        let arr = []
+                 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') {
+
+                              if(typeof this.ruleForm.resourceManagement =='string'){
+                               arr =  this.ruleForm.resourceManagement.split(",")
+                              }
+                              arr = arr.filter(item => item !== items);
+
+                             this.ruleForm.resourceManagement = arr.join(',')
+
+                             this.ruleForm.cereResourceStrategy.splice(index,1);
+                                done();
+                             } else {
+                               done();
+                             }
+               }
+               })
+
+
+
       },
       fenleiChange(value){
           this.ruleForm.classificationCode = value[value.length - 1]
diff --git a/admin-web-master/src/views/ads/fangli/index.vue b/admin-web-master/src/views/ads/fangli/index.vue
index c715cc2..468f680 100644
--- a/admin-web-master/src/views/ads/fangli/index.vue
+++ b/admin-web-master/src/views/ads/fangli/index.vue
@@ -261,7 +261,7 @@ export default {
         card: 'first', // 切换
       },
       currentPage: 1,
-      total: 100,
+      total: 0,
       flag: false,
       pageSize: 10,
       tableData: [],
diff --git a/admin-web-master/src/views/business/autd/index.vue b/admin-web-master/src/views/business/autd/index.vue
index d0393e1..b74ce4d 100644
--- a/admin-web-master/src/views/business/autd/index.vue
+++ b/admin-web-master/src/views/business/autd/index.vue
@@ -96,7 +96,7 @@
                 <div class="tableBtn greens"  @click="delet(scope.row)"  v-if="activeName == 1 || activeName == 2">
                   删除
                 </div>
-                <div class="tableBtn greens"    v-if="activeName == 1 || activeName == 2" @click="luru(scope.row)">
+                <div class="tableBtn greens"    v-if="activeName == 1" @click="luru(scope.row)">
                   录入合同
                 </div>
               </div>
diff --git a/admin-web-master/src/views/customer/icManagement/index.vue b/admin-web-master/src/views/customer/icManagement/index.vue
index c895761..ddba14f 100644
--- a/admin-web-master/src/views/customer/icManagement/index.vue
+++ b/admin-web-master/src/views/customer/icManagement/index.vue
@@ -9,44 +9,29 @@
         <!-- 搜索 -->
         <div class="formSearch">
           <div>
-            <el-form
-              :model="formSel"
-              :inline="true"
-            >
+            <el-form :model="formSel" :inline="true">
               <el-form-item label="客户名称">
                 <el-input v-model="formSel.contactName" placeholder="请输入" style="width:168px" />
               </el-form-item>
 
               <el-form-item label="主体类型">
-                <el-select
-                  v-model="formSel.type"
-                  placeholder="请选择"
-                  style="width:168px;"
-                >
+                <el-select v-model="formSel.type" placeholder="请选择" style="width:168px;">
                   <el-option label="有限责任公司" value="有限责任公司" />
                 </el-select>
               </el-form-item>
               <el-form-item label="客户级别">
-               <el-select
-                 v-model="formSel.customerLevel"
-                 placeholder="请选择"
-                 style="width:168px;"
-               >
-                 <el-option label="A" value="A" />
-                 <el-option label="B" value="B" />
-                 <el-option label="C" value="C" />
-               </el-select>
+                <el-select v-model="formSel.customerLevel" placeholder="请选择" style="width:168px;">
+                  <el-option label="A" value="A" />
+                  <el-option label="B" value="B" />
+                  <el-option label="C" value="C" />
+                </el-select>
               </el-form-item>
               <el-form-item label="状态">
-               <el-select
-                 v-model="formSel.auditStatus"
-                 placeholder="请选择"
-                 style="width:168px;"
-               >
-                 <el-option label="待审核" value="1" />
-                 <el-option label="审核通过" value="2" />
-                 <el-option label="已驳回" value="3" />
-               </el-select>
+                <el-select v-model="formSel.auditStatus" placeholder="请选择" style="width:168px;">
+                  <el-option label="待审核" value="1" />
+                  <el-option label="审核通过" value="2" />
+                  <el-option label="已驳回" value="3" />
+                </el-select>
               </el-form-item>
 
             </el-form>
@@ -61,69 +46,28 @@
 
         </div>
         <div style="margin-bottom:20px;">
-          <el-button
-              style="background-color: #3F9B6A;color: #fff;padding:8px 15px;" icon="el-icon-circle-plus-outline"
-            @click="addbuss"
-            >新增</el-button
-          >
+          <el-button style="background-color: #3F9B6A;color: #fff;padding:8px 15px;" icon="el-icon-circle-plus-outline"
+            @click="addbuss">新增</el-button>
         </div>
         <!-- 表格 -->
-        <el-table
-          :data="
+        <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="60"
-          >
-          <template slot-scope="scope">
-            {{scope.$index+1}}
-          </template>
+          " :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+          <el-table-column label="序号" min-width="60">
+            <template slot-scope="scope">
+              {{scope.$index+1}}
+            </template>
           </el-table-column>
-          <el-table-column
-            label="意向客户名称"
-            prop="contactName"
-            min-width="150"
-          />
-          <el-table-column
-            label="联系电话"
-            prop="contactPhone"
-            min-width="150"
-          />
-          <el-table-column
-            label="主体类型"
-            prop="type"
-            min-width="100"
-          />
-          <el-table-column
-            label="企业名称"
-            prop="subjectName"
-            min-width="200"
-
-          />
-          <el-table-column
-            label="注册资本"
-            prop="registeredCapital"
-            min-width="100"
-
-          />
-          <el-table-column
-            label="成立日期"
-            prop="establishmentDate"
-            min-width="100"
-
-          />
-          <el-table-column
-            label="客户级别"
-            prop="customerLevel"
-            min-width="100"
-
-          />
+          <el-table-column label="意向客户名称" prop="contactName" min-width="150" />
+          <el-table-column label="联系电话" prop="contactPhone" min-width="150" />
+          <el-table-column label="主体类型" prop="type" min-width="100" />
+          <el-table-column label="企业名称" prop="subjectName" min-width="200" />
+          <el-table-column label="注册资本" prop="registeredCapital" min-width="100" />
+          <el-table-column label="成立日期" prop="establishmentDate" min-width="100" />
+          <el-table-column label="客户级别" prop="customerLevel" min-width="100" />
           <el-table-column prop="auditStatus" label="状态" min-width="150">
             <template slot-scope="scope">
               {{ scope.row.auditStatus == "1" ? "待审核" :scope.row.auditStatus == "2" ?'审核通过' :scope.row.auditStatus == "3" ?'已驳回' :'' }}
@@ -140,7 +84,7 @@
               <div class="tableBtn greens" @click="delGuan(scope.row)" v-if="scope.row.auditStatus == '1'">
                 删除
               </div>
-            <!--  <div
+              <!--  <div
                 v-if="scope.row.dataForm == '1'"
                 class="tableBtn greens"
                 @click="fabu(scope.row)"
@@ -155,33 +99,15 @@
           </el-table-column>
         </el-table>
         <div class="fenye">
-          <el-pagination
-            class="pagination"
-            :hide-on-single-page="flag"
-            background
-            small
-            :current-page="currentPage"
-            :page-sizes="[10, 20, 50, 100]"
-           layout="prev, pager, next,total"
-            :total="total"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
+          <el-pagination class="pagination" :hide-on-single-page="flag" background small :current-page="currentPage"
+            :page-sizes="[10, 20, 50, 100]" layout="prev, pager, next,total" :total="total"
+            @size-change="handleSizeChange" @current-change="handleCurrentChange" />
         </div>
         <!-- 详情框  :visible.sync="detbox" -->
         <!-- <div  v-show="detbox" class="dialog_css_Xq " style="padding: 0;width:85%"> -->
-        <el-dialog
-         :visible.sync="detbox"
-         custom-class="tongyong_css"
-         style="padding: 0"
-         width="55%"
-         center
-         :close-on-click-modal="false"
-         class="dialog_css_Xq"
-         :show-close="false"
-        >
-          <div
-            style="
+        <el-dialog :visible.sync="detbox" custom-class="tongyong_css" style="padding: 0" width="55%" center
+          :close-on-click-modal="false" class="dialog_css_Xq" :show-close="false">
+          <div style="
               background-color: #fafafa;
               border: 1px solid #eaeaea;
               height: 42px;
@@ -189,108 +115,72 @@
               padding: 0 20px;
               line-height: 42px;
 
-            "
-          >
+            ">
             {{edit == true?'详情':'编辑'}}
           </div>
           <div style="padding: 0 20px">
-            <div
-              style="
+            <div style="
                 display: flex;
                 justify-content: space-between;
                 font-size: 14px;
                 margin-bottom: 20px;
-              "
-            >
+              ">
               <el-tabs v-model="card" @tab-click="handleClick">
                 <el-tab-pane label="意向客户信息" name="first">
                   <el-form ref="ruleForm" :model="secondData" label-width="150px">
                     <el-form-item label="主体名称" prop="subjectName">
-                      <el-input
-                        v-model="secondData.subjectName"
-                        :disabled="edit?true:false"
-                      />
+                      <el-input v-model="secondData.subjectName" :disabled="edit?true:false" />
                     </el-form-item>
                     <el-form-item label="统一社会信用代码" prop="unifiedSocialCreditCode">
-                      <el-input
-                        v-model="secondData.unifiedSocialCreditCode"
-                        :disabled="edit?true:false"
-                      />
+                      <el-input v-model="secondData.unifiedSocialCreditCode" :disabled="edit?true:false" />
                     </el-form-item>
-                    <el-form-item label="类型"  prop="type">
-                      <el-select
-                        v-model="secondData.type"
-                        :disabled="edit?true:false"
-                        style="width: 100%;"
-                      >
+                    <el-form-item label="类型" prop="type">
+                      <el-select v-model="secondData.type" :disabled="edit?true:false" style="width: 100%;">
                         <el-option label="有限责任公司" value="有限责任公司" />
                       </el-select>
                     </el-form-item>
                     <el-form-item label="法定代表人" prop="legalRepresentative">
-                      <el-input
-                        v-model="secondData.legalRepresentative"
-                     :disabled="edit?true:false"
-                      />
+                      <el-input v-model="secondData.legalRepresentative" :disabled="edit?true:false" />
                     </el-form-item>
                     <el-form-item label="经营范围" prop="businessScope">
-                     <el-input type="textarea" v-model="secondData.businessScope" :rows="4" :disabled="edit?true:false"></el-input>
+                      <el-input type="textarea" v-model="secondData.businessScope" :rows="4"
+                        :disabled="edit?true:false"></el-input>
                     </el-form-item>
                     <el-form-item label="注册资本" prop="registeredCapital">
-                      <el-input
-                        v-model="secondData.registeredCapital"
-                        :disabled="edit?true:false"
-                      />
+                      <el-input v-model="secondData.registeredCapital" :disabled="edit?true:false" />
                     </el-form-item>
                     <el-form-item label="成立日期" prop="establishmentDate">
-                      <el-input
-                        v-model="secondData.establishmentDate"
-                        :disabled="edit?true:false"
-                      />
+                      <el-input v-model="secondData.establishmentDate" :disabled="edit?true:false" />
                     </el-form-item>
                     <el-form-item label="住所" prop="address">
-                      <el-input
-                        v-model="secondData.address"
-                        :disabled="edit?true:false"
-                      />
+                      <el-input v-model="secondData.address" :disabled="edit?true:false" />
                     </el-form-item>
                     <el-form-item label="邮箱地址" prop="emailAddress">
-                      <el-input
-                        v-model="secondData.emailAddress"
-                        :disabled="edit?true:false"
-                      />
+                      <el-input v-model="secondData.emailAddress" :disabled="edit?true:false" />
                     </el-form-item>
                     <el-form-item label="营业期限">
                       <el-date-picker style="width: 100%;" v-model="businessStartDate" value-format="yyyy-MM-dd"
-                        type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" align="right"  :disabled="edit?true:false">
+                        type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
+                        align="right" :disabled="edit?true:false">
                       </el-date-picker>
                     </el-form-item>
                     <el-form-item label="营业执照" prop="businessLicense">
-                    <upimg v-model="secondData.businessLicense" :limit="1" :fileSize="1" v-if="edit==false"></upimg>
-                    <img :src="secondData.businessLicense" alt="" v-if="edit" >
+                      <upimg v-model="secondData.businessLicense" :limit="1" :fileSize="1" v-if="edit==false"></upimg>
+                      <img :src="secondData.businessLicense" alt="" v-if="edit">
                     </el-form-item>
                   </el-form>
                 </el-tab-pane>
                 <el-tab-pane label="联系人信息" name="second">
                   <el-form ref="ruleForm" :model="secondData" label-width="130px">
                     <el-form-item label="联系人名称" prop="contactName">
-                      <el-input
-                        v-model="secondData.contactName"
-                        :disabled="edit?true:false"
-                      />
+                      <el-input v-model="secondData.contactName" :disabled="edit?true:false" />
 
                     </el-form-item>
                     <el-form-item label=" 联系电话" prop="contactPhone">
-                      <el-input
-                        v-model="secondData.contactPhone"
-                        :disabled="edit?true:false"
-                      />
+                      <el-input v-model="secondData.contactPhone" :disabled="edit?true:false" />
                     </el-form-item>
                     <el-form-item label="职位" prop="position">
-                      <el-select
-                        v-model="secondData.position"
-                        :disabled="edit?true:false"
-                        style="width: 100%;"
-                      >
+                      <el-select v-model="secondData.position" :disabled="edit?true:false" style="width: 100%;">
                         <el-option label="总经理" value="总经理" />
                       </el-select>
                     </el-form-item>
@@ -299,181 +189,115 @@
               </el-tabs>
             </div>
 
-            <div
-              style="
+            <div style="
                 width: 99%;
                 padding: 10px;
                 display: flex;
                 justify-content: flex-end;
-              "
-            >
-              <el-button
-                class="buttonHover"
-                  style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
-                @click="closeFn(1)"
-                >取消</el-button
-              >
-            <!--  <el-button
+              ">
+              <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
+                @click="closeFn(1)">取消</el-button>
+              <!--  <el-button
                  style="background-color: #3F9B6A;color: #fff"
                 @click="bianji"
                 v-if="edit"
                 >编辑</el-button
               > -->
 
-              <el-button
-                 style="background-color: #3F9B6A;color: #fff"
-                @click="msgeditS"
-                v-if="edit==false"
-                >确定</el-button
-              >
+              <el-button style="background-color: #3F9B6A;color: #fff" @click="msgeditS"
+                v-if="edit==false">确定</el-button>
             </div>
           </div>
         </el-dialog>
         <!-- ******************************************************弹框开始****************************************************** -->
         <!-- 新增弹框 -->
-        <el-dialog
-          :visible.sync="ggXin"
-          custom-class="Xintongyong_css"
-          style="padding: 0"
-          width="65%"
-          center
-          :close-on-click-modal="false"
-        append-to-body
-        >
-        <div style="padding: 20px;max-height: calc(100vh - 200px);
+        <el-dialog :visible.sync="ggXin" custom-class="Xintongyong_css" style="padding: 0" width="65%" center
+          :close-on-click-modal="false" append-to-body>
+          <div style="padding: 20px;max-height: calc(100vh - 200px);
         overflow-y: auto;">
-          <div style="font-size: 14px;padding-bottom: 20px;color: #000;">新增页</div>
-          <div class="setup">
-            <el-steps :space="200" :active="stepNum">
-              <el-step title="意向客户信息" />
-              <el-step title="联系人信息" />
-            </el-steps>
-          </div>
-            <el-form ref="AddFrom" :model="ruleForm" :rules="rules" label-width="150px">
-          <div v-if="stepNum == 0" style="padding: 0 20px 20px 20px">
-
-              <el-form-item label="主体名称" prop="subjectName">
-                <el-input
-                  v-model="ruleForm.subjectName"
-                  placeholder="请输入"
-                  maxlength="50"
-                />
-              </el-form-item>
-              <el-form-item label="统一社会信用代码" prop="unifiedSocialCreditCode">
-                <el-input
-                  v-model="ruleForm.unifiedSocialCreditCode"
-                  placeholder="请输入"
-                />
-              </el-form-item>
-              <el-form-item label="类型"  prop="type">
-                <el-select
-                  v-model="ruleForm.type"
-                  placeholder="请选择"
+            <div style="font-size: 14px;padding-bottom: 20px;color: #000;">新增页</div>
+            <div class="setup">
+              <el-steps :space="200" :active="stepNum">
+                <el-step title="意向客户信息" />
+                <el-step title="联系人信息" />
+              </el-steps>
+            </div>
 
-                  style="width: 100%;"
-                >
-                  <el-option label="有限责任公司" value="有限责任公司" />
-                </el-select>
-              </el-form-item>
-              <el-form-item label="法定代表人" prop="legalRepresentative">
-                <el-input
-                  v-model="ruleForm.legalRepresentative"
-                  placeholder="请输入"
-                />
-              </el-form-item>
-              <el-form-item label="经营范围" prop="businessScope">
-               <el-input type="textarea" v-model="ruleForm.businessScope" :rows="4" ></el-input>
-              </el-form-item>
-              <el-form-item label="注册资本" prop="registeredCapital">
-                <el-input
-                  v-model="ruleForm.registeredCapital"
-                  placeholder="请输入"
-                />
-              </el-form-item>
-              <el-form-item label="成立日期" prop="establishmentDate">
-                <el-input
-                  v-model="ruleForm.establishmentDate"
-                  placeholder="请输入YYYY-MM-dd"
-                />
-              </el-form-item>
-              <el-form-item label="住所" prop="address">
-                <el-input
-                  v-model="ruleForm.address"
-                  placeholder="请输入"
-                />
-              </el-form-item>
-              <el-form-item label="邮箱地址" prop="emailAddress">
-                <el-input
-                  v-model="ruleForm.emailAddress"
-                  placeholder="请输入"
-                />
-              </el-form-item>
-              <el-form-item label="营业期限" prop="yytime">
-                <el-date-picker style="width: 100%;" v-model="ruleForm.yytime"  value-format="yyyy-MM-dd" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" align="right" >
-                </el-date-picker>
-              </el-form-item>
-              <el-form-item label="营业执照" prop="businessLicense">
-              <upimg v-model="ruleForm.businessLicense" :limit="1" :fileSize="1"></upimg>
-              </el-form-item>
 
-          </div>
-          <div v-else style="padding: 0 20px 20px 20px">
-             <el-form-item label="联系人名称" prop="contactName">
-               <el-input
-                 v-model="ruleForm.contactName"
-                 placeholder="请输入"
-
-               />
-
-             </el-form-item>
-             <el-form-item label=" 联系电话" prop="contactPhone">
-               <el-input
-                 v-model="ruleForm.contactPhone"
-                 placeholder="请输入"
-
-               />
-             </el-form-item>
-             <el-form-item label="职位" prop="position">
-               <el-select
-                 v-model="ruleForm.position"
-                 placeholder="请选择"
-
-                 style="width: 100%;"
-               >
-                 <el-option label="总经理" value="总经理" />
-               </el-select>
-             </el-form-item>
+            <el-form ref="AddFromOne"  v-show="stepNum == 0"  :model="ruleForm" :rules="rulesOne" label-width="150px">
+              <div style="padding: 0 20px 20px 20px">
+
+                <el-form-item label="主体名称" prop="subjectName">
+                  <el-input v-model="ruleForm.subjectName" placeholder="请输入" maxlength="50" />
+                </el-form-item>
+                <el-form-item label="统一社会信用代码" prop="unifiedSocialCreditCode">
+                  <el-input v-model="ruleForm.unifiedSocialCreditCode" placeholder="请输入" />
+                </el-form-item>
+                <el-form-item label="类型" prop="type">
+                  <el-select v-model="ruleForm.type" placeholder="请选择" style="width: 100%;">
+                    <el-option label="有限责任公司" value="有限责任公司" />
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="法定代表人" prop="legalRepresentative">
+                  <el-input v-model="ruleForm.legalRepresentative" placeholder="请输入" />
+                </el-form-item>
+                <el-form-item label="经营范围" prop="businessScope">
+                  <el-input type="textarea" v-model="ruleForm.businessScope" :rows="4"></el-input>
+                </el-form-item>
+                <el-form-item label="注册资本" prop="registeredCapital">
+                  <el-input v-model="ruleForm.registeredCapital" placeholder="请输入" />
+                </el-form-item>
+                <el-form-item label="成立日期" prop="establishmentDate">
+                  <el-input v-model="ruleForm.establishmentDate" placeholder="请输入YYYY-MM-dd" />
+                </el-form-item>
+                <el-form-item label="住所" prop="address">
+                  <el-input v-model="ruleForm.address" placeholder="请输入" />
+                </el-form-item>
+                <el-form-item label="邮箱地址" prop="emailAddress">
+                  <el-input v-model="ruleForm.emailAddress" placeholder="请输入" />
+                </el-form-item>
+                <el-form-item label="营业期限" prop="yytime">
+                  <el-date-picker style="width: 100%;" v-model="ruleForm.yytime" value-format="yyyy-MM-dd"
+                    type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" align="right">
+                  </el-date-picker>
+                </el-form-item>
+                <el-form-item label="营业执照" prop="businessLicense">
+                  <upimg v-model="ruleForm.businessLicense" :limit="1" :fileSize="1"></upimg>
+                </el-form-item>
 
-            </div>
-                 </el-form>
-        </div>
+              </div>
+
+            </el-form>
+            <el-form ref="AddFromTwo" v-show="stepNum != 0" :model="ruleForm" :rules="rulesTwo" label-width="150px">
+
+              <div  style="padding: 0 20px 20px 20px">
+                <el-form-item label="联系人名称" prop="contactName">
+                  <el-input v-model="ruleForm.contactName" placeholder="请输入" />
+
+                </el-form-item>
+                <el-form-item label=" 联系电话" prop="contactPhone">
+                  <el-input v-model="ruleForm.contactPhone" placeholder="请输入" />
+                </el-form-item>
+                <el-form-item label="职位" prop="position">
+                  <el-select v-model="ruleForm.position" placeholder="请选择" style="width: 100%;">
+                    <el-option label="总经理" value="总经理" />
+                  </el-select>
+                </el-form-item>
+
+              </div>
+            </el-form>
+          </div>
 
           <template #footer>
             <div style="display: flex; justify-content: flex-end; align-items: center;">
-           <el-button
-            class="buttonHover"
-              style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
-             @click="closeFn(2)"
-             >取 消</el-button
-           >
-           <el-button
-             v-if="stepNum == 0"
-           style="background-color: #3F9B6A;color: #fff"
-             @click="lextStep(1)"
-             >下一步</el-button
-           >
-           <el-button
-             v-if="stepNum == 1"
-             style="background-color: #3F9B6A;color: #fff"
-             @click="lextStep(0)"
-             >上一步</el-button
-           >
-           <el-button
-              v-if="stepNum == 1"
-           style="background-color: #3F9B6A;color: #fff"
-             @click="addCheck('ruleForm')"
-             >确 定</el-button
-           >
+              <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
+                @click="closeFn(2)">取 消</el-button>
+              <el-button v-if="stepNum == 0" style="background-color: #3F9B6A;color: #fff"
+                @click="lextStep(1)">下一步</el-button>
+              <el-button v-if="stepNum == 1" style="background-color: #3F9B6A;color: #fff"
+                @click="lextStep(0)">上一步</el-button>
+              <el-button v-if="stepNum == 1" style="background-color: #3F9B6A;color: #fff"
+                @click="addCheck('ruleForm')">确 定</el-button>
             </div>
           </template>
         </el-dialog>
@@ -484,417 +308,453 @@
 </template>
 
 <script>
-import { uploadUrl,token } from '@/utils/request'
-import {
-icManAll,
-icManAdd,
-icManEdit,
-icManDel,
-}from '../../../api/icManagement';
-import upimg from "@/components/ImageUpload/index";
-export default {
-  components: {upimg},
-  data() {
-    return {
-      detbox: false, // 详情
-      edit: true, // 编辑
-      formInline: {
-        shopName: '',
-        positionInformation: '',
-        shopArea: '',
-        useTo: '',
-        rent: '',
-        locationImage: '',
-        locationDescription: '',
-        temporaryPavingId: ''
-      }, // 临铺新增数据
-      LinID:'',//添加临铺ID
-      Ids:'',//查询新增的临铺列表
-      action: uploadUrl, // 上传图片
-      myHeaders: {
-        'Authorization-admin': token
-      },
-      ggXin: false, // 新增
-
-      formSel: {
-      contactName:'',
-      type:'',
-      customerLevel:'',
-      auditStatus:'',
-        pageNumber: 1,
+  import {
+    uploadUrl,
+    token
+  } from '@/utils/request'
+  import {
+    icManAll,
+    icManAdd,
+    icManEdit,
+    icManDel,
+  } from '../../../api/icManagement';
+  import upimg from "@/components/ImageUpload/index";
+  export default {
+    components: {
+      upimg
+    },
+    data() {
+      return {
+        detbox: false, // 详情
+        edit: true, // 编辑
+        formInline: {
+          shopName: '',
+          positionInformation: '',
+          shopArea: '',
+          useTo: '',
+          rent: '',
+          locationImage: '',
+          locationDescription: '',
+          temporaryPavingId: ''
+        }, // 临铺新增数据
+        LinID: '', //添加临铺ID
+        Ids: '', //查询新增的临铺列表
+        action: uploadUrl, // 上传图片
+        myHeaders: {
+          'Authorization-admin': token
+        },
+        ggXin: false, // 新增
+
+        formSel: {
+          contactName: '',
+          type: '',
+          customerLevel: '',
+          auditStatus: '',
+          pageNumber: 1,
+          pageSize: 10,
+        },
+        ruleForm: {
+          subjectName: '', //主体名称
+          unifiedSocialCreditCode: '', //统一社会信用代码
+          type: '', //类型
+          legalRepresentative: '', //法定代表人
+          businessScope: '', //经营范围
+          registeredCapital: '', //注册资本
+          establishmentDate: '', //成立日期
+          address: '', //住所
+          emailAddress: '', //邮箱地址
+          businessStartDate: '', //营业开始日期
+          businessEndDate: '', //营业结束日期
+          businessLicense: '', //营业执照
+          contactName: '', //联系人名称
+          contactPhone: '', //联系电话
+          position: '', //职位
+          auditStatus: '1',
+          yytime: []
+        },
+        card: 'first', // 切换
+        stepNum: 0,
+        businessStartDate: [],
+        secondData: {},
+        currentPage: 1,
+        total: 10,
+        flag: false,
         pageSize: 10,
+        tableData: [],
+        msgid: '',
+        pageindex: {
+          pageNumber: 1,
+          pageSize: 10,
+        },
+        rulesTwo:{
+          contactName: [{
+            required: true,
+            message: '请输入联系人名称',
+            trigger: 'blur'
+          }, ],
+          contactPhone: [{
+            required: true,
+            message: '请输入联系电话',
+            trigger: 'blur'
+          }, ],
+          position: [{
+            required: true,
+            message: '请选择职位',
+            trigger: 'change'
+          }, ],
+        },
+        rulesOne: {
+          subjectName: [{
+            required: true,
+            message: '请输入主体名称',
+            trigger: 'blur'
+          }, ],
+          unifiedSocialCreditCode: [{
+              required: true,
+              message: '请输入统一社会信用代码',
+              trigger: 'blur'
+            },
+            // { validator: this.validateUnifiedSocialCreditCode(), trigger: 'blur' }
+          ],
+          type: [{
+            required: true,
+            message: '请选择类型',
+            trigger: 'change'
+          }],
+          legalRepresentative: [{
+            required: true,
+            message: '请输入法定代表人',
+            trigger: 'blur'
+          }, ],
+          businessScope: [{
+            required: true,
+            message: '请输入经营范围',
+            trigger: 'blur'
+          }, ],
+          registeredCapital: [{
+            required: true,
+            message: '请输入注册资本',
+            trigger: 'blur'
+          }, ],
+          establishmentDate: [{
+            required: true,
+            message: '请输入成立日期',
+            trigger: 'blur'
+          }, ],
+          yytime: [{
+            required: true,
+            message: '请选择营业期限',
+            trigger: 'change'
+          }, ],
+          businessLicense: [{
+            required: true,
+            message: '请选择营业执照',
+            trigger: 'change'
+          }, ],
+
+
+
+        }
+      };
+    },
+
+    created() {
+      this.getAll();
+    },
+    mounted() {},
+
+    methods: {
+      // validateUnifiedSocialCreditCode(rule, value, callback){
+      //     const regex = /^[A-Z0-9]{18}$/;
+      //     if (!value) {
+      //       callback(new Error('请输入统一社会信用代码'));
+      //     } else if (!regex.test(value)) {
+      //       callback(new Error('统一社会信用代码必须为18位数字和大写字母'));
+      //     } else {
+      //       callback();
+      //     }
+      // },
+      // 获取当前时间
+      updateCurrentTime() {
+        const now = new Date();
+        const year = now.getFullYear();
+        const month = (now.getMonth() + 1).toString().padStart(2, '0');
+        const day = now.getDate().toString().padStart(2, '0');
+        const hours = now.getHours().toString().padStart(2, '0');
+        const minutes = now.getMinutes().toString().padStart(2, '0');
+        const seconds = now.getSeconds().toString().padStart(2, '0');
+
+        return `${year}-${month}-${day} ${hours}:${minutes}`;
       },
-      ruleForm: {
-        subjectName:'',//主体名称
-        unifiedSocialCreditCode:'',//统一社会信用代码
-        type:'',//类型
-        legalRepresentative:'',//法定代表人
-        businessScope:'',//经营范围
-        registeredCapital:'',//注册资本
-        establishmentDate:'',//成立日期
-        address:'',//住所
-        emailAddress:'',//邮箱地址
-        businessStartDate:'',//营业开始日期
-        businessEndDate:'',//营业结束日期
-        businessLicense:'',//营业执照
-        contactName:'',//联系人名称
-        contactPhone:'',//联系电话
-        position:'',//职位
-        auditStatus:'1',
-        yytime:[]
+      handleSelectionChange(val) {
+        this.multipleSelection = val;
       },
-      card: 'first', // 切换
-      stepNum:0,
-      businessStartDate:[],
-      secondData: {},
-      currentPage: 1,
-      total: 10,
-      flag: false,
-      pageSize: 10,
-      tableData: [],
-      msgid: '',
-      pageindex: {
-        pageNumber: 1,
-        pageSize: 10,
+      lextStep(val) {
+        this.stepNum = val;
       },
-      rules:{
-        subjectName: [{
-          required: true,
-          message: '请输入主体名称',
-          trigger: 'blur'
-        }, ],
-        unifiedSocialCreditCode: [
-           { required: true, message: '请输入统一社会信用代码', trigger: 'blur' },
-           // { validator: this.validateUnifiedSocialCreditCode(), trigger: 'blur' }
-         ],
-        type: [{
-          required: true,
-          message: '请选择类型',
-          trigger: 'change'
-        }],
-      legalRepresentative: [{
-        required: true,
-        message: '请输入法定代表人',
-        trigger: 'blur'
-      }, ],
-      businessScope: [{
-        required: true,
-        message: '请输入经营范围',
-        trigger: 'blur'
-      }, ],
-      registeredCapital: [{
-        required: true,
-        message: '请输入注册资本',
-        trigger: 'blur'
-      }, ],
-      establishmentDate: [{
-        required: true,
-        message: '请输入成立日期',
-        trigger: 'blur'
-      }, ],
-      yytime: [{
-        required: true,
-        message: '请选择营业期限',
-        trigger: 'change'
-      }, ],
-      businessLicense: [{
-        required: true,
-        message: '请选择营业执照',
-        trigger: 'change'
-      }, ],
-      contactName: [{
-        required: true,
-        message: '请输入联系人名称',
-        trigger: 'blur'
-      }, ],
-      contactPhone: [{
-        required: true,
-        message: '请输入联系电话',
-        trigger: 'blur'
-      }, ],
-      position: [{
-        required: true,
-        message: '请选择职位',
-        trigger: 'change'
-      }, ],
-
-
-      }
-    };
-  },
-
-  created() {
-    this.getAll();
-  },
-  mounted() {},
-
-  methods: {
-    // validateUnifiedSocialCreditCode(rule, value, callback){
-    //     const regex = /^[A-Z0-9]{18}$/;
-    //     if (!value) {
-    //       callback(new Error('请输入统一社会信用代码'));
-    //     } else if (!regex.test(value)) {
-    //       callback(new Error('统一社会信用代码必须为18位数字和大写字母'));
-    //     } else {
-    //       callback();
-    //     }
-    // },
-    // 获取当前时间
-    updateCurrentTime() {
-      const now = new Date();
-      const year = now.getFullYear();
-      const month = (now.getMonth() + 1).toString().padStart(2, '0');
-      const day = now.getDate().toString().padStart(2, '0');
-      const hours = now.getHours().toString().padStart(2, '0');
-      const minutes = now.getMinutes().toString().padStart(2, '0');
-      const seconds = now.getSeconds().toString().padStart(2, '0');
-
-      return `${year}-${month}-${day} ${hours}:${minutes}`;
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    lextStep(val) {
-      this.stepNum = val;
-    },
-    onCreated(editor) {
-      this.editor = Object.seal(editor); // 一定要用 Object.seal() ，否则会报错
-    },
-    // 查询全数据
-    async getAll() {
-      const res = await icManAll(this.pageindex);
-      this.tableData = res.data.content
+      onCreated(editor) {
+        this.editor = Object.seal(editor); // 一定要用 Object.seal() ，否则会报错
+      },
+      // 查询全数据
+      async getAll() {
+        const res = await icManAll(this.pageindex);
+        this.tableData = res.data.content
         this.total = res.data.content.length
-    },
-    // 编辑确认
-    async msgeditS() {
-      if(this.businessStartDate.length !=0){
-        this.secondData.businessStartDate =  this.businessStartDate[0]
-        this.secondData.businessEndDate =  this.businessStartDate[1]
-      }
- await icManEdit(this.secondData);
-      this.detbox = false
-      this.getAll();
-    },
-    // 编辑
-    bianji() {
-      if (this.edit) {
-        this.edit = false;
-      }
-    },
-    bianjilist(item) {
-      this.detbox = true;
-      this.secondData = item;
-      this.businessStartDate[0]= item.businessStartDate
-        this.businessStartDate[1] =item.businessEndDate
-      this.msgid = item.id;
-      if (this.edit) {
-        this.edit = false;
-      }
-    },
-    // 发布
-    async fabu(item) {
-      const upTime = this.updateCurrentTime();
-      await EditLinAn({ id: item.id, dataForm: '2', submissionTime: upTime });
-      this.getAll();
-    },
-    // 查询
-    async onSubmit() {
-     const res =  await icManAll(this.formSel)
- this.tableData = res.data.content
-   this.total = res.data.content.length
-    },
+      },
+      // 编辑确认
+      async msgeditS() {
+        if (this.businessStartDate.length != 0) {
+          this.secondData.businessStartDate = this.businessStartDate[0]
+          this.secondData.businessEndDate = this.businessStartDate[1]
+        }
+        await icManEdit(this.secondData);
+        this.detbox = false
+        this.getAll();
+      },
+      // 编辑
+      bianji() {
+        if (this.edit) {
+          this.edit = false;
+        }
+      },
+      bianjilist(item) {
+        this.detbox = true;
+        this.secondData = item;
+        this.businessStartDate[0] = item.businessStartDate
+        this.businessStartDate[1] = item.businessEndDate
+        this.msgid = item.id;
+        if (this.edit) {
+          this.edit = false;
+        }
+      },
+      // 发布
+      async fabu(item) {
+        const upTime = this.updateCurrentTime();
+        await EditLinAn({
+          id: item.id,
+          dataForm: '2',
+          submissionTime: upTime
+        });
+        this.getAll();
+      },
+      // 查询
+      async onSubmit() {
+        const res = await icManAll(this.formSel)
+        this.tableData = res.data.content
+        this.total = res.data.content.length
+      },
 
-    // 详情点击
-   async handleEditForm(item) {
-          this.secondData = item;
-          this.businessStartDate[0]= item.businessStartDate
-            this.businessStartDate[1] =item.businessEndDate
-        this.card =  'first'
-      this.detbox = true
-    },
-    // 新增
-    addbuss() {
-      this.ruleForm={
-        subjectName:'',//主体名称
-        unifiedSocialCreditCode:'',//统一社会信用代码
-        type:'',//类型
-        legalRepresentative:'',//法定代表人
-        businessScope:'',//经营范围
-        registeredCapital:'',//注册资本
-        establishmentDate:'',//成立日期
-        address:'',//住所
-        emailAddress:'',//邮箱地址
-        businessStartDate:'',//营业开始日期
-        businessEndDate:'',//营业结束日期
-        businessLicense:'',//营业执照
-        contactName:'',//联系人名称
-        contactPhone:'',//联系电话
-        position:'',//职位
-        auditStatus:'1',
-        yytime:[]
-      }
-      this.ggXin = true;
+      // 详情点击
+      async handleEditForm(item) {
+        this.secondData = item;
+        this.businessStartDate[0] = item.businessStartDate
+        this.businessStartDate[1] = item.businessEndDate
+        this.card = 'first'
+        this.detbox = true
+      },
+      // 新增
+      addbuss() {
+        this.ruleForm = {
+          subjectName: '', //主体名称
+          unifiedSocialCreditCode: '', //统一社会信用代码
+          type: '', //类型
+          legalRepresentative: '', //法定代表人
+          businessScope: '', //经营范围
+          registeredCapital: '', //注册资本
+          establishmentDate: '', //成立日期
+          address: '', //住所
+          emailAddress: '', //邮箱地址
+          businessStartDate: '', //营业开始日期
+          businessEndDate: '', //营业结束日期
+          businessLicense: '', //营业执照
+          contactName: '', //联系人名称
+          contactPhone: '', //联系电话
+          position: '', //职位
+          auditStatus: '1',
+          yytime: []
+        }
+        this.ggXin = true;
 
-    },
-    // 新增确定
-     addCheck() {
+      },
+      // 新增确定
+      addCheck() {
+        let c1 = false
+        this.$refs.AddFromOne.validate((valid) => {
 
-        this.$refs.AddFrom.validate((valid) => {
-          console.log(valid)
           if (valid) {
-            console.log(this.ruleForm.yytime)
-         if(this.ruleForm.yytime.length !=0 ){
-
-         this.ruleForm.businessStartDate = this.ruleForm.yytime[0]
-         this.ruleForm.businessEndDate = this.ruleForm.yytime[1]
-         }else{
-         this.$message({
-           message: '请选择营业期限',
-
-         })
-         return
-         }
-         // this.ruleForm.yytime =[]
-         if(this.fileList.length !=0){
-           this.form.annex = JSON.stringify(this.fileList[0])
-         }
-            icManAdd(this.ruleForm).then(res => {
+            c1 = true
+          } else {
             this.$message({
-              message: '保存成功',
-              type: 'success'
+              message: '请填写完整信息',
+              type: 'error'
             })
-          this.getAll();
-          this.stepNum = 0
-          this.ggXin = false
-                this.$refs.AddFrom.resetFields()
-              })
+            c1 = false
+
+          }
+        })
+        if(!c1) {
+          return;
+        }
+        this.$refs.AddFromTwo.validate((valid) => {
+
+          if (valid) {
+            c1 = true
           } else {
             this.$message({
               message: '请填写完整信息',
               type: 'error'
             })
-            return false;
+             c1 = false
+
           }
         })
+        if(!c1) {
+          return;
+        }
+        if (this.ruleForm.yytime.length != 0) {
+
+          this.ruleForm.businessStartDate = this.ruleForm.yytime[0]
+          this.ruleForm.businessEndDate = this.ruleForm.yytime[1]
+        } else {
+          this.$message({
+            message: '请选择营业期限',
+
+          })
+          return
+        }
+        // this.ruleForm.yytime =[]
+
+        icManAdd(this.ruleForm).then(res => {
+          this.$message({
+            message: '保存成功',
+            type: 'success'
+          })
+          this.getAll();
+          this.stepNum = 0
+          this.ggXin = false
+          this.$refs.AddFrom.resetFields()
+        })
 
-
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val;
-    },
-    handleSizeChange(val) {
-      this.pageSize = val;
-    },
-    // 取消
-    closeFn(val) {
-      if (val == 1) {
-        this.detbox = false;
-        this.edit = true;
-      } else {
-        this.ggXin = false;
-        this.stepNum = 0;
-      }
-    },
-    //删除管理列表
-    delGuan(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') {
-                           icManDel({id: item.id}).then(res=>{
-                              this.getAll()
-                             done();
-                           })
-                         } else {
-                           done();
-                         }
-           }
-           })
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val;
+      },
+      handleSizeChange(val) {
+        this.pageSize = val;
+      },
+      // 取消
+      closeFn(val) {
+        if (val == 1) {
+          this.detbox = false;
+          this.edit = true;
+        } else {
+          this.ggXin = false;
+          this.stepNum = 0;
+        }
+      },
+      //删除管理列表
+      delGuan(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') {
+              icManDel({
+                id: item.id
+              }).then(res => {
+                this.getAll()
+                done();
+              })
+            } else {
+              done();
+            }
+          }
+        })
 
       },
-    //删除详情
-   async Lindel(item){
-     await delLin({id:item.id})
-     this.SelLins()
-    },
-    // 新增铺位
-    addPavingPlan(val) {
-      this.formInline = {
-        shopName: '',
-        positionInformation: '',
-        shopArea: '',
-        useTo: '',
-        rent: '',
-        locationImage: '',
-        locationDescription: '',
-        temporaryPavingId: ''
-      }
+      //删除详情
+      async Lindel(item) {
+        await delLin({
+          id: item.id
+        })
+        this.SelLins()
+      },
+      // 新增铺位
+      addPavingPlan(val) {
+        this.formInline = {
+          shopName: '',
+          positionInformation: '',
+          shopArea: '',
+          useTo: '',
+          rent: '',
+          locationImage: '',
+          locationDescription: '',
+          temporaryPavingId: ''
+        }
 
-    },
+      },
       // 新增铺位取消按钮
-    doCancel(){
-      this.isAdd = false
-    },
-    // 新增铺位确定按钮
-  async doSubmit(){
-    if(this.detbox){
-        this.formInline.temporaryPavingId = this.msgid
-      let res =  await addLin(this.formInline)
+      doCancel() {
+        this.isAdd = false
+      },
+      // 新增铺位确定按钮
+      async doSubmit() {
+        if (this.detbox) {
+          this.formInline.temporaryPavingId = this.msgid
+          let res = await addLin(this.formInline)
 
-    }else{
-        let res =  await addLin(this.formInline)
-       this.LinID = res.data.id
+        } else {
+          let res = await addLin(this.formInline)
+          this.LinID = res.data.id
 
-        if (this.Ids.length == 0) {
+          if (this.Ids.length == 0) {
             this.Ids = this.LinID
           } else {
             this.Ids = this.Ids + ',' + this.LinID
           }
-    }
-    this.isAdd = false
-    this.SelLins()
+        }
+        this.isAdd = false
+        this.SelLins()
 
-    },
+      },
 
-    handlePreview(file) {
-      console.log(file);
-    },
-    handleRemove(file, fileList) {
-      console.log(file, fileList);
-    },
+      handlePreview(file) {
+        console.log(file);
+      },
+      handleRemove(file, fileList) {
+        console.log(file, fileList);
+      },
 
-    // 重置按钮
-    resetting() {
-      this.formSel = {
-      contactName:'',
-      type:'',
-      customerLevel:'',
-      auditStatus:'',
-        pageNumber: 1,
-        pageSize: 10,
-      }
-      this.getAll()
-    },
+      // 重置按钮
+      resetting() {
+        this.formSel = {
+          contactName: '',
+          type: '',
+          customerLevel: '',
+          auditStatus: '',
+          pageNumber: 1,
+          pageSize: 10,
+        }
+        this.getAll()
+      },
+    }
   }
-}
 </script>
 <style src="@wangeditor/editor/dist/css/style.css"></style>
 <style scoped>
-/deep/ .first-column-bg {
-  background-color: #f4f4f5 !important;
-}
+  /deep/ .first-column-bg {
+    background-color: #f4f4f5 !important;
+  }
 
-.zhuti {
+  .zhuti {
     padding: 0 20px 20px 20px;
     min-height: calc(100vh - 50px - 20px);
     background-color: #Fff;
@@ -903,310 +763,315 @@ export default {
 
 
 
-.tableBtn {
-  display: inline-block;
-  margin-right: 10px;
-}
+  .tableBtn {
+    display: inline-block;
+    margin-right: 10px;
+  }
 
-.formSearch {
+  .formSearch {
     display: flex;
     width: 100%;
     font-size: 14px;
     justify-content: space-between;
   }
 
-.greens {
-  color: #3f9b6a;
-}
+  .greens {
+    color: #3f9b6a;
+  }
 
- /deep/ .el-table__row {
+  /deep/ .el-table__row {
     font-size: 14px;
     color: #000000e6;
     height: 42px;
   }
-.fenye {
-  margin-top: 20px;
-  display: flex;
-  justify-content: flex-end;
-  position: relative;
-}
-
-/deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
-  background-color: #3f9b6a;
-}
-
-:last-child {
-  margin-bottom: 0;
-}
-
-.el-col {
-  border-radius: 4px;
-}
-
-.bg-purple-dark {
-  background: #99a9bf;
-}
-
-.bg-purple {
-  /* background: #d3dce6; */
-}
-
-.bg-purple-light {
-  background: #e5e9f2;
-}
-
-.grid-content {
-  border-radius: 4px;
-  min-height: 36px;
-}
-
-.row-bg {
-  padding: 10px 0;
-  background-color: #f9fafc;
-}
-
-/deep/ .bg-purple[data-v-0e3fe4ec] {
-  background: #fff;
-  height: 50px;
-}
-
-/deep/ .el-form--label-top .el-form-item__label {
-  padding: 0;
-}
-
-.demo-input-suffix {
-  display: flex;
-  margin-right: 20px;
-}
-
-.pagination {
-  text-align: right;
-  line-height: 20px;
-}
-
-.dialog_css {
-  padding: 0px;
-}
-
-.dialog_xin {
-  padding: 0px;
-}
-
-/deep/.el-dialog__body {
-  padding: 0px;
-}
-
-/deep/ .el-dialog__header {
-  background-color: #fff;
-  padding: 0;
-}
-
-
-.el-row {
-  &:last-child {
+
+  .fenye {
+    margin-top: 20px;
+    display: flex;
+    justify-content: flex-end;
+    position: relative;
+  }
+
+  /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
+    background-color: #3f9b6a;
+  }
+
+  :last-child {
     margin-bottom: 0;
   }
-}
-
-/deep/ .avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 108px;
-  height: 108px;
-  line-height: 108px;
-  /*text-align: center;*/
-}
-
-.avatar {
-  width: 108px;
-  height: 108px;
-  display: block;
-}
-
-::v-deep .el-tabs__item.is-active {
-  color: #3f9b6a;
-  opacity: 1;
-}
-
-/deep/ .el-tabs__nav-wrap::after {
-  background-color: #fff;
-}
-
-::v-deep .el-tabs__item:hover {
-  color: #3f9b6a;
-  cursor: pointer;
-  opacity: 1;
-}
-
-/deep/ .el-tabs__active-bar {
-  background-color: #389865;
-}
-
-/deep/ .el-table_2_column_13 {
-  font-weight: 100;
-}
-
-::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 .el-steps .el-step__head.is-wait {
+
+  .el-col {
+    border-radius: 4px;
+  }
+
+  .bg-purple-dark {
+    background: #99a9bf;
+  }
+
+  .bg-purple {
+    /* background: #d3dce6; */
+  }
+
+  .bg-purple-light {
+    background: #e5e9f2;
+  }
+
+  .grid-content {
+    border-radius: 4px;
+    min-height: 36px;
+  }
+
+  .row-bg {
+    padding: 10px 0;
+    background-color: #f9fafc;
+  }
+
+  /deep/ .bg-purple[data-v-0e3fe4ec] {
+    background: #fff;
+    height: 50px;
+  }
+
+  /deep/ .el-form--label-top .el-form-item__label {
+    padding: 0;
+  }
+
+  .demo-input-suffix {
+    display: flex;
+    margin-right: 20px;
+  }
+
+  .pagination {
+    text-align: right;
+    line-height: 20px;
+  }
+
+  .dialog_css {
+    padding: 0px;
+  }
+
+  .dialog_xin {
+    padding: 0px;
+  }
+
+  /deep/.el-dialog__body {
+    padding: 0px;
+  }
+
+  /deep/ .el-dialog__header {
+    background-color: #fff;
+    padding: 0;
+  }
+
+
+  .el-row {
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+
+  /deep/ .avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 108px;
+    height: 108px;
+    line-height: 108px;
+    /*text-align: center;*/
+  }
+
+  .avatar {
+    width: 108px;
+    height: 108px;
+    display: block;
+  }
+
+  ::v-deep .el-tabs__item.is-active {
+    color: #3f9b6a;
+    opacity: 1;
+  }
+
+  /deep/ .el-tabs__nav-wrap::after {
+    background-color: #fff;
+  }
+
+  ::v-deep .el-tabs__item:hover {
+    color: #3f9b6a;
+    cursor: pointer;
+    opacity: 1;
+  }
+
+  /deep/ .el-tabs__active-bar {
+    background-color: #389865;
+  }
+
+  /deep/ .el-table_2_column_13 {
+    font-weight: 100;
+  }
+
+  ::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 .el-steps .el-step__head.is-wait {
   background-color: red; /* 修改为你想要的颜色 */
 
-/* 修改未进行步骤的描述文字颜色 */
-::v-deep .el-steps .el-step__description.is-wait {
-  color: #999;
-  /* 修改为你想要的颜色 */
-}
-
-/* 修改未进行步骤的图标颜色 */
-::v-deep .el-steps .el-step__icon.is-text.is-wait {
-  color: #999;
-  /* 修改为你想要的颜色 */
-}
-
-/* 修改未进行步骤的边框色 */
-::v-deep .el-steps .el-step__line.is-wait {
-  border-color: #eee;
-  /* 修改为你想要的颜色 */
-}
-
-::v-deep .el-steps .is-process .el-step__line {
-  background-color: #3f9b6a;
-  /* 修改线的颜色 */
-}
-
-::v-deep .el-steps .is-process .el-step__title {
-  color: #fe7b6a;
-  /* 修改进行中步骤的标题颜色 */
-}
-
-::v-deep .el-steps .is-process .el-step__icon {
-  color: #fff;
-  /* 修改进行中步骤的图标颜色 */
-  background: #3f9b6a;
-  /* 修改进行中步骤图标的边框颜色 */
-  border: 0px;
-}
-
-::v-deep .el-step__icon-inner {
-  line-height: 0;
-}
-
-/* 线条长度 */
-::v-deep .el-step.is-vertical .el-step__line {
-  top: 30px;
-  height: 60px;
-}
-
-::v-deep .moren {
-  .el-input__inner {
+  /* 修改未进行步骤的描述文字颜色 */
+  ::v-deep .el-steps .el-step__description.is-wait {
+    color: #999;
+    /* 修改为你想要的颜色 */
+  }
+
+  /* 修改未进行步骤的图标颜色 */
+  ::v-deep .el-steps .el-step__icon.is-text.is-wait {
+    color: #999;
+    /* 修改为你想要的颜色 */
+  }
+
+  /* 修改未进行步骤的边框色 */
+  ::v-deep .el-steps .el-step__line.is-wait {
+    border-color: #eee;
+    /* 修改为你想要的颜色 */
+  }
+
+  ::v-deep .el-steps .is-process .el-step__line {
+    background-color: #3f9b6a;
+    /* 修改线的颜色 */
+  }
+
+  ::v-deep .el-steps .is-process .el-step__title {
+    color: #fe7b6a;
+    /* 修改进行中步骤的标题颜色 */
+  }
+
+  ::v-deep .el-steps .is-process .el-step__icon {
+    color: #fff;
+    /* 修改进行中步骤的图标颜色 */
+    background: #3f9b6a;
+    /* 修改进行中步骤图标的边框颜色 */
+    border: 0px;
+  }
+
+  ::v-deep .el-step__icon-inner {
+    line-height: 0;
+  }
+
+  /* 线条长度 */
+  ::v-deep .el-step.is-vertical .el-step__line {
+    top: 30px;
+    height: 60px;
+  }
+
+  ::v-deep .moren {
+    .el-input__inner {
+      margin-top: 5px;
+      padding: 0 20px;
+    }
+  }
+
+  /deep/ .el-radio-group {
+    margin-top: 11px;
+  }
+
+  /deep/ .el-radio__input.is-checked .el-radio__inner {
+    border-color: #3f9b6a;
+    background: #3f9b6a;
+  }
+
+  ::v-deep .el-col {
+    padding: 0 !important;
+  }
+
+  /deep/ .el-radio-group {
+    width: 100%;
+  }
+
+  .radio-right-side {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+  }
+
+  /deep/ .radio-right-side .el-radio__label {
+    display: flex;
+    align-items: center;
+  }
+
+  /deep/ .radio-right-side .el-radio__inner {
+    order: 1;
+  }
+
+  /deep/ .radio-right-side .el-radio__input {
+    display: flex;
+    order: 2;
+  }
+
+  /deep/ .radio-right-side {
+    &:hover {
+      color: #000;
+    }
+  }
+
+
+  ::v-deep .setup {
+    .el-steps {
+      justify-content: center;
+    }
+  }
+
+  ::v-deep .el-step__head.is-finish {
+    color: #c0c4cc;
+    border-color: #c0c4cc;
+  }
+
+  ::v-deep .el-step__title.is-finish {
+    color: #c0c4cc;
+  }
+
+  ::v-deep .el-step__title.is-process {
+    color: #c0c4cc;
+  }
+
+  ::v-deep .el-tabs {
+    width: 100%;
+  }
+
+  ::v-deep .setup {
+    .el-step__main {
+      margin-left: -17px;
+    }
+
+    .el-step__title.is-process {
+      color: #3f9b6a;
+    }
+
+  }
+
+  ::v-deep .el-pagination__jump {
     margin-top: 5px;
-    padding: 0 20px;
-  }
-}
-
-/deep/ .el-radio-group {
-  margin-top: 11px;
-}
-
-/deep/ .el-radio__input.is-checked .el-radio__inner {
-  border-color: #3f9b6a;
-  background: #3f9b6a;
-}
-
-::v-deep .el-col {
-  padding: 0 !important;
-}
-
-/deep/ .el-radio-group {
-  width: 100%;
-}
-
-.radio-right-side {
-  width: 100%;
-  display: flex;
-  justify-content: space-between;
-}
-
-/deep/ .radio-right-side .el-radio__label {
-  display: flex;
-  align-items: center;
-}
-
-/deep/ .radio-right-side .el-radio__inner {
-  order: 1;
-}
-
-/deep/ .radio-right-side .el-radio__input {
-  display: flex;
-  order: 2;
-}
-
-/deep/ .radio-right-side {
-  &:hover {
-    color: #000;
-  }
-}
-
-
-::v-deep .setup {
-  .el-steps {
-    justify-content: center;
-  }
-}
-
-::v-deep .el-step__head.is-finish {
-  color: #c0c4cc;
-  border-color: #c0c4cc;
-}
-
-::v-deep .el-step__title.is-finish {
-  color: #c0c4cc;
-}
-
-::v-deep .el-step__title.is-process {
-  color: #c0c4cc;
-}
-
-::v-deep .el-tabs {
-  width: 100%;
-}
-::v-deep .setup{
-  .el-step__main{
-    margin-left: -17px;
-  }
- .el-step__title.is-process{
-   color: #3f9b6a;
- }
-
-}
-::v-deep .el-pagination__jump{
-  margin-top:5px;
-}
-::v-deep .linClass{
-.el-dialog__header{
-padding: 20px 20px 10px;
-font-size: 14px;
-}
-}
+  }
+
+  ::v-deep .linClass {
+    .el-dialog__header {
+      padding: 20px 20px 10px;
+      font-size: 14px;
+    }
+  }
 </style>
 <style lang="scss" scoped>
   ::v-deep .bian_css {
diff --git a/admin-web-master/src/views/customer/rsaReview/index.vue b/admin-web-master/src/views/customer/rsaReview/index.vue
index 2c62822..74658f0 100644
--- a/admin-web-master/src/views/customer/rsaReview/index.vue
+++ b/admin-web-master/src/views/customer/rsaReview/index.vue
@@ -85,7 +85,7 @@
               <div class="tableBtn greens" @click="handleEditForm(scope.row)">
                 查看
               </div>
-              <div class="tableBtn greens" @click="addbuss(scope.row)" v-if=" scope.row.auditStatus == '2'|| scope.row.auditStatus == '1'">
+              <div class="tableBtn greens" @click="addbuss(scope.row)" v-if=" scope.row.auditStatus == '2'">
                 审核
               </div>
             </template>
diff --git a/admin-web-master/src/views/detect/addziyuan.vue b/admin-web-master/src/views/detect/addziyuan.vue
index 4817410..5a8d621 100644
--- a/admin-web-master/src/views/detect/addziyuan.vue
+++ b/admin-web-master/src/views/detect/addziyuan.vue
@@ -543,7 +543,34 @@
             this.gongyuanList = gongyaun.data.filter(item => item.superior == value);
      },
       closeFn() {
-        this.$emit('childClose', false);
+        this.fileData = []
+        this.resourceType =  {
+          leixin: '商铺'
+        }
+        this.advue= {
+          type: '线上广告位'
+        }
+        this.leixing=true //广告位类型
+        this.ruleForm={
+          shopName: '',
+          venueNumber: '',
+          houseNumber: '',
+          architecturalForm: '',
+          actualUsableArea: '',
+          belongingRegion: '',
+          belongingDepartment: '',
+          head: '',
+          detailedLocation: '',
+          mapPunctuation: '',
+          shopDescription: '',
+          displayMainImage: '',
+          architecturalDrawings: '',
+          displayMainVidio: '',
+          belongingGreenwaySection: '',
+          belongingParkTrail: '',
+          floorSpace: '',
+        }
+        this.$emit('childClose', false)
       },
       //获取当前时间
        updateCurrentTime() {
@@ -596,6 +623,33 @@
                 this.ruleForm.otherMedia = this.fileData[0].url
               }
               changadd(this.ruleForm).then(res=>{
+                this.fileData = []
+                this.resourceType =  {
+                  leixin: '商铺'
+                }
+                this.advue= {
+                  type: '线上广告位'
+                }
+                this.leixing=true //广告位类型
+                this.ruleForm={
+                  shopName: '',
+                  venueNumber: '',
+                  houseNumber: '',
+                  architecturalForm: '',
+                  actualUsableArea: '',
+                  belongingRegion: '',
+                  belongingDepartment: '',
+                  head: '',
+                  detailedLocation: '',
+                  mapPunctuation: '',
+                  shopDescription: '',
+                  displayMainImage: '',
+                  architecturalDrawings: '',
+                  displayMainVidio: '',
+                  belongingGreenwaySection: '',
+                  belongingParkTrail: '',
+                  floorSpace: '',
+                }
                 this.$emit('childClose', false);
               })
               }
diff --git a/admin-web-master/src/views/detect/information.vue b/admin-web-master/src/views/detect/information.vue
index 1e6d32c..1dde8e0 100644
--- a/admin-web-master/src/views/detect/information.vue
+++ b/admin-web-master/src/views/detect/information.vue
@@ -47,7 +47,7 @@
           <div> <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff;padding:8px 15px;">查询
             </el-button>
             <el-button @click="resetting" class="buttonHover"
-              style="color: #000;border: 1px solid #DBDBDB;background-color: #fff;">重置
+              style="color: #606266;border: 1px solid #DBDBDB;background-color: #fff;">重置
             </el-button>
           </div>
         </div>
@@ -284,7 +284,7 @@
                     <el-button @click="addpush('ruleForm')"
                       style="background-color: #3F9B6A;color: #fff;">确定</el-button>
                     <el-button @click="colse(1)" class="buttonHover"
-                      style="color: #000;border: 1px solid #DBDBDB;background-color: #fff;">取消</el-button>
+                      style="color: #606266;border: 1px solid #DBDBDB;background-color: #fff;">取消</el-button>
 
                   </div>
 
@@ -474,7 +474,7 @@
                           :on-success="handleUploadSuccess" :file-list="fileData" :auto-upload="true"
                           v-if="fileData.length==0" v-else>
                           <el-button style="background-color: #fff;color: #3F9B6A;border: 1px solid #dcdfe6;"
-                            class="buttonHover" v-if="fileData.length==0">+点击上传</el-button>
+                            class="buttonHover" v-if="fileData.length==0 && edit==false">+点击上传</el-button>
                         </el-upload>
                       </el-form-item>
                     </el-col>
@@ -515,11 +515,11 @@
         </el-tabs>
 <el-row :gutter="20">
                     <el-col :span="12">
-                        <div style="margin-top: 20px">
+                        <div style="padding-left:160px;">
                           <el-button @click="editpush()" style="background-color: #3F9B6A;color: #fff;"
                             v-if="!edit">确定</el-button>
                           <el-button @click="colse(2)" class="buttonHover"
-                            style="color: #000;border: 1px solid #DBDBDB;background-color: #fff;">取消</el-button>
+                            style="color: #606266;border: 1px solid #DBDBDB;background-color: #fff;">取消</el-button>
 
                         </div>
 
@@ -1137,7 +1137,7 @@
     font-size: 14px;
 
     .el-form-item__label {
-      /* color: #AEAEAE; */
+      color: #0006;
     }
   }
 
diff --git a/admin-web-master/src/views/detect/ziyuanList.vue b/admin-web-master/src/views/detect/ziyuanList.vue
index e1704d2..a1857ea 100644
--- a/admin-web-master/src/views/detect/ziyuanList.vue
+++ b/admin-web-master/src/views/detect/ziyuanList.vue
@@ -523,6 +523,7 @@
     listData: {
       immediate: true, // 立即执行handler函数
       handler(newVal) {
+        this.edit = true
         this.ruleForm = { ...newVal }; // 使用展开运算符创建新对象，以触发响应式更新
         if(this.ruleForm.advertisingType){
              this.changeType(this.ruleForm.advertisingType)
diff --git a/admin-web-master/src/views/rent/audit/index.vue b/admin-web-master/src/views/rent/audit/index.vue
index 73f1fea..8b88c4b 100644
--- a/admin-web-master/src/views/rent/audit/index.vue
+++ b/admin-web-master/src/views/rent/audit/index.vue
@@ -502,8 +502,8 @@
                      <el-button  class="buttonHover"
                     style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
                        @click="closeFn(1)">取消</el-button>
-                       <el-button   @click="closemsg"
-                                    style="background-color: #3F9B6A;color: #fff">删除</el-button>
+                       <!-- <el-button   @click="closemsg"
+                                    style="background-color: #3F9B6A;color: #fff">删除</el-button> -->
 
        </div>
                    </div>
diff --git a/admin-web-master/src/views/scheme/planningBz.vue b/admin-web-master/src/views/scheme/planningBz.vue
index 2f4da8b..6e0095a 100644
--- a/admin-web-master/src/views/scheme/planningBz.vue
+++ b/admin-web-master/src/views/scheme/planningBz.vue
@@ -124,9 +124,9 @@
           <el-table-column label="操作" min-width="250" >
             <template slot-scope="scope">
               <div @click="handleEditForm(scope.row,1)" class="tableBtn greens">查看</div>
-              <div @click="handleEditForm(scope.row,2)" class="tableBtn greens" v-if="scope.row.reviewStatus == '1'">编辑</div>
+              <div @click="handleEditForm(scope.row,2)" class="tableBtn greens" >编辑</div>
               <!-- <div class="tableBtn greens">撤回</div> -->
-              <div @click="handleDelete(scope.row)" class="tableBtn greens" v-if="scope.row.reviewStatus == '1'">删除</div>
+              <div @click="handleDelete(scope.row)" class="tableBtn greens" >删除</div>
             </template>
           </el-table-column>
         </el-table>
diff --git a/admin-web-master/src/views/scheme/sam.vue b/admin-web-master/src/views/scheme/sam.vue
index b1de74b..291e130 100644
--- a/admin-web-master/src/views/scheme/sam.vue
+++ b/admin-web-master/src/views/scheme/sam.vue
@@ -119,7 +119,7 @@
           </el-form-item>
           <el-form-item label="策略模板" prop="policyTemplate">
             <el-select v-model="secondData.policyTemplate" style="width: 87%;margin-right: 15px" disabled>
-              <el-option :label="item.policyName" :value="item.id" v-for="(item,index) in tableData" />
+              <el-option :label="item.policyName" :value="item.id" v-for="(item,index) in modelData" />
             </el-select>
           </el-form-item>
           <el-row>
@@ -262,6 +262,11 @@ import samXin from "./samXin"
           pageSize: 10,
            isTemplate: '1'
         },
+        Modelpageindex: {
+          pageNumber: 1,
+          pageSize: 10,
+           isTemplate: '0'
+        },
         fileList: [],
         paymentDate:[],
         leaseDate:[]
@@ -280,9 +285,10 @@ this.getAll()
       //查询全数据
       async getAll() {
         const res = await ceGetAll(this.pageindex)
-        console.log(res)
         this.tableData = res.data.content
           this.total  = res.data.content.length
+          const ce = await ceGetAll(this.Modelpageindex)
+          this.modelData = ce.data.content
       },
 
       //删除记录按钮
@@ -351,6 +357,7 @@ this.getAll()
         this.ggXin = false
       },
       closexaing(val){
+
         this.xiang = false
       },
       handleClick() {
diff --git a/admin-web-master/src/views/scheme/samXin.vue b/admin-web-master/src/views/scheme/samXin.vue
index b6ab984..e74030d 100644
--- a/admin-web-master/src/views/scheme/samXin.vue
+++ b/admin-web-master/src/views/scheme/samXin.vue
@@ -508,28 +508,29 @@ this.getAll()
         this.addMing = true
       },
       closeFn() {
-        this.$emit('childClose', false);
         this.form = {
-          policyName: '', //策略名称
-          applicableResources: '商铺', //适用资源
-          policyTemplate: null, //策略模板
-          isRental: '', //是否出租 (0:否,1:是)
-          isSelfOperated: '', //是否白营 (0: 否, 1: 是)
-          businessType: '', //经营类型
-          rentalPrice: '', //租金价格
-          leaseTerm: '', //商铺租期
-          leaseStartDate: '', //租赁开始日期
-          leaseEndDate: '', //租赁结束日期
-          rentFreeCondition: '', //免租条件
-          rentFreePeriod: '', //免租期(单位:天)
-          paymentTerms: '', //付款条件
-          paymentStartDate: '', //付款开始日期
-          paymentEndDate: '', //付款结束日期
-          createDate: '', //创建时间
-          isTemplate: '1', //是否为模板(0.是 1.否)
-        }
-       this.paymentDate=[]
-       this.leaseDate = []
+           policyName: '', //策略名称
+           applicableResources: '商铺', //适用资源
+           policyTemplate: null, //策略模板
+           isRental: '', //是否出租 (0:否,1:是)
+           isSelfOperated: '', //是否白营 (0: 否, 1: 是)
+           businessType: '', //经营类型
+           rentalPrice: '', //租金价格
+           leaseTerm: '', //商铺租期
+           leaseStartDate: '', //租赁开始日期
+           leaseEndDate: '', //租赁结束日期
+           rentFreeCondition: '', //免租条件
+           rentFreePeriod: '', //免租期(单位:天)
+           paymentTerms: '', //付款条件
+           paymentStartDate: '', //付款开始日期
+           paymentEndDate: '', //付款结束日期
+           createDate: '', //创建时间
+           isTemplate: '1', //是否为模板(0.是 1.否)
+         }
+        this.paymentDate=[]
+        this.leaseDate = []
+        this.$emit('childClose', false);
+
       },
       MingClose(){
         this.addMing = false
@@ -583,6 +584,27 @@ this.getAll()
                         })
                       }else{
                         ceEdit(this.formInline).then(res => {
+                          this.form = {
+                             policyName: '', //策略名称
+                             applicableResources: '商铺', //适用资源
+                             policyTemplate: null, //策略模板
+                             isRental: '', //是否出租 (0:否,1:是)
+                             isSelfOperated: '', //是否白营 (0: 否, 1: 是)
+                             businessType: '', //经营类型
+                             rentalPrice: '', //租金价格
+                             leaseTerm: '', //商铺租期
+                             leaseStartDate: '', //租赁开始日期
+                             leaseEndDate: '', //租赁结束日期
+                             rentFreeCondition: '', //免租条件
+                             rentFreePeriod: '', //免租期(单位:天)
+                             paymentTerms: '', //付款条件
+                             paymentStartDate: '', //付款开始日期
+                             paymentEndDate: '', //付款结束日期
+                             createDate: '', //创建时间
+                             isTemplate: '1', //是否为模板(0.是 1.否)
+                           }
+                          this.paymentDate=[]
+                          this.leaseDate = []
                           this.addMing = false
                           this.getAll()
                         })