webapp / GreenwayWeb

Commit 1efed26b536b5397fd7db366f95dac57a6daf957

Authored by wesley88
2 parents ab7d388b 467908ba

Merge branch 'master' of http://39.98.150.180/webapp/GreenwayWeb

Inline Side-by-side
Showing 6 changed files with 275 additions and 260 deletions
admin-web-master/.env.development
  View file @1efed26
... ... @@ -4,7 +4,7 @@ ENV = 'development'
4 4 # base api
5 5 VUE_APP_BASE_API = '/dev-api'
6 6  
7   -# VUE_APP_DOMAIN_PREFIX_1 = "http://zhld.028wlkj.com:49008/cdwlMall/admin-server"
  7 + VUE_APP_DOMAIN_PREFIX_1 = "https://zhld.028wlkj.com:49008/cdwlMall/admin-server"
8 8 # VUE_APP_DOMAIN_PREFIX_1='http://8.130.38.56:9003'
9   -VUE_APP_DOMAIN_PREFIX_1='http://172.16.61.124:9003'
10   -VUE_APP_DOMAIN_PREFIX_2='http://192.168.2.38:9003'
11 9 \ No newline at end of file
  10 +# VUE_APP_DOMAIN_PREFIX_1='http://172.16.61.124:9003'
  11 + VUE_APP_DOMAIN_PREFIX_2='http://192.168.2.38:9003'
... ...
admin-web-master/.env.production
  View file @1efed26
... ... @@ -3,8 +3,8 @@ ENV = 'production'
3 3  
4 4 # base api
5 5 VUE_APP_BASE_API = '/prod-api'
6   -# VUE_APP_DOMAIN_PREFIX_1 = "http://zhld.028wlkj.com:49008/cdwlMall/admin-server"
  6 + VUE_APP_DOMAIN_PREFIX_1 = "http://zhld.028wlkj.com:49008/cdwlMall/admin-server"
7 7 # VUE_APP_DOMAIN_PREFIX_1='http://8.130.38.56:9003'
8   -VUE_APP_DOMAIN_PREFIX_1='http://172.16.61.124:9003'
  8 +# VUE_APP_DOMAIN_PREFIX_1='http://172.16.61.124:9003'
9 9 VUE_APP_DOMAIN_PREFIX_2='http://192.168.2.38:9003'
10 10  
... ...
admin-web-master/src/views/scheme/sam.vue
  View file @1efed26
... ... @@ -24,24 +24,16 @@
24 24 type="datetimerange" range-separator="-" start-placeholder="" end-placeholder="" prefix-icon="none">
25 25 </el-date-picker> -->
26 26 <div style="width:68px;height:36px;line-height:32px;">经营类型</div>
27   - <el-select v-model="formSel.businessType" placeholder="请选择"
28   - style="width:168px;margin-right: 15px">
29   - <el-option label="商铺" value="商铺" />
30   - <el-option label="场地" value="场地" />
31   - <el-option label="广告位" value="广告位" />
32   - </el-select>
  27 + <el-input placeholder="请输入" v-model="formSel.businessType" style="width:168px;margin-right: 15px" />
  28 +
33 29 <div style="width:68px;height:36px;line-height:32px;">是否出租</div>
34 30 <el-select v-model="formSel.isRental" placeholder="请选择"
35 31 style="width:168px;margin-right: 15px">
36   - <el-option label="否" value="0" />
37   - <el-option label="是" value="1" />
38   - </el-select>
39   - <div style="width:68px;height:36px;line-height:32px;">是否自营</div>
40   - <el-select v-model="formSel.isSelfOperated" placeholder="请选择"
41   - style="width:168px;">
42   - <el-option label="否" value="0" />
  32 + <el-option label="自营" value="0" />
43 33 <el-option label="是" value="1" />
44 34 </el-select>
  35 +
  36 +
45 37 </div>
46 38 <div>
47 39 <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">检索
... ... @@ -78,15 +70,11 @@
78 70 </el-table-column>
79 71 <el-table-column label="是否出租" prop="isRental" min-width="100" >
80 72 <template slot-scope="scope">
81   - {{scope.row.isRental == '0'?'否':'是'}}
82   - </template>
83   - </el-table-column>
84   - <el-table-column label="是否自营" prop="planningObjectives" min-width="100" >
85   - <template slot-scope="scope">
86   - {{scope.row.isSelfOperated == '0'?'否':'是'}}
  73 + {{scope.row.isRental == '0'?'自营':'是'}}
87 74 </template>
88 75 </el-table-column>
89 76  
  77 +
90 78 <el-table-column label="操作" min-width="200" >
91 79 <template slot-scope="scope">
92 80 <div @click="handleEditForm(scope.row,1)" class="tableBtn greens">查看</div>
... ... @@ -132,24 +120,13 @@
132 120 </el-form-item>
133 121 </el-col>
134 122 <el-col :span="12">
135   - <el-form-item label="是否自营" prop="isSelfOperated">
136   - <el-select v-model="secondData.isSelfOperated" style="width: 72%;margin-right: 15px" :disabled="xiangqing==1?true:false">
137   - <el-option label="否" value="0" />
138   - <el-option label="是" value="1" />
139   - </el-select>
  123 + <el-form-item label="经营类型" prop="businessType" v-if="secondData.applicableResources == '商铺'">
  124 + <el-input v-model="secondData.businessType" placeholder="请输入" style="width: 72%;margin-right: 15px" maxlength="50" :disabled="xiangqing==1?true:false"></el-input>
140 125 </el-form-item>
141 126 </el-col>
142 127 </el-row>
143 128 <el-row>
144   - <el-col :span="12">
145   - <el-form-item label="经营类型" prop="businessType">
146   - <el-select v-model="secondData.businessType" style="width: 72%;margin-right: 15px" :disabled="xiangqing==1?true:false">
147   - <el-option label="商铺" value="商铺" />
148   - <el-option label="场地" value="场地" />
149   - <el-option label="广告位" value="广告位" />
150   - </el-select>
151   - </el-form-item>
152   - </el-col>
  129 +
153 130 <el-col :span="12">
154 131 <el-form-item label="租金价格" prop="rentalPrice">
155 132 <el-input v-model="secondData.rentalPrice" style="width: 72%;margin-right: 15px;" :disabled="xiangqing==1?true:false">
... ... @@ -160,13 +137,19 @@
160 137  
161 138 </el-form-item>
162 139 </el-col>
163   - </el-row>
164   - <el-row>
165 140 <el-col :span="12">
166   - <el-form-item label="商铺租期" prop="leaseTerm">
167   - <el-input v-model="secondData.leaseTerm" style="width: 72%;" :disabled="xiangqing==1?true:false"></el-input>
  141 + <el-form-item label="付款周期" prop="leaseTerm">
  142 + <el-select v-model="secondData.leaseTerm" placeholder="请选择" style="width: 72%;margin-right: 15px" :disabled="xiangqing==1?true:false">
  143 + <el-option label="日" value="日" />
  144 + <el-option label="月" value="月" />
  145 + <el-option label="季" value="季" />
  146 + <el-option label="年" value="年" />
  147 + </el-select>
168 148 </el-form-item>
169 149 </el-col>
  150 + </el-row>
  151 +
  152 + <el-row>
170 153 <el-col :span="12">
171 154 <el-form-item label="租赁时段" prop="leaseDate">
172 155 <el-date-picker v-model="leaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="至"
... ... @@ -174,36 +157,53 @@
174 157 </el-date-picker>
175 158 </el-form-item>
176 159 </el-col>
177   - </el-row>
178   - <el-row>
179 160 <el-col :span="12">
180 161 <el-form-item label="免租条件" prop="rentFreeCondition">
181 162 <el-input v-model="secondData.rentFreeCondition" style="width: 72%;" :disabled="xiangqing==1?true:false"></el-input>
182 163 </el-form-item>
183 164 </el-col>
  165 +
  166 + </el-row>
  167 + <el-row>
184 168 <el-col :span="12">
185 169 <el-form-item label="免租期" prop="rentFreePeriod">
186   - <el-input v-model="secondData.rentFreePeriod" placeholder="请输入/天" style="width: 72%;" :disabled="xiangqing==1?true:false"></el-input>
187 170  
  171 + <el-select v-model="secondData.rentFreePeriod" placeholder="请选择" style="width: 72%;margin-right: 15px" :disabled="xiangqing==1?true:false">
  172 + <el-option :label="item" :value="item" v-for="item in 31" />
  173 + </el-select>
188 174 </el-form-item>
189 175 </el-col>
190   - </el-row>
191   - <el-row>
192 176 <el-col :span="12">
193   - <el-form-item label="付款条件" prop="paymentTerms">
194   - <el-input v-model="secondData.paymentTerms" style="width: 72%;" :disabled="xiangqing==1?true:false"></el-input>
  177 + <el-form-item label="付款日" prop="payDay">
  178 +
  179 + <el-select v-model="secondData.payDay" placeholder="请选择" style="width: 72%;margin-right: 15px" :disabled="xiangqing==1?true:false">
  180 + <el-option :label="item" :value="item" v-for="item in 31" />
  181 + </el-select>
195 182 </el-form-item>
196 183 </el-col>
197   - <el-col :span="12">
198   - <el-form-item label="付款日期" prop="paymentDate">
199   - <el-date-picker v-model="paymentDate" value-format="yyyy-MM-dd" type="daterange" range-separator="至"
200   - start-placeholder="开始日期" end-placeholder="结束日期" style="width: 72%;" :disabled="xiangqing==1?true:false">
201   - </el-date-picker>
  184 + </el-row>
  185 + <el-row>
  186 + <el-col :span="24">
  187 + <el-form-item label="优惠政策" prop="preferentialPolicy">
  188 + <div style="border: 1px solid #dddfe5;padding:20px;" v-html="secondData.preferentialPolicy" v-if="xiangqing==1"></div>
  189 + <wangEditor v-model="secondData.preferentialPolicy" ref="editor" :height="100" v-else></wangEditor>
  190 +
202 191 </el-form-item>
203 192 </el-col>
  193 +
  194 + </el-row>
  195 + <el-row>
  196 +
  197 + <el-col :span="24">
  198 + <el-form-item label="其他说明" prop="otherDescription">
  199 + <div style="border: 1px solid #dddfe5;padding:20px;" v-html="secondData.otherDescription" v-if="xiangqing==1"></div>
  200 + <wangEditor v-model="secondData.otherDescription" ref="editor" :height="100" v-else></wangEditor>
  201 + </el-form-item>
  202 + </el-col>
  203 +
204 204 </el-row>
205 205 </el-form>
206   - <div style="display: flex;justify-content: flex-end;">
  206 + <div style="display: flex;justify-content: flex-end;margin-top:20px;">
207 207 <el-button @click="closexaing(1)" class="buttonHover"
208 208 style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消</el-button>
209 209 <el-button @click="addCheck()"
... ... @@ -269,7 +269,8 @@ import samXin from &quot;./samXin&quot;
269 269 },
270 270 fileList: [],
271 271 paymentDate:[],
272   - leaseDate:[]
  272 + leaseDate:[],
  273 + modelData:[]
273 274 }
274 275 },
275 276  
... ...
admin-web-master/src/views/scheme/samXin.vue
  View file @1efed26
... ... @@ -24,30 +24,19 @@
24 24 <el-col :span="12">
25 25 <el-form-item label="是否出租" prop="isRental">
26 26 <el-select v-model="form.isRental" placeholder="请选择" style="width: 72%;margin-right: 15px">
27   - <el-option label="否" value="0" />
  27 + <el-option label="自营" value="0" />
28 28 <el-option label="是" value="1" />
29 29 </el-select>
30 30 </el-form-item>
31 31 </el-col>
32 32 <el-col :span="12">
33   - <el-form-item label="是否自营" prop="isSelfOperated">
34   - <el-select v-model="form.isSelfOperated" placeholder="请选择" style="width: 72%;margin-right: 15px">
35   - <el-option label="否" value="0" />
36   - <el-option label="是" value="1" />
37   - </el-select>
  33 + <el-form-item label="经营类型" prop="businessType" v-if="form.applicableResources == '商铺'">
  34 + <el-input v-model="form.businessType" placeholder="请输入" style="width: 72%;margin-right: 15px" maxlength="50"></el-input>
38 35 </el-form-item>
39 36 </el-col>
40 37 </el-row>
41 38 <el-row>
42   - <el-col :span="12">
43   - <el-form-item label="经营类型" prop="businessType">
44   - <el-select v-model="form.businessType" placeholder="请选择" style="width: 72%;margin-right: 15px">
45   - <el-option label="商铺" value="商铺" />
46   - <el-option label="场地" value="场地" />
47   - <el-option label="广告位" value="广告位" />
48   - </el-select>
49   - </el-form-item>
50   - </el-col>
  39 +
51 40 <el-col :span="12">
52 41 <el-form-item label="租金价格" prop="rentalPrice">
53 42 <el-input v-model.number="form.rentalPrice" placeholder="请输入" style="width: 72%;margin-right: 15px;" maxlength="30">
... ... @@ -58,14 +47,24 @@
58 47  
59 48 </el-form-item>
60 49 </el-col>
  50 + <el-col :span="12">
  51 + <el-form-item label="付款周期" prop="leaseTerm">
  52 + <el-select v-model="form.leaseTerm" placeholder="请选择" style="width: 72%;margin-right: 15px">
  53 + <el-option label="日" value="日" />
  54 + <el-option label="月" value="月" />
  55 + <el-option label="季" value="季" />
  56 + <el-option label="年" value="年" />
  57 + </el-select>
  58 + </el-form-item>
  59 + </el-col>
61 60 </el-row>
62 61 <el-row>
63   - <el-col :span="12">
  62 + <!-- <el-col :span="12">
64 63 <el-form-item label="商铺租期" prop="leaseTerm">
65 64 <el-input v-model="form.leaseTerm" style="width: 72%;" placeholder="请输入/年或/月" maxlength="20"></el-input>
66 65  
67 66 </el-form-item>
68   - </el-col>
  67 + </el-col> -->
69 68 <el-col :span="12">
70 69 <el-form-item label="租赁时段" prop="leaseDate">
71 70 <el-date-picker v-model="leaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="至"
... ... @@ -73,34 +72,53 @@
73 72 </el-date-picker>
74 73 </el-form-item>
75 74 </el-col>
76   - </el-row>
77   - <el-row>
78 75 <el-col :span="12">
79 76 <el-form-item label="免租条件" prop="rentFreeCondition">
80 77 <el-input v-model="form.rentFreeCondition" placeholder="请输入" style="width: 72%;" maxlength="50"></el-input>
81 78 </el-form-item>
82 79 </el-col>
  80 + </el-row>
  81 + <el-row>
  82 +
83 83 <el-col :span="12">
84 84 <el-form-item label="免租期" prop="rentFreePeriod">
85   - <el-input v-model="form.rentFreePeriod" placeholder="请输入/天" style="width: 72%;" maxlength="20"></el-input>
86   -
  85 + <!-- <el-input v-model="form.rentFreePeriod" placeholder="请输入/天" style="width: 72%;" maxlength="20"></el-input> -->
  86 + <el-select v-model="form.rentFreePeriod" placeholder="请选择" style="width: 72%;margin-right: 15px">
  87 + <el-option :label="item" :value="item" v-for="item in 31" />
  88 + </el-select>
  89 + </el-form-item>
  90 + </el-col>
  91 + <el-col :span="12">
  92 + <el-form-item label="付款日" prop="payDay">
  93 + <!-- <el-input v-model="form.payDay" placeholder="请输入" style="width: 72%;" maxlength="50"></el-input> -->
  94 + <el-select v-model="form.payDay" placeholder="请选择" style="width: 72%;margin-right: 15px">
  95 + <el-option :label="item" :value="item" v-for="item in 31" />
  96 + </el-select>
87 97 </el-form-item>
88 98 </el-col>
89 99 </el-row>
90 100 <el-row>
91   - <el-col :span="12">
92   - <el-form-item label="付款条件" prop="paymentTerms">
93   - <el-input v-model="form.paymentTerms" placeholder="请输入" style="width: 72%;" maxlength="50"></el-input>
  101 +
  102 + <el-col :span="24">
  103 + <el-form-item label="优惠政策" prop="preferentialPolicy">
  104 +
  105 + <wangEditor v-model="form.preferentialPolicy" ref="editor" :height="100"></wangEditor>
  106 +
94 107 </el-form-item>
95 108 </el-col>
96   - <el-col :span="12">
97   - <el-form-item label="付款日期" prop="paymentDate">
98   - <el-date-picker v-model="paymentDate" value-format="yyyy-MM-dd" type="daterange" range-separator="至"
99   - start-placeholder="开始日期" end-placeholder="结束日期" style="width: 72%;">
100   - </el-date-picker>
  109 +
  110 + </el-row>
  111 + <el-row>
  112 +
  113 + <el-col :span="24">
  114 + <el-form-item label="其他说明" prop="otherDescription">
  115 +
  116 + <wangEditor v-model="form.otherDescription" ref="editor" :height="100"></wangEditor>
101 117 </el-form-item>
102 118 </el-col>
  119 +
103 120 </el-row>
  121 +
104 122 </el-form>
105 123 <div style="display: flex;justify-content: flex-end;margin-top:20px;">
106 124 <el-button @click="closeFn()" style="background-color: #fff;color: #000;border: 1px solid #B1B1B1;"
... ... @@ -134,14 +152,10 @@
134 152 </el-table-column>
135 153 <el-table-column label="是否出租" prop="isRental" width="120">
136 154 <template slot-scope="scope">
137   - {{scope.row.isrental == '0'?'否':'是'}}
138   - </template>
139   - </el-table-column>
140   - <el-table-column label="是否自营" prop="isSelfOperated" width="120">
141   - <template slot-scope="scope">
142   - {{scope.row.isSelfOperated == '0'?'否':'是'}}
  155 + {{scope.row.isrental == '0'?'自营':'是'}}
143 156 </template>
144 157 </el-table-column>
  158 +
145 159 <el-table-column label="经营类型" prop="businessType" width="150">
146 160 </el-table-column>
147 161 <el-table-column prop="rentalPrice" label="租金价格" width="150">
... ... @@ -181,98 +195,109 @@
181 195 width="65%" center :close-on-click-modal="false" :show-close="false" append-to-body>
182 196 <div style="padding:20px;">
183 197 <el-form :model="formInline" :rules="formInlineRules" ref="formInlineRules" label-width="80px">
184   - <el-form-item label="策略名称" prop="policyName">
185   - <el-input v-model="formInline.policyName" placeholder="请输入"
186   - style="width: 87%;margin-right: 15px" maxlength="50"></el-input>
187   - </el-form-item>
188   - <el-form-item label="适用资源" prop="applicableResources">
189   - <el-radio-group v-model="formInline.applicableResources">
190   - <el-radio label="商铺">商铺</el-radio>
191   - <el-radio label="场地">场地</el-radio>
192   - <el-radio label="广告位">广告位</el-radio>
193   - </el-radio-group>
194   - </el-form-item>
195   - <el-row>
196   - <el-col :span="12">
197   - <el-form-item label="是否出租" prop="isRental">
198   - <el-select v-model="formInline.isRental" placeholder="请选择" style="width: 72%;margin-right: 15px">
199   - <el-option label="否" value="0" />
200   - <el-option label="是" value="1" />
201   - </el-select>
202   - </el-form-item>
203   - </el-col>
204   - <el-col :span="12">
205   - <el-form-item label="是否自营" prop="isSelfOperated">
206   - <el-select v-model="formInline.isSelfOperated" placeholder="请选择"
207   - style="width: 72%;margin-right: 15px">
208   - <el-option label="否" value="0" />
209   - <el-option label="是" value="1" />
210   - </el-select>
211   - </el-form-item>
212   - </el-col>
213   - </el-row>
214   - <el-row>
215   - <el-col :span="12">
216   - <el-form-item label="经营类型" prop="businessType">
217   - <el-select v-model="formInline.businessType" placeholder="请选择" style="width: 72%;margin-right: 15px">
218   - <el-option label="商铺" value="商铺" />
219   - <el-option label="场地" value="场地" />
220   - <el-option label="广告位" value="广告位" />
221   - </el-select>
222   - </el-form-item>
223   - </el-col>
224   - <el-col :span="12">
225   - <el-form-item label="租金价格" prop="rentalPrice">
226   - <el-input v-model.number="formInline.rentalPrice" placeholder="请输入" style="width: 72%;margin-right: 15px" maxlength="30">
227   - <template slot="suffix"><span
228   - style="position: absolute;top: 19px;right: 1px;width: 50px;">元/m<sup>2</sup></span></template>
229   - </el-input>
230   -
  198 + <el-form-item label="策略名称" prop="policyName">
  199 + <el-input v-model="formInline.policyName" placeholder="请输入" style="width: 87%;margin-right: 15px" maxlength="50"></el-input>
  200 + </el-form-item>
  201 + <el-form-item label="适用资源" prop="applicableResources">
  202 + <el-radio-group v-model="formInline.applicableResources">
  203 + <el-radio label="商铺" value="商铺">商铺</el-radio>
  204 + <el-radio label="场地" value="场地">场地</el-radio>
  205 + <el-radio label="广告位" value="广告位">广告位</el-radio>
  206 + </el-radio-group>
  207 + </el-form-item>
  208 +
  209 + <el-row>
  210 + <el-col :span="12">
  211 + <el-form-item label="是否出租" prop="isRental">
  212 + <el-select v-model="formInline.isRental" placeholder="请选择" style="width: 72%;margin-right: 15px">
  213 + <el-option label="自营" value="0" />
  214 + <el-option label="是" value="1" />
  215 + </el-select>
  216 + </el-form-item>
  217 + </el-col>
  218 + <el-col :span="12">
  219 + <el-form-item label="经营类型" prop="businessType" v-if="formInline.applicableResources == '商铺'">
  220 + <el-input v-model="formInline.businessType" placeholder="请输入" style="width: 72%;margin-right: 15px" maxlength="50"></el-input>
  221 + </el-form-item>
  222 + </el-col>
  223 + </el-row>
  224 + <el-row>
  225 +
  226 + <el-col :span="12">
  227 + <el-form-item label="租金价格" prop="rentalPrice">
  228 + <el-input v-model.number="formInline.rentalPrice" placeholder="请输入" style="width: 72%;margin-right: 15px;" maxlength="30">
  229 + <template slot="suffix"><span
  230 + style="position: absolute;top: 19px;right: 1px;width: 50px;">元/m<sup>2</sup></span></template>
  231 +
  232 + </el-input>
  233 +
  234 + </el-form-item>
  235 + </el-col>
  236 + <el-col :span="12">
  237 + <el-form-item label="付款周期" prop="leaseTerm">
  238 + <el-select v-model="formInline.leaseTerm" placeholder="请选择" style="width: 72%;margin-right: 15px">
  239 + <el-option label="日" value="日" />
  240 + <el-option label="月" value="月" />
  241 + <el-option label="季" value="季" />
  242 + <el-option label="年" value="年" />
  243 + </el-select>
  244 + </el-form-item>
  245 + </el-col>
  246 + </el-row>
  247 + <el-row>
  248 +
  249 + <el-col :span="12">
  250 + <el-form-item label="租赁时段" prop="leaseDate">
  251 + <el-date-picker v-model="leaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="至"
  252 + start-placeholder="开始日期" end-placeholder="结束日期" style="width: 72%;">
  253 + </el-date-picker>
  254 + </el-form-item>
  255 + </el-col>
  256 + <el-col :span="12">
  257 + <el-form-item label="免租条件" prop="rentFreeCondition">
  258 + <el-input v-model="formInline.rentFreeCondition" placeholder="请输入" style="width: 72%;" maxlength="50"></el-input>
  259 + </el-form-item>
  260 + </el-col>
  261 + </el-row>
  262 + <el-row>
  263 +
  264 + <el-col :span="12">
  265 + <el-form-item label="免租期" prop="rentFreePeriod">
  266 +
  267 + <el-select v-model="formInline.rentFreePeriod" placeholder="请选择" style="width: 72%;margin-right: 15px">
  268 + <el-option :label="item" :value="item" v-for="item in 31" />
  269 + </el-select>
  270 + </el-form-item>
  271 + </el-col>
  272 + <el-col :span="12">
  273 + <el-form-item label="付款日" prop="payDay">
  274 +
  275 + <el-select v-model="formInline.payDay" placeholder="请选择" style="width: 72%;margin-right: 15px">
  276 + <el-option :label="item" :value="item" v-for="item in 31" />
  277 + </el-select>
  278 + </el-form-item>
  279 + </el-col>
  280 + </el-row>
  281 + <el-row>
  282 +
  283 + <el-col :span="24">
  284 + <el-form-item label="优惠政策" prop="preferentialPolicy">
  285 +
  286 + <wangEditor v-model="formInline.preferentialPolicy" ref="editor" :height="100"></wangEditor>
231 287  
232 288 </el-form-item>
233 289 </el-col>
234   - </el-row>
235   - <el-row>
236   - <el-col :span="12">
237   - <el-form-item label="商铺租期" prop="leaseTerm">
238   - <el-input v-model="formInline.leaseTerm" style="width: 72%;;margin-right: 15px" placeholder="请输入/年或/月" maxlength="20"></el-input>
239 290  
240   - </el-form-item>
241   - </el-col>
242   - <el-col :span="12">
243   - <el-form-item label="租赁时段" prop="leaseDate">
244   - <el-date-picker v-model="leaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="至"
245   - start-placeholder="开始日期" end-placeholder="结束日期" style="width: 72%;">
246   - </el-date-picker>
247   - </el-form-item>
248   - </el-col>
249 291 </el-row>
250 292 <el-row>
251   - <el-col :span="12">
252   - <el-form-item label="免租条件" prop="rentFreeCondition">
253   - <el-input v-model="formInline.rentFreeCondition" placeholder="请输入" style="width: 72%;" maxlength="50"></el-input>
254   - </el-form-item>
255   - </el-col>
256   - <el-col :span="12">
257   - <el-form-item label="免租期" prop="rentFreePeriod">
258   - <el-input v-model="formInline.rentFreePeriod" placeholder="请输入/天" style="width: 72%;" maxlength="20"></el-input>
259 293  
  294 + <el-col :span="24">
  295 + <el-form-item label="其他说明" prop="otherDescription">
  296 +
  297 + <wangEditor v-model="formInline.otherDescription" ref="editor" :height="100"></wangEditor>
260 298 </el-form-item>
261 299 </el-col>
262   - </el-row>
263   - <el-row>
264   - <el-col :span="12">
265   - <el-form-item label="付款条件" prop="paymentTerms">
266   - <el-input v-model="formInline.paymentTerms" placeholder="请输入" style="width: 72%;" maxlength="50"></el-input>
267   - </el-form-item>
268   - </el-col>
269   - <el-col :span="12">
270   - <el-form-item label="付款日期" prop="paymentDate">
271   - <el-date-picker v-model="paymentDate" value-format="yyyy-MM-dd" type="daterange" range-separator="至"
272   - start-placeholder="开始日期" end-placeholder="结束日期" style="width: 72%;">
273   - </el-date-picker>
274   - </el-form-item>
275   - </el-col>
  300 +
276 301 </el-row>
277 302 </el-form>
278 303 <div style="display: flex;justify-content: flex-end;margin-top:20px;">
... ... @@ -316,41 +341,40 @@
316 341 policyName: '', //策略名称
317 342 applicableResources: '商铺', //适用资源
318 343 policyTemplate: null, //策略模板
319   - isRental: '', //是否出租 (0:否,1:是)
320   - isSelfOperated: '', //是否白营 (0: 否, 1: 是)
  344 + isRental: '', //是否出租 (0:白营,1:是)
321 345 businessType: '', //经营类型
322   - rentalPrice: '', //租金价格
  346 + rentalPrice: null, //租金价格
323 347 leaseTerm: '', //商铺租期
324 348 leaseStartDate: '', //租赁开始日期
325 349 leaseEndDate: '', //租赁结束日期
326 350 rentFreeCondition: '', //免租条件
327 351 rentFreePeriod: '', //免租期(单位:天)
328   - paymentTerms: '', //付款条件
329   - paymentStartDate: '', //付款开始日期
330   - paymentEndDate: '', //付款结束日期
  352 + payDay: '', //付款日
331 353 createDate: '', //创建时间
332 354 isTemplate: '1', //是否为模板(0.是 1.否)
  355 + preferentialPolicy:'',
  356 + otherDescription:''
333 357 },
334 358 modeCode: false, //模板管理框
335 359 tableData: [],
336 360 addMing: false, //新增模板框
337 361 modeAdd: true, //新增编辑模板 状态切换
338 362 formInline: {
339   - policyName: '', //策略名称
340   - applicableResources: '商铺', //适用资源
341   - isRental: '', //是否出租 (0:否,1:是)
342   - isSelfOperated: '', //是否出租 (0: 否, 1: 是)
343   - businessType: '', //经营类型
344   - rentalPrice: '', //租金价格
345   - leaseTerm: '', //商铺租期
346   - leaseStartDate: '', //租赁开始日期
347   - leaseEndDate: '', //租赁结束日期
348   - rentFreeCondition: '', //免租条件
349   - rentFreePeriod: '', //免租期(单位:天)
350   - paymentTerms: '', //付款条件
351   - paymentStartDate: '', //付款开始日期
352   - paymentEndDate: '', //付款结束日期
353   - createDate: '', //创建时间
  363 + policyName: '', //策略名称
  364 + applicableResources: '商铺', //适用资源
  365 + policyTemplate: null, //策略模板
  366 + isRental: '', //是否出租 (0:白营,1:是)
  367 + businessType: '', //经营类型
  368 + rentalPrice: null, //租金价格
  369 + leaseTerm: '', //商铺租期
  370 + leaseStartDate: '', //租赁开始日期
  371 + leaseEndDate: '', //租赁结束日期
  372 + rentFreeCondition: '', //免租条件
  373 + rentFreePeriod: '', //免租期(单位:天)
  374 + payDay: '', //付款日
  375 + createDate: '', //创建时间
  376 + preferentialPolicy:'',
  377 + otherDescription:'',
354 378 isTemplate: '0', //是否为模板(0.是 1.否)
355 379 },
356 380 leaseDate: [], //租赁时段
... ... @@ -420,11 +444,6 @@
420 444 message: '请选择是否出租',
421 445 trigger: 'change'
422 446 }],
423   - isSelfOperated: [{
424   - required: true,
425   - message: '请选择是否出租',
426   - trigger: 'change'
427   - }],
428 447 businessType: [{
429 448 required: true,
430 449 message: '请选择经营类型',
... ... @@ -480,23 +499,23 @@ this.getAll()
480 499 this.paymentDate = []
481 500 if (val == 1) {
482 501 this.formInline = {
483   - policyName: '', //策略名称
484   - applicableResources: '商铺', //适用资源
485   - isRental: '', //是否出租 (0:否,1:是)
486   - isSelfOperated: '', //是否白营 (0: 否, 1: 是)
487   - businessType: '', //经营类型
488   - rentalPrice: '', //租金价格
489   - leaseTerm: '', //商铺租期
490   - leaseStartDate: '', //租赁开始日期
491   - leaseEndDate: '', //租赁结束日期
492   - rentFreeCondition: '', //免租条件
493   - rentFreePeriod: '', //免租期(单位:天)
494   - paymentTerms: '', //付款条件
495   - paymentStartDate: '', //付款开始日期
496   - paymentEndDate: '', //付款结束日期
497   - createDate: '', //创建时间
498   - isTemplate: '0', //是否为模板(0.是 1.否)
499   - }
  502 + policyName: '', //策略名称
  503 + applicableResources: '商铺', //适用资源
  504 + policyTemplate: null, //策略模板
  505 + isRental: '', //是否出租 (0:白营,1:是)
  506 + businessType: '', //经营类型
  507 + rentalPrice: null, //租金价格
  508 + leaseTerm: '', //商铺租期
  509 + leaseStartDate: '', //租赁开始日期
  510 + leaseEndDate: '', //租赁结束日期
  511 + rentFreeCondition: '', //免租条件
  512 + rentFreePeriod: '', //免租期(单位:天)
  513 + payDay: '', //付款日
  514 + createDate: '', //创建时间
  515 + preferentialPolicy:'',
  516 + otherDescription:'',
  517 + isTemplate: '0', //是否为模板(0.是 1.否)
  518 + }
500 519 } else {
501 520 this.leaseDate[0] = item.leaseStartDate
502 521 this.leaseDate[1] = item.leaseEndDate
... ... @@ -509,24 +528,23 @@ this.getAll()
509 528 },
510 529 closeFn() {
511 530 this.form = {
512   - policyName: '', //策略名称
513   - applicableResources: '商铺', //适用资源
514   - policyTemplate: null, //策略模板
515   - isRental: '', //是否出租 (0:否,1:是)
516   - isSelfOperated: '', //是否白营 (0: 否, 1: 是)
517   - businessType: '', //经营类型
518   - rentalPrice: '', //租金价格
519   - leaseTerm: '', //商铺租期
520   - leaseStartDate: '', //租赁开始日期
521   - leaseEndDate: '', //租赁结束日期
522   - rentFreeCondition: '', //免租条件
523   - rentFreePeriod: '', //免租期(单位:天)
524   - paymentTerms: '', //付款条件
525   - paymentStartDate: '', //付款开始日期
526   - paymentEndDate: '', //付款结束日期
527   - createDate: '', //创建时间
528   - isTemplate: '1', //是否为模板(0.是 1.否)
529   - }
  531 + policyName: '', //策略名称
  532 + applicableResources: '商铺', //适用资源
  533 + policyTemplate: null, //策略模板
  534 + isRental: '', //是否出租 (0:白营,1:是)
  535 + businessType: '', //经营类型
  536 + rentalPrice: null, //租金价格
  537 + leaseTerm: '', //商铺租期
  538 + leaseStartDate: '', //租赁开始日期
  539 + leaseEndDate: '', //租赁结束日期
  540 + rentFreeCondition: '', //免租条件
  541 + rentFreePeriod: '', //免租期(单位:天)
  542 + payDay: '', //付款日
  543 + createDate: '', //创建时间
  544 + isTemplate: '1', //是否为模板(0.是 1.否)
  545 + preferentialPolicy:'',
  546 + otherDescription:''
  547 + }
530 548 this.paymentDate=[]
531 549 this.leaseDate = []
532 550 this.$emit('childClose', false);
... ... @@ -535,24 +553,23 @@ this.getAll()
535 553 close(){
536 554  
537 555 this.form = {
538   - policyName: '', //策略名称
539   - applicableResources: '商铺', //适用资源
540   - policyTemplate: null, //策略模板
541   - isRental: '', //是否出租 (0:否,1:是)
542   - isSelfOperated: '', //是否白营 (0: 否, 1: 是)
543   - businessType: '', //经营类型
544   - rentalPrice: '', //租金价格
545   - leaseTerm: '', //商铺租期
546   - leaseStartDate: '', //租赁开始日期
547   - leaseEndDate: '', //租赁结束日期
548   - rentFreeCondition: '', //免租条件
549   - rentFreePeriod: '', //免租期(单位:天)
550   - paymentTerms: '', //付款条件
551   - paymentStartDate: '', //付款开始日期
552   - paymentEndDate: '', //付款结束日期
553   - createDate: '', //创建时间
554   - isTemplate: '1', //是否为模板(0.是 1.否)
555   - }
  556 + policyName: '', //策略名称
  557 + applicableResources: '商铺', //适用资源
  558 + policyTemplate: null, //策略模板
  559 + isRental: '', //是否出租 (0:白营,1:是)
  560 + businessType: '', //经营类型
  561 + rentalPrice: null, //租金价格
  562 + leaseTerm: '', //商铺租期
  563 + leaseStartDate: '', //租赁开始日期
  564 + leaseEndDate: '', //租赁结束日期
  565 + rentFreeCondition: '', //免租条件
  566 + rentFreePeriod: '', //免租期(单位:天)
  567 + payDay: '', //付款日
  568 + createDate: '', //创建时间
  569 + isTemplate: '1', //是否为模板(0.是 1.否)
  570 + preferentialPolicy:'',
  571 + otherDescription:''
  572 + }
556 573 this.paymentDate=[]
557 574 this.leaseDate = []
558 575 this.$emit('childClose', false);
... ...
yanshouban/src/views/ads/fangli/addform.vue
  View file @1efed26
... ... @@ -235,14 +235,10 @@
235 235 </el-table-column>
236 236 <el-table-column label="是否出租" prop="planningObjectives" min-width="100" >
237 237 <template slot-scope="scope">
238   - {{scope.row.isrental == '0'?'否':'是'}}
239   - </template>
240   - </el-table-column>
241   - <el-table-column label="是否自营" prop="planningObjectives" min-width="100" >
242   - <template slot-scope="scope">
243   - {{scope.row.isSelfOperated == '0'?'否':'是'}}
  238 + {{scope.row.isrental == '0'?'自营':'是'}}
244 239 </template>
245 240 </el-table-column>
  241 +
246 242 </el-table>
247 243 </div>
248 244 </div>
... ...
yanshouban/src/views/scheme/planningBz.vue
  View file @1efed26
... ... @@ -283,7 +283,8 @@
283 283 <el-row :gutter="20">
284 284 <el-col :span="24">
285 285 <el-form-item label="附件信息">
286   - <div style="padding:10px 0;line-height:20px;color:#3F9B6A" v-if="xiangqing==1" @click="yulanFu(secondData.annex)">{{secondData.annex.name}}</div>
  286 + <!-- <div style="padding:10px 0;line-height:20px;color:#3F9B6A" v-if="xiangqing==1" @click="yulanFu(secondData.annex)">{{secondData.annex.name}}</div> -->
  287 + <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>
287 288 <el-upload class="upload-demo" ref="upload" :action="upload" :on-preview="handlePreview" v-else
288 289 :on-success="handleSuccess"
289 290 :on-remove="handleRemove" :file-list="fileList" :auto-upload="true" :on-change="handleChange">
... ...