From 73b308f2bfc84d5df4c713c0fd8f8ea0f6944d14 Mon Sep 17 00:00:00 2001
From: 2509699674 <2509699647@qq.com>
Date: Tue, 24 Dec 2024 01:01:17 +0800
Subject: [PATCH] '招商方案调整'

---
 admin-web-master/src/views/ads/fangAudit/bianform.vue |   7 ++++---
 admin-web-master/src/views/ads/fangAudit/index.vue    | 185 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------
 admin-web-master/src/views/ads/fangli/addform.vue     | 146 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------
 admin-web-master/src/views/ads/fangli/bianform.vue    | 244 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------
 admin-web-master/src/views/ads/fangli/index.vue       |  41 +++++++++--------------------------------
 5 files changed, 334 insertions(+), 289 deletions(-)

diff --git a/admin-web-master/src/views/ads/fangAudit/bianform.vue b/admin-web-master/src/views/ads/fangAudit/bianform.vue
index 1f623ff..6e8ad7a 100644
--- a/admin-web-master/src/views/ads/fangAudit/bianform.vue
+++ b/admin-web-master/src/views/ads/fangAudit/bianform.vue
@@ -150,10 +150,9 @@
                               </el-row>
                               <el-row :gutter="20">
                                 <el-col :span="24">
+                                  <el-form-item label="招商资源管理"  class="grid-content bg-purple">
                                     <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>
+
                                               <div style="padding: 15px;">
                                                 <div style="padding: 0px 20px 0px 0px">
                                                   <el-table :data="ruleForm.cereResourceStrategy"
@@ -188,6 +187,8 @@
                                                 </div>
                                               </div>
                                             </div>
+                                     </el-form-item>
+
                                 </el-col>
 
                               </el-row>
diff --git a/admin-web-master/src/views/ads/fangAudit/index.vue b/admin-web-master/src/views/ads/fangAudit/index.vue
index 1abbbad..353dbb8 100644
--- a/admin-web-master/src/views/ads/fangAudit/index.vue
+++ b/admin-web-master/src/views/ads/fangAudit/index.vue
@@ -39,115 +39,92 @@
 
         </div>
         <!-- 表格 -->
-        <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>
-                  </el-table-column>
-                  <el-table-column
-                    label="招商方案名称"
-                    prop="planName"
-                    min-width="300"
-                  />
-                  <el-table-column
-                    label="规划方案名称"
-
-                    min-width="300"
-                  >
-                  <template slot-scope="scope">
-                    {{scope.row.cereInvestmentPlanningManagement.planningName}}
-                  </template>
-                  </el-table-column>
-                  <el-table-column
-                    label="计划实施时间"
-
-                    min-width="250"
-                  >
-                  <template slot-scope="scope">
-                    {{scope.row.cereInvestmentPlanningManagement.implementationStartTime}} - {{scope.row.cereInvestmentPlanningManagement.implementationEndTime}}
-                  </template>
-                  </el-table-column>
-                  <el-table-column
-                    label="涵盖资源数"
-                    min-width="120"
-        >
-            <template slot-scope="scope">
-                {{ scope.row.cereResourceStrategy.length }}
-              </template>
-                  </el-table-column>
-                  <el-table-column
-                    label="资源编号"
-                    prop="founder"
-                    min-width="200">
-                     <template slot-scope="scope">
-                            {{ scope.row.cereResourceStrategy.resourcesId }}
-                          </template>
-                              </el-table-column>
-                  <el-table-column
-                    label="资源类型"
-                    prop="contactInformation"
-                    min-width="150"
-        >
-             <template slot-scope="scope">
-                    {{ scope.row.cereResourceStrategy.id }}
-                  </template>
-                              </el-table-column>
-                  <el-table-column
-                    label="租金"
-
-                    min-width="150"
-        >
-         <template slot-scope="scope">
-
-                              </template>
-                              </el-table-column>
-                  <el-table-column
-                    label="免租期"
-
-                    min-width="150"
+       <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>
+                 </el-table-column>
+                 <el-table-column
+                   label="招商方案名称"
+                   prop="planName"
+                   min-width="300"
+                 />
+                 <!-- <el-table-column
+                   label="规划方案名称"
+
+                   min-width="300"
                  >
                  <template slot-scope="scope">
+                   {{scope.row.cereInvestmentPlanningManagement.planningName}}
+                 </template>
+                 </el-table-column> -->
+                 <!-- <el-table-column
+                   label="计划实施时间"
 
-                                      </template>
-                                      </el-table-column>
-                  <el-table-column
-                    label="付款方式"
+                   min-width="250"
+                 >
+                 <template slot-scope="scope">
+                   {{scope.row.cereInvestmentPlanningManagement.implementationStartTime}} - {{scope.row.cereInvestmentPlanningManagement.implementationEndTime}}
+                 </template>
+                 </el-table-column> -->
+                 <el-table-column
+                   label="涵盖资源数"
+                   min-width="120"
+       >
+           <template slot-scope="scope">
+               {{ scope.row.cereResourceStrategy.length }}
+             </template>
+                 </el-table-column>
+
+                 <el-table-column
+                   label="资源类型"
+                   prop="contactInformation"
+                   min-width="150"
+       >
+            <template slot-scope="scope">
+                   {{ scope.row.cereResourceStrategy.id }}
+                 </template>
+                             </el-table-column>
+                 <el-table-column
+                   label="租金/周期"
+
+                   min-width="150"
+       >
+        <template slot-scope="scope">
+
+                             </template>
+                             </el-table-column>
+                 <el-table-column
+                   label="付款日"
+
+                   min-width="150"
+                >
+                <template slot-scope="scope">
 
-                    min-width="150"
-                  >
-                  <template slot-scope="scope">
+                                     </template>
+                                     </el-table-column>
+
+                 <el-table-column
+                   label="状态"
+                   min-width="150"
+                 >
+                 <template slot-scope="scope">
+                              {{scope.row.auditStatus =='1'?'待审核':scope.row.auditStatus =='2'?'审核通过':scope.row.auditStatus =='3'?'已驳回':''}}
+                       </template>
+                     </el-table-column>
 
-                                       </template>
-                                       </el-table-column>
-                  <el-table-column
-                    label="当前节点"
-                    min-width="150"
-                  >
-                  <template slot-scope="scope">
-                               {{scope.row.auditStatus =='1'?'待审核':scope.row.auditStatus =='2'?'审核通过':scope.row.auditStatus =='3'?'已驳回':''}}
-                        </template>
-                      </el-table-column>
-                    <!-- <el-table-column
-                      label="启用状态"
-                      prop="auditStatus"
-                      min-width="150"
-                    >
-                    <template slot-scope="scope">
-                       未启用
-                    </template>
-                     </el-table-column> -->
           <el-table-column label="操作" width="180" fixed="right">
             <template slot-scope="scope">
               <div class="tableBtn greens" @click="handleEditForm(scope.row,false)">
diff --git a/admin-web-master/src/views/ads/fangli/addform.vue b/admin-web-master/src/views/ads/fangli/addform.vue
index b4c3ec6..eb56f14 100644
--- a/admin-web-master/src/views/ads/fangli/addform.vue
+++ b/admin-web-master/src/views/ads/fangli/addform.vue
@@ -57,52 +57,57 @@
                     </el-col>
 
                   </el-row>
+<el-row :gutter="20">
+                    <el-col :span="24">
+                      <el-form-item label="招商资源管理"  class="grid-content bg-purple">
+                        <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
+                          <div style="padding: 0px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: flex-end;">
 
-                    <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: #3F9B6A;margin-left: 10px;" @click="mingShow">
-                          添加
-                        </div>
-                      </div>
-                      <div style="padding: 15px;">
-                        <div style="padding: 0px 20px 0px 0px">
-                          <el-table :data="tableData"
-                            :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-                             >
-                            <el-table-column label="序号" min-width="5%" >
-                              <template slot-scope="scope">
-                                {{scope.$index + 1}}
-                              </template>
-                            </el-table-column>
-                            <!-- <el-table-column label="资源编号" prop="id" width="100">
-
-                            </el-table-column> -->
-                            <el-table-column label="资源名称"  min-width="20%" show-overflow-tooltip>
-                            <template slot-scope="scope">
-                              {{scope.row.shopName ? scope.row.shopName :  scope.row.advertisingName?scope.row.advertisingName:scope.row.venueName}}
-                            </template>
-                            </el-table-column>
-                            <el-table-column label="资源类型" min-width="10%">
-                              <template slot-scope="scope">
-                                {{scope.row.shopName ? '商铺' : scope.row.advertisingType?scope.row.advertisingType:'场地'}}
-                              </template>
-                            </el-table-column>
-                            <el-table-column prop="notes" label="策略描述" min-width="25%" show-overflow-tooltip>
-                            </el-table-column>
-                            <el-table-column prop="policyName" label="策略名称" min-width="25%" show-overflow-tooltip>
-                            </el-table-column>
-                            <el-table-column label="操作" min-width="15%">
-                              <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>
-                              </template>
-                            </el-table-column>
-                          </el-table>
+                            <div style="color: #3F9B6A;margin-left: 10px;" @click="mingShow">
+                              添加
+                            </div>
+                          </div>
+                          <div style="padding: 15px;">
+                            <div style="padding: 0px 20px 0px 0px">
+                              <el-table :data="tableData"
+                                :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+                                 >
+                                <el-table-column label="序号" min-width="5%" >
+                                  <template slot-scope="scope">
+                                    {{scope.$index + 1}}
+                                  </template>
+                                </el-table-column>
+                                <el-table-column label="资源名称"  min-width="20%" show-overflow-tooltip>
+                                <template slot-scope="scope">
+                                  {{scope.row.shopName ? scope.row.shopName :  scope.row.advertisingName?scope.row.advertisingName:scope.row.venueName}}
+                                </template>
+                                </el-table-column>
+                                <el-table-column label="资源类型" min-width="10%">
+                                  <template slot-scope="scope">
+                                    {{scope.row.shopName ? '商铺' : scope.row.advertisingType?scope.row.advertisingType:'场地'}}
+                                  </template>
+                                </el-table-column>
+                                <el-table-column prop="policyName" label="策略名称" min-width="25%" show-overflow-tooltip>
+                                </el-table-column>
+                                <el-table-column prop="notes" label="策略描述" min-width="25%" show-overflow-tooltip>
+                                </el-table-column>
+
+                                <el-table-column label="操作" min-width="15%">
+                                  <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>
+                                  </template>
+                                </el-table-column>
+                              </el-table>
+                            </div>
+                          </div>
                         </div>
-                      </div>
-                    </div>
+                      </el-form-item>
+                    </el-col>
+
+                  </el-row>
+
                   <el-row :gutter="20">
                     <el-col :span="24">
                       <el-form-item label="附件信息" prop="mainPurpose" class="grid-content bg-purple">
@@ -137,17 +142,27 @@
 
 
 
-    <el-dialog :visible.sync="addMing" title="添加" style="padding: 0;" width="65%"
+    <el-dialog :visible.sync="addMing" title="添加" style="padding: 0;" width="65%" custom-class='tian_dialog'
       append-to-body center :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
 
       <div style="padding:20px;max-height: calc(100vh - 200px);
       overflow-y: auto;">
         <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 style="line-height:200%">选择资源</div>
+            <div style="display: flex">
+               <el-input
+                  placeholder="请输入"
+                  suffix-icon="el-icon-search"
+                  style="wdith:40%;margin-right:15px;"
+                  v-model="pageindex.findLike">
+                </el-input>
+                <el-button @click="onSearch" style="background-color: #3F9B6A;color: #fff">查询
+                </el-button>
+                <el-button @click="resetting" class="buttonHover"
+                  style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置
+                </el-button>
+            </div>
           </div>
           <div style="padding: 15px;">
             <div style="padding: 0px 20px 0px 0px">
@@ -448,6 +463,7 @@ multipleSelection:[],
   pageindex: {
           pageNumber: 1,
           pageSize: 10,
+          findLike:'',
         },
         ziyuanData:[],
         celueSel:null,
@@ -456,7 +472,8 @@ multipleSelection:[],
         newAdd:{
           resourcesId:'',//资源ID
           rentalPoliciesId:'',//策略ID
-        }
+        },
+
       }
     },
     created() {
@@ -489,13 +506,19 @@ multipleSelection:[],
          this.celueData = celue.data.content
       },
      async mingShow(){
+       this.pageindex.findLike =''
         const ziyuan =  await getAlls(this.pageindex)
          const ggw  = await map1(this.pageindex)
          const changdi = await changAlls(this.pageindex)
         this.ziyuanData = [...ziyuan.data.content,...ggw.data.content,...changdi.data.content]
         this.addMing = true
       },
-
+async ziyuan(){
+  const ziyuan =  await getAlls(this.pageindex)
+   const ggw  = await map1(this.pageindex)
+   const changdi = await changAlls(this.pageindex)
+  this.ziyuanData = [...ziyuan.data.content,...ggw.data.content,...changdi.data.content]
+},
       //上传
       submitUpload() {
         this.$refs.upload.submit();
@@ -662,7 +685,19 @@ multipleSelection:[],
       },
       seveMode(){
 
-      }
+      },
+      onSearch(){
+ this.ziyuan()
+      },
+      resetting(){
+
+        this.pageindex={
+                pageNumber: 1,
+                pageSize: 10,
+                findLike:'',
+              }
+              this.ziyuan()
+      },
     }
   }
 </script>
@@ -770,4 +805,11 @@ multipleSelection:[],
     border-bottom :0px;
   }
 }
+ ::v-deep  .tian_dialog  {
+  .el-dialog__body{
+    padding:0px;
+
+  }
+}
+
 </style>
diff --git a/admin-web-master/src/views/ads/fangli/bianform.vue b/admin-web-master/src/views/ads/fangli/bianform.vue
index 7f51866..2984a58 100644
--- a/admin-web-master/src/views/ads/fangli/bianform.vue
+++ b/admin-web-master/src/views/ads/fangli/bianform.vue
@@ -101,54 +101,56 @@
                               </el-row>
                               <el-row :gutter="20">
                                 <el-col :span="24">
+                                  <el-form-item label="招商资源管理"  class="grid-content bg-purple">
                                     <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> -->
-                                              </div>
-                                              <div style="padding: 15px;">
-                                                <div style="padding: 0px 20px 0px 0px">
-                                                  <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-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="MingDelete(scope.row.id,scope.$index)" class="tableBtn greens">删除</div>
-                                                      </template>
-                                                    </el-table-column> -->
-                                                  </el-table>
-                                                </div>
-                                              </div>
-                                            </div>
+                                    <div style="padding: 0px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: flex-end;">
+                                                                 <div style="color: #2d8a58;margin-left: 10px;" @click="addziyuan" v-if="steat">
+                                                                   添加
+                                                                 </div>
+                                                               </div>
+                                                               <div style="padding: 15px;">
+                                                                 <div style="padding: 0px 20px 0px 0px">
+                                                                   <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-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="MingDelete(scope.row.id,scope.$index)" class="tableBtn greens">删除</div>
+                                                                       </template>
+                                                                     </el-table-column> -->
+                                                                   </el-table>
+                                                                 </div>
+                                                               </div>
+                                                             </div>
+                                        </el-form-item>
+
                                 </el-col>
 
                               </el-row>
@@ -186,62 +188,76 @@
 
                         </el-col>
                       </el-row>
-                      <el-dialog title="添加" :visible.sync="addMing" custom-class='XDD_css' style="padding: 0;" width="50%"
+                      <el-dialog :visible.sync="addMing" title="添加" style="padding: 0;" width="65%" custom-class='tian_dialog'
                         append-to-body center :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
 
-                        <div style="padding: 15px;width:100%">
+                        <div style="padding:20px;max-height: calc(100vh - 200px);
+                        overflow-y: auto;">
                           <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 style="line-height:200%">选择资源</div>
+                              <div style="display: flex">
+                                 <el-input
+                                    placeholder="请输入"
+                                    suffix-icon="el-icon-search"
+                                    style="wdith:40%;margin-right:15px;"
+                                    v-model="pageziyuan.findLike">
+                                  </el-input>
+                                  <el-button @click="onSearch" style="background-color: #3F9B6A;color: #fff">查询
+                                  </el-button>
+                                  <el-button @click="resetting" class="buttonHover"
+                                    style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置
+                                  </el-button>
+                              </div>
                             </div>
                             <div style="padding: 15px;">
                               <div style="padding: 0px 20px 0px 0px">
-                                <el-table :data="tableData"
-                                @selection-change="handleSelectionChange" tooltip-effect="dark"
+                                <el-table :data="ziyuanData"
+                                tooltip-effect="dark"
+                                   @selection-change="handleSelectionChange"
                                   :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-                                   style="width: 100%">
-                                 <el-table-column
-                                         label="选择"
-                                        type="selection"
-                                        width="55">
-                                      </el-table-column>
-                                 <el-table-column label="序号"  min-width="8%" >
-                                   <template slot-scope="scope">
-                                     {{scope.$index + 1}}
-                                   </template>
-                                 </el-table-column>
-                                 <el-table-column label="编号" prop="id" min-width="8%">
-
-                                 </el-table-column>
-                                 <el-table-column label="资源名称"  min-width="25%">
-                                 <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="资源类型" min-width="12%">
-                                   <template slot-scope="scope">
-                                     {{scope.row.shopName ? '商铺' : scope.row.advertisingType?scope.row.advertisingType:'场地'}}
-                                   </template>
-                                 </el-table-column>
-                                 <el-table-column prop="notes" label="对应策略" min-width="15%">
-                                 </el-table-column>
+                                  >
+                                   <el-table-column
+                                          label="选择"
+                                         type="selection"
+                                         width="55">
+                                       </el-table-column>
+                                  <el-table-column label="序号"  min-width="8%" >
+                                    <template slot-scope="scope">
+                                      {{scope.$index + 1}}
+                                    </template>
+                                  </el-table-column>
+                                  <el-table-column label="编号" prop="id" min-width="8%">
+
+                                  </el-table-column>
+                                  <el-table-column label="资源名称"  min-width="25%">
+                                  <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="资源类型" min-width="12%">
+                                    <template slot-scope="scope">
+                                      {{scope.row.shopName ? '商铺' : scope.row.advertisingType?scope.row.advertisingType:'场地'}}
+                                    </template>
+                                  </el-table-column>
+                                  <el-table-column prop="notes" label="对应策略" min-width="15%">
+                                  </el-table-column>
                                 </el-table>
                               </div>
                             </div>
                           </div>
-
                         </div>
-                        <div style="display: flex;justify-content: flex-end;padding: 10px 20px 10px 0">
-                          <el-button  @click="mingClose()" class="buttonHover"
-                              style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消
-                          </el-button>
-                          <el-button  @click="minSev" style="background-color: #3F9B6A;color: #fff;">确定
-                          </el-button>
+                        <template #footer>
+                          <div style="display: flex; justify-content: flex-end; align-items: center;">
+                            <el-button  @click="minSev" style="background-color: #3F9B6A;color: #fff;">确定
+                            </el-button>
+                           <el-button  @click="mingClose" class="buttonHover"
+                                 style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消
+                           </el-button>
+
+                          </div>
+                        </template>
 
-                        </div>
                       </el-dialog>
                       <!-- 策略选择 -->
                       <el-dialog :visible.sync="celueMing" custom-class='XDD_css' style="padding: 0;" width="50%"
@@ -396,8 +412,13 @@ guihuaDate:[],
            trigger: 'change'
          }],
        },
-       xiangTab:'first'
-
+       xiangTab:'first',
+      pageziyuan:{
+        pageNumber: 1,
+        pageSize: 10,
+        findLike:''
+      },
+ ziyuanData:[]
       }
     },
     watch: {
@@ -519,11 +540,20 @@ guihuaDate:[],
 
       },
       minSev() {
- this.tableData = this.multipleSelection
+        console.log(this.ruleForm.cereResourceStrategy,this.multipleSelection)
+        const existingIds = new Set(this.ruleForm.cereResourceStrategy.map(item => item.id));
+
+        // 过滤出 multipleSelection 中 id 不在 existingIds 中的元素
+        const newElements = this.multipleSelection.filter(item =>
+          !existingIds.has(item.id)
+        );
+
+        // 将新元素添加到 cereResourceStrategy 数组中
+        this.ruleForm.cereResourceStrategy.push(...newElements);
+   // this.tableData = this.multipleSelection
         this.addMing = false
         this.multipleSelection =[]
 
-
       },
       MingDelete(items,index) {
 
@@ -563,9 +593,9 @@ guihuaDate:[],
       fenleiChange(value){
           this.ruleForm.classificationCode = value[value.length - 1]
       },
-      handleSelectionChange(val) {
-        this.multipleSelection = val;
-      },
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
       mingClose(){
            this.addMing = false
       },
@@ -593,10 +623,28 @@ guihuaDate:[],
     const ziyuan =  await getAlls(this.pageindex)
      const ggw  = await map1(this.pageindex)
      const changdi = await changAlls(this.pageindex)
-    this.tableData = [...ziyuan.data.content,...ggw.data.content,...changdi.data.content]
+    this.ziyuanData = [...ziyuan.data.content,...ggw.data.content,...changdi.data.content]
         this.addMing = true
+      },
+      async ziyuan(){
+        const ziyuan =  await getAlls(this.pageindex)
+         const ggw  = await map1(this.pageindex)
+         const changdi = await changAlls(this.pageindex)
+        this.ziyuanData = [...ziyuan.data.content,...ggw.data.content,...changdi.data.content]
+      },
+ onSearch(){
+ this.ziyuan()
+      },
+      resetting(){
+
+        this.pageindex={
+                pageNumber: 1,
+                pageSize: 10,
+                findLike:'',
+              }
+              this.ziyuan()
+      },
 
-      }
     }
   }
 </script>
diff --git a/admin-web-master/src/views/ads/fangli/index.vue b/admin-web-master/src/views/ads/fangli/index.vue
index 96285c7..942dead 100644
--- a/admin-web-master/src/views/ads/fangli/index.vue
+++ b/admin-web-master/src/views/ads/fangli/index.vue
@@ -68,7 +68,7 @@
             prop="planName"
             min-width="300"
           />
-          <el-table-column
+          <!-- <el-table-column
             label="规划方案名称"
 
             min-width="300"
@@ -76,8 +76,8 @@
           <template slot-scope="scope">
             {{scope.row.cereInvestmentPlanningManagement.planningName}}
           </template>
-          </el-table-column>
-          <el-table-column
+          </el-table-column> -->
+          <!-- <el-table-column
             label="计划实施时间"
 
             min-width="250"
@@ -85,7 +85,7 @@
           <template slot-scope="scope">
             {{scope.row.cereInvestmentPlanningManagement.implementationStartTime}} - {{scope.row.cereInvestmentPlanningManagement.implementationEndTime}}
           </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column
             label="涵盖资源数"
             min-width="120"
@@ -94,14 +94,7 @@
         {{ scope.row.cereResourceStrategy.length }}
       </template>
           </el-table-column>
-          <el-table-column
-            label="资源编号"
-            prop="founder"
-            min-width="200">
-             <template slot-scope="scope">
-                    {{ scope.row.cereResourceStrategy.resourcesId }}
-                  </template>
-                      </el-table-column>
+
           <el-table-column
             label="资源类型"
             prop="contactInformation"
@@ -112,7 +105,7 @@
           </template>
                       </el-table-column>
           <el-table-column
-            label="租金"
+            label="租金/周期"
 
             min-width="150"
 >
@@ -121,7 +114,7 @@
                       </template>
                       </el-table-column>
           <el-table-column
-            label="免租期"
+            label="付款日"
 
             min-width="150"
          >
@@ -129,32 +122,16 @@
 
                               </template>
                               </el-table-column>
-          <el-table-column
-            label="付款方式"
 
-            min-width="150"
-          >
-          <template slot-scope="scope">
-
-                               </template>
-                               </el-table-column>
           <el-table-column
-            label="当前节点"
+            label="状态"
             min-width="150"
           >
           <template slot-scope="scope">
                        {{scope.row.auditStatus =='1'?'待审核':scope.row.auditStatus =='2'?'审核通过':scope.row.auditStatus =='3'?'已驳回':''}}
                 </template>
               </el-table-column>
-          <!-- <el-table-column
-            label="启用状态"
-            prop="auditStatus"
-            min-width="150"
-          >
-          <template slot-scope="scope">
-             未启用
-          </template>
-           </el-table-column> -->
+
           <el-table-column label="操作" width="180" fixed="right">
             <template slot-scope="scope">
               <div class="tableBtn greens" @click="handleEditForm(scope.row,false)">
--
libgit2 0.21.4