Commit bdbe36601fb8a4e5becd3e34b27db225696c681b
1 parent
90d96766
1
Showing
9 changed files
with
174 additions
and
314 deletions
admin-web-master/dist.zip
0 → 100644
No preview for this file type
admin-web-master/src/components/add/addsam.vue
| @@ -12,13 +12,14 @@ | @@ -12,13 +12,14 @@ | ||
| 12 | </el-radio-group> | 12 | </el-radio-group> |
| 13 | </el-form-item> | 13 | </el-form-item> |
| 14 | <el-form-item label="策略模板" prop="policyTemplate"> | 14 | <el-form-item label="策略模板" prop="policyTemplate"> |
| 15 | - <el-select v-model="ruleForm.policyTemplate" placeholder="请选择" style="width:calc(100% - 100px);" @change="changeMode"> | 15 | + <el-select v-model="ruleForm.policyTemplate" placeholder="请选择" style="width:calc(100% - 100px);" |
| 16 | + @change="changeMode"> | ||
| 16 | <el-option :label="item.policyName" :value="item.id" v-for="(item,index) in tableData" /> | 17 | <el-option :label="item.policyName" :value="item.id" v-for="(item,index) in tableData" /> |
| 17 | </el-select> | 18 | </el-select> |
| 18 | <el-button style="background-color: #3F9B6A;color: #fff;float: right;" @click="modeCode = true">管理模板 | 19 | <el-button style="background-color: #3F9B6A;color: #fff;float: right;" @click="modeCode = true">管理模板 |
| 19 | </el-button> | 20 | </el-button> |
| 20 | </el-form-item> | 21 | </el-form-item> |
| 21 | - <el-row v-if="ruleForm.applicableResources == '商铺'"> | 22 | + <el-row> |
| 22 | <el-col :span="12"> | 23 | <el-col :span="12"> |
| 23 | <el-form-item label="是否出租" prop="isRental"> | 24 | <el-form-item label="是否出租" prop="isRental"> |
| 24 | <el-select v-model="ruleForm.isRental" placeholder="请选择" style="width: 100%;"> | 25 | <el-select v-model="ruleForm.isRental" placeholder="请选择" style="width: 100%;"> |
| @@ -27,78 +28,16 @@ | @@ -27,78 +28,16 @@ | ||
| 27 | </el-select> | 28 | </el-select> |
| 28 | </el-form-item> | 29 | </el-form-item> |
| 29 | </el-col> | 30 | </el-col> |
| 30 | - <el-col :span="12"> | 31 | + <el-col :span="12" v-if="ruleForm.applicableResources == '商铺'"> |
| 31 | <el-form-item label="经营类型" prop="businessType"> | 32 | <el-form-item label="经营类型" prop="businessType"> |
| 32 | <el-select v-model="ruleForm.businessType" placeholder="请选择" style="width: 100%;"> | 33 | <el-select v-model="ruleForm.businessType" placeholder="请选择" style="width: 100%;"> |
| 33 | <el-option label="超市" value="超市" /> | 34 | <el-option label="超市" value="超市" /> |
| 34 | <el-option label="鞋店" value="鞋店" /> | 35 | <el-option label="鞋店" value="鞋店" /> |
| 35 | <el-option label="家居饰品店" value="家居饰品店" /> | 36 | <el-option label="家居饰品店" value="家居饰品店" /> |
| 36 | </el-select> | 37 | </el-select> |
| 37 | - <!-- <el-input v-model="ruleForm.businessType" placeholder="请输入" maxlength="50"></el-input> --> | ||
| 38 | - </el-form-item> | ||
| 39 | - </el-col> | ||
| 40 | - </el-row> | ||
| 41 | - <el-row v-if="ruleForm.applicableResources == '商铺'"> | ||
| 42 | - <el-col :span="12"> | ||
| 43 | - <el-form-item label="租金" prop="rentalPrice"> | ||
| 44 | - <el-input v-model.number="ruleForm.rentalPrice" placeholder="请输入" maxlength="30"> | ||
| 45 | - <template slot="suffix"><span | ||
| 46 | - style="position: absolute;top: 0px;right: 1px;width: 50px;">元/m<sup>2</sup></span></template> | ||
| 47 | - </el-input> | ||
| 48 | - </el-form-item> | ||
| 49 | - </el-col> | ||
| 50 | - <el-col :span="12"> | ||
| 51 | - <el-form-item label="付款周期" prop="leaseTerm"> | ||
| 52 | - <el-select v-model="ruleForm.leaseTerm" placeholder="请选择" style="width: 100%;"> | ||
| 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> | ||
| 60 | - </el-row> | ||
| 61 | - <el-row v-if="ruleForm.applicableResources == '商铺'"> | ||
| 62 | - <el-col :span="12"> | ||
| 63 | - <el-form-item label="租赁时段" prop="leaseDate"> | ||
| 64 | - <el-date-picker v-model="leaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="至" | ||
| 65 | - style="width: 100%;" start-placeholder="开始日期" end-placeholder="结束日期"> | ||
| 66 | - </el-date-picker> | ||
| 67 | - </el-form-item> | ||
| 68 | - </el-col> | ||
| 69 | - <el-col :span="12"> | ||
| 70 | - <el-form-item label="免租条件" prop="rentFreeCondition"> | ||
| 71 | - <el-input v-model="ruleForm.rentFreeCondition" placeholder="请输入" maxlength="50"></el-input> | ||
| 72 | - </el-form-item> | ||
| 73 | - </el-col> | ||
| 74 | - </el-row> | ||
| 75 | - <el-row v-if="ruleForm.applicableResources == '商铺'"> | ||
| 76 | - <el-col :span="12"> | ||
| 77 | - <el-form-item label="免租期" prop="rentFreePeriod"> | ||
| 78 | - <el-select v-model="ruleForm.rentFreePeriod" placeholder="请选择" style="width: 100%;"> | ||
| 79 | - <el-option :label="item" :value="item" v-for="item in 31" /> | ||
| 80 | - </el-select> | ||
| 81 | - </el-form-item> | ||
| 82 | - </el-col> | ||
| 83 | - <el-col :span="12"> | ||
| 84 | - <el-form-item label="付款日" prop="payDay"> | ||
| 85 | - <el-select v-model="ruleForm.payDay" placeholder="请选择" style="width: 100%;"> | ||
| 86 | - <el-option :label="item" :value="item" v-for="item in 31" /> | ||
| 87 | - </el-select> | ||
| 88 | - </el-form-item> | ||
| 89 | - </el-col> | ||
| 90 | - </el-row> | ||
| 91 | - | ||
| 92 | - <el-row v-if="ruleForm.applicableResources == '场地' || ruleForm.applicableResources == '广告位'"> | ||
| 93 | - <el-col :span="12"> | ||
| 94 | - <el-form-item label="是否出租" prop="isRental"> | ||
| 95 | - <el-select v-model="ruleForm.isRental" placeholder="请选择" style="width: 100%;"> | ||
| 96 | - <el-option label="自营" value="0" /> | ||
| 97 | - <el-option label="是" value="1" /> | ||
| 98 | - </el-select> | ||
| 99 | </el-form-item> | 38 | </el-form-item> |
| 100 | </el-col> | 39 | </el-col> |
| 101 | - <el-col :span="12"> | 40 | + <el-col :span="12" v-if="ruleForm.isRental !== '0'"> |
| 102 | <el-form-item label="租金价格" prop="rentalPrice"> | 41 | <el-form-item label="租金价格" prop="rentalPrice"> |
| 103 | <el-input v-model.number="ruleForm.rentalPrice" placeholder="请输入" maxlength="30"> | 42 | <el-input v-model.number="ruleForm.rentalPrice" placeholder="请输入" maxlength="30"> |
| 104 | <template slot="suffix"><span | 43 | <template slot="suffix"><span |
| @@ -106,10 +45,7 @@ | @@ -106,10 +45,7 @@ | ||
| 106 | </el-input> | 45 | </el-input> |
| 107 | </el-form-item> | 46 | </el-form-item> |
| 108 | </el-col> | 47 | </el-col> |
| 109 | - </el-row> | ||
| 110 | - <el-row v-if="ruleForm.applicableResources == '场地' || ruleForm.applicableResources == '广告位'"> | ||
| 111 | - | ||
| 112 | - <el-col :span="12"> | 48 | + <el-col :span="12" v-if="ruleForm.isRental !== '0'"> |
| 113 | <el-form-item label="付款周期" prop="leaseTerm"> | 49 | <el-form-item label="付款周期" prop="leaseTerm"> |
| 114 | <el-select v-model="ruleForm.leaseTerm" placeholder="请选择" style="width: 100%;"> | 50 | <el-select v-model="ruleForm.leaseTerm" placeholder="请选择" style="width: 100%;"> |
| 115 | <el-option label="日" value="日" /> | 51 | <el-option label="日" value="日" /> |
| @@ -120,29 +56,25 @@ | @@ -120,29 +56,25 @@ | ||
| 120 | </el-form-item> | 56 | </el-form-item> |
| 121 | </el-col> | 57 | </el-col> |
| 122 | <el-col :span="12"> | 58 | <el-col :span="12"> |
| 123 | - <el-form-item label="租赁时段" prop="leaseDate"> | 59 | + <el-form-item :label="ruleForm.isRental !== '0'?'租赁时段':'使用周期'" prop="leaseDate"> |
| 124 | <el-date-picker v-model="leaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="至" | 60 | <el-date-picker v-model="leaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="至" |
| 125 | style="width: 100%;" start-placeholder="开始日期" end-placeholder="结束日期"> | 61 | style="width: 100%;" start-placeholder="开始日期" end-placeholder="结束日期"> |
| 126 | </el-date-picker> | 62 | </el-date-picker> |
| 127 | </el-form-item> | 63 | </el-form-item> |
| 128 | </el-col> | 64 | </el-col> |
| 129 | - </el-row> | ||
| 130 | - <el-row v-if="ruleForm.applicableResources == '场地' || ruleForm.applicableResources == '广告位'"> | ||
| 131 | - <el-col :span="12"> | 65 | + <el-col :span="12" v-if="ruleForm.isRental !== '0'"> |
| 132 | <el-form-item label="免租条件" prop="rentFreeCondition"> | 66 | <el-form-item label="免租条件" prop="rentFreeCondition"> |
| 133 | <el-input v-model="ruleForm.rentFreeCondition" placeholder="请输入" maxlength="50"></el-input> | 67 | <el-input v-model="ruleForm.rentFreeCondition" placeholder="请输入" maxlength="50"></el-input> |
| 134 | </el-form-item> | 68 | </el-form-item> |
| 135 | </el-col> | 69 | </el-col> |
| 136 | - <el-col :span="12"> | 70 | + <el-col :span="12" v-if="ruleForm.isRental !== '0'"> |
| 137 | <el-form-item label="免租期" prop="rentFreePeriod"> | 71 | <el-form-item label="免租期" prop="rentFreePeriod"> |
| 138 | <el-select v-model="ruleForm.rentFreePeriod" placeholder="请选择" style="width: 100%;"> | 72 | <el-select v-model="ruleForm.rentFreePeriod" placeholder="请选择" style="width: 100%;"> |
| 139 | <el-option :label="item" :value="item" v-for="item in 31" /> | 73 | <el-option :label="item" :value="item" v-for="item in 31" /> |
| 140 | </el-select> | 74 | </el-select> |
| 141 | </el-form-item> | 75 | </el-form-item> |
| 142 | </el-col> | 76 | </el-col> |
| 143 | - </el-row> | ||
| 144 | - <el-row v-if="ruleForm.applicableResources == '场地' || ruleForm.applicableResources == '广告位'"> | ||
| 145 | - <el-col :span="12"> | 77 | + <el-col :span="12" v-if="ruleForm.isRental !== '0'"> |
| 146 | <el-form-item label="付款日" prop="payDay"> | 78 | <el-form-item label="付款日" prop="payDay"> |
| 147 | <el-select v-model="ruleForm.payDay" placeholder="请选择" style="width: 100%;"> | 79 | <el-select v-model="ruleForm.payDay" placeholder="请选择" style="width: 100%;"> |
| 148 | <el-option :label="item" :value="item" v-for="item in 31" /> | 80 | <el-option :label="item" :value="item" v-for="item in 31" /> |
| @@ -150,20 +82,12 @@ | @@ -150,20 +82,12 @@ | ||
| 150 | </el-form-item> | 82 | </el-form-item> |
| 151 | </el-col> | 83 | </el-col> |
| 152 | </el-row> | 84 | </el-row> |
| 153 | - <el-row> | ||
| 154 | - <el-col :span="24"> | ||
| 155 | - <el-form-item label="优惠政策" prop="preferentialPolicy"> | ||
| 156 | - <wangEditor v-model="ruleForm.preferentialPolicy" ref="editor" :height="100"></wangEditor> | ||
| 157 | - </el-form-item> | ||
| 158 | - </el-col> | ||
| 159 | - </el-row> | ||
| 160 | - <el-row> | ||
| 161 | - <el-col :span="24"> | ||
| 162 | - <el-form-item label="其他说明" prop="otherDescription"> | ||
| 163 | - <wangEditor v-model="ruleForm.otherDescription" ref="editor" :height="100"></wangEditor> | ||
| 164 | - </el-form-item> | ||
| 165 | - </el-col> | ||
| 166 | - </el-row> | 85 | + <el-form-item v-if="ruleForm.isRental !== '0'" label="优惠政策" prop="preferentialPolicy"> |
| 86 | + <wangEditor v-model="ruleForm.preferentialPolicy" ref="editor" :height="100"></wangEditor> | ||
| 87 | + </el-form-item> | ||
| 88 | + <el-form-item label="其他说明" prop="otherDescription"> | ||
| 89 | + <wangEditor v-model="ruleForm.otherDescription" ref="editor" :height="100"></wangEditor> | ||
| 90 | + </el-form-item> | ||
| 167 | <el-row :gutter="20"> | 91 | <el-row :gutter="20"> |
| 168 | <el-col :span="12"> | 92 | <el-col :span="12"> |
| 169 | <el-form-item> | 93 | <el-form-item> |
| @@ -214,32 +138,32 @@ | @@ -214,32 +138,32 @@ | ||
| 214 | <el-table :data="tableData" | 138 | <el-table :data="tableData" |
| 215 | :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> | 139 | :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> |
| 216 | <el-table-column label="序号" width="50"> | 140 | <el-table-column label="序号" width="50"> |
| 217 | - <template slot-scope="scope"> | ||
| 218 | - {{scope.$index +1}} | ||
| 219 | - </template> | ||
| 220 | - </el-table-column> | 141 | + <template slot-scope="scope"> |
| 142 | + {{scope.$index +1}} | ||
| 143 | + </template> | ||
| 144 | + </el-table-column> | ||
| 221 | <el-table-column label="策略名称" prop="policyName"> | 145 | <el-table-column label="策略名称" prop="policyName"> |
| 222 | </el-table-column> | 146 | </el-table-column> |
| 223 | <el-table-column label="适用资源" prop="applicableResources"> | 147 | <el-table-column label="适用资源" prop="applicableResources"> |
| 224 | </el-table-column> | 148 | </el-table-column> |
| 225 | - <el-table-column label="经营类型" prop="businessType" > | 149 | + <el-table-column label="经营类型" prop="businessType"> |
| 226 | </el-table-column> | 150 | </el-table-column> |
| 227 | - <el-table-column prop="rentalPrice" label="租金/周期" > | 151 | + <el-table-column prop="rentalPrice" label="租金/周期"> |
| 228 | <template slot-scope="scope"> | 152 | <template slot-scope="scope"> |
| 229 | {{scope.row.rentalPrice}}/{{scope.row.leaseTerm}} | 153 | {{scope.row.rentalPrice}}/{{scope.row.leaseTerm}} |
| 230 | </template> | 154 | </template> |
| 231 | </el-table-column> | 155 | </el-table-column> |
| 232 | - <el-table-column label="付款日" > | 156 | + <el-table-column label="付款日"> |
| 233 | <template slot-scope="scope"> | 157 | <template slot-scope="scope"> |
| 234 | {{scope.row.payDay}} | 158 | {{scope.row.payDay}} |
| 235 | </template> | 159 | </template> |
| 236 | </el-table-column> | 160 | </el-table-column> |
| 237 | - <el-table-column label="是否出租" prop="isRental" > | 161 | + <el-table-column label="是否出租" prop="isRental"> |
| 238 | <template slot-scope="scope"> | 162 | <template slot-scope="scope"> |
| 239 | {{scope.row.isrental == '0'?'自营':'是'}} | 163 | {{scope.row.isrental == '0'?'自营':'是'}} |
| 240 | </template> | 164 | </template> |
| 241 | </el-table-column> | 165 | </el-table-column> |
| 242 | - <el-table-column label="操作" > | 166 | + <el-table-column label="操作"> |
| 243 | <template slot-scope="scope"> | 167 | <template slot-scope="scope"> |
| 244 | <div @click="addM(scope.row)" class="tableBtn greens">编辑</div> | 168 | <div @click="addM(scope.row)" class="tableBtn greens">编辑</div> |
| 245 | <div @click="delM(scope.row.id)" class="tableBtn greens">删除</div> | 169 | <div @click="delM(scope.row.id)" class="tableBtn greens">删除</div> |
| @@ -248,9 +172,9 @@ | @@ -248,9 +172,9 @@ | ||
| 248 | </el-table> | 172 | </el-table> |
| 249 | <div style="display: flex;justify-content: space-between;" class="bom"> | 173 | <div style="display: flex;justify-content: space-between;" class="bom"> |
| 250 | <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{total}}</span> 项数据</div> | 174 | <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{total}}</span> 项数据</div> |
| 251 | - <el-pagination :current-page="querymb.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="querymb.pageSize" | ||
| 252 | - background small layout="prev, pager, next" :total="total" @size-change="handleSizeChange" | ||
| 253 | - @current-change="handleCurrentChange"> | 175 | + <el-pagination :current-page="querymb.pageNumber+1" :page-sizes="[10, 20, 50, 100]" |
| 176 | + :page-size="querymb.pageSize" background small layout="prev, pager, next" :total="total" | ||
| 177 | + @size-change="handleSizeChange" @current-change="handleCurrentChange"> | ||
| 254 | </el-pagination> | 178 | </el-pagination> |
| 255 | </div> | 179 | </div> |
| 256 | <div style="margin-top:20px;"> | 180 | <div style="margin-top:20px;"> |
| @@ -259,8 +183,8 @@ | @@ -259,8 +183,8 @@ | ||
| 259 | </div> | 183 | </div> |
| 260 | </div> | 184 | </div> |
| 261 | </div> | 185 | </div> |
| 262 | - <el-dialog :title="formInline.id?'编辑模板':'新增模板'" :visible.sync="addMing" custom-class='bian_css' style="padding: 0;" | ||
| 263 | - width="65%" center :close-on-click-modal="false" :show-close="false" append-to-body> | 186 | + <el-dialog :title="formInline.id?'编辑模板':'新增模板'" :visible.sync="addMing" custom-class='bian_css' |
| 187 | + style="padding: 0;" width="65%" center :close-on-click-modal="false" :show-close="false" append-to-body> | ||
| 264 | <div style="padding:20px;"> | 188 | <div style="padding:20px;"> |
| 265 | <el-form :model="formInline" :rules="rulesSt2" ref="formInline" label-width="130px" class="demo-ruleForm"> | 189 | <el-form :model="formInline" :rules="rulesSt2" ref="formInline" label-width="130px" class="demo-ruleForm"> |
| 266 | <el-form-item label="策略名称" prop="policyName"> | 190 | <el-form-item label="策略名称" prop="policyName"> |
| @@ -273,7 +197,7 @@ | @@ -273,7 +197,7 @@ | ||
| 273 | <el-radio label="广告位" value="广告位">广告位</el-radio> | 197 | <el-radio label="广告位" value="广告位">广告位</el-radio> |
| 274 | </el-radio-group> | 198 | </el-radio-group> |
| 275 | </el-form-item> | 199 | </el-form-item> |
| 276 | - <el-row v-if="formInline.applicableResources == '商铺'"> | 200 | + <el-row> |
| 277 | <el-col :span="12"> | 201 | <el-col :span="12"> |
| 278 | <el-form-item label="是否出租" prop="isRental"> | 202 | <el-form-item label="是否出租" prop="isRental"> |
| 279 | <el-select v-model="formInline.isRental" placeholder="请选择" style="width: 100%;"> | 203 | <el-select v-model="formInline.isRental" placeholder="请选择" style="width: 100%;"> |
| @@ -282,78 +206,16 @@ | @@ -282,78 +206,16 @@ | ||
| 282 | </el-select> | 206 | </el-select> |
| 283 | </el-form-item> | 207 | </el-form-item> |
| 284 | </el-col> | 208 | </el-col> |
| 285 | - <el-col :span="12"> | 209 | + <el-col :span="12" v-if="formInline.applicableResources == '商铺'"> |
| 286 | <el-form-item label="经营类型" prop="businessType"> | 210 | <el-form-item label="经营类型" prop="businessType"> |
| 287 | <el-select v-model="formInline.businessType" placeholder="请选择" style="width: 100%;"> | 211 | <el-select v-model="formInline.businessType" placeholder="请选择" style="width: 100%;"> |
| 288 | <el-option label="超市" value="超市" /> | 212 | <el-option label="超市" value="超市" /> |
| 289 | <el-option label="鞋店" value="鞋店" /> | 213 | <el-option label="鞋店" value="鞋店" /> |
| 290 | <el-option label="家居饰品店" value="家居饰品店" /> | 214 | <el-option label="家居饰品店" value="家居饰品店" /> |
| 291 | </el-select> | 215 | </el-select> |
| 292 | - <!-- <el-input v-model="formInline.businessType" placeholder="请输入" maxlength="50"></el-input> --> | ||
| 293 | - | ||
| 294 | - </el-form-item> | ||
| 295 | - </el-col> | ||
| 296 | - </el-row> | ||
| 297 | - <el-row v-if="formInline.applicableResources == '商铺'"> | ||
| 298 | - <el-col :span="12"> | ||
| 299 | - <el-form-item label="租金" prop="rentalPrice"> | ||
| 300 | - <el-input v-model.number="formInline.rentalPrice" placeholder="请输入" maxlength="30"> | ||
| 301 | - <template slot="suffix"><span | ||
| 302 | - style="position: absolute;top: 0px;right: 1px;width: 50px;">元/m<sup>2</sup></span></template> | ||
| 303 | - </el-input> | ||
| 304 | - </el-form-item> | ||
| 305 | - </el-col> | ||
| 306 | - <el-col :span="12"> | ||
| 307 | - <el-form-item label="付款周期" prop="leaseTerm"> | ||
| 308 | - <el-select v-model="formInline.leaseTerm" placeholder="请选择" style="width: 100%;"> | ||
| 309 | - <el-option label="日" value="日" /> | ||
| 310 | - <el-option label="月" value="月" /> | ||
| 311 | - <el-option label="季" value="季" /> | ||
| 312 | - <el-option label="年" value="年" /> | ||
| 313 | - </el-select> | ||
| 314 | - </el-form-item> | ||
| 315 | - </el-col> | ||
| 316 | - </el-row> | ||
| 317 | - <el-row v-if="formInline.applicableResources == '商铺'"> | ||
| 318 | - <el-col :span="12"> | ||
| 319 | - <el-form-item label="租赁时段" prop="leaseDate"> | ||
| 320 | - <el-date-picker v-model="leaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="至" | ||
| 321 | - style="width: 100%;" start-placeholder="开始日期" end-placeholder="结束日期"> | ||
| 322 | - </el-date-picker> | ||
| 323 | - </el-form-item> | ||
| 324 | - </el-col> | ||
| 325 | - <el-col :span="12"> | ||
| 326 | - <el-form-item label="免租条件" prop="rentFreeCondition"> | ||
| 327 | - <el-input v-model="formInline.rentFreeCondition" placeholder="请输入" maxlength="50"></el-input> | ||
| 328 | - </el-form-item> | ||
| 329 | - </el-col> | ||
| 330 | - </el-row> | ||
| 331 | - <el-row v-if="formInline.applicableResources == '商铺'"> | ||
| 332 | - <el-col :span="12"> | ||
| 333 | - <el-form-item label="免租期" prop="rentFreePeriod"> | ||
| 334 | - <el-select v-model="formInline.rentFreePeriod" placeholder="请选择" style="width: 100%;"> | ||
| 335 | - <el-option :label="item" :value="item" v-for="item in 31" /> | ||
| 336 | - </el-select> | ||
| 337 | - </el-form-item> | ||
| 338 | - </el-col> | ||
| 339 | - <el-col :span="12"> | ||
| 340 | - <el-form-item label="付款日" prop="payDay"> | ||
| 341 | - <el-select v-model="formInline.payDay" placeholder="请选择" style="width: 100%;"> | ||
| 342 | - <el-option :label="item" :value="item" v-for="item in 31" /> | ||
| 343 | - </el-select> | ||
| 344 | </el-form-item> | 216 | </el-form-item> |
| 345 | </el-col> | 217 | </el-col> |
| 346 | - </el-row> | ||
| 347 | - <el-row v-if="formInline.applicableResources == '场地' || formInline.applicableResources == '广告位'"> | ||
| 348 | - <el-col :span="12"> | ||
| 349 | - <el-form-item label="是否出租" prop="isRental"> | ||
| 350 | - <el-select v-model="formInline.isRental" placeholder="请选择" style="width: 100%;"> | ||
| 351 | - <el-option label="自营" value="0" /> | ||
| 352 | - <el-option label="是" value="1" /> | ||
| 353 | - </el-select> | ||
| 354 | - </el-form-item> | ||
| 355 | - </el-col> | ||
| 356 | - <el-col :span="12"> | 218 | + <el-col :span="12" v-if="formInline.isRental !== '0'"> |
| 357 | <el-form-item label="租金价格" prop="rentalPrice"> | 219 | <el-form-item label="租金价格" prop="rentalPrice"> |
| 358 | <el-input v-model.number="formInline.rentalPrice" placeholder="请输入" maxlength="30"> | 220 | <el-input v-model.number="formInline.rentalPrice" placeholder="请输入" maxlength="30"> |
| 359 | <template slot="suffix"><span | 221 | <template slot="suffix"><span |
| @@ -361,9 +223,7 @@ | @@ -361,9 +223,7 @@ | ||
| 361 | </el-input> | 223 | </el-input> |
| 362 | </el-form-item> | 224 | </el-form-item> |
| 363 | </el-col> | 225 | </el-col> |
| 364 | - </el-row> | ||
| 365 | - <el-row v-if="formInline.applicableResources == '场地' || formInline.applicableResources == '广告位'"> | ||
| 366 | - <el-col :span="12"> | 226 | + <el-col :span="12" v-if="formInline.isRental !== '0'"> |
| 367 | <el-form-item label="付款周期" prop="leaseTerm"> | 227 | <el-form-item label="付款周期" prop="leaseTerm"> |
| 368 | <el-select v-model="formInline.leaseTerm" placeholder="请选择" style="width: 100%;"> | 228 | <el-select v-model="formInline.leaseTerm" placeholder="请选择" style="width: 100%;"> |
| 369 | <el-option label="日" value="日" /> | 229 | <el-option label="日" value="日" /> |
| @@ -374,29 +234,25 @@ | @@ -374,29 +234,25 @@ | ||
| 374 | </el-form-item> | 234 | </el-form-item> |
| 375 | </el-col> | 235 | </el-col> |
| 376 | <el-col :span="12"> | 236 | <el-col :span="12"> |
| 377 | - <el-form-item label="租赁时段" prop="leaseDate"> | 237 | + <el-form-item :label="formInline.isRental !== '0'?'租赁时段':'使用周期'" prop="leaseDate"> |
| 378 | <el-date-picker v-model="leaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="至" | 238 | <el-date-picker v-model="leaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="至" |
| 379 | style="width: 100%;" start-placeholder="开始日期" end-placeholder="结束日期"> | 239 | style="width: 100%;" start-placeholder="开始日期" end-placeholder="结束日期"> |
| 380 | </el-date-picker> | 240 | </el-date-picker> |
| 381 | </el-form-item> | 241 | </el-form-item> |
| 382 | </el-col> | 242 | </el-col> |
| 383 | - </el-row> | ||
| 384 | - <el-row v-if="formInline.applicableResources == '场地' || formInline.applicableResources == '广告位'"> | ||
| 385 | - <el-col :span="12"> | 243 | + <el-col :span="12" v-if="formInline.isRental !== '0'"> |
| 386 | <el-form-item label="免租条件" prop="rentFreeCondition"> | 244 | <el-form-item label="免租条件" prop="rentFreeCondition"> |
| 387 | <el-input v-model="formInline.rentFreeCondition" placeholder="请输入" maxlength="50"></el-input> | 245 | <el-input v-model="formInline.rentFreeCondition" placeholder="请输入" maxlength="50"></el-input> |
| 388 | </el-form-item> | 246 | </el-form-item> |
| 389 | </el-col> | 247 | </el-col> |
| 390 | - <el-col :span="12"> | 248 | + <el-col :span="12" v-if="formInline.isRental !== '0'"> |
| 391 | <el-form-item label="免租期" prop="rentFreePeriod"> | 249 | <el-form-item label="免租期" prop="rentFreePeriod"> |
| 392 | <el-select v-model="formInline.rentFreePeriod" placeholder="请选择" style="width: 100%;"> | 250 | <el-select v-model="formInline.rentFreePeriod" placeholder="请选择" style="width: 100%;"> |
| 393 | <el-option :label="item" :value="item" v-for="item in 31" /> | 251 | <el-option :label="item" :value="item" v-for="item in 31" /> |
| 394 | </el-select> | 252 | </el-select> |
| 395 | </el-form-item> | 253 | </el-form-item> |
| 396 | </el-col> | 254 | </el-col> |
| 397 | - </el-row> | ||
| 398 | - <el-row v-if="formInline.applicableResources == '场地' || formInline.applicableResources == '广告位'"> | ||
| 399 | - <el-col :span="12"> | 255 | + <el-col :span="12" v-if="formInline.isRental !== '0'"> |
| 400 | <el-form-item label="付款日" prop="payDay"> | 256 | <el-form-item label="付款日" prop="payDay"> |
| 401 | <el-select v-model="formInline.payDay" placeholder="请选择" style="width: 100%;"> | 257 | <el-select v-model="formInline.payDay" placeholder="请选择" style="width: 100%;"> |
| 402 | <el-option :label="item" :value="item" v-for="item in 31" /> | 258 | <el-option :label="item" :value="item" v-for="item in 31" /> |
| @@ -404,20 +260,12 @@ | @@ -404,20 +260,12 @@ | ||
| 404 | </el-form-item> | 260 | </el-form-item> |
| 405 | </el-col> | 261 | </el-col> |
| 406 | </el-row> | 262 | </el-row> |
| 407 | - <el-row> | ||
| 408 | - <el-col :span="24"> | ||
| 409 | - <el-form-item label="优惠政策" prop="preferentialPolicy"> | ||
| 410 | - <wangEditor v-model="formInline.preferentialPolicy" ref="editor" :height="100"></wangEditor> | ||
| 411 | - </el-form-item> | ||
| 412 | - </el-col> | ||
| 413 | - </el-row> | ||
| 414 | - <el-row> | ||
| 415 | - <el-col :span="24"> | ||
| 416 | - <el-form-item label="其他说明" prop="otherDescription"> | ||
| 417 | - <wangEditor v-model="formInline.otherDescription" ref="editor" :height="100"></wangEditor> | ||
| 418 | - </el-form-item> | ||
| 419 | - </el-col> | ||
| 420 | - </el-row> | 263 | + <el-form-item v-if="formInline.isRental !== '0'" label="优惠政策" prop="preferentialPolicy"> |
| 264 | + <wangEditor v-model="formInline.preferentialPolicy" ref="editor" :height="100"></wangEditor> | ||
| 265 | + </el-form-item> | ||
| 266 | + <el-form-item label="其他说明" prop="otherDescription"> | ||
| 267 | + <wangEditor v-model="formInline.otherDescription" ref="editor" :height="100"></wangEditor> | ||
| 268 | + </el-form-item> | ||
| 421 | </el-form> | 269 | </el-form> |
| 422 | <div style="display: flex;justify-content: flex-end;margin-top:20px;"> | 270 | <div style="display: flex;justify-content: flex-end;margin-top:20px;"> |
| 423 | <el-button @click="closemb()" style="background-color: #fff;color: #000;border: 1px solid #B1B1B1;" | 271 | <el-button @click="closemb()" style="background-color: #fff;color: #000;border: 1px solid #B1B1B1;" |
| @@ -445,8 +293,8 @@ | @@ -445,8 +293,8 @@ | ||
| 445 | }, | 293 | }, |
| 446 | data() { | 294 | data() { |
| 447 | return { | 295 | return { |
| 448 | - addMing:false, | ||
| 449 | - modeAdd:false, | 296 | + addMing: false, |
| 297 | + modeAdd: false, | ||
| 450 | modeCode: false, | 298 | modeCode: false, |
| 451 | leaseDate: [], //租赁时段 | 299 | leaseDate: [], //租赁时段 |
| 452 | paymentDate: [], //付款日期 | 300 | paymentDate: [], //付款日期 |
| @@ -577,12 +425,12 @@ | @@ -577,12 +425,12 @@ | ||
| 577 | } | 425 | } |
| 578 | ], | 426 | ], |
| 579 | }, | 427 | }, |
| 580 | - querymb:{ | 428 | + querymb: { |
| 581 | pageNumber: 0, | 429 | pageNumber: 0, |
| 582 | pageSize: 10, | 430 | pageSize: 10, |
| 583 | isTemplate: '0' | 431 | isTemplate: '0' |
| 584 | }, | 432 | }, |
| 585 | - total:0 | 433 | + total: 0 |
| 586 | }; | 434 | }; |
| 587 | }, | 435 | }, |
| 588 | props: { | 436 | props: { |
| @@ -674,9 +522,11 @@ | @@ -674,9 +522,11 @@ | ||
| 674 | this.total = res.data.totalElements | 522 | this.total = res.data.totalElements |
| 675 | }, | 523 | }, |
| 676 | addmb() { | 524 | addmb() { |
| 677 | - console.error({...this.formInline}) | ||
| 678 | - this.formInline.isTemplate = '0' | ||
| 679 | - if(this.formInline.id) { | 525 | + console.error({ |
| 526 | + ...this.formInline | ||
| 527 | + }) | ||
| 528 | + this.formInline.isTemplate = '0' | ||
| 529 | + if (this.formInline.id) { | ||
| 680 | if (this.leaseDate.length != 0) { | 530 | if (this.leaseDate.length != 0) { |
| 681 | this.formInline.leaseStartDate = this.leaseDate[0] | 531 | this.formInline.leaseStartDate = this.leaseDate[0] |
| 682 | this.formInline.leaseEndDate = this.leaseDate[1] | 532 | this.formInline.leaseEndDate = this.leaseDate[1] |
| @@ -752,8 +602,8 @@ | @@ -752,8 +602,8 @@ | ||
| 752 | return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; | 602 | return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; |
| 753 | }, | 603 | }, |
| 754 | add() { | 604 | add() { |
| 755 | - this.ruleForm.isTemplate = '1' | ||
| 756 | - if(this.ruleForm.id) { | 605 | + this.ruleForm.isTemplate = '1' |
| 606 | + if (this.ruleForm.id) { | ||
| 757 | if (this.leaseDate.length != 0) { | 607 | if (this.leaseDate.length != 0) { |
| 758 | this.ruleForm.leaseStartDate = this.leaseDate[0] | 608 | this.ruleForm.leaseStartDate = this.leaseDate[0] |
| 759 | this.ruleForm.leaseEndDate = this.leaseDate[1] | 609 | this.ruleForm.leaseEndDate = this.leaseDate[1] |
| @@ -876,7 +726,7 @@ | @@ -876,7 +726,7 @@ | ||
| 876 | height: 32px; | 726 | height: 32px; |
| 877 | } | 727 | } |
| 878 | } | 728 | } |
| 879 | - | 729 | + |
| 880 | .formSearch { | 730 | .formSearch { |
| 881 | display: flex; | 731 | display: flex; |
| 882 | width: 100%; | 732 | width: 100%; |
admin-web-master/src/components/chakan/map.vue
| @@ -93,13 +93,27 @@ | @@ -93,13 +93,27 @@ | ||
| 93 | <el-form-item label="备注信息" prop="memo" v-if="editbgid.advertisingType == '线上广告位'"> | 93 | <el-form-item label="备注信息" prop="memo" v-if="editbgid.advertisingType == '线上广告位'"> |
| 94 | <div class="duiqi">{{editbgid.memo || '无'}}</div> | 94 | <div class="duiqi">{{editbgid.memo || '无'}}</div> |
| 95 | </el-form-item> | 95 | </el-form-item> |
| 96 | - | ||
| 97 | - | ||
| 98 | - | ||
| 99 | - | ||
| 100 | - | ||
| 101 | - | ||
| 102 | </el-form> | 96 | </el-form> |
| 97 | + <TitleWithCircle title="历史发布/下架记录" /> | ||
| 98 | + <div style="padding: 20px;"> | ||
| 99 | + <el-table :data="datalistxsj" | ||
| 100 | + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" | ||
| 101 | + tooltip-effect="dark custom-tooltip-effect"> | ||
| 102 | + <el-table-column label="类型" prop="type" > | ||
| 103 | + </el-table-column> | ||
| 104 | + <el-table-column label="操作时间" prop="operationTime" > | ||
| 105 | + </el-table-column> | ||
| 106 | + <el-table-column label="操作人" prop="operator"> | ||
| 107 | + </el-table-column> | ||
| 108 | + </el-table> | ||
| 109 | + <div style="display: flex;justify-content: space-between;" class="bom"> | ||
| 110 | + <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{totalsxj}}</span> 项数据</div> | ||
| 111 | + <el-pagination :current-page="pagequerysxj.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="pagequerysxj.pageSize" | ||
| 112 | + background small layout="prev, pager, next" :total="totalsxj" @size-change="handleSizeChangesxj" | ||
| 113 | + @current-change="handleCurrentChangesxj"> | ||
| 114 | + </el-pagination> | ||
| 115 | + </div> | ||
| 116 | + </div> | ||
| 103 | </div> | 117 | </div> |
| 104 | </div> | 118 | </div> |
| 105 | </el-tab-pane> | 119 | </el-tab-pane> |
| @@ -161,6 +175,7 @@ | @@ -161,6 +175,7 @@ | ||
| 161 | import MapXian from "@/components/MapContainer/MapXian"; | 175 | import MapXian from "@/components/MapContainer/MapXian"; |
| 162 | import TitleWithCircle from '@/components/top/index'; | 176 | import TitleWithCircle from '@/components/top/index'; |
| 163 | import { | 177 | import { |
| 178 | + cereBusinessOperationqueryByPage, | ||
| 164 | cereResourceStrategylist, | 179 | cereResourceStrategylist, |
| 165 | cereBusinessPlan | 180 | cereBusinessPlan |
| 166 | } from '@/api/newly'; | 181 | } from '@/api/newly'; |
| @@ -184,6 +199,13 @@ | @@ -184,6 +199,13 @@ | ||
| 184 | }, | 199 | }, |
| 185 | data() { | 200 | data() { |
| 186 | return { | 201 | return { |
| 202 | + datalistxsj:[], | ||
| 203 | + totalsxj:0, | ||
| 204 | + pagequerysxj:{ | ||
| 205 | + pageNumber: 0, | ||
| 206 | + pageSize: 10, | ||
| 207 | + resourcesId: 'sp' + this.editbgid.id | ||
| 208 | + }, | ||
| 187 | xiangTab: 'first', | 209 | xiangTab: 'first', |
| 188 | list: [], | 210 | list: [], |
| 189 | parentMessage: {}, | 211 | parentMessage: {}, |
| @@ -214,6 +236,7 @@ | @@ -214,6 +236,7 @@ | ||
| 214 | } | 236 | } |
| 215 | this.datalist1 = res.data | 237 | this.datalist1 = res.data |
| 216 | }) | 238 | }) |
| 239 | + this.getAllxsj() | ||
| 217 | } | 240 | } |
| 218 | 241 | ||
| 219 | 242 | ||
| @@ -222,6 +245,26 @@ | @@ -222,6 +245,26 @@ | ||
| 222 | 245 | ||
| 223 | }, | 246 | }, |
| 224 | methods: { | 247 | methods: { |
| 248 | + handleCurrentChangesxj(val) { | ||
| 249 | + this.pagequerysxj.pageNumber = val - 1 | ||
| 250 | + this.getAllxsj() | ||
| 251 | + }, | ||
| 252 | + handleSizeChangesxj(val) { | ||
| 253 | + this.pagequerysxj.pageSize = val | ||
| 254 | + this.pagequerysxj.pageNumber = 0 | ||
| 255 | + this.getAllxsj() | ||
| 256 | + }, | ||
| 257 | + getAllxsj() { | ||
| 258 | + cereBusinessOperationqueryByPage(this.pagequerysxj).then(res => { | ||
| 259 | + console.error(res) | ||
| 260 | + if (!Array.isArray(res.data.content)) { | ||
| 261 | + this.datalistxsj = []; | ||
| 262 | + return; | ||
| 263 | + } | ||
| 264 | + this.datalistxsj = res.data.content | ||
| 265 | + this.totalsxj = res.data.totalElements | ||
| 266 | + }) | ||
| 267 | + }, | ||
| 225 | changetype() { | 268 | changetype() { |
| 226 | this.xiangTab = 'first' | 269 | this.xiangTab = 'first' |
| 227 | this.$emit('removeonaction', '1') | 270 | this.$emit('removeonaction', '1') |
admin-web-master/src/components/chakan/sam.vue
| @@ -2,131 +2,82 @@ | @@ -2,131 +2,82 @@ | ||
| 2 | <div> | 2 | <div> |
| 3 | <div> | 3 | <div> |
| 4 | <el-tabs v-model="xiangTab"> | 4 | <el-tabs v-model="xiangTab"> |
| 5 | - <el-tab-pane label="资源信息" name="first"> | 5 | + <el-tab-pane label="策略信息" name="first"> |
| 6 | <div style="margin-top: 30px;" class="editcss"> | 6 | <div style="margin-top: 30px;" class="editcss"> |
| 7 | <TitleWithCircle title="基础信息" /> | 7 | <TitleWithCircle title="基础信息" /> |
| 8 | <div style="padding: 20px;"> | 8 | <div style="padding: 20px;"> |
| 9 | <el-form :model="editbgid" ref="formInline" label-width="120px" class="demo-ruleForm"> | 9 | <el-form :model="editbgid" ref="formInline" label-width="120px" class="demo-ruleForm"> |
| 10 | <el-row :gutter="20"> | 10 | <el-row :gutter="20"> |
| 11 | <el-col :span="8"> | 11 | <el-col :span="8"> |
| 12 | - <el-form-item label="场地名称" prop="venueName"> | ||
| 13 | - <div class="duiqi">{{editbgid.venueName || '无'}}</div> | 12 | + <el-form-item label="策略名称" prop="policyName"> |
| 13 | + <div class="duiqi">{{editbgid.policyName || '无'}}</div> | ||
| 14 | </el-form-item> | 14 | </el-form-item> |
| 15 | </el-col> | 15 | </el-col> |
| 16 | <el-col :span="8"> | 16 | <el-col :span="8"> |
| 17 | - <el-form-item label="场地类型" prop="venueType"> | ||
| 18 | - <div class="duiqi">{{editbgid.venueType || '无'}}</div> | 17 | + <el-form-item label="适用资源" prop="applicableResources"> |
| 18 | + <div class="duiqi">{{editbgid.applicableResources || '无'}}</div> | ||
| 19 | </el-form-item> | 19 | </el-form-item> |
| 20 | </el-col> | 20 | </el-col> |
| 21 | <el-col :span="8"> | 21 | <el-col :span="8"> |
| 22 | - <el-form-item label="实际使用面积" prop="actualArea"> | ||
| 23 | - <div class="duiqi">{{editbgid.actualArea || '无'}}</div> | 22 | + <el-form-item label="是否出租" prop="isRental"> |
| 23 | + <div class="duiqi">{{editbgid.isRental=='0'?'自营':editbgid.isRental=='1'?'是':'无'}}</div> | ||
| 24 | </el-form-item> | 24 | </el-form-item> |
| 25 | </el-col> | 25 | </el-col> |
| 26 | </el-row> | 26 | </el-row> |
| 27 | <el-row :gutter="20"> | 27 | <el-row :gutter="20"> |
| 28 | <el-col :span="8"> | 28 | <el-col :span="8"> |
| 29 | - <el-form-item label="所属区域" prop="district"> | ||
| 30 | - <div class="duiqi">{{editbgid.district || '无'}}</div> | 29 | + <el-form-item label="付款日" prop="payDay"> |
| 30 | + <div class="duiqi">{{editbgid.payDay || '无'}}</div> | ||
| 31 | </el-form-item> | 31 | </el-form-item> |
| 32 | </el-col> | 32 | </el-col> |
| 33 | <el-col :span="8"> | 33 | <el-col :span="8"> |
| 34 | - <el-form-item label="归属部门" prop="department"> | ||
| 35 | - <div class="duiqi">{{editbgid.department || '无'}}</div> | 34 | + <el-form-item label="租金" prop="rentalPrice"> |
| 35 | + <div class="duiqi">{{editbgid.rentalPrice || '无'}}</div> | ||
| 36 | </el-form-item> | 36 | </el-form-item> |
| 37 | </el-col> | 37 | </el-col> |
| 38 | <el-col :span="8"> | 38 | <el-col :span="8"> |
| 39 | - <el-form-item label="负责人" prop="responsiblePerson"> | ||
| 40 | - <div class="duiqi">{{editbgid.belongingParkTrail || '无'}}</div> | 39 | + <el-form-item label="付款周期" prop="leaseTerm"> |
| 40 | + <div class="duiqi">{{editbgid.leaseTerm || '无'}}</div> | ||
| 41 | </el-form-item> | 41 | </el-form-item> |
| 42 | </el-col> | 42 | </el-col> |
| 43 | </el-row> | 43 | </el-row> |
| 44 | <el-row :gutter="20"> | 44 | <el-row :gutter="20"> |
| 45 | <el-col :span="8"> | 45 | <el-col :span="8"> |
| 46 | - <el-form-item label="联系人" prop="contact"> | 46 | + <el-form-item label="租赁时段" prop="contact"> |
| 47 | <div class="duiqi">{{editbgid.contact || '无'}}</div> | 47 | <div class="duiqi">{{editbgid.contact || '无'}}</div> |
| 48 | </el-form-item> | 48 | </el-form-item> |
| 49 | </el-col> | 49 | </el-col> |
| 50 | <el-col :span="8"> | 50 | <el-col :span="8"> |
| 51 | - <el-form-item label="联系电话" prop="phoneNumber"> | ||
| 52 | - <div class="duiqi">{{editbgid.belongingParkTrail || '无'}}</div> | 51 | + <el-form-item label="免租条件" prop="rentFreeCondition"> |
| 52 | + <div class="duiqi">{{editbgid.rentFreeCondition || '无'}}</div> | ||
| 53 | + </el-form-item> | ||
| 54 | + </el-col> | ||
| 55 | + <el-col :span="8"> | ||
| 56 | + <el-form-item label="免租期" prop="rentFreePeriod"> | ||
| 57 | + <div class="duiqi">{{editbgid.rentFreePeriod || '无'}}</div> | ||
| 53 | </el-form-item> | 58 | </el-form-item> |
| 54 | </el-col> | 59 | </el-col> |
| 55 | </el-row> | 60 | </el-row> |
| 56 | - <el-form-item label="详细位置" prop="detailedLocation"> | ||
| 57 | - <div class="duiqi">{{editbgid.detailedLocation || '无'}}</div> | ||
| 58 | - </el-form-item> | ||
| 59 | - <el-form-item label="地图标点" prop="mapMarker"> | ||
| 60 | - <div style="width: 100%;height: 300px;"> | ||
| 61 | - <newmap :isx="false" :message="editbgid.mapMarker"></newmap> | ||
| 62 | - </div> | ||
| 63 | - </el-form-item> | ||
| 64 | - <el-form-item label="场地描述" prop="description"> | ||
| 65 | - <div class="duiqi">{{editbgid.description || '无'}}</div> | ||
| 66 | - </el-form-item> | ||
| 67 | - <el-form-item label="规划图纸" prop="planningDrawing"> | ||
| 68 | - <div v-if="editbgid.planningDrawing"> | ||
| 69 | - <img :src="$baseURL+item" alt="" style="width:140px;height:140px;" | ||
| 70 | - v-for="item in editbgid.planningDrawing.split(',')"> | ||
| 71 | - </div> | ||
| 72 | - <div class="duiqi" v-else>无</div> | ||
| 73 | - </el-form-item> | ||
| 74 | - <el-form-item label="展示主图" prop="displayImage"> | ||
| 75 | - <div > | ||
| 76 | - <img :src="$baseURL+item" alt="" style="width:140px;height:140px;" | ||
| 77 | - v-for="item in editbgid.displayImage.split(',')"> | ||
| 78 | - </div> | 61 | + <el-row v-if="editbgid.applicableResources == '商铺'"> |
| 62 | + <el-col :span="8" > | ||
| 63 | + <el-form-item label="经营类型" prop="businessType"> | ||
| 64 | + <div class="duiqi" >{{editbgid.businessType || '无'}}</div> | ||
| 65 | + </el-form-item> | ||
| 66 | + </el-col> | ||
| 67 | + </el-row> | ||
| 68 | + <el-form-item label="优惠政策" prop="preferentialPolicy"> | ||
| 69 | + <div class="duiqi" v-if="editbgid.preferentialPolicy" v-html="editbgid.preferentialPolicy"></div> | ||
| 70 | + <div class="duiqi" v-else>无</div> | ||
| 79 | </el-form-item> | 71 | </el-form-item> |
| 80 | - <el-form-item label="其他视频" prop="otherImageVideos" > | ||
| 81 | - <div class="duiqi" :class="editbgid.otherImageVideos?'greens':''" @click ="editbgid.otherImageVideos?openfile($baseURL+editbgid.otherImageVideos):''">{{editbgid.otherImageVideos?'查看详情':'无'}}</div> | 72 | + <el-form-item label="其他说明" prop="otherDescription"> |
| 73 | + <div v-if="editbgid.otherDescription" class="duiqi" v-html="editbgid.otherDescription"></div> | ||
| 74 | + <div class="duiqi" v-else>无</div> | ||
| 82 | </el-form-item> | 75 | </el-form-item> |
| 83 | </el-form> | 76 | </el-form> |
| 84 | </div> | 77 | </div> |
| 85 | </div> | 78 | </div> |
| 86 | </el-tab-pane> | 79 | </el-tab-pane> |
| 87 | - <el-tab-pane label="招商方案信息" name="second"> | ||
| 88 | - <div style="margin-top: 30px;" class="editcss"> | ||
| 89 | - <!-- <TitleWithCircle title="招商方案信息" /> | ||
| 90 | - <div style="padding: 20px;"> | ||
| 91 | - <el-table :data="datalist1" | ||
| 92 | - :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" | ||
| 93 | - tooltip-effect="dark custom-tooltip-effect"> | ||
| 94 | - <el-table-column label="招商方案名称" prop="planName" min-width="200"> | ||
| 95 | - </el-table-column> | ||
| 96 | - <el-table-column label="创建日期" prop="createTime" min-width="100"> | ||
| 97 | - </el-table-column> | ||
| 98 | - </el-table> | ||
| 99 | - </div> --> | ||
| 100 | - <TitleWithCircle title="策略方案" /> | ||
| 101 | - <div style="padding: 20px;"> | ||
| 102 | - <el-table :data="datalist" | ||
| 103 | - :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" | ||
| 104 | - tooltip-effect="dark custom-tooltip-effect"> | ||
| 105 | - <el-table-column label="策略名称" prop="policyName" min-width="200"> | ||
| 106 | - </el-table-column> | ||
| 107 | - <el-table-column label="适用资源" prop="applicableResources" min-width="100"> | ||
| 108 | - </el-table-column> | ||
| 109 | - <el-table-column label="经营类型" prop="businessType" min-width="100"> | ||
| 110 | 80 | ||
| 111 | - </el-table-column> | ||
| 112 | - <el-table-column label="租金价格" prop="rentalPrice" min-width="150"> | ||
| 113 | - </el-table-column> | ||
| 114 | - <el-table-column label="租期" prop="leaseTerm" min-width="100"> | ||
| 115 | - </el-table-column> | ||
| 116 | - <el-table-column label="是否出租" prop="isRental" min-width="100"> | ||
| 117 | - <template slot-scope="scope"> | ||
| 118 | - {{scope.row.isRental == '0'?'否':'是'}} | ||
| 119 | - </template> | ||
| 120 | - </el-table-column> | ||
| 121 | - <el-table-column label="是否自营" prop="planningObjectives" min-width="100"> | ||
| 122 | - <template slot-scope="scope"> | ||
| 123 | - {{scope.row.isSelfOperated == '0'?'否':'是'}} | ||
| 124 | - </template> | ||
| 125 | - </el-table-column> | ||
| 126 | - </el-table> | ||
| 127 | - </div> | ||
| 128 | - </div> | ||
| 129 | - </el-tab-pane> | ||
| 130 | </el-tabs> | 81 | </el-tabs> |
| 131 | </div> | 82 | </div> |
| 132 | <div> | 83 | <div> |
admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue
| @@ -38,11 +38,6 @@ | @@ -38,11 +38,6 @@ | ||
| 38 | </el-button> | 38 | </el-button> |
| 39 | </div> | 39 | </div> |
| 40 | </div> | 40 | </div> |
| 41 | - <div style="margin-bottom: 20px;"> | ||
| 42 | - <el-button @click="removeonaction('2')" style="background-color: #3F9B6A;color: #fff;padding:8px 15px;" | ||
| 43 | - icon="el-icon-circle-plus-outline">新增</el-button> | ||
| 44 | - <!-- <el-button @click="" style="background-color: #3F9B6A;color: #fff">批量导入</el-button> --> | ||
| 45 | - </div> | ||
| 46 | <!-- 表格 --> | 41 | <!-- 表格 --> |
| 47 | <el-table :data="tableData" | 42 | <el-table :data="tableData" |
| 48 | :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> | 43 | :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> |
admin-web-master/src/views/detect/map/index.vue
| @@ -154,7 +154,8 @@ | @@ -154,7 +154,8 @@ | ||
| 154 | import resourceCommodity from '../../../components/chakan/map' | 154 | import resourceCommodity from '../../../components/chakan/map' |
| 155 | import { | 155 | import { |
| 156 | cereResourceStrategy, | 156 | cereResourceStrategy, |
| 157 | - editStatus | 157 | + editStatus, |
| 158 | + cereBusinessOperationadd | ||
| 158 | } from '@/api/newly.js' | 159 | } from '@/api/newly.js' |
| 159 | import cl from '@/components/change/cl.vue' | 160 | import cl from '@/components/change/cl.vue' |
| 160 | export default { | 161 | export default { |
| @@ -217,6 +218,14 @@ | @@ -217,6 +218,14 @@ | ||
| 217 | }).then(res => { | 218 | }).then(res => { |
| 218 | this.onSubmit() | 219 | this.onSubmit() |
| 219 | }) | 220 | }) |
| 221 | + cereBusinessOperationadd({ | ||
| 222 | + type:'发布', | ||
| 223 | + resourceId: this.oncetype+this.oninfo.id, | ||
| 224 | + operator: localStorage.getItem('roleName'), | ||
| 225 | + operationTime: this.gettime() | ||
| 226 | + }).then(res => { | ||
| 227 | + console.error(res) | ||
| 228 | + }) | ||
| 220 | } else { | 229 | } else { |
| 221 | this.$message({ | 230 | this.$message({ |
| 222 | message: '绑定失败', | 231 | message: '绑定失败', |
| @@ -300,6 +309,14 @@ | @@ -300,6 +309,14 @@ | ||
| 300 | message: tit + '成功', | 309 | message: tit + '成功', |
| 301 | type: 'success' | 310 | type: 'success' |
| 302 | }) | 311 | }) |
| 312 | + cereBusinessOperationadd({ | ||
| 313 | + type:tit, | ||
| 314 | + resourceId: 'sp'+row.id, | ||
| 315 | + operator: localStorage.getItem('roleName'), | ||
| 316 | + operationTime: that.gettime() | ||
| 317 | + }).then(res => { | ||
| 318 | + console.error(res) | ||
| 319 | + }) | ||
| 303 | this.removeonaction('1') | 320 | this.removeonaction('1') |
| 304 | } else { | 321 | } else { |
| 305 | this.$message({ | 322 | this.$message({ |
admin-web-master/src/views/scheme/sam.vue
| @@ -13,7 +13,7 @@ | @@ -13,7 +13,7 @@ | ||
| 13 | <el-input placeholder="请输入" v-model="formSel.policyName" style="width:168px;margin-right: 15px"> | 13 | <el-input placeholder="请输入" v-model="formSel.policyName" style="width:168px;margin-right: 15px"> |
| 14 | </el-input> | 14 | </el-input> |
| 15 | <div style="width:68px;height:36px;line-height:32px;">适用资源</div> | 15 | <div style="width:68px;height:36px;line-height:32px;">适用资源</div> |
| 16 | - <el-select v-model="formSel.applicableResources" placeholder="请选择" style="width: 100px;margin-right: 5px"> | 16 | + <el-select v-model="formSel.applicableResources" placeholder="请选择" style="width: 168px;margin-right: 15px"> |
| 17 | <el-option label="商铺" value="商铺" /> | 17 | <el-option label="商铺" value="商铺" /> |
| 18 | <el-option label="场地" value="场地" /> | 18 | <el-option label="场地" value="场地" /> |
| 19 | <el-option label="广告位" value="广告位" /> | 19 | <el-option label="广告位" value="广告位" /> |
| @@ -22,15 +22,15 @@ | @@ -22,15 +22,15 @@ | ||
| 22 | <el-date-picker style="width:168px;margin-right: 15px" v-model="plan_Time" value-format="yyyy-MM-dd HH:mm:ss" | 22 | <el-date-picker style="width:168px;margin-right: 15px" v-model="plan_Time" value-format="yyyy-MM-dd HH:mm:ss" |
| 23 | type="datetimerange" range-separator="-" start-placeholder="" end-placeholder="" prefix-icon="none"> | 23 | type="datetimerange" range-separator="-" start-placeholder="" end-placeholder="" prefix-icon="none"> |
| 24 | </el-date-picker> --> | 24 | </el-date-picker> --> |
| 25 | - <div style="width:68px;height:36px;line-height:32px;">经营类型</div> | ||
| 26 | - <el-input placeholder="请输入" v-model="formSel.businessType" style="width:168px;margin-right: 15px" /> | 25 | + |
| 27 | 26 | ||
| 28 | <div style="width:68px;height:36px;line-height:32px;">是否出租</div> | 27 | <div style="width:68px;height:36px;line-height:32px;">是否出租</div> |
| 29 | <el-select v-model="formSel.isRental" placeholder="请选择" style="width:168px;margin-right: 15px"> | 28 | <el-select v-model="formSel.isRental" placeholder="请选择" style="width:168px;margin-right: 15px"> |
| 30 | <el-option label="自营" value="0" /> | 29 | <el-option label="自营" value="0" /> |
| 31 | <el-option label="是" value="1" /> | 30 | <el-option label="是" value="1" /> |
| 32 | </el-select> | 31 | </el-select> |
| 33 | - | 32 | + <div style="width:68px;height:36px;line-height:32px;">经营类型</div> |
| 33 | + <el-input placeholder="请输入" v-model="formSel.businessType" style="width:168px;margin-right: 15px" /> | ||
| 34 | 34 | ||
| 35 | </div> | 35 | </div> |
| 36 | <div> | 36 | <div> |
| @@ -74,7 +74,7 @@ | @@ -74,7 +74,7 @@ | ||
| 74 | 74 | ||
| 75 | <el-table-column label="操作" min-width="200"> | 75 | <el-table-column label="操作" min-width="200"> |
| 76 | <template slot-scope="scope"> | 76 | <template slot-scope="scope"> |
| 77 | - <div @click="handleEditForm(scope.row,1)" class="tableBtn greens">查看</div> | 77 | + <div @click="details(scope.row)" class="tableBtn greens">查看</div> |
| 78 | <div @click="removeinfo(scope.row)" class="tableBtn greens">编辑</div> | 78 | <div @click="removeinfo(scope.row)" class="tableBtn greens">编辑</div> |
| 79 | <div @click="handleDelete(scope.row)" class="tableBtn greens">删除</div> | 79 | <div @click="handleDelete(scope.row)" class="tableBtn greens">删除</div> |
| 80 | </template> | 80 | </template> |
| @@ -337,6 +337,10 @@ | @@ -337,6 +337,10 @@ | ||
| 337 | }, | 337 | }, |
| 338 | 338 | ||
| 339 | methods: { | 339 | methods: { |
| 340 | + details(row) { | ||
| 341 | + this.detailsinfo = row | ||
| 342 | + this.onaction = '3' | ||
| 343 | + }, | ||
| 340 | removeinfo(row) { | 344 | removeinfo(row) { |
| 341 | this.detailsinfo = row | 345 | this.detailsinfo = row |
| 342 | this.onaction = '4' | 346 | this.onaction = '4' |
lvdao-miniapp/unpackage/dist/dev/mp-weixin/common/vendor.js
| @@ -7176,7 +7176,7 @@ function initData(vueOptions, context) { | @@ -7176,7 +7176,7 @@ function initData(vueOptions, context) { | ||
| 7176 | try { | 7176 | try { |
| 7177 | data = data.call(context); // 支持 Vue.prototype 上挂的数据 | 7177 | data = data.call(context); // 支持 Vue.prototype 上挂的数据 |
| 7178 | } catch (e) { | 7178 | } catch (e) { |
| 7179 | - if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) { | 7179 | + if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) { |
| 7180 | console.warn('根据 Vue 的 data 函数初始化小程序 data 失败,请尽量确保 data 函数中不访问 vm 对象,否则可能影响首次数据渲染速度。', data); | 7180 | console.warn('根据 Vue 的 data 函数初始化小程序 data 失败,请尽量确保 data 函数中不访问 vm 对象,否则可能影响首次数据渲染速度。', data); |
| 7181 | } | 7181 | } |
| 7182 | } | 7182 | } |
| @@ -14219,7 +14219,7 @@ function type(obj) { | @@ -14219,7 +14219,7 @@ function type(obj) { | ||
| 14219 | 14219 | ||
| 14220 | function flushCallbacks$1(vm) { | 14220 | function flushCallbacks$1(vm) { |
| 14221 | if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) { | 14221 | if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) { |
| 14222 | - if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) { | 14222 | + if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) { |
| 14223 | var mpInstance = vm.$scope; | 14223 | var mpInstance = vm.$scope; |
| 14224 | console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid + | 14224 | console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid + |
| 14225 | ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']'); | 14225 | ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']'); |
| @@ -14240,14 +14240,14 @@ function nextTick$1(vm, cb) { | @@ -14240,14 +14240,14 @@ function nextTick$1(vm, cb) { | ||
| 14240 | //1.nextTick 之前 已 setData 且 setData 还未回调完成 | 14240 | //1.nextTick 之前 已 setData 且 setData 还未回调完成 |
| 14241 | //2.nextTick 之前存在 render watcher | 14241 | //2.nextTick 之前存在 render watcher |
| 14242 | if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) { | 14242 | if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) { |
| 14243 | - if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){ | 14243 | + if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){ |
| 14244 | var mpInstance = vm.$scope; | 14244 | var mpInstance = vm.$scope; |
| 14245 | console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid + | 14245 | console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid + |
| 14246 | ']:nextVueTick'); | 14246 | ']:nextVueTick'); |
| 14247 | } | 14247 | } |
| 14248 | return nextTick(cb, vm) | 14248 | return nextTick(cb, vm) |
| 14249 | }else{ | 14249 | }else{ |
| 14250 | - if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){ | 14250 | + if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){ |
| 14251 | var mpInstance$1 = vm.$scope; | 14251 | var mpInstance$1 = vm.$scope; |
| 14252 | console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid + | 14252 | console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid + |
| 14253 | ']:nextMPTick'); | 14253 | ']:nextMPTick'); |
| @@ -14343,7 +14343,7 @@ var patch = function(oldVnode, vnode) { | @@ -14343,7 +14343,7 @@ var patch = function(oldVnode, vnode) { | ||
| 14343 | }); | 14343 | }); |
| 14344 | var diffData = this.$shouldDiffData === false ? data : diff(data, mpData); | 14344 | var diffData = this.$shouldDiffData === false ? data : diff(data, mpData); |
| 14345 | if (Object.keys(diffData).length) { | 14345 | if (Object.keys(diffData).length) { |
| 14346 | - if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) { | 14346 | + if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) { |
| 14347 | console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid + | 14347 | console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid + |
| 14348 | ']差量更新', | 14348 | ']差量更新', |
| 14349 | JSON.stringify(diffData)); | 14349 | JSON.stringify(diffData)); |
| @@ -18651,7 +18651,7 @@ function _extends() { | @@ -18651,7 +18651,7 @@ function _extends() { | ||
| 18651 | var formatRegExp = /%[sdj%]/g; | 18651 | var formatRegExp = /%[sdj%]/g; |
| 18652 | var warning = function warning() {}; // don't print warning message when in production env or node runtime | 18652 | var warning = function warning() {}; // don't print warning message when in production env or node runtime |
| 18653 | 18653 | ||
| 18654 | -if (typeof process !== 'undefined' && Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}) && "development" !== 'production' && typeof window !== 'undefined' && typeof document !== 'undefined') { | 18654 | +if (typeof process !== 'undefined' && Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}) && "development" !== 'production' && typeof window !== 'undefined' && typeof document !== 'undefined') { |
| 18655 | warning = function warning(type, errors) { | 18655 | warning = function warning(type, errors) { |
| 18656 | if (typeof console !== 'undefined' && console.warn) { | 18656 | if (typeof console !== 'undefined' && console.warn) { |
| 18657 | if (errors.every(function (e) { | 18657 | if (errors.every(function (e) { |
lvdao-miniapp/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-line-progress/u-line-progress.json