From 4394f7f2d08dea9586e02195057d4c0846a0460c Mon Sep 17 00:00:00 2001
From: 2509699674 <2509699647@qq.com>
Date: Mon, 23 Dec 2024 23:55:46 +0800
Subject: [PATCH] '策略'

---
 admin-web-master/.env.development            |   6 +++---
 admin-web-master/.env.production             |   4 ++--
 admin-web-master/src/views/scheme/sam.vue    | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------
 admin-web-master/src/views/scheme/samXin.vue | 411 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 yanshouban/src/views/ads/fangli/addform.vue  |   8 ++------
 yanshouban/src/views/scheme/planningBz.vue   |   3 ++-
 6 files changed, 275 insertions(+), 260 deletions(-)

diff --git a/admin-web-master/.env.development b/admin-web-master/.env.development
index 85d334e..a6a4a20 100644
--- a/admin-web-master/.env.development
+++ b/admin-web-master/.env.development
@@ -4,7 +4,7 @@ ENV = 'development'
 # base api
 VUE_APP_BASE_API = '/dev-api'
 
-# VUE_APP_DOMAIN_PREFIX_1 = "http://zhld.028wlkj.com:49008/cdwlMall/admin-server"
+ VUE_APP_DOMAIN_PREFIX_1 = "https://zhld.028wlkj.com:49008/cdwlMall/admin-server"
 # VUE_APP_DOMAIN_PREFIX_1='http://8.130.38.56:9003'
-VUE_APP_DOMAIN_PREFIX_1='http://172.16.61.124:9003'
-VUE_APP_DOMAIN_PREFIX_2='http://192.168.2.38:9003'
\ No newline at end of file
+# VUE_APP_DOMAIN_PREFIX_1='http://172.16.61.124:9003'
+ VUE_APP_DOMAIN_PREFIX_2='http://192.168.2.38:9003'
diff --git a/admin-web-master/.env.production b/admin-web-master/.env.production
index 2e9cf85..481df10 100644
--- a/admin-web-master/.env.production
+++ b/admin-web-master/.env.production
@@ -3,8 +3,8 @@ ENV = 'production'
 
 # base api
 VUE_APP_BASE_API = '/prod-api'
-# VUE_APP_DOMAIN_PREFIX_1 = "http://zhld.028wlkj.com:49008/cdwlMall/admin-server"
+ VUE_APP_DOMAIN_PREFIX_1 = "http://zhld.028wlkj.com:49008/cdwlMall/admin-server"
 # VUE_APP_DOMAIN_PREFIX_1='http://8.130.38.56:9003'
-VUE_APP_DOMAIN_PREFIX_1='http://172.16.61.124:9003'
+# VUE_APP_DOMAIN_PREFIX_1='http://172.16.61.124:9003'
 VUE_APP_DOMAIN_PREFIX_2='http://192.168.2.38:9003'
 
diff --git a/admin-web-master/src/views/scheme/sam.vue b/admin-web-master/src/views/scheme/sam.vue
index 8be5efa..49e757f 100644
--- a/admin-web-master/src/views/scheme/sam.vue
+++ b/admin-web-master/src/views/scheme/sam.vue
@@ -24,24 +24,16 @@
               type="datetimerange" range-separator="-" start-placeholder="" end-placeholder=""   prefix-icon="none">
             </el-date-picker> -->
             <div style="width:68px;height:36px;line-height:32px;">经营类型</div>
-            <el-select v-model="formSel.businessType" placeholder="请选择"
-               style="width:168px;margin-right: 15px">
-            <el-option label="商铺" value="商铺" />
-            <el-option label="场地" value="场地" />
-            <el-option label="广告位" value="广告位" />
-            </el-select>
+            <el-input placeholder="请输入" v-model="formSel.businessType" style="width:168px;margin-right: 15px" />
+
             <div style="width:68px;height:36px;line-height:32px;">是否出租</div>
             <el-select v-model="formSel.isRental" placeholder="请选择"
                style="width:168px;margin-right: 15px">
-              <el-option label="否" value="0" />
-              <el-option label="是" value="1" />
-            </el-select>
-            <div style="width:68px;height:36px;line-height:32px;">是否自营</div>
-            <el-select v-model="formSel.isSelfOperated" placeholder="请选择"
-               style="width:168px;">
-              <el-option label="否" value="0" />
+              <el-option label="自营" value="0" />
               <el-option label="是" value="1" />
             </el-select>
+
+
           </div>
           <div>
             <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">检索
@@ -78,15 +70,11 @@
           </el-table-column>
           <el-table-column label="是否出租" prop="isRental" min-width="100" >
             <template slot-scope="scope">
-              {{scope.row.isRental == '0'?'否':'是'}}
-                 </template>
-          </el-table-column>
-          <el-table-column label="是否自营" prop="planningObjectives" min-width="100" >
-            <template slot-scope="scope">
-              {{scope.row.isSelfOperated == '0'?'否':'是'}}
+              {{scope.row.isRental == '0'?'自营':'是'}}
                  </template>
           </el-table-column>
 
+
           <el-table-column label="操作" min-width="200" >
             <template slot-scope="scope">
               <div @click="handleEditForm(scope.row,1)" class="tableBtn greens">查看</div>
@@ -132,24 +120,13 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="是否自营" prop="isSelfOperated">
-                <el-select v-model="secondData.isSelfOperated"  style="width: 72%;margin-right: 15px" :disabled="xiangqing==1?true:false">
-                  <el-option label="否" value="0" />
-                  <el-option label="是" value="1" />
-                </el-select>
+              <el-form-item label="经营类型" prop="businessType" v-if="secondData.applicableResources == '商铺'">
+                <el-input v-model="secondData.businessType" placeholder="请输入" style="width:  72%;margin-right: 15px"  maxlength="50" :disabled="xiangqing==1?true:false"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="12">
-              <el-form-item label="经营类型" prop="businessType">
-                <el-select v-model="secondData.businessType"  style="width: 72%;margin-right: 15px" :disabled="xiangqing==1?true:false">
-                  <el-option label="商铺" value="商铺" />
-                  <el-option label="场地" value="场地" />
-                  <el-option label="广告位" value="广告位" />
-                </el-select>
-              </el-form-item>
-            </el-col>
+
             <el-col :span="12">
               <el-form-item label="租金价格" prop="rentalPrice">
                 <el-input v-model="secondData.rentalPrice"  style="width: 72%;margin-right: 15px;" :disabled="xiangqing==1?true:false">
@@ -160,13 +137,19 @@
 
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
             <el-col :span="12">
-              <el-form-item label="商铺租期" prop="leaseTerm">
-                <el-input v-model="secondData.leaseTerm" style="width: 72%;" :disabled="xiangqing==1?true:false"></el-input>
+              <el-form-item label="付款周期" prop="leaseTerm">
+                <el-select v-model="secondData.leaseTerm" placeholder="请选择" style="width: 72%;margin-right: 15px" :disabled="xiangqing==1?true:false">
+                  <el-option label="日" value="日" />
+                  <el-option label="月" value="月" />
+                  <el-option label="季" value="季" />
+                  <el-option label="年" value="年" />
+                </el-select>
               </el-form-item>
             </el-col>
+          </el-row>
+
+          <el-row>
             <el-col :span="12">
               <el-form-item label="租赁时段" prop="leaseDate">
                 <el-date-picker v-model="leaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="至"
@@ -174,36 +157,53 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
             <el-col :span="12">
               <el-form-item label="免租条件" prop="rentFreeCondition">
                 <el-input v-model="secondData.rentFreeCondition" style="width: 72%;" :disabled="xiangqing==1?true:false"></el-input>
               </el-form-item>
             </el-col>
+
+          </el-row>
+          <el-row>
             <el-col :span="12">
               <el-form-item label="免租期" prop="rentFreePeriod">
-                <el-input v-model="secondData.rentFreePeriod" placeholder="请输入/天" style="width: 72%;" :disabled="xiangqing==1?true:false"></el-input>
 
+                <el-select v-model="secondData.rentFreePeriod" placeholder="请选择" style="width: 72%;margin-right: 15px" :disabled="xiangqing==1?true:false">
+                  <el-option :label="item" :value="item" v-for="item in 31" />
+                </el-select>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
             <el-col :span="12">
-              <el-form-item label="付款条件" prop="paymentTerms">
-                <el-input v-model="secondData.paymentTerms"  style="width: 72%;" :disabled="xiangqing==1?true:false"></el-input>
+              <el-form-item label="付款日" prop="payDay">
+
+                <el-select v-model="secondData.payDay" placeholder="请选择" style="width: 72%;margin-right: 15px" :disabled="xiangqing==1?true:false">
+                  <el-option :label="item" :value="item" v-for="item in 31" />
+                </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
-              <el-form-item label="付款日期" prop="paymentDate">
-                <el-date-picker v-model="paymentDate" value-format="yyyy-MM-dd" type="daterange" range-separator="至"
-                  start-placeholder="开始日期" end-placeholder="结束日期" style="width: 72%;" :disabled="xiangqing==1?true:false">
-                </el-date-picker>
+          </el-row>
+           <el-row>
+          <el-col :span="24">
+              <el-form-item label="优惠政策" prop="preferentialPolicy">
+              <div style="border: 1px solid #dddfe5;padding:20px;" v-html="secondData.preferentialPolicy" v-if="xiangqing==1"></div>
+                <wangEditor v-model="secondData.preferentialPolicy" ref="editor" :height="100" v-else></wangEditor>
+
               </el-form-item>
             </el-col>
+
+          </el-row>
+          <el-row>
+
+            <el-col :span="24">
+              <el-form-item label="其他说明" prop="otherDescription">
+          <div style="border: 1px solid #dddfe5;padding:20px;" v-html="secondData.otherDescription" v-if="xiangqing==1"></div>
+                <wangEditor v-model="secondData.otherDescription" ref="editor" :height="100" v-else></wangEditor>
+              </el-form-item>
+            </el-col>
+
           </el-row>
         </el-form>
-        <div style="display: flex;justify-content: flex-end;">
+        <div style="display: flex;justify-content: flex-end;margin-top:20px;">
           <el-button @click="closexaing(1)" class="buttonHover"
                   style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消</el-button>
           <el-button @click="addCheck()"
@@ -269,7 +269,8 @@ import samXin from "./samXin"
         },
         fileList: [],
         paymentDate:[],
-        leaseDate:[]
+        leaseDate:[],
+        modelData:[]
       }
     },
 
diff --git a/admin-web-master/src/views/scheme/samXin.vue b/admin-web-master/src/views/scheme/samXin.vue
index 7a33115..4e702e5 100644
--- a/admin-web-master/src/views/scheme/samXin.vue
+++ b/admin-web-master/src/views/scheme/samXin.vue
@@ -24,30 +24,19 @@
           <el-col :span="12">
             <el-form-item label="是否出租" prop="isRental">
               <el-select v-model="form.isRental" placeholder="请选择" style="width: 72%;margin-right: 15px">
-                <el-option label="否" value="0" />
+                <el-option label="自营" value="0" />
                 <el-option label="是" value="1" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="是否自营" prop="isSelfOperated">
-              <el-select v-model="form.isSelfOperated" placeholder="请选择" style="width: 72%;margin-right: 15px">
-                <el-option label="否" value="0" />
-                <el-option label="是" value="1" />
-              </el-select>
+            <el-form-item label="经营类型" prop="businessType" v-if="form.applicableResources == '商铺'">
+              <el-input v-model="form.businessType" placeholder="请输入" style="width:  72%;margin-right: 15px"  maxlength="50"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="经营类型" prop="businessType">
-              <el-select v-model="form.businessType" placeholder="请选择" style="width: 72%;margin-right: 15px">
-                <el-option label="商铺" value="商铺" />
-                <el-option label="场地" value="场地" />
-                <el-option label="广告位" value="广告位" />
-              </el-select>
-            </el-form-item>
-          </el-col>
+
           <el-col :span="12">
             <el-form-item label="租金价格" prop="rentalPrice">
               <el-input v-model.number="form.rentalPrice" placeholder="请输入" style="width: 72%;margin-right: 15px;" maxlength="30">
@@ -58,14 +47,24 @@
 
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="付款周期" prop="leaseTerm">
+              <el-select v-model="form.leaseTerm" placeholder="请选择" style="width: 72%;margin-right: 15px">
+                <el-option label="日" value="日" />
+                <el-option label="月" value="月" />
+                <el-option label="季" value="季" />
+                <el-option label="年" value="年" />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="商铺租期" prop="leaseTerm">
               <el-input v-model="form.leaseTerm" style="width: 72%;"  placeholder="请输入/年或/月" maxlength="20"></el-input>
 
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="12">
             <el-form-item label="租赁时段" prop="leaseDate">
               <el-date-picker v-model="leaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="至"
@@ -73,34 +72,53 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="免租条件" prop="rentFreeCondition">
               <el-input v-model="form.rentFreeCondition" placeholder="请输入" style="width: 72%;" maxlength="50"></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
+
           <el-col :span="12">
             <el-form-item label="免租期" prop="rentFreePeriod">
-              <el-input v-model="form.rentFreePeriod" placeholder="请输入/天" style="width: 72%;" maxlength="20"></el-input>
-
+              <!-- <el-input v-model="form.rentFreePeriod" placeholder="请输入/天" style="width: 72%;" maxlength="20"></el-input> -->
+              <el-select v-model="form.rentFreePeriod" placeholder="请选择" style="width: 72%;margin-right: 15px">
+                <el-option :label="item" :value="item" v-for="item in 31" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="付款日" prop="payDay">
+              <!-- <el-input v-model="form.payDay" placeholder="请输入" style="width: 72%;" maxlength="50"></el-input> -->
+              <el-select v-model="form.payDay" placeholder="请选择" style="width: 72%;margin-right: 15px">
+                <el-option :label="item" :value="item" v-for="item in 31" />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="付款条件" prop="paymentTerms">
-              <el-input v-model="form.paymentTerms" placeholder="请输入" style="width: 72%;" maxlength="50"></el-input>
+
+          <el-col :span="24">
+            <el-form-item label="优惠政策" prop="preferentialPolicy">
+
+              <wangEditor v-model="form.preferentialPolicy" ref="editor" :height="100"></wangEditor>
+
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="付款日期" prop="paymentDate">
-              <el-date-picker v-model="paymentDate" value-format="yyyy-MM-dd" type="daterange" range-separator="至"
-                start-placeholder="开始日期" end-placeholder="结束日期" style="width: 72%;">
-              </el-date-picker>
+
+        </el-row>
+        <el-row>
+
+          <el-col :span="24">
+            <el-form-item label="其他说明" prop="otherDescription">
+
+              <wangEditor v-model="form.otherDescription" ref="editor" :height="100"></wangEditor>
             </el-form-item>
           </el-col>
+
         </el-row>
+
       </el-form>
       <div style="display: flex;justify-content: flex-end;margin-top:20px;">
         <el-button @click="closeFn()" style="background-color: #fff;color: #000;border: 1px solid #B1B1B1;"
@@ -134,14 +152,10 @@
                   </el-table-column>
                   <el-table-column label="是否出租" prop="isRental" width="120">
                     <template slot-scope="scope">
-                      {{scope.row.isrental == '0'?'否':'是'}}
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="是否自营" prop="isSelfOperated" width="120">
-                    <template slot-scope="scope">
-                      {{scope.row.isSelfOperated == '0'?'否':'是'}}
+                      {{scope.row.isrental == '0'?'自营':'是'}}
                     </template>
                   </el-table-column>
+
                   <el-table-column label="经营类型" prop="businessType" width="150">
                   </el-table-column>
                   <el-table-column prop="rentalPrice" label="租金价格" width="150">
@@ -181,98 +195,109 @@
         width="65%" center :close-on-click-modal="false" :show-close="false" append-to-body>
         <div style="padding:20px;">
           <el-form :model="formInline" :rules="formInlineRules" ref="formInlineRules" label-width="80px">
-            <el-form-item label="策略名称" prop="policyName">
-              <el-input v-model="formInline.policyName" placeholder="请输入"
-                style="width: 87%;margin-right: 15px" maxlength="50"></el-input>
-            </el-form-item>
-            <el-form-item label="适用资源" prop="applicableResources">
-              <el-radio-group v-model="formInline.applicableResources">
-                <el-radio label="商铺">商铺</el-radio>
-                <el-radio label="场地">场地</el-radio>
-                <el-radio label="广告位">广告位</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="是否出租" prop="isRental">
-                  <el-select v-model="formInline.isRental" placeholder="请选择" style="width: 72%;margin-right: 15px">
-                    <el-option label="否" value="0" />
-                    <el-option label="是" value="1" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="是否自营" prop="isSelfOperated">
-                  <el-select v-model="formInline.isSelfOperated" placeholder="请选择"
-                    style="width: 72%;margin-right: 15px">
-                    <el-option label="否" value="0" />
-                    <el-option label="是" value="1" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="经营类型" prop="businessType">
-                  <el-select v-model="formInline.businessType" placeholder="请选择" style="width: 72%;margin-right: 15px">
-                   <el-option label="商铺" value="商铺" />
-                   <el-option label="场地" value="场地" />
-                   <el-option label="广告位" value="广告位" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="租金价格" prop="rentalPrice">
-                  <el-input v-model.number="formInline.rentalPrice" placeholder="请输入" style="width: 72%;margin-right: 15px" maxlength="30">
-                    <template slot="suffix"><span
-                        style="position: absolute;top: 19px;right: 1px;width: 50px;">元/m<sup>2</sup></span></template>
-                  </el-input>
-
+           <el-form-item label="策略名称" prop="policyName">
+             <el-input v-model="formInline.policyName" placeholder="请输入" style="width: 87%;margin-right: 15px"  maxlength="50"></el-input>
+           </el-form-item>
+           <el-form-item label="适用资源" prop="applicableResources">
+             <el-radio-group v-model="formInline.applicableResources">
+               <el-radio label="商铺" value="商铺">商铺</el-radio>
+               <el-radio label="场地" value="场地">场地</el-radio>
+               <el-radio label="广告位" value="广告位">广告位</el-radio>
+             </el-radio-group>
+           </el-form-item>
+
+           <el-row>
+             <el-col :span="12">
+               <el-form-item label="是否出租" prop="isRental">
+                 <el-select v-model="formInline.isRental" placeholder="请选择" style="width: 72%;margin-right: 15px">
+                   <el-option label="自营" value="0" />
+                   <el-option label="是" value="1" />
+                 </el-select>
+               </el-form-item>
+             </el-col>
+             <el-col :span="12">
+               <el-form-item label="经营类型" prop="businessType" v-if="formInline.applicableResources == '商铺'">
+                 <el-input v-model="formInline.businessType" placeholder="请输入" style="width:  72%;margin-right: 15px"  maxlength="50"></el-input>
+               </el-form-item>
+             </el-col>
+           </el-row>
+           <el-row>
+
+             <el-col :span="12">
+               <el-form-item label="租金价格" prop="rentalPrice">
+                 <el-input v-model.number="formInline.rentalPrice" placeholder="请输入" style="width: 72%;margin-right: 15px;" maxlength="30">
+                   <template slot="suffix"><span
+                       style="position: absolute;top: 19px;right: 1px;width: 50px;">元/m<sup>2</sup></span></template>
+
+                 </el-input>
+
+               </el-form-item>
+             </el-col>
+             <el-col :span="12">
+               <el-form-item label="付款周期" prop="leaseTerm">
+                 <el-select v-model="formInline.leaseTerm" placeholder="请选择" style="width: 72%;margin-right: 15px">
+                   <el-option label="日" value="日" />
+                   <el-option label="月" value="月" />
+                   <el-option label="季" value="季" />
+                   <el-option label="年" value="年" />
+                 </el-select>
+               </el-form-item>
+             </el-col>
+           </el-row>
+           <el-row>
+
+             <el-col :span="12">
+               <el-form-item label="租赁时段" prop="leaseDate">
+                 <el-date-picker v-model="leaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="至"
+                   start-placeholder="开始日期" end-placeholder="结束日期" style="width: 72%;">
+                 </el-date-picker>
+               </el-form-item>
+             </el-col>
+             <el-col :span="12">
+               <el-form-item label="免租条件" prop="rentFreeCondition">
+                 <el-input v-model="formInline.rentFreeCondition" placeholder="请输入" style="width: 72%;" maxlength="50"></el-input>
+               </el-form-item>
+             </el-col>
+           </el-row>
+           <el-row>
+
+             <el-col :span="12">
+               <el-form-item label="免租期" prop="rentFreePeriod">
+
+                 <el-select v-model="formInline.rentFreePeriod" placeholder="请选择" style="width: 72%;margin-right: 15px">
+                   <el-option :label="item" :value="item" v-for="item in 31" />
+                 </el-select>
+               </el-form-item>
+             </el-col>
+             <el-col :span="12">
+               <el-form-item label="付款日" prop="payDay">
+
+                 <el-select v-model="formInline.payDay" placeholder="请选择" style="width: 72%;margin-right: 15px">
+                   <el-option :label="item" :value="item" v-for="item in 31" />
+                 </el-select>
+               </el-form-item>
+             </el-col>
+           </el-row>
+           <el-row>
+
+              <el-col :span="24">
+                <el-form-item label="优惠政策" prop="preferentialPolicy">
+
+                  <wangEditor v-model="formInline.preferentialPolicy" ref="editor" :height="100"></wangEditor>
 
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="商铺租期" prop="leaseTerm">
-                  <el-input v-model="formInline.leaseTerm" style="width: 72%;;margin-right: 15px"  placeholder="请输入/年或/月" maxlength="20"></el-input>
 
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="租赁时段" prop="leaseDate">
-                  <el-date-picker v-model="leaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="至"
-                    start-placeholder="开始日期" end-placeholder="结束日期" style="width: 72%;">
-                  </el-date-picker>
-                </el-form-item>
-              </el-col>
             </el-row>
             <el-row>
-              <el-col :span="12">
-                <el-form-item label="免租条件" prop="rentFreeCondition">
-                  <el-input v-model="formInline.rentFreeCondition" placeholder="请输入" style="width: 72%;" maxlength="50"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="免租期" prop="rentFreePeriod">
-                  <el-input v-model="formInline.rentFreePeriod" placeholder="请输入/天" style="width: 72%;" maxlength="20"></el-input>
 
+              <el-col :span="24">
+                <el-form-item label="其他说明" prop="otherDescription">
+
+                  <wangEditor v-model="formInline.otherDescription" ref="editor" :height="100"></wangEditor>
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="付款条件" prop="paymentTerms">
-                  <el-input v-model="formInline.paymentTerms" placeholder="请输入" style="width: 72%;" maxlength="50"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="付款日期" prop="paymentDate">
-                  <el-date-picker v-model="paymentDate" value-format="yyyy-MM-dd" type="daterange" range-separator="至"
-                    start-placeholder="开始日期" end-placeholder="结束日期" style="width: 72%;">
-                  </el-date-picker>
-                </el-form-item>
-              </el-col>
+
             </el-row>
           </el-form>
           <div style="display: flex;justify-content: flex-end;margin-top:20px;">
@@ -316,41 +341,40 @@
           policyName: '', //策略名称
           applicableResources: '商铺', //适用资源
           policyTemplate: null, //策略模板
-          isRental: '', //是否出租 (0:否,1:是)
-          isSelfOperated: '', //是否白营 (0: 否, 1: 是)
+          isRental: '', //是否出租 (0:白营,1:是)
           businessType: '', //经营类型
-          rentalPrice: '', //租金价格
+          rentalPrice: null, //租金价格
           leaseTerm: '', //商铺租期
           leaseStartDate: '', //租赁开始日期
           leaseEndDate: '', //租赁结束日期
           rentFreeCondition: '', //免租条件
           rentFreePeriod: '', //免租期(单位:天)
-          paymentTerms: '', //付款条件
-          paymentStartDate: '', //付款开始日期
-          paymentEndDate: '', //付款结束日期
+          payDay: '', //付款日
           createDate: '', //创建时间
           isTemplate: '1', //是否为模板(0.是 1.否)
+          preferentialPolicy:'',
+          otherDescription:''
         },
         modeCode: false, //模板管理框
         tableData: [],
         addMing: false, //新增模板框
         modeAdd: true, //新增编辑模板 状态切换
         formInline: {
-          policyName: '', //策略名称
-          applicableResources: '商铺', //适用资源
-          isRental: '', //是否出租 (0:否,1:是)
-          isSelfOperated: '', //是否出租 (0: 否, 1: 是)
-          businessType: '', //经营类型
-          rentalPrice: '', //租金价格
-          leaseTerm: '', //商铺租期
-          leaseStartDate: '', //租赁开始日期
-          leaseEndDate: '', //租赁结束日期
-          rentFreeCondition: '', //免租条件
-          rentFreePeriod: '', //免租期(单位:天)
-          paymentTerms: '', //付款条件
-          paymentStartDate: '', //付款开始日期
-          paymentEndDate: '', //付款结束日期
-          createDate: '', //创建时间
+           policyName: '', //策略名称
+           applicableResources: '商铺', //适用资源
+           policyTemplate: null, //策略模板
+           isRental: '', //是否出租 (0:白营,1:是)
+           businessType: '', //经营类型
+           rentalPrice: null, //租金价格
+           leaseTerm: '', //商铺租期
+           leaseStartDate: '', //租赁开始日期
+           leaseEndDate: '', //租赁结束日期
+           rentFreeCondition: '', //免租条件
+           rentFreePeriod: '', //免租期(单位:天)
+           payDay: '', //付款日
+           createDate: '', //创建时间
+           preferentialPolicy:'',
+           otherDescription:'',
           isTemplate: '0', //是否为模板(0.是 1.否)
         },
         leaseDate: [], //租赁时段
@@ -420,11 +444,6 @@
               message: '请选择是否出租',
               trigger: 'change'
             }],
-            isSelfOperated: [{
-              required: true,
-              message: '请选择是否出租',
-              trigger: 'change'
-            }],
             businessType: [{
               required: true,
               message: '请选择经营类型',
@@ -480,23 +499,23 @@ this.getAll()
         this.paymentDate = []
         if (val == 1) {
           this.formInline = {
-            policyName: '', //策略名称
-            applicableResources: '商铺', //适用资源
-            isRental: '', //是否出租 (0:否,1:是)
-            isSelfOperated: '', //是否白营 (0: 否, 1: 是)
-            businessType: '', //经营类型
-            rentalPrice: '', //租金价格
-            leaseTerm: '', //商铺租期
-            leaseStartDate: '', //租赁开始日期
-            leaseEndDate: '', //租赁结束日期
-            rentFreeCondition: '', //免租条件
-            rentFreePeriod: '', //免租期(单位:天)
-            paymentTerms: '', //付款条件
-            paymentStartDate: '', //付款开始日期
-            paymentEndDate: '', //付款结束日期
-            createDate: '', //创建时间
-            isTemplate: '0', //是否为模板(0.是 1.否)
-          }
+           policyName: '', //策略名称
+           applicableResources: '商铺', //适用资源
+           policyTemplate: null, //策略模板
+           isRental: '', //是否出租 (0:白营,1:是)
+           businessType: '', //经营类型
+           rentalPrice: null, //租金价格
+           leaseTerm: '', //商铺租期
+           leaseStartDate: '', //租赁开始日期
+           leaseEndDate: '', //租赁结束日期
+           rentFreeCondition: '', //免租条件
+           rentFreePeriod: '', //免租期(单位:天)
+           payDay: '', //付款日
+           createDate: '', //创建时间
+           preferentialPolicy:'',
+           otherDescription:'',
+          isTemplate: '0', //是否为模板(0.是 1.否)
+        }
         } else {
           this.leaseDate[0] = item.leaseStartDate
            this.leaseDate[1] = item.leaseEndDate
@@ -509,24 +528,23 @@ this.getAll()
       },
       closeFn() {
         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.否)
-         }
+          policyName: '', //策略名称
+          applicableResources: '商铺', //适用资源
+          policyTemplate: null, //策略模板
+          isRental: '', //是否出租 (0:白营,1:是)
+          businessType: '', //经营类型
+          rentalPrice: null, //租金价格
+          leaseTerm: '', //商铺租期
+          leaseStartDate: '', //租赁开始日期
+          leaseEndDate: '', //租赁结束日期
+          rentFreeCondition: '', //免租条件
+          rentFreePeriod: '', //免租期(单位:天)
+          payDay: '', //付款日
+          createDate: '', //创建时间
+          isTemplate: '1', //是否为模板(0.是 1.否)
+          preferentialPolicy:'',
+          otherDescription:''
+        }
         this.paymentDate=[]
         this.leaseDate = []
         this.$emit('childClose', false);
@@ -535,24 +553,23 @@ this.getAll()
       close(){
 
           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.否)
-           }
+          policyName: '', //策略名称
+          applicableResources: '商铺', //适用资源
+          policyTemplate: null, //策略模板
+          isRental: '', //是否出租 (0:白营,1:是)
+          businessType: '', //经营类型
+          rentalPrice: null, //租金价格
+          leaseTerm: '', //商铺租期
+          leaseStartDate: '', //租赁开始日期
+          leaseEndDate: '', //租赁结束日期
+          rentFreeCondition: '', //免租条件
+          rentFreePeriod: '', //免租期(单位:天)
+          payDay: '', //付款日
+          createDate: '', //创建时间
+          isTemplate: '1', //是否为模板(0.是 1.否)
+          preferentialPolicy:'',
+          otherDescription:''
+        }
           this.paymentDate=[]
           this.leaseDate = []
           this.$emit('childClose', false);
diff --git a/yanshouban/src/views/ads/fangli/addform.vue b/yanshouban/src/views/ads/fangli/addform.vue
index 07745fb..7ba8dbc 100644
--- a/yanshouban/src/views/ads/fangli/addform.vue
+++ b/yanshouban/src/views/ads/fangli/addform.vue
@@ -235,14 +235,10 @@
                 </el-table-column>
                 <el-table-column label="是否出租" prop="planningObjectives" min-width="100" >
                   <template slot-scope="scope">
-                    {{scope.row.isrental == '0'?'否':'是'}}
-                       </template>
-                </el-table-column>
-                <el-table-column label="是否自营" prop="planningObjectives" min-width="100" >
-                  <template slot-scope="scope">
-                    {{scope.row.isSelfOperated == '0'?'否':'是'}}
+                    {{scope.row.isrental == '0'?'自营':'是'}}
                        </template>
                 </el-table-column>
+
               </el-table>
             </div>
           </div>
diff --git a/yanshouban/src/views/scheme/planningBz.vue b/yanshouban/src/views/scheme/planningBz.vue
index 1dfc278..a828068 100644
--- a/yanshouban/src/views/scheme/planningBz.vue
+++ b/yanshouban/src/views/scheme/planningBz.vue
@@ -283,7 +283,8 @@
             <el-row :gutter="20">
               <el-col :span="24">
                 <el-form-item label="附件信息">
-                  <div style="padding:10px 0;line-height:20px;color:#3F9B6A" v-if="xiangqing==1" @click="yulanFu(secondData.annex)">{{secondData.annex.name}}</div>
+                  <!-- <div style="padding:10px 0;line-height:20px;color:#3F9B6A" v-if="xiangqing==1" @click="yulanFu(secondData.annex)">{{secondData.annex.name}}</div> -->
+                  <a style="padding:10px 0;line-height:20px;color:#3F9B6A" class="tableBtn greens"  v-if="xiangqing==1&&secondData.annex" :href="secondData.annex.url" target="_blank" download>{{secondData.annex.name}}</a>
                   <el-upload class="upload-demo" ref="upload" :action="upload" :on-preview="handlePreview"  v-else
                    :on-success="handleSuccess"
                     :on-remove="handleRemove" :file-list="fileList" :auto-upload="true" :on-change="handleChange">
--
libgit2 0.21.4