Commit c0c9fa7a7181d7bbd2b69cffa9b399d19fb849cd
1 parent
64d8975e
1
Showing
9 changed files
with
638 additions
and
91 deletions
admin-web-master/src/api/manage.js
admin-web-master/src/api/newly.js
| 1 | 1 | import request from '@/utils/request' |
| 2 | 2 | // import request from '@/utils/request2' |
| 3 | + | |
| 4 | + | |
| 5 | +// 退租决算管理 | |
| 6 | +export function changeContractInformationqueryByPage(data) { | |
| 7 | + return request({ | |
| 8 | + url: '/changeContractInformation/queryByPage', | |
| 9 | + method: 'post', | |
| 10 | + data | |
| 11 | + }) | |
| 12 | +} | |
| 13 | + | |
| 3 | 14 | // oa |
| 4 | 15 | export function general(data) { |
| 5 | 16 | return request({ | ... | ... |
admin-web-master/src/components/add/addht.vue
| ... | ... | @@ -236,7 +236,7 @@ import { |
| 236 | 236 | let info = await this.culfj() |
| 237 | 237 | console.error(info) |
| 238 | 238 | let c1 = { |
| 239 | - documentAddress: "http://172.16.10.237:19000" + this.templateAttachment, | |
| 239 | + documentAddress: this.templateAttachment, | |
| 240 | 240 | insertData: JSON.stringify(info) |
| 241 | 241 | } |
| 242 | 242 | dataInprotDocument(c1).then(res => { |
| ... | ... | @@ -329,7 +329,7 @@ import { |
| 329 | 329 | let info = await this.culfj() |
| 330 | 330 | console.error(info) |
| 331 | 331 | let c1 = { |
| 332 | - documentAddress: "http://172.16.10.237:19000" + this.templateAttachment, | |
| 332 | + documentAddress: this.templateAttachment, | |
| 333 | 333 | insertData: JSON.stringify(info) |
| 334 | 334 | } |
| 335 | 335 | dataInprotDocument(c1).then(res => { |
| ... | ... | @@ -483,7 +483,7 @@ import { |
| 483 | 483 | let info = await this.culfj() |
| 484 | 484 | console.error(info) |
| 485 | 485 | let c1 = { |
| 486 | - documentAddress: "http://172.16.10.237:19000" + this.templateAttachment, | |
| 486 | + documentAddress: this.templateAttachment, | |
| 487 | 487 | insertData: JSON.stringify(info) |
| 488 | 488 | } |
| 489 | 489 | dataInprotDocument(c1).then(res => { | ... | ... |
admin-web-master/src/components/buscha/busCha.vue
| ... | ... | @@ -228,7 +228,37 @@ |
| 228 | 228 | </div> |
| 229 | 229 | </el-tab-pane> |
| 230 | 230 | </el-tabs> |
| 231 | + <div v-if="info.dataStatus == '5' && issp == '2'" style="margin-top: 20px;"> | |
| 232 | + <TitleWithCircle title="审核情况"/> | |
| 233 | + <div style="padding: 20px;"> | |
| 234 | + <el-form :model="info" label-width="100px" class="demo-ruleForm"> | |
| 235 | + <el-form-item label="状态"> | |
| 236 | + <el-radio v-model="radio" label="1">通过</el-radio> | |
| 237 | + <el-radio v-model="radio" label="6">不通过</el-radio> | |
| 238 | + </el-form-item> | |
| 239 | + <el-form-item label="审核意见"> | |
| 240 | + <el-input maxlength="200" show-word-limit rows="4" v-model="reviewComments" placeholder="请输入审核意见" | |
| 241 | + type="textarea" /> | |
| 242 | + </el-form-item> | |
| 243 | + </el-form> | |
| 244 | + </div> | |
| 245 | + </div> | |
| 246 | + <div v-if="(info.dataStatus == '1' || info.dataStatus == '6')&& info.isInterior == '1'" style="margin-top: 20px;"> | |
| 247 | + <TitleWithCircle title="审核结果"/> | |
| 248 | + <div style="padding: 20px;"> | |
| 249 | + <el-form :model="info" label-width="100px" class="demo-ruleForm"> | |
| 250 | + <el-form-item label="状态"> | |
| 251 | + <div class="duiqi">{{info.dataStatus=='1'?'使用中':info.dataStatus=='3'?'已拒绝':'无'}}</div> | |
| 252 | + </el-form-item> | |
| 253 | + <el-form-item label="审核意见"> | |
| 254 | + <div class="duiqi">{{info.reviewComments || '无'}}</div> | |
| 255 | + </el-form-item> | |
| 256 | + </el-form> | |
| 257 | + </div> | |
| 258 | + </div> | |
| 231 | 259 | <div> |
| 260 | + <el-button v-if="info.dataStatus == '5' && issp == '2'" @click="minSev" | |
| 261 | + style="background-color: #3F9B6A;color: #fff;">确定</el-button> | |
| 232 | 262 | <el-button class="buttonHover" |
| 233 | 263 | style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;" |
| 234 | 264 | @click="changetype">返回</el-button> |
| ... | ... | @@ -273,6 +303,9 @@ |
| 273 | 303 | import chakanmap from '@/components/chakan/map' |
| 274 | 304 | import allimg from '@/components/chakan/allimg.vue'; |
| 275 | 305 | import chakancd from '@/components/chakan/cd' |
| 306 | + import { | |
| 307 | + editById, | |
| 308 | + } from '@/api/manage.js' | |
| 276 | 309 | export default { |
| 277 | 310 | components: { |
| 278 | 311 | oneht, |
| ... | ... | @@ -289,9 +322,17 @@ |
| 289 | 322 | return {}; // 返回一个空数组作为默认值 |
| 290 | 323 | }, |
| 291 | 324 | }, |
| 325 | + issp: { | |
| 326 | + type: String, | |
| 327 | + default: function() { | |
| 328 | + return '1'; | |
| 329 | + }, | |
| 330 | + }, | |
| 292 | 331 | }, |
| 293 | 332 | data() { |
| 294 | 333 | return { |
| 334 | + reviewComments:'', | |
| 335 | + radio: '1', | |
| 295 | 336 | url:'', |
| 296 | 337 | type:'1', |
| 297 | 338 | tableData: [], |
| ... | ... | @@ -333,6 +374,28 @@ |
| 333 | 374 | |
| 334 | 375 | }, |
| 335 | 376 | methods: { |
| 377 | + minSev() { | |
| 378 | + editById({ | |
| 379 | + contractNumber: this.info.contractNumber, | |
| 380 | + dataStatus: this.radio, | |
| 381 | + reviewComments: this.reviewComments?this.reviewComments:null | |
| 382 | + }).then(res => { | |
| 383 | + console.error(res) | |
| 384 | + if (res.code == 200) { | |
| 385 | + this.$message({ | |
| 386 | + message: '处理成功', | |
| 387 | + type: 'success' | |
| 388 | + }) | |
| 389 | + this.info.dataStatus = this.radio | |
| 390 | + this.$emit('removeonaction', '1') | |
| 391 | + } else { | |
| 392 | + this.$message({ | |
| 393 | + message: '处理失败', | |
| 394 | + type: 'error' | |
| 395 | + }) | |
| 396 | + } | |
| 397 | + }) | |
| 398 | + }, | |
| 336 | 399 | removeonaction() { |
| 337 | 400 | this.type = '1' |
| 338 | 401 | }, | ... | ... |
admin-web-master/src/utils/request.js
| ... | ... | @@ -17,15 +17,11 @@ let baseURL = '' |
| 17 | 17 | if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { |
| 18 | 18 | |
| 19 | 19 | // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; |
| 20 | - baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'; | |
| 20 | + // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'; | |
| 21 | 21 | |
| 22 | 22 | // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; |
| 23 | 23 | |
| 24 | -<<<<<<< HEAD | |
| 25 | 24 | baseURL = 'http://128.10.249.23:9003'; |
| 26 | -======= | |
| 27 | - // baseURL = 'http://128.10.249.13:9003'; | |
| 28 | ->>>>>>> 89bb9f2b58e667e7b1bc81a97a5c37f15bfe7980 | |
| 29 | 25 | |
| 30 | 26 | } else { |
| 31 | 27 | console.error('---------------------') | ... | ... |
admin-web-master/src/views/shopRental/manage/index.vue
| ... | ... | @@ -96,8 +96,10 @@ |
| 96 | 96 | |
| 97 | 97 | <el-table-column label="操作" min-width="150" fixed="right"> |
| 98 | 98 | <template slot-scope="scope"> |
| 99 | - <div @click="details(scope.row)" class="tableBtn greens">查看</div> | |
| 99 | + <div @click="details(scope.row,'1')" class="tableBtn greens">查看</div> | |
| 100 | 100 | <!-- --> |
| 101 | + <div v-if='scope.row.dataStatus == 5 && scope.row.isInterior == 1' @click="details(scope.row,'2')" class="tableBtn greens">审核</div> | |
| 102 | + <div v-if='scope.row.dataStatus == 4' @click="remove(scope.row)" class="tableBtn greens">内部审核</div> | |
| 101 | 103 | <div v-if='scope.row.dataStatus == 4' @click="openOAitem(scope.row)" class="tableBtn greens">OA审核</div> |
| 102 | 104 | <div v-if='scope.row.dataStatus == 1' @click="removeinfo(scope.row,'合同变更')" class="tableBtn greens">合同变更</div> |
| 103 | 105 | <div v-if='scope.row.dataStatus == 1' @click="removeinfo(scope.row,'合同续约')" class="tableBtn greens">合同续约</div> |
| ... | ... | @@ -139,7 +141,7 @@ |
| 139 | 141 | style="color:#000000e6">查看</span></div> |
| 140 | 142 | </div> |
| 141 | 143 | <div> |
| 142 | - <busCha :info="detailsinfo" @removeonaction="removeonaction"></busCha> | |
| 144 | + <busCha :issp="issp" :info="detailsinfo" @removeonaction="removeonaction"></busCha> | |
| 143 | 145 | </div> |
| 144 | 146 | <!-- <div> |
| 145 | 147 | <el-button class="buttonHover" |
| ... | ... | @@ -183,7 +185,8 @@ |
| 183 | 185 | <script> |
| 184 | 186 | import { |
| 185 | 187 | contractGetAllnew, |
| 186 | - edit | |
| 188 | + edit, | |
| 189 | + editById | |
| 187 | 190 | } from '@/api/manage.js' |
| 188 | 191 | import add from '@/components/add/addht.vue' |
| 189 | 192 | import addremove from '@/components/add/addremoveht.vue' |
| ... | ... | @@ -198,6 +201,7 @@ |
| 198 | 201 | export default { |
| 199 | 202 | data() { |
| 200 | 203 | return { |
| 204 | + issp:'1', | |
| 201 | 205 | rulesoa: { |
| 202 | 206 | reviewers: [{ |
| 203 | 207 | required: true, |
| ... | ... | @@ -233,6 +237,41 @@ |
| 233 | 237 | this.getAll() |
| 234 | 238 | }, |
| 235 | 239 | methods: { |
| 240 | + remove(row) { | |
| 241 | + let that = this | |
| 242 | + this.$confirm('是否确定内部审核吗？', '提示', { | |
| 243 | + confirmButtonText: '确定', | |
| 244 | + cancelButtonText: '取消', | |
| 245 | + type: 'warning' | |
| 246 | + }).then(() => { | |
| 247 | + editById({ | |
| 248 | + contractNumber:row.contractNumber, | |
| 249 | + isInterior:'1' | |
| 250 | + }).then(res => { | |
| 251 | + console.error(res) | |
| 252 | + if (res.code == 200) { | |
| 253 | + edit({ | |
| 254 | + contractNumber: row.contractNumber, | |
| 255 | + dataStatus: '5', | |
| 256 | + }).then(res1 => { | |
| 257 | + this.$message({ | |
| 258 | + message: '处理成功', | |
| 259 | + type: 'success' | |
| 260 | + }) | |
| 261 | + console.error(res1) | |
| 262 | + this.resetting() | |
| 263 | + }) | |
| 264 | + | |
| 265 | + } else { | |
| 266 | + this.$message({ | |
| 267 | + message: res.msg, | |
| 268 | + type: 'error' | |
| 269 | + }) | |
| 270 | + } | |
| 271 | + | |
| 272 | + }) | |
| 273 | + }) | |
| 274 | + }, | |
| 236 | 275 | openOAitem(row){ |
| 237 | 276 | this.oainfo = row |
| 238 | 277 | this.ruleForm.reviewers = '' |
| ... | ... | @@ -421,7 +460,8 @@ |
| 421 | 460 | }) |
| 422 | 461 | }) |
| 423 | 462 | }, |
| 424 | - details(row) { | |
| 463 | + details(row,e) { | |
| 464 | + this.issp = e | |
| 425 | 465 | this.detailsinfo = row |
| 426 | 466 | this.onaction = '3' |
| 427 | 467 | }, | ... | ... |
admin-web-master/src/views/shopRental/rentTermination/index copy 2.vue
0 → 100644
| 1 | +<template> | |
| 2 | + <div style="background-color:#f7f7f7;padding:10px 10px;"> | |
| 3 | + <div class="zhuti" v-if="onaction == '1'"> | |
| 4 | + <div style="height:58px;line-height:58px;"> | |
| 5 | + <div style="color:#0006"> <span>商铺租赁服务</span> <span style="padding:0 5px;">></span> <span | |
| 6 | + style="color:#000000e6">退租决算管理</span></div> | |
| 7 | + </div> | |
| 8 | + <!-- 线上 --> | |
| 9 | + <div> | |
| 10 | + <!-- 搜索 --> | |
| 11 | + <div class="formSearch"> | |
| 12 | + <el-form :inline="true" :model="pagequery"> | |
| 13 | + <el-form-item label="合同名称"> | |
| 14 | + <el-input v-model="pagequery.contractName" placeholder="请输入" style="width:168px;" /> | |
| 15 | + </el-form-item> | |
| 16 | + </el-form> | |
| 17 | + | |
| 18 | + <div> | |
| 19 | + <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询 | |
| 20 | + </el-button> | |
| 21 | + <el-button @click="resetting" class="buttonHover" | |
| 22 | + style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置 | |
| 23 | + </el-button> | |
| 24 | + </div> | |
| 25 | + </div> | |
| 26 | + <!-- <div style="margin-bottom: 20px;"> | |
| 27 | + <el-button @click="removeonaction('2')" style="background-color: #3F9B6A;color: #fff;padding:8px 15px;" | |
| 28 | + icon="el-icon-circle-plus-outline">新增</el-button> | |
| 29 | + <el-button @click="" style="background-color: #3F9B6A;color: #fff">批量导入</el-button> | |
| 30 | + </div> --> | |
| 31 | + <!-- 表格 --> | |
| 32 | + | |
| 33 | + <el-table :data="tableData" | |
| 34 | + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> | |
| 35 | + <el-table-column label="承租人名称"> | |
| 36 | + <template slot-scope="scope"> | |
| 37 | + {{scope.row.tenantName}} | |
| 38 | + | |
| 39 | + </template> | |
| 40 | + </el-table-column> | |
| 41 | + <el-table-column label="租赁类型"> | |
| 42 | + <template slot-scope="scope"> | |
| 43 | + {{scope.row.contractType}} | |
| 44 | + | |
| 45 | + </template> | |
| 46 | + </el-table-column> | |
| 47 | + <el-table-column label="租金/周期"> | |
| 48 | + <template slot-scope="scope"> | |
| 49 | + {{scope.row.contractAmount}} / {{scope.row.paymentCycle}} | |
| 50 | + | |
| 51 | + </template> | |
| 52 | + </el-table-column> | |
| 53 | + <el-table-column label="合同编号"> | |
| 54 | + <template slot-scope="scope"> | |
| 55 | + {{scope.row.contractNumber}} | |
| 56 | + | |
| 57 | + </template> | |
| 58 | + </el-table-column> | |
| 59 | + <el-table-column label="租赁起止时间"> | |
| 60 | + <template slot-scope="scope"> | |
| 61 | + {{scope.row.contractSigningDate}}至{{scope.row.contractTerminationDate}} | |
| 62 | + | |
| 63 | + </template> | |
| 64 | + </el-table-column> | |
| 65 | + | |
| 66 | + <el-table-column label="操作" fixed="right"> | |
| 67 | + <template slot-scope="scope"> | |
| 68 | + <div @click="details(scope.row)" class="tableBtn greens">查看</div> | |
| 69 | + <div @click="addgzd(scope.row)" class="tableBtn greens">生成退租告知单</div> | |
| 70 | + </template> | |
| 71 | + </el-table-column> | |
| 72 | + </el-table> | |
| 73 | + <div style="display: flex;justify-content: space-between;" class="bom"> | |
| 74 | + <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{total}}</span> 项数据</div> | |
| 75 | + <el-pagination :current-page="pagequery.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="10" background | |
| 76 | + small layout="prev, pager, next" :total="total" @size-change="handleSizeChange" | |
| 77 | + @current-change="handleCurrentChange"> | |
| 78 | + </el-pagination> | |
| 79 | + </div> | |
| 80 | + | |
| 81 | + </div> | |
| 82 | + | |
| 83 | + </div> | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + <div class="zhuti" v-if="onaction == '2'"> | |
| 91 | + <div style="height:58px;line-height:58px;"> | |
| 92 | + <div style="color:#0006"> <span>退租决算管理</span> <span style="padding:0 5px;">></span> <span | |
| 93 | + style="color:#000000e6">新增</span></div> | |
| 94 | + </div> | |
| 95 | + | |
| 96 | + <div style="padding: 20px 20px 20px 0;"> | |
| 97 | + <add :info="detailsinfo" @removeonaction="removeonaction"></add> | |
| 98 | + </div> | |
| 99 | + </div> | |
| 100 | + <div class="zhuti" v-if="onaction == '3'"> | |
| 101 | + <div style="height:58px;line-height:58px;"> | |
| 102 | + <div style="color:#0006"> <span>退租决算管理</span> <span style="padding:0 5px;">></span> <span | |
| 103 | + style="color:#000000e6">查看</span></div> | |
| 104 | + </div> | |
| 105 | + <div> | |
| 106 | + <busCha :info="detailsinfo" @removeonaction="removeonaction"></busCha> | |
| 107 | + </div> | |
| 108 | + <!-- <div> | |
| 109 | + <el-button class="buttonHover" | |
| 110 | + style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;" | |
| 111 | + @click="removeonaction('1')">返回</el-button> | |
| 112 | + </div> --> | |
| 113 | + </div> | |
| 114 | + </div> | |
| 115 | + | |
| 116 | + | |
| 117 | +</template> | |
| 118 | + | |
| 119 | +<script> | |
| 120 | + import { | |
| 121 | + contractGetAllnew, | |
| 122 | + } from '../../../api/manage.js' | |
| 123 | + import add from './add' | |
| 124 | + import busCha from '../../../components/buscha/busCha' | |
| 125 | + export default { | |
| 126 | + data() { | |
| 127 | + return { | |
| 128 | + detailsinfo:{}, | |
| 129 | + pagequery: { | |
| 130 | + pageNumber: 0, | |
| 131 | + pageSize: 10, | |
| 132 | + contractName: '', | |
| 133 | + dataStatus:'1', | |
| 134 | + }, | |
| 135 | + tableData: [], | |
| 136 | + total: 0, | |
| 137 | + onaction: '1', | |
| 138 | + info:{} | |
| 139 | + } | |
| 140 | + }, | |
| 141 | + components: { | |
| 142 | + add,busCha | |
| 143 | + }, | |
| 144 | + created() { | |
| 145 | + this.getAll() | |
| 146 | + | |
| 147 | + }, | |
| 148 | + methods: { | |
| 149 | + addgzd(row) { | |
| 150 | + this.detailsinfo = row | |
| 151 | + this.onaction = '2' | |
| 152 | + }, | |
| 153 | + details(row) { | |
| 154 | + this.detailsinfo = row | |
| 155 | + this.onaction = '3' | |
| 156 | + }, | |
| 157 | + biangeng(row) { | |
| 158 | + alert(`合同变更 - 店铺ID: ${row.id}`); | |
| 159 | + }, | |
| 160 | + xuyue(row) { | |
| 161 | + alert(`合同续约 - 店铺ID: ${row.id}`); | |
| 162 | + }, | |
| 163 | + zhongzhi(row) { | |
| 164 | + alert(`合同终止 - 店铺ID: ${row.id}`); | |
| 165 | + }, | |
| 166 | + async getAll() { | |
| 167 | + const res = await contractGetAllnew(this.pagequery) | |
| 168 | + this.tableData = res.data.content | |
| 169 | + this.total = res.data.totalElements | |
| 170 | + }, | |
| 171 | + removeonaction(e) { | |
| 172 | + console.error(e) | |
| 173 | + this.onaction = e | |
| 174 | + }, | |
| 175 | + handleCurrentChange(val) { | |
| 176 | + this.pagequery.pageNumber = val-1 | |
| 177 | + this.getAll() | |
| 178 | + }, | |
| 179 | + handleSizeChange(val) { | |
| 180 | + this.pagequery.pageSize = val | |
| 181 | + }, | |
| 182 | + // 查询按钮 | |
| 183 | + async onSubmit() { | |
| 184 | + this.pagequery.pageNumber = 0 | |
| 185 | + this.getAll() | |
| 186 | + }, | |
| 187 | + //重置按钮 | |
| 188 | + resetting() { | |
| 189 | + this.pagequery = { | |
| 190 | + pageNumber: 0, | |
| 191 | + pageSize: 10, | |
| 192 | + contractName: '', | |
| 193 | + dataStatus:'1', | |
| 194 | + }, | |
| 195 | + this.getAll() | |
| 196 | + }, | |
| 197 | + } | |
| 198 | + | |
| 199 | + } | |
| 200 | +</script> | |
| 201 | + | |
| 202 | +<style scoped> | |
| 203 | + .el-table { | |
| 204 | + /* height: calc(100vh - 330px); */ | |
| 205 | + } | |
| 206 | + | |
| 207 | + .zhuti { | |
| 208 | + padding: 0 20px 20px 20px; | |
| 209 | + min-height: calc(100vh - 50px - 20px); | |
| 210 | + background-color: #Fff; | |
| 211 | + | |
| 212 | + } | |
| 213 | + | |
| 214 | + .chengeXia { | |
| 215 | + border-bottom: 6px solid #3F9B6A; | |
| 216 | + padding-bottom: 4px; | |
| 217 | + color: #3F9B6A; | |
| 218 | + } | |
| 219 | + | |
| 220 | + /* /deep/ .el-form-item__content { | |
| 221 | + line-height: 0; | |
| 222 | + } */ | |
| 223 | + | |
| 224 | + .tableBtn { | |
| 225 | + display: inline-block; | |
| 226 | + margin-right: 10px; | |
| 227 | + color: #ACACAC; | |
| 228 | + } | |
| 229 | + | |
| 230 | + .formSearch { | |
| 231 | + display: flex; | |
| 232 | + width: 100%; | |
| 233 | + font-size: 14px; | |
| 234 | + justify-content: space-between; | |
| 235 | + } | |
| 236 | + | |
| 237 | + .greens { | |
| 238 | + color: #3F9B6A; | |
| 239 | + } | |
| 240 | + | |
| 241 | + /deep/ .el-table__row { | |
| 242 | + font-size: 14px; | |
| 243 | + color: #000000e6; | |
| 244 | + height: 42px; | |
| 245 | + } | |
| 246 | + | |
| 247 | + .fenye { | |
| 248 | + margin-top: 20px; | |
| 249 | + display: flex; | |
| 250 | + justify-content: space-between; | |
| 251 | + } | |
| 252 | + | |
| 253 | + /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active { | |
| 254 | + background-color: #3F9B6A; | |
| 255 | + } | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + .el-col { | |
| 260 | + border-radius: 4px; | |
| 261 | + } | |
| 262 | + | |
| 263 | + .bg-purple-dark { | |
| 264 | + background: #99a9bf; | |
| 265 | + } | |
| 266 | + | |
| 267 | + .bg-purple { | |
| 268 | + background: #d3dce6; | |
| 269 | + } | |
| 270 | + | |
| 271 | + .bg-purple-light { | |
| 272 | + background: #e5e9f2; | |
| 273 | + } | |
| 274 | + | |
| 275 | + .grid-content { | |
| 276 | + border-radius: 4px; | |
| 277 | + min-height: 36px; | |
| 278 | + } | |
| 279 | + | |
| 280 | + .row-bg { | |
| 281 | + padding: 10px 0; | |
| 282 | + background-color: #f9fafc; | |
| 283 | + } | |
| 284 | + | |
| 285 | + /deep/ .bg-purple[data-v-0e3fe4ec] { | |
| 286 | + background: #fff; | |
| 287 | + height: 50px; | |
| 288 | + } | |
| 289 | + | |
| 290 | + /deep/ .bg-purple[data-v-3bebae82] { | |
| 291 | + background: #fff; | |
| 292 | + height: 50px; | |
| 293 | + } | |
| 294 | + | |
| 295 | + ::v-deep .bg-purple { | |
| 296 | + background: #fff; | |
| 297 | + height: 50px; | |
| 298 | + } | |
| 299 | + | |
| 300 | + /deep/ .el-form--label-top .el-form-item__label { | |
| 301 | + padding: 0; | |
| 302 | + } | |
| 303 | + | |
| 304 | + ::v-deep .el-dialog__wrapper { | |
| 305 | + .el-dialog__header { | |
| 306 | + background-color: #fff; | |
| 307 | + } | |
| 308 | + } | |
| 309 | + | |
| 310 | + | |
| 311 | + | |
| 312 | + .dialog-footer { | |
| 313 | + display: flex; | |
| 314 | + justify-content: flex-end; | |
| 315 | + border-top: solid rgba(209, 209, 209, 0.2) 2px; | |
| 316 | + padding-top: 20px; | |
| 317 | + } | |
| 318 | + | |
| 319 | + | |
| 320 | + | |
| 321 | + | |
| 322 | + .el-select-dropdown__item.selected { | |
| 323 | + color: #3F9B6A; | |
| 324 | + } | |
| 325 | + | |
| 326 | + ::v-deep .el-dialog__title { | |
| 327 | + color: #000; | |
| 328 | + } | |
| 329 | + | |
| 330 | + ::v-deep .el-dialog__wrapper { | |
| 331 | + | |
| 332 | + .dialog_css { | |
| 333 | + margin-right: 12px; | |
| 334 | + margin-top: 61px !important; | |
| 335 | + | |
| 336 | + } | |
| 337 | + | |
| 338 | + .diaslog_zhong { | |
| 339 | + margin-left: 222px; | |
| 340 | + margin-top: 61px !important; | |
| 341 | + } | |
| 342 | + | |
| 343 | + } | |
| 344 | + | |
| 345 | + /deep/ .el-table_1_column_8 .hetong { | |
| 346 | + color: #7DBB9A; | |
| 347 | + text-decoration: underline; | |
| 348 | + } | |
| 349 | + | |
| 350 | + /deep/ .first-column-bg { | |
| 351 | + background-color: #FAFAFA !important; | |
| 352 | + } | |
| 353 | + | |
| 354 | + .el-table tr { | |
| 355 | + height: 56px; | |
| 356 | + } | |
| 357 | + | |
| 358 | + ::v-deep .table3 { | |
| 359 | + .el-table__empty-block { | |
| 360 | + display: none; | |
| 361 | + } | |
| 362 | + } | |
| 363 | + | |
| 364 | + ::v-deep .textarea { | |
| 365 | + width: 85%; | |
| 366 | + | |
| 367 | + .el-textarea__inner { | |
| 368 | + width: 100%; | |
| 369 | + } | |
| 370 | + } | |
| 371 | + | |
| 372 | + ::v-deep .el-button--mini { | |
| 373 | + padding: 7px 10px; | |
| 374 | + } | |
| 375 | + | |
| 376 | + ::v-deep .pass_input { | |
| 377 | + width: 100%; | |
| 378 | + | |
| 379 | + .el-input__inner { | |
| 380 | + border: none; | |
| 381 | + padding: 0; | |
| 382 | + } | |
| 383 | + } | |
| 384 | + | |
| 385 | + ::v-deep .pass_select { | |
| 386 | + width: 100%; | |
| 387 | + | |
| 388 | + .el-input__inner { | |
| 389 | + border: none; | |
| 390 | + padding: 0; | |
| 391 | + } | |
| 392 | + | |
| 393 | + .el-icon-arrow-up:before { | |
| 394 | + content: '' | |
| 395 | + } | |
| 396 | + | |
| 397 | + } | |
| 398 | + | |
| 399 | + /deep/ .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell { | |
| 400 | + background-color: #fff; | |
| 401 | + } | |
| 402 | +</style> | |
| 403 | +<style lang="scss" scoped> | |
| 404 | + ::v-deep .el-dialog__body { | |
| 405 | + padding: 0 0 !important; | |
| 406 | + } | |
| 407 | + | |
| 408 | + ::v-deep .buttonHover:hover { | |
| 409 | + color: #3f9b6a !important; | |
| 410 | + border-color: #c5e1d2 !important; | |
| 411 | + background-color: #ecf5f0 !important; | |
| 412 | + outline: none; | |
| 413 | + } | |
| 414 | +</style> | ... | ... |
admin-web-master/src/views/shopRental/rentTermination/index.vue
| ... | ... | @@ -34,35 +34,40 @@ |
| 34 | 34 | :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> |
| 35 | 35 | <el-table-column label="承租人名称"> |
| 36 | 36 | <template slot-scope="scope"> |
| 37 | - {{scope.row.tenantName}} | |
| 37 | + {{scope.row.cereContractInformation.tenantName}} | |
| 38 | 38 | |
| 39 | 39 | </template> |
| 40 | 40 | </el-table-column> |
| 41 | 41 | <el-table-column label="租赁类型"> |
| 42 | 42 | <template slot-scope="scope"> |
| 43 | - {{scope.row.contractType}} | |
| 43 | + {{scope.row.cereContractInformation.contractType}} | |
| 44 | 44 | |
| 45 | 45 | </template> |
| 46 | 46 | </el-table-column> |
| 47 | - <el-table-column label="租金/周期"> | |
| 47 | + <el-table-column label="手机号"> | |
| 48 | 48 | <template slot-scope="scope"> |
| 49 | - {{scope.row.contractAmount}} / {{scope.row.paymentCycle}} | |
| 49 | + {{scope.row.cereContractInformation.tenantTelephone}} | |
| 50 | 50 | |
| 51 | 51 | </template> |
| 52 | 52 | </el-table-column> |
| 53 | - <el-table-column label="合同编号"> | |
| 53 | + <el-table-column label="资源名称"> | |
| 54 | 54 | <template slot-scope="scope"> |
| 55 | - {{scope.row.contractNumber}} | |
| 55 | + {{scope.row.cereContractInformation.tenantTelephone}} | |
| 56 | 56 | |
| 57 | 57 | </template> |
| 58 | 58 | </el-table-column> |
| 59 | 59 | <el-table-column label="租赁起止时间"> |
| 60 | 60 | <template slot-scope="scope"> |
| 61 | - {{scope.row.contractSigningDate}}至{{scope.row.contractTerminationDate}} | |
| 61 | + {{scope.row.cereContractInformation.contractSigningDate}}至{{scope.row.cereContractInformation.contractTerminationDate}} | |
| 62 | 62 | |
| 63 | 63 | </template> |
| 64 | 64 | </el-table-column> |
| 65 | + <el-table-column label="申请时间"> | |
| 66 | + <template slot-scope="scope"> | |
| 67 | + {{scope.row.createTime}} | |
| 65 | 68 | |
| 69 | + </template> | |
| 70 | + </el-table-column> | |
| 66 | 71 | <el-table-column label="操作" fixed="right"> |
| 67 | 72 | <template slot-scope="scope"> |
| 68 | 73 | <div @click="details(scope.row)" class="tableBtn greens">查看</div> |
| ... | ... | @@ -118,8 +123,8 @@ |
| 118 | 123 | |
| 119 | 124 | <script> |
| 120 | 125 | import { |
| 121 | - contractGetAllnew, | |
| 122 | - } from '../../../api/manage.js' | |
| 126 | + changeContractInformationqueryByPage, | |
| 127 | + } from '@/api/newly.js' | |
| 123 | 128 | import add from './add' |
| 124 | 129 | import busCha from '../../../components/buscha/busCha' |
| 125 | 130 | export default { |
| ... | ... | @@ -164,7 +169,7 @@ |
| 164 | 169 | alert(`合同终止 - 店铺ID: ${row.id}`); |
| 165 | 170 | }, |
| 166 | 171 | async getAll() { |
| 167 | - const res = await contractGetAllnew(this.pagequery) | |
| 172 | + const res = await changeContractInformationqueryByPage(this.pagequery) | |
| 168 | 173 | this.tableData = res.data.content |
| 169 | 174 | this.total = res.data.totalElements |
| 170 | 175 | }, | ... | ... |
lvdao-miniapp/pagesA/myZiyuan/myZiyuanQuit.vue
| 1 | 1 | <template> |
| 2 | 2 | <view class="page"> |
| 3 | 3 | |
| 4 | - <view class="add-list"> | |
| 5 | - <u-form labelPosition="left" :model="ruleForm" ref="uForm" :labelWidth="250"> | |
| 6 | - <u-form-item label="*申请原因" prop="reasonForApplication" borderBottom> | |
| 7 | - </u-form-item> | |
| 8 | - <u-input v-model="ruleForm.reasonForApplication" type="textarea" :custom-style="customStyle"></u-input> | |
| 9 | - </u-form> | |
| 10 | - </view> | |
| 11 | -<view class="add-list"> | |
| 12 | - <u-form labelPosition="left" :model="ruleForm" ref="uForm" :labelWidth="250"> | |
| 4 | + <view class="add-list"> | |
| 5 | + <u-form labelPosition="left" :model="ruleForm" ref="uForm" :labelWidth="250"> | |
| 6 | + <u-form-item label="*申请原因" prop="reasonForApplication" borderBottom> | |
| 7 | + </u-form-item> | |
| 8 | + <u-input v-model="ruleForm.reasonForApplication" type="textarea" :custom-style="customStyle"></u-input> | |
| 9 | + </u-form> | |
| 10 | + </view> | |
| 11 | + <view class="add-list"> | |
| 12 | + <u-form labelPosition="left" :model="ruleForm" ref="uForm" :labelWidth="250"> | |
| 13 | 13 | <u-form-item label="*申请退租时间" prop="applicationTime" borderBottom> |
| 14 | 14 | <u-input v-model="ruleForm.applicationTime" type="select" @click="busStartshow = true" |
| 15 | - placeholder="请选择" :custom-style="selStyle"/> | |
| 16 | - <u-picker mode="time" v-model="busStartshow" :params="params" | |
| 17 | - @confirm="busStTimeChange"></u-picker> | |
| 15 | + placeholder="请选择" :custom-style="selStyle" /> | |
| 16 | + <u-picker mode="time" v-model="busStartshow" :params="params" @confirm="busStTimeChange"></u-picker> | |
| 18 | 17 | </u-form-item> |
| 19 | - | |
| 20 | - </u-form> | |
| 21 | - </view> | |
| 18 | + | |
| 19 | + </u-form> | |
| 20 | + </view> | |
| 22 | 21 | <!-- 保存按钮 --> |
| 23 | 22 | <view class="page-footer"> |
| 24 | 23 | <u-button type="success" style="flex: 1; margin: 0 10px;" @click="go">提交申请</u-button> |
| ... | ... | @@ -31,12 +30,12 @@ |
| 31 | 30 | data() { |
| 32 | 31 | return { |
| 33 | 32 | ruleForm: { |
| 34 | - reasonForApplication:'', | |
| 35 | - applicationTime:'', | |
| 36 | - contractId:0, | |
| 37 | - contractType:0, | |
| 38 | - createTime:'', | |
| 39 | - createUser:'' | |
| 33 | + reasonForApplication: '', | |
| 34 | + applicationTime: '', | |
| 35 | + contractId: 0, | |
| 36 | + contractType: 0, | |
| 37 | + createTime: '', | |
| 38 | + createUser: '' | |
| 40 | 39 | }, |
| 41 | 40 | busStartshow: false, |
| 42 | 41 | params: { |
| ... | ... | @@ -44,22 +43,22 @@ |
| 44 | 43 | month: true, |
| 45 | 44 | day: true, |
| 46 | 45 | }, |
| 47 | - customStyle:{ | |
| 48 | - padding:'10px', | |
| 49 | - backgroundColor:'#F0F0F0', | |
| 50 | - borderRadius:'10px', | |
| 51 | - | |
| 46 | + customStyle: { | |
| 47 | + padding: '10px', | |
| 48 | + backgroundColor: '#F0F0F0', | |
| 49 | + borderRadius: '10px', | |
| 50 | + | |
| 52 | 51 | }, |
| 53 | - selStyle:{ | |
| 54 | - textAlign:'right' | |
| 52 | + selStyle: { | |
| 53 | + textAlign: 'right' | |
| 55 | 54 | } |
| 56 | - | |
| 55 | + | |
| 57 | 56 | }; |
| 58 | 57 | }, |
| 59 | 58 | onLoad(option) { |
| 60 | - if(option.ids){ | |
| 61 | - this.ruleForm.contractId = Number(option.ids) | |
| 62 | - } | |
| 59 | + if (option.ids) { | |
| 60 | + this.ruleForm.contractId = Number(option.ids) | |
| 61 | + } | |
| 63 | 62 | }, |
| 64 | 63 | onShow() {}, |
| 65 | 64 | methods: { |
| ... | ... | @@ -75,27 +74,27 @@ |
| 75 | 74 | return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; |
| 76 | 75 | }, |
| 77 | 76 | chek() { |
| 78 | - if (!this.ruleForm.reasonForApplication) { | |
| 79 | - uni.showToast({ | |
| 80 | - icon: 'none', | |
| 81 | - title: '请输入申请原因' | |
| 82 | - }); | |
| 83 | - return; | |
| 84 | - } | |
| 85 | - if (!this.ruleForm.applicationTime) { | |
| 86 | - uni.showToast({ | |
| 87 | - icon: 'none', | |
| 88 | - title: '请选择退租申请时间' | |
| 89 | - }); | |
| 90 | - return; | |
| 91 | - } | |
| 92 | - | |
| 93 | - }, | |
| 77 | + if (!this.ruleForm.reasonForApplication) { | |
| 78 | + uni.showToast({ | |
| 79 | + icon: 'none', | |
| 80 | + title: '请输入申请原因' | |
| 81 | + }); | |
| 82 | + return; | |
| 83 | + } | |
| 84 | + if (!this.ruleForm.applicationTime) { | |
| 85 | + uni.showToast({ | |
| 86 | + icon: 'none', | |
| 87 | + title: '请选择退租申请时间' | |
| 88 | + }); | |
| 89 | + return; | |
| 90 | + } | |
| 91 | + | |
| 92 | + }, | |
| 94 | 93 | go() { |
| 95 | 94 | this.ruleForm.createUser = uni.getStorageSync('user').phone |
| 96 | 95 | this.ruleForm.createTime = this.getCurrentTime() |
| 97 | 96 | this.chek() |
| 98 | - this.$http.sendRequest('/changeContractInformation/add', 'POST',this.ruleForm, 1).then(res => { | |
| 97 | + this.$http.sendRequest('/changeContractInformation/add', 'POST', this.ruleForm, 1).then(res => { | |
| 99 | 98 | uni.showToast({ |
| 100 | 99 | title: '提交成功', |
| 101 | 100 | icon: 'none', |
| ... | ... | @@ -106,7 +105,7 @@ |
| 106 | 105 | |
| 107 | 106 | }) |
| 108 | 107 | }, |
| 109 | - timeChange(val) { | |
| 108 | + timeChange(val) { | |
| 110 | 109 | const { |
| 111 | 110 | year, |
| 112 | 111 | month, |
| ... | ... | @@ -118,13 +117,13 @@ |
| 118 | 117 | this.ruleForm.applicationTime = this.timeChange(val) |
| 119 | 118 | }, |
| 120 | 119 | |
| 121 | - | |
| 120 | + | |
| 122 | 121 | } |
| 123 | 122 | } |
| 124 | 123 | </script> |
| 125 | 124 | |
| 126 | 125 | <style scoped lang="scss"> |
| 127 | - .page{ | |
| 126 | + .page { | |
| 128 | 127 | position: absolute; |
| 129 | 128 | left: 0; |
| 130 | 129 | top: 0; |
| ... | ... | @@ -134,23 +133,24 @@ |
| 134 | 133 | background-color: #f6f6f6; |
| 135 | 134 | padding: 0 10px; |
| 136 | 135 | } |
| 136 | + | |
| 137 | 137 | .steps-box { |
| 138 | 138 | padding-top: 40rpx; |
| 139 | 139 | } |
| 140 | - | |
| 141 | - .add-list{ | |
| 142 | - | |
| 140 | + | |
| 141 | + .add-list { | |
| 142 | + | |
| 143 | 143 | padding: 0 20px 20px 20px; |
| 144 | 144 | background-color: #FFFFFF; |
| 145 | 145 | border-radius: 20rpx; |
| 146 | 146 | margin-top: 20rpx; |
| 147 | 147 | width: 100%; |
| 148 | - | |
| 149 | - | |
| 148 | + | |
| 149 | + | |
| 150 | 150 | } |
| 151 | - | |
| 151 | + | |
| 152 | 152 | /* 保存按钮 */ |
| 153 | - .page-footer{ | |
| 153 | + .page-footer { | |
| 154 | 154 | position: fixed; |
| 155 | 155 | left: 0; |
| 156 | 156 | bottom: 0; |
| ... | ... | @@ -161,50 +161,59 @@ |
| 161 | 161 | background-color: #FFFFFF; |
| 162 | 162 | padding-bottom: constant(safe-area-inset-bottom); |
| 163 | 163 | padding-bottom: env(safe-area-inset-bottom); |
| 164 | - .footer-buy{ | |
| 164 | + | |
| 165 | + .footer-buy { | |
| 165 | 166 | display: flex; |
| 166 | 167 | align-items: center; |
| 167 | 168 | justify-content: space-between; |
| 168 | 169 | width: 100%; |
| 169 | 170 | height: 100%; |
| 170 | - .cart-add{ | |
| 171 | + | |
| 172 | + .cart-add { | |
| 171 | 173 | display: flex; |
| 172 | 174 | align-items: center; |
| 173 | 175 | justify-content: center; |
| 174 | 176 | width: 100%; |
| 175 | 177 | height: 100rpx; |
| 176 | 178 | background-color: #3f9b6a; |
| 177 | - text{ | |
| 179 | + | |
| 180 | + text { | |
| 178 | 181 | font-size: 28rpx; |
| 179 | 182 | color: #FFFFFF; |
| 180 | 183 | } |
| 181 | 184 | } |
| 182 | 185 | } |
| 183 | 186 | } |
| 184 | - | |
| 185 | - .feedback-data{ | |
| 187 | + | |
| 188 | + .feedback-data { | |
| 186 | 189 | width: 100%; |
| 187 | 190 | padding-bottom: 20rpx; |
| 188 | 191 | border-bottom: 2rpx solid #f6f6f6; |
| 189 | - .title{ | |
| 192 | + | |
| 193 | + .title { | |
| 190 | 194 | display: flex; |
| 191 | 195 | align-items: center; |
| 192 | 196 | height: 100rpx; |
| 193 | - text{ | |
| 197 | + | |
| 198 | + text { | |
| 194 | 199 | font-size: 26rpx; |
| 195 | 200 | color: #222222; |
| 196 | 201 | } |
| 197 | - .star{ | |
| 202 | + | |
| 203 | + .star { | |
| 198 | 204 | color: red; |
| 199 | 205 | } |
| 200 | 206 | } |
| 201 | - .voucher-img{ | |
| 207 | + | |
| 208 | + .voucher-img { | |
| 202 | 209 | display: flex; |
| 203 | 210 | align-items: center; |
| 211 | + | |
| 204 | 212 | .voucher-list { |
| 205 | 213 | width: 33%; |
| 206 | 214 | height: 100%; |
| 207 | - image{ | |
| 215 | + | |
| 216 | + image { | |
| 208 | 217 | width: 160rpx; |
| 209 | 218 | height: 160rpx; |
| 210 | 219 | border-radius: 10rpx; | ... | ... |