Commit 8cb5c17e961feed2e34f4b3e0a2be17f13a68674

Authored by 杨鑫
1 parent 8550d958

'最新1'

yanshouban/src/App.vue
... ... @@ -28,22 +28,26 @@ export default {
28 28 created() {
29 29  
30 30 // this.fetchData()
  31 +
31 32 let refreshToken= localStorage.getItem('refreshToken');
32   - // if (this.$store.state.user.token) {
33   - // this.getPrivacySwitch();
34   - // } else if (refreshToken) {
35   - // this.handleLogin();
36   - // } else {
37   - // window.location.href = 'https://zhld.scjysm.com:1443/home'; // 直接跳转到指定的 URL
38   - // }
39   - if (refreshToken) {
40   - console.log(refreshToken)
41   - this.handleLogin();
42   - } else if (this.$store.state.user.token) {
  33 +
  34 + if (this.$store.state.user.token) {
43 35 this.getPrivacySwitch();
44   - } else {
45   - window.location.href = 'https://zhld.scjysm.com:1443/home'; // 直接跳转到指定的 URL
  36 + } else{
  37 + this.handleLogin();
46 38 }
  39 +//     if (refreshToken) {
  40 +//       if(!this.$store.state.user.token) {
  41 +//         this.handleLogin();
  42 +//       }  
  43 +//     } else {
  44 +
  45 +//     window.location.href = 'https://zhld.scjysm.com:1443/home'; // 直接跳转到指定的 URL
  46 +//     }
  47 +// if (this.$store.state.user.token) {
  48 +// this.getPrivacySwitch();
  49 +// }
  50 +
47 51 },
48 52 methods: {
49 53 handleLogin () {
... ...
yanshouban/src/api/rentalMan.js
... ... @@ -23,3 +23,31 @@ export function rentalAdd(data) {
23 23 data
24 24 })
25 25 }
  26 +
  27 +//导出出租管理
  28 +export function excelRentOutQueryByPage(data) {
  29 + return request({
  30 + url: '/cereLeasingInformation/excelRentOutQueryByPage',
  31 + method: 'post',
  32 + data,
  33 + responseType: 'blob'
  34 + })
  35 +}
  36 +//导出决算管理
  37 +export function excelManagementOfFinalAccountsForRentals(data) {
  38 + return request({
  39 + url: '/cereLeasingInformation/excelManagementOfFinalAccountsForRentals',
  40 + method: 'post',
  41 + data,
  42 + responseType: 'blob'
  43 + })
  44 +}
  45 +//导出续租管理
  46 +export function excelLeaseRenewalManagement(data) {
  47 + return request({
  48 + url: '/cereLeasingInformation/excelLeaseRenewalManagement',
  49 + method: 'post',
  50 + data,
  51 + responseType: 'blob'
  52 + })
  53 +}
... ...
yanshouban/src/utils/request.js
... ... @@ -21,9 +21,9 @@ if (host == '172.16.61.48' || host == '172.16.61.49 :5173' || host =='172.16.61.
21 21 // PREFIX = 'http://172.16.61.48/meserver/admin-server';
22 22 // PREFIX = 'http://192.168.2.213:9003';
23 23 // PREFIX = 'http://8.130.38.56:8019/admin-server';
24   - // PREFIX = 'http://192.168.2.250:9003';
  24 + PREFIX = 'http://192.168.8.106:9003';
25 25 // PREFIX = 'https://wjdc.scjysm.asia:1443/meserver/admin-server';
26   - PREFIX = 'https://jy.scjysm.asia:18086/admin-server';
  26 + // PREFIX = 'https://jy.scjysm.asia:18086/admin-server';
27 27 // PREFIX = 'http://172.16.61.126:8080/meserver/admin-server';
28 28 // PREFIX = 'https://wjdc.scjysm.asia:1443/meserver/admin-server'
29 29  
... ...
yanshouban/src/views/active/couponlist/component/shopList.vue
... ... @@ -122,6 +122,16 @@ export default {
122 122 const res = await businessListGetAll(formInline)
123 123 this.total = res.data.total
124 124 this.tableData = res.data.list
  125 + this.tableData.map(res=>{
  126 + res.shopPhone = this.$decrypt(res.shopPhone)
  127 + res.shopPassword = this.$decrypt(res.shopPassword)
  128 + res.idCardNum = this.$decrypt(res.idCardNum)
  129 + res.emailAddress = this.$decrypt(res.emailAddress)
  130 + res.shopAdress = this.$decrypt(res.shopAdress)
  131 + res.legalRepresentative = this.$decrypt(res.legalRepresentative)
  132 + res.chargePersonPhone = this.$decrypt(res.chargePersonPhone)
  133 +
  134 + })
125 135 }
126 136 }
127 137 }
... ...
yanshouban/src/views/ads/fangli/index.vue
... ... @@ -168,10 +168,13 @@
168 168 <div class="tableBtn greens" @click="handleEditForm(scope.row,true)" v-if="scope.row.auditStatus =='1'">
169 169 编辑
170 170 </div>
  171 + <div class="tableBtn greens" v-if="scope.row.auditStatus =='1'" @click="peizhi(scope.row)">
  172 + 审核流程配置
  173 + </div>
171 174 <div class="tableBtn greens" v-if="scope.row.enableStatus== 1 &&scope.row.auditStatus =='2'" @click="qiyong(scope.row,0)">
172 175 启用
173 176 </div>
174   - <div class="tableBtn greens" v-if="scope.row.enableStatus==0 &&scope.row.auditStatus =='2' " @click="qiyong(scope.row,1)">
  177 + <div class="tableBtn greens" v-if="scope.row.enableStatus == 0 &&scope.row.auditStatus =='2' " @click="qiyong(scope.row,1)">
175 178 禁用
176 179 </div>
177 180 <div class="tableBtn greens" @click="delGuan(scope.row)" >
... ... @@ -196,6 +199,28 @@
196 199 </div>
197 200 </div>
198 201 </div>
  202 + <el-dialog :visible.sync="peiShow" custom-class='bian_css' style="padding: 0;" width="75%"
  203 + :close-on-press-escape="false" center :close-on-click-modal="false" class="dialog_css_Xq" :show-close="false">
  204 + <div style="padding:20px;">
  205 + <el-form label-position="right" ref="jibenFrom" :model="peiForm" :rules="peiFormRules" label-width="140px"
  206 + style="position: relative">
  207 + <el-form-item label="审核提醒时间" class="grid-content bg-purple device-from" prop="planName">
  208 + <el-date-picker style="width:160px;margin-right:5px" v-model="peiForm.auditTime"
  209 + value-format="yyyy-M-d" type="daterange" range-separator="-" start-placeholder=""
  210 + end-placeholder="" prefix-icon="none" >
  211 + </el-date-picker>
  212 + </el-form-item>
  213 + </el-form>
  214 + <div style="padding-top:20px;display:flex;justify-content: flex-end;">
  215 + <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
  216 + @click="peiCheck">确定</el-button>
  217 + <el-button @click="peiShow = false" style="background-color: #3F9B6A;color: #fff">取消</el-button>
  218 +
  219 + </div>
  220 +
  221 + </div>
  222 +
  223 + </el-dialog>
199 224 <addxin :showAdd="addAct" @childClose='childClose' v-if="addAct"></addxin>
200 225 <xiang :showBian="banAct" :steat='steatqie' :list='itemXiang' @bianClose='bianClose' ></xiang>
201 226 </div>
... ... @@ -281,7 +306,14 @@ export default {
281 306 addAct:false,//新增框
282 307 banAct:false,//详情
283 308 steatqie:false,//编辑详情切换
284   - itemXiang:{}
  309 + itemXiang:{},
  310 + peiShow:false,
  311 + // peiFormRules
  312 + peiId:'',
  313 + peiForm:{
  314 + auditTime:''
  315 + }
  316 +
285 317 }
286 318 },
287 319  
... ... @@ -500,6 +532,24 @@ export default {
500 532 })
501 533 }
502 534 },
  535 + async peiCheck(){
  536 + if(this.peiForm.auditTime ==''){
  537 + this.$message({
  538 + message: '请填写审核提醒时间',
  539 + })
  540 + return;
  541 + }
  542 + await fangEdit({id:this.peiId,auditTime:this.peiForm.auditTime})
  543 + this.peiShow = false
  544 + this.getAll()
  545 + },
  546 + peizhi(item){
  547 + this.peiForm = {
  548 + auditTime:''
  549 + }
  550 + this.peiShow = true
  551 + this.peiId = item.id
  552 + },
503 553 }
504 554 }
505 555 </script>
... ...
yanshouban/src/views/business/autd/index.vue
... ... @@ -448,6 +448,12 @@ export default {
448 448 const res = await settlementGetAll(formInline)
449 449 this.tableData = res.data.list
450 450 this.total = res.data.total
  451 + this.tableData.map(res=>{
  452 + res.shopPhone = this.$decrypt(res.shopPhone)
  453 + res.shopPassword = this.$decrypt(res.shopPassword)
  454 + res.emailAddress = this.$decrypt(res.emailAddress)
  455 + res.idCardNum = this.$decrypt(res.idCardNum)
  456 + })
451 457 },
452 458 luru(item){
453 459 this.hetongBox = true
... ...
yanshouban/src/views/business/businessList/index.vue
... ... @@ -1058,6 +1058,15 @@ export default {
1058 1058 const res = await businessListGetAll(formInline)
1059 1059 this.total = res.data.total
1060 1060 this.tableData = res.data.list
  1061 + this.tableData.map(res=>{
  1062 + res.shopPhone = this.$decrypt(res.shopPhone)
  1063 + res.shopPassword = this.$decrypt(res.shopPassword)
  1064 + res.idCardNum = this.$decrypt(res.idCardNum)
  1065 + res.emailAddress = this.$decrypt(res.emailAddress)
  1066 + res.shopAdress = this.$decrypt(res.shopAdress)
  1067 + res.legalRepresentative = this.$decrypt(res.legalRepresentative)
  1068 + res.chargePersonPhone = this.$decrypt(res.chargePersonPhone)
  1069 + })
1061 1070 },
1062 1071 // 编辑号码
1063 1072 inputPhone () {
... ...
yanshouban/src/views/channel/list/index.vue
... ... @@ -178,6 +178,12 @@ export default {
178 178 this.list = data.list
179 179 this.tableOptions.total = data.total
180 180 this.loading = false
  181 + this.list.map(res=>{
  182 + res.name = this.$decrypt(res.name)
  183 + res.email = this.$decrypt(res.email)
  184 + res.idCardNum = this.$decrypt(res.idCardNum)
  185 + res.phone = this.$decrypt(res.phone)
  186 + })
181 187 },
182 188 /**
183 189 * 分页
... ...
yanshouban/src/views/comment/commentSys/index.vue
... ... @@ -293,6 +293,12 @@ export default {
293 293 const res = await commentSysGetall(formParams)
294 294 this.tableData = res.data.list
295 295 this.total = res.data.total
  296 + this.tableData.map(res=>{
  297 + res.name = this.$decrypt(res.name)
  298 + res.email = this.$decrypt(res.email)
  299 + res.idCardNum = this.$decrypt(res.idCardNum)
  300 + res.phone = this.$decrypt(res.phone)
  301 + })
296 302 }
297 303 }
298 304 }
... ...
yanshouban/src/views/comprehensive/Lcinquiry/index.vue
... ... @@ -107,7 +107,12 @@ async getAll(){
107 107 const res = await orderGetAll(this.formInline)
108 108 const Orderlist = await materialChangeInquiry(res.data.list)
109 109 this.tableData = Orderlist.data
110   -console.log(Orderlist.data)
  110 + this.tableData.map(res=>{
  111 + res.customerName = this.$decrypt(res.customerName)
  112 + res.receiveName = this.$decrypt(res.receiveName)
  113 + res.receivePhone = this.$decrypt(res.receivePhone)
  114 + res.receiveAdress = this.$decrypt(res.receiveAdress)
  115 + })
111 116 },
112 117 async search(){
113 118 this.formInline.dates = this.formParams.dates
... ... @@ -115,6 +120,12 @@ async search(){
115 120 const res = await orderGetAll(this.formInline)
116 121 const Orderlist = await materialChangeInquiry(res.data.list)
117 122 this.tableData = Orderlist.data
  123 + this.tableData.map(res=>{
  124 + res.customerName = this.$decrypt(res.customerName)
  125 + res.receiveName = this.$decrypt(res.receiveName)
  126 + res.receivePhone = this.$decrypt(res.receivePhone)
  127 + res.receiveAdress = this.$decrypt(res.receiveAdress)
  128 + })
118 129 },
119 130 clear(){
120 131 this.formInline.dates = []
... ...
yanshouban/src/views/comprehensive/OrderRhq/index.vue
... ... @@ -197,6 +197,12 @@ export default {
197 197 this.tableData = res.data.list
198 198 this.total = res.data.total
199 199 this.tableLoading = false
  200 + this.tableData.map(res=>{
  201 + res.customerName = this.$decrypt(res.customerName)
  202 + res.receiveName = this.$decrypt(res.receiveName)
  203 + res.receivePhone = this.$decrypt(res.receivePhone)
  204 + res.receiveAdress = this.$decrypt(res.receiveAdress)
  205 + })
200 206 },
201 207 // 导出订单
202 208 async orderDataExport() {
... ...
yanshouban/src/views/comprehensive/dAddress/index.vue
... ... @@ -120,6 +120,12 @@
120 120 const res = await orderGetAll(this.formInline)
121 121 const Orderlist = await deliveryAddressStatistics(res.data.list)
122 122 this.tableData = Orderlist.data
  123 + this.tableData.map(res=>{
  124 + res.customerName = this.$decrypt(res.customerName)
  125 + res.receiveName = this.$decrypt(res.receiveName)
  126 + res.receivePhone = this.$decrypt(res.receivePhone)
  127 + res.receiveAdress = this.$decrypt(res.receiveAdress)
  128 + })
123 129 },
124 130 async search(){
125 131 this.formInline.dates = this.formParams.dates
... ... @@ -127,6 +133,12 @@
127 133 const res = await orderGetAll(this.formInline)
128 134 const Orderlist = await deliveryAddressStatistics(res.data.list)
129 135 this.tableData = Orderlist.data
  136 + this.tableData.map(res=>{
  137 + res.customerName = this.$decrypt(res.customerName)
  138 + res.receiveName = this.$decrypt(res.receiveName)
  139 + res.receivePhone = this.$decrypt(res.receivePhone)
  140 + res.receiveAdress = this.$decrypt(res.receiveAdress)
  141 + })
130 142 },
131 143 clear(){
132 144 this.formInline.dates = []
... ...
yanshouban/src/views/comprehensive/psRanking/index.vue
... ... @@ -127,14 +127,14 @@ async getAll(){
127 127 const res = await orderGetAll(this.formInline)
128 128 const Orderlist = await salesRanking(res.data.list)
129 129 this.tableData = Orderlist.data
130   -console.log(Orderlist.data)
  130 +
131 131 },
132 132 async search(){
133 133 this.formInline.dates = this.formParams.dates
134 134 const res = await orderGetAll(this.formInline)
135 135 const Orderlist = await salesRanking(res.data.list)
136 136 this.tableData = Orderlist.data
137   - console.log(Orderlist.data)
  137 +
138 138 },
139 139 clear(){
140 140 this.formParams.dates =[]
... ...
yanshouban/src/views/couponmanagement/coupon.vue
... ... @@ -6,7 +6,7 @@
6 6 <div style="padding-bottom: 15px;padding-right: 30px;padding-left: 80px;font-weight: bold;">
7 7 所需金额:{{ changecouponfrom() }} 元
8 8 </div>
9   -
  9 +
10 10 <el-form ref="ruleForm" class="formBox" :model="couponfrom" label-width="150px" :rules="couponRules">
11 11 <el-form-item label="优惠券名称" prop="couponName">
12 12 <el-input v-model="couponfrom.couponName" placeholder="请输入优惠券名称" onblur="value=value.replace(/(^\s*)|(\s*$)/g, '')" />
... ... @@ -33,7 +33,7 @@
33 33 <el-form-item label="可用商品类别:">
34 34 <el-radio-group v-model="couponfrom.useCategory" @change="changeType">
35 35 <el-radio :label="1" >全部</el-radio>
36   - <el-radio :label="2" >选择类别</el-radio>
  36 + <el-radio :label="2" >选择类别</el-radio>
37 37 </el-radio-group>
38 38 </el-form-item>
39 39 <el-form-item label="选择商品类别:" v-if="couponfrom.useCategory === 2">
... ... @@ -50,15 +50,15 @@
50 50 <el-radio-group v-model="couponfrom.usedMerchants" >
51 51 <el-radio :label="1" >全平台</el-radio>
52 52 <!-- <el-radio :label="2" >自营</el-radio> -->
53   - <el-radio :label="3" >部分商家</el-radio>
  53 + <el-radio :label="3" >部分商家</el-radio>
54 54 </el-radio-group>
55 55 </el-form-item>
56 56 <el-form-item label="选择商家:" v-if="couponfrom.usedMerchants === 3">
57   - <el-select
58   - style="width: 100%;"
59   - multiple
60   - v-model="usedMerchants"
61   - placeholder="请选择"
  57 + <el-select
  58 + style="width: 100%;"
  59 + multiple
  60 + v-model="usedMerchants"
  61 + placeholder="请选择"
62 62 filterable
63 63 @change="changeusedMerchants"
64 64 >
... ... @@ -102,7 +102,7 @@
102 102 </div>
103 103 </div>
104 104 </template>
105   -
  105 +
106 106 <script>
107 107 import { commdityClassGetAll } from '@/api/renovation';
108 108 import TitleWithCircle from '@/components/top/index';
... ... @@ -138,8 +138,8 @@
138 138 if(this.couponfrom.couponType == '1') {
139 139 if(Number(this.couponfrom.discountContent) >= Number(this.couponfrom.maxDiscountAmount)) {
140 140 return callback(new Error('请满减金额大于优惠金额'));
141   - }
142   - }
  141 + }
  142 + }
143 143 callback();
144 144 }
145 145 return {
... ... @@ -171,7 +171,7 @@
171 171 if(val == '1') {
172 172 this.useCategory = null
173 173 } else {
174   - }
  174 + }
175 175 },
176 176 'couponfrom.usedMerchants'(val) {
177 177 this.usedMerchants = null
... ... @@ -199,7 +199,7 @@
199 199 this.couponfrom.startTime = ''
200 200 this.couponfrom.endTime = ''
201 201 }
202   -
  202 +
203 203 },
204 204 changecouponfrom() {
205 205 let num = 0
... ... @@ -224,6 +224,15 @@
224 224 pageSize: 400
225 225 })
226 226 this.shopList = res1.data.list
  227 + this.shopList.map(res=>{
  228 + res.shopPhone = this.$decrypt(res.shopPhone)
  229 + res.shopPassword = this.$decrypt(res.shopPassword)
  230 + res.idCardNum = this.$decrypt(res.idCardNum)
  231 + res.emailAddress = this.$decrypt(res.emailAddress)
  232 + res.shopAdress = this.$decrypt(res.shopAdress)
  233 + res.legalRepresentative = this.$decrypt(res.legalRepresentative)
  234 + res.chargePersonPhone = this.$decrypt(res.chargePersonPhone)
  235 + })
227 236 },
228 237 changeThreshold(val) { // 输入框值改变
229 238 if (val) {
... ... @@ -302,7 +311,7 @@
302 311 padding-left: 30px;
303 312 }
304 313 }
305   -
  314 +
306 315 </style>
307 316 <style scoped>
308 317 .flexBox /deep/ .el-input {
... ... @@ -353,6 +362,5 @@
353 362 input[type="number"]{
354 363 -moz-appearance: textfield;
355 364 }
356   -
  365 +
357 366 </style>
358   -
359 367 \ No newline at end of file
... ...
yanshouban/src/views/member/memberList/index.vue
... ... @@ -425,6 +425,11 @@ export default {
425 425 const res = await customerMageGetAll(formParams)
426 426 this.tableData = res.data.list
427 427 this.total = res.data.total
  428 + this.tableData.map(res=>{
  429 + res.phone = this.$decrypt(res.phone)
  430 + res.name = this.$decrypt(res.name)
  431 +
  432 + })
428 433 },
429 434 // 初始化查询所有标签
430 435 async getSelect (name) {
... ...
yanshouban/src/views/online/QRCode/index.vue
... ... @@ -175,6 +175,15 @@ export default {
175 175 const res = await businessListGetAll(formInline)
176 176 this.total = res.data.total
177 177 this.tableData = res.data.list
  178 + this.tableData.map(res=>{
  179 + res.shopPhone = this.$decrypt(res.shopPhone)
  180 + res.shopPassword = this.$decrypt(res.shopPassword)
  181 + res.idCardNum = this.$decrypt(res.idCardNum)
  182 + res.emailAddress = this.$decrypt(res.emailAddress)
  183 + res.shopAdress = this.$decrypt(res.shopAdress)
  184 + res.legalRepresentative = this.$decrypt(res.legalRepresentative)
  185 + res.chargePersonPhone = this.$decrypt(res.chargePersonPhone)
  186 + })
178 187 },
179 188 onSubmit(){
180 189  
... ...
yanshouban/src/views/online/QRFunds/index.vue
... ... @@ -175,6 +175,14 @@ export default {
175 175 const res = await businessListGetAll(formInline)
176 176 this.total = res.data.total
177 177 this.tableData = res.data.list
  178 + this.tableData.map(res=>{
  179 + res.shopPhone = this.$decrypt(res.shopPhone)
  180 + res.shopPassword = this.$decrypt(res.shopPassword)
  181 + res.idCardNum = this.$decrypt(res.idCardNum)
  182 + res.emailAddress = this.$decrypt(res.emailAddress)
  183 + res.shopAdress = this.$decrypt(res.shopAdress)
  184 + res.legalRepresentative = this.$decrypt(res.legalRepresentative)
  185 + })
178 186 },
179 187 onSubmit(){
180 188  
... ...
yanshouban/src/views/online/reconciliationProcessing/index.vue
... ... @@ -206,6 +206,12 @@ export default {
206 206 const res = await orderGetAll(this.formInline)
207 207 this.tableData = res.data.list
208 208 this.total = res.data.total
  209 + this.tableData.map(res=>{
  210 + res.customerName = this.$decrypt(res.customerName)
  211 + res.receiveName = this.$decrypt(res.receiveName)
  212 + res.receivePhone = this.$decrypt(res.receivePhone)
  213 + res.receiveAdress = this.$decrypt(res.receiveAdress)
  214 + })
209 215 // this.tableLoading = false
210 216 },
211 217 async getOrder(){
... ...
yanshouban/src/views/order/orderany/index.vue
... ... @@ -211,6 +211,12 @@
211 211 },
212 212 async getTotalData() {
213 213 const res = await orderGetAll(this.formParams)
  214 + res.map(item=>{
  215 + item.customerName = this.$decrypt(item.customerName)
  216 + item.receiveName = this.$decrypt(item.receiveName)
  217 + item.receivePhone = this.$decrypt(item.receivePhone)
  218 + item.receiveAdress = this.$decrypt(item.receiveAdress)
  219 + })
214 220 const Orderlist = await orderStatistics(res.data.list)
215 221 const tablelist = await orderStatisticsProductInformation(res.data.list)
216 222  
... ...
yanshouban/src/views/order/ordersel/index.vue
... ... @@ -200,6 +200,13 @@ export default {
200 200 this.tableData = res.data.list
201 201 this.total = res.data.total
202 202 this.tableLoading = false
  203 + this.tableData.map(item=>{
  204 + item.customerName = this.$decrypt(item.customerName)
  205 + item.receiveName = this.$decrypt(item.receiveName)
  206 + item.receivePhone = this.$decrypt(item.receivePhone)
  207 +item.receiveAdress = this.$decrypt(item.receiveAdress)
  208 +
  209 + })
203 210 },
204 211 // 导出订单
205 212 async orderDataExport() {
... ...
yanshouban/src/views/order/pending/index.vue
... ... @@ -199,6 +199,12 @@ export default {
199 199 this.tableData = res.data.list
200 200 this.total = res.data.total
201 201 this.tableLoading = false
  202 + this.tableData.map(res=>{
  203 + res.customerName = this.$decrypt(res.customerName)
  204 + res.receiveName = this.$decrypt(res.receiveName)
  205 + res.receivePhone = this.$decrypt(res.receivePhone)
  206 + res.receiveAdress = this.$decrypt(res.receiveAdress)
  207 + })
202 208 },
203 209 // 导出订单
204 210 async orderDataExport() {
... ...
yanshouban/src/views/renovation/brand/index.vue
... ... @@ -102,6 +102,12 @@ export default {
102 102 this.loading = false
103 103 this.list = data.list
104 104 this.tableOptions.total = data.total
  105 + this.list.map(res=>{
  106 + res.name = this.$decrypt(res.name)
  107 + res.email = this.$decrypt(res.email)
  108 + res.idCardNum = this.$decrypt(res.idCardNum)
  109 + res.phone = this.$decrypt(res.phone)
  110 + })
105 111 },
106 112 handleSizeChange (val) {
107 113 this.query.pageSize = val
... ...
yanshouban/src/views/rent/audit/index.vue
... ... @@ -1766,7 +1766,14 @@ contractNumber: &#39;&#39;, //合同对应的ID
1766 1766 this.selData.push(item.businessPurpose);
1767 1767 }
1768 1768 })
1769   -
  1769 + this.tableData.map(item=>{
  1770 + res.emailAddress = this.$decrypt(item.emailAddress)
  1771 + res.idNumber = this.$decrypt(item.idNumber)
  1772 + res.unifiedSocialCreditCode = this.$decrypt(item.unifiedSocialCreditCode)
  1773 + res.legalRepresentative = this.$decrypt(item.legalRepresentative)
  1774 + res.residence = this.$decrypt(item.residence)
  1775 + res.applicant = this.$decrypt(item.applicant)
  1776 + })
1770 1777 },
1771 1778 //编辑确认
1772 1779 async msgeditS(){
... ... @@ -1874,6 +1881,14 @@ contractNumber: &#39;&#39;, //合同对应的ID
1874 1881 GetAll(page).then(res=>{
1875 1882 this.tableData = res.data.content
1876 1883 this.total = res.data.content.length
  1884 + this.tableData.map(item=>{
  1885 + res.emailAddress = this.$decrypt(item.emailAddress)
  1886 + res.idNumber = this.$decrypt(item.idNumber)
  1887 + res.unifiedSocialCreditCode = this.$decrypt(item.unifiedSocialCreditCode)
  1888 + res.legalRepresentative = this.$decrypt(item.legalRepresentative)
  1889 + res.residence = this.$decrypt(item.residence)
  1890 + res.applicant = this.$decrypt(item.applicant)
  1891 + })
1877 1892 })
1878 1893  
1879 1894  
... ...
yanshouban/src/views/salesSta/dataSta.vue
... ... @@ -367,7 +367,12 @@ export default {
367 367  
368 368 this.tableLoading = true
369 369 const res = await orderGetAll(this.formInline)
370   -
  370 + res.map(item=>{
  371 + item.customerName = this.$decrypt(item.customerName)
  372 + item.receiveName = this.$decrypt(item.receiveName)
  373 + item.receivePhone = this.$decrypt(item.receivePhone)
  374 + item.receiveAdress = this.$decrypt(item.receiveAdress)
  375 + })
371 376 const Orderlist = await calculateGrossProfit(res.data.list)
372 377 const tablelist = await salesStatistics(res.data.list)
373 378 this.maoli = Orderlist.data
... ... @@ -375,6 +380,7 @@ const res = await orderGetAll(this.formInline)
375 380 // this.loading = false;
376 381 // this.total = res.data.total;
377 382 // this.tableData = res.data.list;
  383 +
378 384 },
379 385  
380 386  
... ...
yanshouban/src/views/setup/user/index.vue
... ... @@ -361,6 +361,12 @@ export default {
361 361 const res = await getList(formInline)
362 362 const res2 = await roleGetall({ search: '', page: 1, pageSize: 10 })
363 363 this.tableData = res.data.list
  364 + this.tableData.map(res=>{
  365 + res.name = this.$decrypt(res.name)
  366 + res.email = this.$decrypt(res.email)
  367 + res.idCardNum = this.$decrypt(res.idCardNum)
  368 + res.phone = this.$decrypt(res.phone)
  369 + })
364 370 this.total = res.data.total
365 371 this.roleList = res2.data.list
366 372 },
... ...
yanshouban/src/views/shopRental/manage/index.vue
... ... @@ -342,7 +342,7 @@
342 342 </template>
343 343 <div v-if="index ==2">{{heForm.contractAmount}}</div>
344 344 <el-input v-model="heForm.contractAmount" style="width:100%;" v-else placeholder="请输入"/>
345   - {{heForm.earnestMoney}}
  345 +
346 346 <!-- <el-input v-model="heForm.earnestMoney" placeholder="请输入" style="width:100%;" /> -->
347 347 </el-descriptions-item>
348 348 <el-descriptions-item>
... ...
yanshouban/src/views/shopRental/renewalMan/index.vue
... ... @@ -12,8 +12,16 @@
12 12 <el-form-item label="商户名称">
13 13 <el-input v-model="formSel.leaseName" placeholder="请输入" style="width:168px;" />
14 14 </el-form-item>
  15 + <el-form-item label="租赁类型">
  16 + <el-select v-model="formSel.leaseType" placeholder="请选择"
  17 + style="width: 168px;margin-right: 15px">
  18 + <el-option label="商铺" value="商铺" />
  19 + <el-option label="场地" value="场地" />
  20 + <el-option label="广告位" value="广告位" />
  21 + </el-select>
  22 + </el-form-item>
15 23 <el-form-item label="起租日期">
16   - <el-date-picker style="width:160px;margin-right:5px" v-model="formSel.cereContractInformation.leaseStartDate"
  24 + <el-date-picker style="width:160px;margin-right:5px" v-model="leaseStartDate"
17 25 value-format="yyyy-M-d" type="daterange" range-separator="-" start-placeholder=""
18 26 end-placeholder="" prefix-icon="none" >
19 27 </el-date-picker>
... ... @@ -27,64 +35,59 @@
27 35 </el-button>
28 36 </div>
29 37 </div>
30   - <!-- <div style="margin: 20px 0;">
  38 + <div style="margin: 20px 0;">
31 39 <div>
32 40 <el-button
33   - style="background-color: #3F9B6A;color: #fff;padding:8px 15px;">导出</el-button>
  41 + style="background-color: #3F9B6A;color: #fff;padding:8px 15px;" @click="daochu">导出</el-button>
34 42 </div>
35 43  
36   - </div> -->
  44 + </div>
37 45 <!-- 表格 -->
38 46  
39 47 <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
40 48 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" >
41   - <el-table-column label="合同编号" min-width="150" >
42   - <template slot-scope="scope">
43   - {{scope.row.cereContractInformation.contractNumber}}
44   -
45   - </template>
46   - </el-table-column>
47   - <el-table-column label="合同名称" min-width="200">
  49 + <el-table-column label="商户名称" min-width="150" >
48 50 <template slot-scope="scope">
49   - {{scope.row.cereContractInformation.contractName}}
  51 + {{scope.row.leaseName}}
50 52  
51 53 </template>
52 54 </el-table-column>
53   - <el-table-column label="合同金额" min-width="100">
54   - <template slot-scope="scope">
55   - {{scope.row.cereContractInformation.contractAmount}}
56   -
57   - </template>
58   - </el-table-column>
59   -
60   - <el-table-column label="起租日期" min-width="300">
61   - <template slot-scope="scope">
62   - {{scope.row.cereContractInformation.leaseStartDate}}
63   -
64   - </template>
65   - </el-table-column>
66   - <el-table-column label="出租人名称" min-width="100">
67   - <template slot-scope="scope">
68   - {{scope.row.cereContractInformation.lessorName}}
69   -
70   - </template>
71   - </el-table-column>
72   - <el-table-column label="承租人名称" min-width="150">
73   - <template slot-scope="scope">
74   - {{scope.row.cereContractInformation.tenantName}}
75   -
76   - </template>
77   - </el-table-column>
78   - <el-table-column label="商铺编号" min-width="150">
79   - <template slot-scope="scope">
80   - {{scope.row.cereContractInformation.shopNumber}}
81   - </template>
82   - </el-table-column>
83   -
84   - <el-table-column label="状态" prop="contractType" min-width="100">
85   -
86   - </el-table-column>
87   - <el-table-column label="操作" min-width="300">
  55 + <el-table-column label="承租人" min-width="150" >
  56 + <template slot-scope="scope">
  57 + {{scope.row.cereContractInformation.tenantName}}
  58 +
  59 + </template>
  60 + </el-table-column>
  61 + <el-table-column label="租赁类型" min-width="150" >
  62 + <template slot-scope="scope">
  63 + {{scope.row.leaseType}}
  64 +
  65 + </template>
  66 + </el-table-column>
  67 + <el-table-column label="资源名称" min-width="200">
  68 + <template slot-scope="scope">
  69 + {{scope.row.cereContractInformation.contractName}}
  70 +
  71 + </template>
  72 + </el-table-column>
  73 + <el-table-column label="合同编号" min-width="150" >
  74 + <template slot-scope="scope">
  75 + {{scope.row.cereContractInformation.contractNumber}}
  76 +
  77 + </template>
  78 + </el-table-column>
  79 +
  80 + <el-table-column label="起租日期" min-width="200">
  81 + <template slot-scope="scope">
  82 + {{scope.row.cereContractInformation.leaseStartDate}}
  83 +
  84 + </template>
  85 + </el-table-column>
  86 +
  87 + <el-table-column label="租赁状态" min-width="150">
  88 +
  89 + </el-table-column>
  90 + <el-table-column label="操作" min-width="250">
88 91 <template slot-scope="scope">
89 92 <div @click="details(scope.row)" class="tableBtn greens">查看</div>
90 93 <div @click="addbuss(3,scope.row)" class="tableBtn greens">续租</div>
... ... @@ -154,297 +157,346 @@
154 157 <div style="padding:20px;">
155 158 <div style="font-size: 14px;padding-bottom: 20px;color: #000;">租赁信息</div>
156 159 <div style="margin-bottom: 10px;">
157   - <el-descriptions class="margin-top" :column="3" border labelStyle="width:150px;height:42px;">
158   - <el-descriptions-item>
159   - <template slot="label">
160   - 租赁人
161   - </template>
162   - 张三
163   - </el-descriptions-item>
164   - <el-descriptions-item>
165   - <template slot="label">
166   - 意向租期
167   - </template>
168   - 2022-02-22至2022-03-22
169   - </el-descriptions-item>
170   - <el-descriptions-item>
171   - <template slot="label">
172   - 意向租金
173   - </template>
174   - 6000
175   - </el-descriptions-item>
176   - <el-descriptions-item>
177   - <template slot="label">
178   - 租赁主体
179   - </template>
180   - 四川省成都市太平洋有限公司
181   - </el-descriptions-item>
182   - <el-descriptions-item>
183   - <template slot="label">
184   - 经营者
185   - </template>
186   - 张三
187   - </el-descriptions-item>
188   - <el-descriptions-item>
189   - <template slot="label">
190   - 状态
191   - </template>
192   -
193   - </el-descriptions-item>
194   - </el-descriptions>
  160 + <el-descriptions class="margin-top" :column="3" border :labelStyle="labelStyle"
  161 + :contentStyle="contentStyle">
  162 + <el-descriptions-item>
  163 + <template slot="label">
  164 + 租赁人
  165 + </template>
  166 + <span >{{xiangData.tenant}}</span>
  167 +
  168 + </el-descriptions-item>
  169 + <el-descriptions-item>
  170 + <template slot="label">
  171 + 意向租期
  172 + </template>
  173 + <span >{{xiangData.intendedLeaseTerm}}</span>
  174 +
  175 + </el-descriptions-item>
  176 + <el-descriptions-item>
  177 + <template slot="label">
  178 + 意向租金
  179 + </template>
  180 + <span >{{xiangData.intentionalRent}}</span>
  181 +
  182 + </el-descriptions-item>
  183 + <el-descriptions-item>
  184 + <template slot="label">
  185 + 租赁主体
  186 + </template>
  187 + <span >{{xiangData.leasingEntity}}</span>
  188 +
  189 + </el-descriptions-item>
  190 + <el-descriptions-item>
  191 + <template slot="label">
  192 + 经营者
  193 + </template>
  194 + <span >{{xiangData.operator}}</span>
  195 +
  196 + </el-descriptions-item>
  197 + <el-descriptions-item>
  198 + <template slot="label">
  199 + 状态
  200 + </template>
  201 + <span >{{xiangData.state}}</span>
  202 +
  203 + </el-descriptions-item>
  204 + </el-descriptions>
195 205 </div>
196 206 <div style="">
197   - <el-descriptions class="margin-top" :column="3" border labelStyle="width:150px;">
198   - <el-descriptions-item>
199   - <template slot="label">
200   - 租赁类型
201   - </template>
202   - 商铺
203   - </el-descriptions-item>
204   - <el-descriptions-item>
205   - <template slot="label">
206   - 编号
207   - </template>
208   - 284771g
209   - </el-descriptions-item>
210   - <el-descriptions-item>
211   - <template slot="label">
212   - 名称
213   - </template>
214   - 成华公园南门口沿街铺
215   - </el-descriptions-item>
216   - <el-descriptions-item>
217   - <template slot="label">
218   - 行政区
219   - </template>
220   - 成华区
221   - </el-descriptions-item>
222   - <el-descriptions-item>
223   - <template slot="label">
224   - 地址
225   - </template>
226   - 成华公园南门口沿街铺
227   - </el-descriptions-item>
228   - <el-descriptions-item>
229   - <template slot="label">
230   - 所属主体
231   - </template>
232   - 绿道
233   - </el-descriptions-item>
234   - <el-descriptions-item>
235   - <template slot="label">
236   - 负责人
237   - </template>
238   - 王五
239   - </el-descriptions-item>
240   - <el-descriptions-item>
241   - <template slot="label">
242   - 联系电话
243   - </template>
244   - 18374658230
245   - </el-descriptions-item>
246   - <el-descriptions-item>
247   - <template slot="label">
248   - 范围
249   - </template>
250   - 123
251   - </el-descriptions-item>
252   - <el-descriptions-item>
253   - <template slot="label">
254   - 面积
255   - </template>
256   - 104.2
257   - </el-descriptions-item>
258   - <el-descriptions-item>
259   - <template slot="label">
260   - 建成时间
261   - </template>
262   - 2022-02-22
263   - </el-descriptions-item>
264   - <el-descriptions-item>
265   - <template slot="label">
266   - 房屋类型
267   - </template>
268   - -
269   - </el-descriptions-item>
270   - <el-descriptions-item>
271   - <template slot="label">
272   - 主要设施
273   - </template>
274   - -
275   - </el-descriptions-item>
276   - <el-descriptions-item>
277   - <template slot="label">
278   - 平面图
279   - </template>
280   - -
281   - </el-descriptions-item>
282   - <el-descriptions-item>
283   - <template slot="label">
284   - 收费标准
285   - </template>
286   - -
287   - </el-descriptions-item>
288   - <el-descriptions-item>
289   - <template slot="label">
290   - 标签
291   - </template>
292   - -
293   - </el-descriptions-item>
294   - <el-descriptions-item>
295   - <template slot="label">
296   - 备注信息
297   - </template>
298   - -
299   - </el-descriptions-item>
300   - <el-descriptions-item>
301   - <template slot="label">
302   - 宣传视频
303   - </template>
304   - -
305   - </el-descriptions-item>
306   - <el-descriptions-item>
307   - <template slot="label">
308   - 宣传图片
309   - </template>
310   - -
311   - </el-descriptions-item>
312   - <el-descriptions-item>
313   - <template slot="label">
314   - 备注信息
315   - </template>
316   - -
317   - </el-descriptions-item>
318   - </el-descriptions>
  207 + <el-descriptions class="margin-top" :column="3" border :labelStyle="labelStyle"
  208 + :contentStyle="contentStyle">
  209 + <el-descriptions-item>
  210 + <template slot="label">
  211 + 租赁类型
  212 + </template>
  213 + <span >{{xiangData.leaseType}}</span>
  214 +
  215 + </el-descriptions-item>
  216 + <el-descriptions-item>
  217 + <template slot="label">
  218 + 编号
  219 + </template>
  220 + <span >{{xiangData.leaseCode}}</span>
  221 +
  222 + </el-descriptions-item>
  223 + <el-descriptions-item>
  224 + <template slot="label">
  225 + 名称
  226 + </template>
  227 + <span >{{xiangData.leaseName}}</span>
  228 +
  229 + </el-descriptions-item>
  230 + <el-descriptions-item>
  231 + <template slot="label">
  232 + 行政区
  233 + </template>
  234 + <span >{{xiangData.administrativeRegion}}</span>
  235 +
  236 + </el-descriptions-item>
  237 + <el-descriptions-item>
  238 + <template slot="label">
  239 + 地址
  240 + </template>
  241 + <span >{{xiangData.leaseAddress}}</span>
  242 +
  243 + </el-descriptions-item>
  244 + <el-descriptions-item>
  245 + <template slot="label">
  246 + 所属主体
  247 + </template>
  248 + <span >{{xiangData.owner}}</span>
  249 +
  250 + </el-descriptions-item>
  251 + <el-descriptions-item>
  252 + <template slot="label">
  253 + 负责人
  254 + </template>
  255 + <span >{{xiangData.commander}}</span>
  256 +
  257 + </el-descriptions-item>
  258 + <el-descriptions-item>
  259 + <template slot="label">
  260 + 联系电话
  261 + </template>
  262 + <span >{{xiangData.telephone}}</span>
  263 +
  264 + </el-descriptions-item>
  265 + <el-descriptions-item>
  266 + <template slot="label">
  267 + 范围
  268 + </template>
  269 + <span >{{xiangData.scope}}</span>
  270 +
  271 + </el-descriptions-item>
  272 + <el-descriptions-item>
  273 + <template slot="label">
  274 + 面积
  275 + </template>
  276 + <span >{{xiangData.area}}</span>
  277 +
  278 + </el-descriptions-item>
  279 + <el-descriptions-item>
  280 + <template slot="label">
  281 + 建成时间
  282 + </template>
  283 + <span >{{xiangData.completionTime}}</span>
  284 +
  285 + </el-descriptions-item>
  286 + <el-descriptions-item>
  287 + <template slot="label">
  288 + 房屋类型
  289 + </template>
  290 + <span >{{xiangData.houseType}}</span>
  291 +
  292 + </el-descriptions-item>
  293 + <el-descriptions-item>
  294 + <template slot="label">
  295 + 主要设施
  296 + </template>
  297 + <span >{{xiangData.mainFacilities}}</span>
  298 +
  299 + </el-descriptions-item>
  300 + <el-descriptions-item>
  301 + <template slot="label">
  302 + 平面图
  303 + </template>
  304 + <span >{{xiangData.planeFigure}}</span>
  305 +
  306 + </el-descriptions-item>
  307 + <el-descriptions-item>
  308 + <template slot="label">
  309 + 收费标准
  310 + </template>
  311 + <span >{{xiangData.feeStandards}}</span>
  312 +
  313 + </el-descriptions-item>
  314 + <el-descriptions-item>
  315 + <template slot="label">
  316 + 标签
  317 + </template>
  318 + <span >{{xiangData.label}}</span>
  319 +
  320 + </el-descriptions-item>
  321 +
  322 + <el-descriptions-item>
  323 + <template slot="label">
  324 + 宣传视频
  325 + </template>
  326 + <span >{{xiangData.promotionVideo}}</span>
  327 +
  328 + </el-descriptions-item>
  329 + <el-descriptions-item>
  330 + <template slot="label">
  331 + 宣传图片
  332 + </template>
  333 + <span >{{xiangData.promotionImage}}</span>
  334 +
  335 + </el-descriptions-item>
  336 + <el-descriptions-item>
  337 + <template slot="label">
  338 + 备注信息
  339 + </template>
  340 + <span >{{xiangData.notes}}</span>
  341 +
  342 + </el-descriptions-item>
  343 + </el-descriptions>
319 344 </div>
320 345 <div style="font-size: 14px;padding: 20px 0;color: #000;">合同信息</div>
321 346 <div>
322   - <el-descriptions class="margin-top" :column="3" border labelStyle="width:150px;height:42px;">
  347 + <el-descriptions class="margin-top" :column="3" border :labelStyle="labelStyle"
  348 + :contentStyle="contentStyle">
323 349 <el-descriptions-item>
324 350 <template slot="label">
325 351 合同编号
326 352 </template>
327   - 296747
  353 + <div >{{heData.contractNumber}}</div>
  354 +
328 355 </el-descriptions-item>
329 356 <el-descriptions-item>
330 357 <template slot="label">
331 358 标段号
332 359 </template>
333   - 7346sfgh
  360 + <div >{{heData.sectionNumber}}</div>
  361 +
  362 +
334 363 </el-descriptions-item>
335 364 <el-descriptions-item>
336 365 <template slot="label">
337 366 合同名称
338 367 </template>
339   - 火星商铺
  368 + <div >{{heData.contractName}}</div>
  369 +
340 370 </el-descriptions-item>
341 371 <el-descriptions-item>
342 372 <template slot="label">
343 373 合同金额
344 374 </template>
345   - 6000
  375 + <div >{{heData.contractAmount}}</div>
  376 +
346 377 </el-descriptions-item>
347 378 <el-descriptions-item>
348 379 <template slot="label">
349 380 保证金
350 381 </template>
351   - 3000
  382 + <div >{{heData.contractAmount}}</div>
  383 +
  384 +
  385 +
352 386 </el-descriptions-item>
353 387 <el-descriptions-item>
354 388 <template slot="label">
355 389 合同签订日期
356 390 </template>
357   - 2022-02-22
  391 + <div >{{heData.contractSigningDate}}</div>
  392 +
358 393 </el-descriptions-item>
359 394 <el-descriptions-item>
360 395 <template slot="label">
361 396 合同终止日期
362 397 </template>
363   - 254
  398 + <div >{{heData.contractTerminationDate}}</div>
  399 +
364 400 </el-descriptions-item>
365 401 <el-descriptions-item>
366 402 <template slot="label">
367 403 起租日期
368 404 </template>
369   - 245
  405 + <div >{{heData.leaseStartDate}}</div>
  406 +
370 407 </el-descriptions-item>
371 408 <el-descriptions-item>
372 409 <template slot="label">
373 410 出租人名称
374 411 </template>
375   - 245
  412 + <div >{{heData.lessorName}}</div>
  413 +
376 414 </el-descriptions-item>
377 415 <el-descriptions-item>
378 416 <template slot="label">
379 417 联系电话
380 418 </template>
381   - 688
  419 + <div >{{heData.telephone}}</div>
  420 +
382 421 </el-descriptions-item>
383 422 <el-descriptions-item>
384 423 <template slot="label">
385 424 银行账号
386 425 </template>
387   - 2435
  426 + <div >{{heData.bankAccount}}</div>
  427 +
388 428 </el-descriptions-item>
389 429 <el-descriptions-item>
390 430 <template slot="label">
391 431 承租人名称
392 432 </template>
393   - 976543
  433 + <div >{{heData.tenantName}}</div>
  434 +
394 435 </el-descriptions-item>
395 436 <el-descriptions-item>
396 437 <template slot="label">
397 438 承租人联系电话
398 439 </template>
399   - 23123
  440 + <div >{{heData.tenantTelephone}}</div>
  441 +
400 442 </el-descriptions-item>
401 443 <el-descriptions-item>
402 444 <template slot="label">
403 445 承租人银行账号
404 446 </template>
405   - 7654
  447 + <div >{{heData.tenantBankAccount}}</div>
  448 +
406 449 </el-descriptions-item>
407 450 <el-descriptions-item>
408 451 <template slot="label">
409 452 商铺编号
410 453 </template>
411   - 876543
  454 + <div >{{heData.shopNumber}}</div>
  455 +
412 456 </el-descriptions-item>
413 457 <el-descriptions-item>
414 458 <template slot="label">
415 459 商铺名称
416 460 </template>
417   - 87654
  461 + <div >{{heData.shopName}}</div>
  462 +
418 463 </el-descriptions-item>
419 464 <el-descriptions-item>
420 465 <template slot="label">
421 466 商铺地址
422 467 </template>
423   - 765
  468 + <div >{{heData.shopAddress}}</div>
  469 +
424 470 </el-descriptions-item>
425 471 <el-descriptions-item>
426 472 <template slot="label">
427 473 商铺面积
428 474 </template>
429   - 76543
  475 + <div >{{heData.shopArea}}</div>
  476 +
430 477 </el-descriptions-item>
431 478 <el-descriptions-item>
432 479 <template slot="label">
433   - 商业态
  480 + 商业态
434 481 </template>
435   - 76543
  482 + <div >{{heData.storeFormats}}</div>
  483 +
436 484 </el-descriptions-item>
437 485 <el-descriptions-item>
438 486 <template slot="label">
439 487 经营项目
440 488 </template>
441   - 7654
  489 + <div >{{heData.businessProjects}}</div>
  490 +
442 491 </el-descriptions-item>
443 492 <el-descriptions-item>
444 493 <template slot="label">
445 494 合同附件
446 495 </template>
447   - 765
  496 + <!-- <el-upload class="video-uploader" :action="uploadFileUrl" :on-remove="hefuRemove"
  497 + :on-success="hefuSuccess" :auto-upload="true" :file-list="hefuData" v-if="index==1">
  498 + <div slot="trigger" style="color:#3f9b6a"> +点击上传</div>
  499 + </el-upload> -->
448 500 </el-descriptions-item>
449 501 </el-descriptions>
450 502 </div>
... ... @@ -601,55 +653,55 @@
601 653 <div style="padding:20px">
602 654 <el-form ref="form" :model="xudan" label-width="120px">
603 655 <el-form-item label="甲方">
604   - <el-input v-model="xudan.name" disabled placeholder="张三"></el-input>
  656 + <el-input v-model="xudan.lessorName" disabled placeholder=""></el-input>
605 657 </el-form-item>
606 658 <el-form-item label="乙方">
607   - <el-input v-model="xudan.name" disabled placeholder="四川省成都市太平洋有限公司"></el-input>
  659 + <el-input v-model="xudan.tenantName" disabled placeholder=""></el-input>
608 660 </el-form-item>
609 661 <el-form-item label="商铺名称">
610   - <el-input v-model="xudan.name" disabled placeholder="成华公园南门口沿街铺"></el-input>
  662 + <el-input v-model="xudan.leaseName" disabled placeholder=""></el-input>
611 663 </el-form-item>
612 664 <el-form-item label="商铺地址">
613   - <el-input v-model="xudan.name" disabled placeholder="南门口沿街铺"></el-input>
  665 + <el-input v-model="xudan.leaseAddress" disabled placeholder=""></el-input>
614 666 </el-form-item>
615 667 <el-form-item label="租赁合同编号" >
616   - <el-input v-model="xudan.name" disabled placeholder="165146"></el-input>
  668 + <el-input v-model="xudan.contractNumber" disabled placeholder=""></el-input>
617 669 </el-form-item>
618 670 <el-form-item label="起租日期">
619   - <el-input v-model="xudan.name" disabled placeholder="2024-10-1"></el-input>
  671 + <el-input v-model="xudan.completionTime" disabled placeholder=""></el-input>
620 672 </el-form-item>
621 673 <el-form-item label="租赁期限">
622   - <el-input v-model="xudan.name" disabled placeholder="1年"></el-input>
  674 + <el-input v-model="xudan.intendedLeaseTerm" disabled placeholder=""></el-input>
623 675 </el-form-item>
624 676 <el-form-item label="租赁情况">
625   - <el-input v-model="xudan.name" disabled placeholder="已租"></el-input>
  677 + <el-input v-model="xudan.name" disabled></el-input>
626 678 </el-form-item>
627 679 <el-form-item label="续租期限">
628   - <el-input v-model="xudan.name" disabled placeholder="1年"></el-input>
  680 + <el-input v-model="xudan.intendedLeaseTerm" disabled ></el-input>
629 681 </el-form-item>
630 682 <el-form-item label="租金">
631   - <el-input v-model="xudan.name" disabled placeholder="6000"></el-input>
  683 + <el-input v-model="xudan.intentionalRent" disabled ></el-input>
632 684 </el-form-item>
633 685 <el-form-item label="租金支付方式">
634 686 <el-input v-model="xudan.name" disabled placeholder="微信"></el-input>
635 687 </el-form-item>
636 688 <el-form-item label="租金支付日期">
637   - <el-input v-model="xudan.name" disabled placeholder="1号"></el-input>
  689 + <el-input v-model="xudan.name" disabled placeholder=""></el-input>
638 690 </el-form-item>
639 691 <el-form-item label="使用用途">
640   - <el-input v-model="xudan.name" disabled placeholder="-"></el-input>
  692 + <el-input v-model="xudan.name" disabled placeholder=""></el-input>
641 693 </el-form-item>
642 694 <el-form-item label="物业管理费">
643   - <el-input v-model="xudan.name" disabled placeholder="10"></el-input>
  695 + <el-input v-model="xudan.wuye" placeholder="请输入"></el-input>
644 696 </el-form-item>
645 697 <el-form-item label="水电费">
646   - <el-input v-model="xudan.name" disabled placeholder="100"></el-input>
  698 + <el-input v-model="xudan.shuidian" placeholder="请输入"></el-input>
647 699 </el-form-item>
648 700 <el-form-item label="续租注意事项">
649   - <wang-editor v-model="xudan.summary" ref="editor" :height="200"></wang-editor>
  701 + <wang-editor v-model="xudan.zhuangxiu" ref="editor" :height="200"></wang-editor>
650 702 </el-form-item>
651 703 <el-form-item label="其他备注信息">
652   - <wang-editor v-model="xudan.summary" ref="editor" :height="200"></wang-editor>
  704 + <wang-editor v-model="xudan.noto" ref="editor" :height="200"></wang-editor>
653 705 </el-form-item>
654 706 </el-form>
655 707  
... ... @@ -660,7 +712,7 @@
660 712 <div style="display: flex;justify-content: flex-end;">
661 713 <el-button @click="danzhengShow=false" class="buttonHover"
662 714 style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">返回</el-button>
663   - <el-button @click="addCheck(3)" style="background-color: #3F9B6A;color: #fff">保存</el-button>
  715 + <!-- <el-button @click="addCheck(3)" style="background-color: #3F9B6A;color: #fff">保存</el-button> -->
664 716 <el-button @click="yulan =true" style="background-color: #3F9B6A;color: #fff">预览</el-button>
665 717 </div>
666 718 </div>
... ... @@ -671,71 +723,71 @@
671 723 <div class="form-header">续租单</div>
672 724 <div class="form-group">
673 725 <label for="partyA">甲方:</label>
674   - <input type="text" id="partyA" disabled="true">
  726 + <input type="text" id="partyA" disabled v-model="xudan.lessorName">
675 727 </div>
676 728 <div class="form-group">
677 729 <label for="partyB">乙方:</label>
678   - <input type="text" id="partyB" disabled="true">
  730 + <input type="text" id="partyB" v-model="xudan.tenantName" disabled>
679 731 </div>
680 732 <div class="form-group">
681 733 <label for="shopName">商铺名称:</label>
682   - <input type="text" id="shopName" disabled="true">
  734 + <input type="text" id="shopName" v-model="xudan.leaseName" disabled>
683 735 </div>
684 736 <div class="form-group">
685 737 <label for="shopAddress">商铺地址:</label>
686   - <input type="text" id="shopAddress" disabled="true">
  738 + <input type="text" id="shopAddress" v-model="xudan.leaseAddress" disabled>
687 739 </div>
688 740 <div class="form-group">
689 741 <label for="shopArea">租赁合同编号:</label>
690   - <input type="text" id="shopArea" disabled="true">
  742 + <input type="text" id="shopAddress" v-model="xudan.leaseAddress" disabled>
691 743 </div>
692 744 <div class="form-group">
693 745 <label>起租日期:</label>
694   - <input type="text" id="startDate" disabled="true">
  746 + <input type="text" id="startDate" v-model="xudan.completionTime" disabled>
695 747 </div>
696 748 <div class="form-group">
697 749 <label for="leaseTerm">租赁期限:</label>
698   - <input type="text" id="leaseTerm" disabled="true">
  750 + <input type="text" id="leaseTerm" v-model="xudan.intendedLeaseTerm" disabled>
699 751 </div>
700 752 <div class="form-group">
701 753 <label for="rentAmount">租赁情况:</label>
702   - <input type="text" id="rentAmount" disabled="true">
  754 + <input type="text" id="leaseTerm" v-model="xudan.name" disabled>
703 755 </div>
704 756 <div class="form-group">
705 757 <label for="paymentMethod">续租期限:</label>
706   - <input type="text" id="paymentMethod" disabled="true">
  758 + <input type="text" id="leaseTerm" v-model="xudan.intendedLeaseTerm" disabled>
707 759 </div>
708 760 <div class="form-group">
709 761 <label>租金支付方式:</label>
710   - <input type="text" id="paymentDate" disabled="true">
  762 + <input type="text" id="leaseTerm" placeholder="微信" disabled>
711 763 </div>
712 764 <div class="form-group">
713 765 <label for="depositAmount">租金支付日期:</label>
714   - <input type="text" id="depositAmount" disabled="true">
  766 + <input type="text" id="depositAmount" disabled>
715 767 </div>
716 768 <div class="form-group">
717 769 <label for="depositAmount">租金:</label>
718   - <input type="text" id="depositAmount" disabled="true">
  770 + <input type="text" id="rentAmount" v-model="xudan.intentionalRent" disabled>
719 771 </div>
720 772 <div class="form-group">
721 773 <label for="usePurpose">使用用途:</label>
722   - <input type="text" id="usePurpose" disabled="true">
  774 + <input type="text" id="usePurpose" placeholder="" disabled>
723 775 </div>
724 776 <div class="form-group">
725 777 <label for="otherFees">物业管理费:</label>
726   - <input type="text" id="usePurpose" disabled="true">
  778 + <input type="text" id="usePurpose" v-model="xudan.wuye" disabled>
727 779 </div>
728 780 <div class="form-group">
729 781 <label for="otherFees">水电费:</label>
730   - <input type="text" id="usePurpose" disabled="true">
  782 + <input type="text" id="usePurpose" v-model="xudan.shuidian" disabled>
731 783 </div>
732 784 <div class="form-group">
733 785 <label for="renovationRules">续租注意事项:</label>
734   - <div style="padding:20px;width:100%;border: 1px solid #ccc;" v-html="zhong.summary"></div>
  786 + <div style="padding:20px;width:100%;border: 1px solid #ccc;" v-html="xudan.zhuangxiu"></div>
735 787 </div>
736 788 <div class="form-group">
737 789 <label for="remarks">其他备注信息:</label>
738   - <div style="padding:20px;width:100%;border: 1px solid #ccc;" v-html="zhong.summary"></div>
  790 + <div style="padding:20px;width:100%;border: 1px solid #ccc;" v-html="xudan.noto"></div>
739 791 </div>
740 792 </div>
741 793  
... ... @@ -768,13 +820,9 @@
768 820 cereLeasingEdit
769 821 } from '../../../api/manage.js'
770 822 import {
771   - businessListGetAll,
772   - businessListSave,
773   - businessListGetById,
774   - businessListUpdate,
775   - businessListStart,
776   - delBusinessById
777   - } from '@/api/business'
  823 + rentalGetAll,
  824 + excelLeaseRenewalManagement
  825 + } from '../../../api/rentalMan.js'
778 826 import wangEditor from "@/components/editor/index"
779 827 import html2canvas from 'html2canvas'
780 828 import jsPDF from 'jspdf'
... ... @@ -817,13 +865,28 @@
817 865 tableData: [
818 866  
819 867 ],
820   - formSel: {
821   - shopName:'',
822   - search:'',
823   - createUser:'',
824   - page: '1', // 当前页
825   - pageSize: '10' // 每页记录数
826   - },
  868 + leaseStartDate:[],
  869 + formSel: {
  870 + leaseName:'',
  871 + leaseType:'',
  872 + cereContractInformation:{
  873 + leaseStartDate:'',
  874 + },
  875 + pageNumber: 1,
  876 + pageSize: 10,
  877 +
  878 + },
  879 + xiangData:{},
  880 + heData:{},
  881 + contentStyle:{
  882 + width:'20%',
  883 + height:'42px',
  884 + },
  885 + labelStyle:{
  886 + width:'150px',
  887 + height:'42px',
  888 + color:'#000',
  889 + },
827 890 pageindex: {
828 891 pageNumber: 1,
829 892 pageSize: 10,
... ... @@ -831,7 +894,18 @@
831 894 bianjiBox:1,
832 895 chengeTatle:1,
833 896 xudan:{
834   -
  897 + lessorName:'',
  898 + tenantName:'',
  899 + leaseName:'',
  900 + leaseAddress:'',
  901 + contractNumber:'',
  902 + completionTime:'',
  903 + intendedLeaseTerm:'',
  904 + intentionalRent:'',
  905 + wuye:'',
  906 + shuidian:'',
  907 + zhuangxiu:'',
  908 + noto:'',
835 909 },
836 910 zhong:{
837 911  
... ... @@ -869,10 +943,9 @@
869 943 this.chengeTatle = val
870 944 },
871 945 async getAll(val) {
872   - // const res = await contractGetAll(this.pageindex)
873   - // console.log(res.data.content)
874   - // this.tableData = res.data.content
875   - // this.total = res.data.content.length
  946 + const res = await rentalGetAll(this.pageindex)
  947 + this.total = res.data.numberOfElements
  948 + this.tableData = res.data.content
876 949 },
877 950  
878 951 // 新增确定按钮
... ... @@ -914,8 +987,10 @@
914 987  
915 988 //详情
916 989 async details(val){
917   - this.detbox = true
918   - console.log(val)
  990 +
  991 + this.xiangData = val
  992 + this.heData = val.cereContractInformation
  993 + this.detbox = true
919 994  
920 995 },
921 996 addbuss(val,item) {
... ... @@ -923,11 +998,13 @@
923 998 this.detbox = false
924 999 this.ggXin = true
925 1000  
926   - this.zhong.Num = item?.contractNumber || this.detaiList.contractNumber
927   - this.zhong.Name = item?.contractName|| this.detaiList.contractName
928   - this.zhong.Time = item?.contractSigningDate|| this.detaiList.contractSigningDate
929   - this.zhong.Data = item?.contractTerminationDate|| this.detaiList.contractTerminationDate
930   - this.zhong.id = item?.id|| this.detaiList.id
  1001 + this.zhong.lessorName = item.cereContractInformation.lessorName
  1002 + this.zhong.tenantName = item.cereContractInformation.tenantName
  1003 + this.zhong.leaseAddress = item.leaseAddress
  1004 + this.zhong.leaseName = item.leaseName
  1005 + this.zhong.completionTime = item.completionTime
  1006 + this.zhong.intendedLeaseTerm = item.intendedLeaseTerm
  1007 + this.zhong.intentionalRent = item.intentionalRent
931 1008  
932 1009 },
933 1010 handleSizeChange(val) {
... ... @@ -963,24 +1040,38 @@
963 1040 },
964 1041 // 查询按钮
965 1042 async onSubmit() {
966   -
967   - const res = await businessListGetAll(this.formSel)
968   - this.total = res.data.total
969   - this.tableData = res.data.list
  1043 + if(this.leaseStartDate.length !=0){
  1044 + this.formSel.cereContractInformation.leaseStartDate = this.leaseStartDate.join(',')
  1045 + }
  1046 + const res = await rentalGetAll(this.formSel)
  1047 + this.total = res.data.numberOfElements
  1048 + this.tableData = res.data.content
970 1049 },
971 1050 //重置按钮
972 1051 resetting(){
973   - this.formSel={
974   - shopName:'',
975   - search:'',
976   - createUser:'',
977   - page: '1', // 当前页
978   - pageSize: '10' // 每页记录数
  1052 + this.formSel={
  1053 + leaseName:'',
  1054 + leaseType:'',
  1055 + cereContractInformation:{
  1056 + leaseStartDate:'',
979 1057 },
980   - this.tableData = []
  1058 + pageNumber: 1,
  1059 + pageSize: 10,
  1060 +
  1061 + }
  1062 + this.leaseStartDate = []
  1063 + this.getAll()
981 1064 },
982 1065 danzheng(item){
983   - this.danzhengShow = true
  1066 + this.xudan.lessorName = item.cereContractInformation.lessorName
  1067 + this.xudan.tenantName = item.cereContractInformation.tenantName
  1068 + this.xudan.leaseAddress = item.leaseAddress
  1069 + this.xudan.leaseName = item.leaseName
  1070 + this.xudan.contractNumber = item.cereContractInformation.contractNumber
  1071 + this.xudan.completionTime = item.completionTime
  1072 + this.xudan.intendedLeaseTerm = item.intendedLeaseTerm
  1073 + this.xudan.intentionalRent = item.intentionalRent
  1074 + this.danzhengShow = true
984 1075 },
985 1076 // 下载
986 1077 async downloadPdf() {
... ... @@ -1009,6 +1100,34 @@
1009 1100 // 保存 PDF 文件
1010 1101 pdf.save('downloaded.pdf');
1011 1102 },
  1103 + async daochu(){
  1104 + let res = await excelLeaseRenewalManagement(this.pageindex)
  1105 + if(!res){
  1106 + return
  1107 + }
  1108 + const blob = new Blob([res], { type: 'application/vnd.ms-excel' })
  1109 + const fileName = '续租管理列表.xls'
  1110 + if ('download' in document.createElement('a')) {
  1111 + // 非IE下载
  1112 + const elink = document.createElement('a')
  1113 + elink.download = fileName
  1114 + elink.style.display = 'none'
  1115 + elink.href = URL.createObjectURL(blob)
  1116 + document.body.appendChild(elink)
  1117 + elink.click()
  1118 + URL.revokeObjectURL(elink.href) // 释放URL 对象
  1119 + document.body.removeChild(elink)
  1120 + } else {
  1121 + // IE10+下载
  1122 + navigator.msSaveBlob(blob, fileName)
  1123 + }
  1124 + this.$message({
  1125 + message: '导出成功',
  1126 + type: 'success'
  1127 + })
  1128 +
  1129 +
  1130 + },
1012 1131 }
1013 1132  
1014 1133 }
... ...
yanshouban/src/views/shopRental/rentTermination/index.vue
... ... @@ -11,18 +11,21 @@
11 11 <div class="formSearch">
12 12 <el-form :inline="true" :model="formSel">
13 13 <el-form-item label="商户名称">
14   - <el-input v-model="formSel.shopName" placeholder="请输入商户名称" style="width:168px;"/>
  14 + <el-input v-model="formSel.leaseName" placeholder="请输入" style="width:168px;" />
15 15 </el-form-item>
16 16 <el-form-item label="租赁类型">
17   - <el-select v-model="formSel.createUser" placeholder="时间"
  17 + <el-select v-model="formSel.leaseType" placeholder="请选择"
18 18 style="width: 168px;margin-right: 15px">
19 19 <el-option label="商铺" value="商铺" />
20 20 <el-option label="场地" value="场地" />
21 21 <el-option label="广告位" value="广告位" />
22 22 </el-select>
23 23 </el-form-item>
24   - <el-form-item label="租赁起租日期">
25   - <el-input v-model="formSel.search" placeholder="请输入" style="width:168px;"/>
  24 + <el-form-item label="起租日期">
  25 + <el-date-picker style="width:160px;margin-right:5px" v-model="leaseStartDate"
  26 + value-format="yyyy-M-d" type="daterange" range-separator="-" start-placeholder=""
  27 + end-placeholder="" prefix-icon="none" >
  28 + </el-date-picker>
26 29 </el-form-item>
27 30 </el-form>
28 31 <div>
... ... @@ -36,41 +39,73 @@
36 39 <div style="margin-bottom: 20px;">
37 40 <el-button @click="tuizuSetWit" style="background-color: #3F9B6A;color: #fff">退租设置
38 41 </el-button>
39   - <!-- <el-button @click="resetting" style="background-color: #3F9B6A;color: #fff">导出
40   - </el-button> -->
  42 + <el-button @click="daochu" style="background-color: #3F9B6A;color: #fff">导出
  43 + </el-button>
41 44 </div>
42 45 <!-- 表格 -->
43 46  
44 47 <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)" align="left"
45 48 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
46   - <el-table-column label="订单编号" min-width="150" prop="id">
47   -
48   - </el-table-column>
49   - <el-table-column label="商户名称" prop="shopName" min-width="200">
50   -
51   - </el-table-column>
52   - <el-table-column label="租赁类型" prop="associatedEvents" min-width="100">
53   -<template slot-scope="scope">
54   - {{scope.row.associatedEvents}}
55   - </template>
56   - </el-table-column>
57   - <el-table-column label="编号" prop="relatedMerchants" min-width="150">
58   -<template slot-scope="scope">
59   - {{scope.row.relatedMerchants}}
60   - </template>
61   - </el-table-column>
62   - <el-table-column label="租金" prop="contractName" min-width="100">
63   - <template slot-scope="scope">
64   - {{scope.row.relatedMerchants}}
65   - </template>
66   - </el-table-column>
67   - <el-table-column prop="contractType" label="租赁起止时间" min-width="250">
68   -<template slot-scope="scope">
69   - {{scope.row.relatedMerchants}}
70   - </template>
71   - </el-table-column>
72   - <el-table-column label="状态" prop="telephone" min-width="150">
73   - </el-table-column>
  49 + <el-table-column label="合同编号" min-width="150" >
  50 + <template slot-scope="scope">
  51 + {{scope.row.cereContractInformation.contractNumber}}
  52 +
  53 + </template>
  54 + </el-table-column>
  55 + <el-table-column label="合同名称" min-width="200">
  56 + <template slot-scope="scope">
  57 + {{scope.row.cereContractInformation.contractName}}
  58 +
  59 + </template>
  60 + </el-table-column>
  61 + <el-table-column label="合同金额" min-width="100">
  62 + <template slot-scope="scope">
  63 + {{scope.row.cereContractInformation.contractAmount}}
  64 +
  65 + </template>
  66 + </el-table-column>
  67 + <el-table-column label="签订日期" min-width="150">
  68 + <template slot-scope="scope">
  69 + {{scope.row.cereContractInformation.contractSigningDate}}
  70 +
  71 + </template>
  72 + </el-table-column>
  73 + <el-table-column label="起租日期" min-width="300">
  74 + <template slot-scope="scope">
  75 + {{scope.row.cereContractInformation.leaseStartDate}}
  76 +
  77 + </template>
  78 + </el-table-column>
  79 + <el-table-column label="出租人名称" min-width="100">
  80 + <template slot-scope="scope">
  81 + {{scope.row.cereContractInformation.lessorName}}
  82 +
  83 + </template>
  84 + </el-table-column>
  85 + <el-table-column label="承租人名称" min-width="150">
  86 + <template slot-scope="scope">
  87 + {{scope.row.cereContractInformation.tenantName}}
  88 +
  89 + </template>
  90 + </el-table-column>
  91 + <el-table-column label="商铺编号" min-width="150">
  92 + <template slot-scope="scope">
  93 + {{scope.row.cereContractInformation.shopNumber}}
  94 + </template>
  95 + </el-table-column>
  96 + <el-table-column label="合同类型" min-width="150">
  97 + <template slot-scope="scope">
  98 + {{scope.row.cereContractInformation.contractType}}
  99 +
  100 + </template>
  101 + </el-table-column>
  102 + <el-table-column prop="contractStatus" label="合同状态" min-width="150">
  103 + <template slot-scope="scope">
  104 + <span v-if='scope.row.cereContractInformation.contractStatus == 1'>使用中</span>
  105 + <span v-else-if='scope.row.cereContractInformation.contractStatus == 2'>往期合同</span>
  106 + <span v-else-if='scope.row.cereContractInformation.contractStatus == 3'>已终止</span>
  107 + </template>
  108 + </el-table-column>
74 109 <el-table-column label="操作" min-width="200">
75 110 <template slot-scope="scope">
76 111 <div @click="details(0,scope.row)" class="tableBtn greens">查看</div>
... ... @@ -93,16 +128,16 @@
93 128 <div style="margin-bottom: 20px;">
94 129 <el-form ref="form" :model="zhong" label-width="80px">
95 130 <el-form-item label="甲方">
96   - <el-input v-model="zhong.name" disabled ></el-input>
  131 + <el-input v-model="zhong.name" placeholder="请输入" ></el-input>
97 132 </el-form-item>
98 133 <el-form-item label="乙方">
99   - <el-input v-model="zhong.yi" disabled ></el-input>
  134 + <el-input v-model="zhong.yi" placeholder="请输入"></el-input>
100 135 </el-form-item>
101 136 <el-form-item label="合同编号">
102   - <el-input v-model="zhong.bqwe" disabled ></el-input>
  137 + <el-input v-model="zhong.bqwe" placeholder="请输入" ></el-input>
103 138 </el-form-item>
104 139 <el-form-item label="起止时间">
105   - <el-input v-model="zhong.dding" disabled ></el-input>
  140 + <el-input v-model="zhong.dding" placeholder="请输入"></el-input>
106 141 </el-form-item>
107 142 <el-form-item label="申请人">
108 143 <el-input v-model="zhong.shenr" placeholder="请输入" ></el-input>
... ... @@ -168,7 +203,7 @@
168 203  
169 204 </div>
170 205 <div style="display: flex;justify-content: flex-end;">
171   - <el-button @click="guiSet" style="background-color: #3F9B6A;color: #fff">提交</el-button>
  206 + <el-button @click="closeFn(3)" style="background-color: #3F9B6A;color: #fff">提交</el-button>
172 207 <el-button @click="closeFn(3)" class="buttonHover"
173 208 style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消</el-button>
174 209  
... ... @@ -182,297 +217,195 @@
182 217 <div style="padding:20px;">
183 218 <div style="font-size: 14px;padding-bottom: 20px;color: #000;">租赁信息</div>
184 219 <div style="margin-bottom: 10px;">
185   - <el-descriptions class="margin-top" :column="3" border labelStyle="width:150px;height:42px;">
  220 + <el-descriptions class="margin-top" :column="3" border :labelStyle="labelStyle"
  221 + :contentStyle="contentStyle">
186 222 <el-descriptions-item>
187 223 <template slot="label">
188 224 租赁人
189 225 </template>
190   - 张三
  226 + {{xiangData.tenant}}
191 227 </el-descriptions-item>
192 228 <el-descriptions-item>
193 229 <template slot="label">
194 230 意向租期
195 231 </template>
196   - 2022-02-22至2022-03-22
  232 + {{xiangData.intendedLeaseTerm}}
197 233 </el-descriptions-item>
198 234 <el-descriptions-item>
199 235 <template slot="label">
200 236 意向租金
201 237 </template>
202   - 6000
  238 + {{xiangData.intentionalRent}}
203 239 </el-descriptions-item>
204 240 <el-descriptions-item>
205 241 <template slot="label">
206 242 租赁主体
207 243 </template>
208   - 四川省成都市太平洋有限公司
  244 + {{xiangData.leasingEntity}}
209 245 </el-descriptions-item>
210 246 <el-descriptions-item>
211 247 <template slot="label">
212 248 经营者
213 249 </template>
214   - 张三
  250 + {{xiangData.operator}}
215 251 </el-descriptions-item>
216 252 <el-descriptions-item>
217 253 <template slot="label">
218 254 状态
219 255 </template>
220   -
221   - </el-descriptions-item>
222   - </el-descriptions>
223   - </div>
224   - <div style="">
225   - <el-descriptions class="margin-top" :column="3" border labelStyle="width:150px;">
226   - <el-descriptions-item>
227   - <template slot="label">
228   - 租赁类型
229   - </template>
230   - 商铺
231   - </el-descriptions-item>
232   - <el-descriptions-item>
233   - <template slot="label">
234   - 编号
235   - </template>
236   - 284771g
237   - </el-descriptions-item>
238   - <el-descriptions-item>
239   - <template slot="label">
240   - 名称
241   - </template>
242   - 成华公园南门口沿街铺
243   - </el-descriptions-item>
244   - <el-descriptions-item>
245   - <template slot="label">
246   - 行政区
247   - </template>
248   - 成华区
249   - </el-descriptions-item>
250   - <el-descriptions-item>
251   - <template slot="label">
252   - 地址
253   - </template>
254   - 成华公园南门口沿街铺
255   - </el-descriptions-item>
256   - <el-descriptions-item>
257   - <template slot="label">
258   - 所属主体
259   - </template>
260   - 绿道
261   - </el-descriptions-item>
262   - <el-descriptions-item>
263   - <template slot="label">
264   - 负责人
265   - </template>
266   - 王五
267   - </el-descriptions-item>
268   - <el-descriptions-item>
269   - <template slot="label">
270   - 联系电话
271   - </template>
272   - 18374658230
273   - </el-descriptions-item>
274   - <el-descriptions-item>
275   - <template slot="label">
276   - 范围
277   - </template>
278   - 123
279   - </el-descriptions-item>
280   - <el-descriptions-item>
281   - <template slot="label">
282   - 面积
283   - </template>
284   - 104.2
285   - </el-descriptions-item>
286   - <el-descriptions-item>
287   - <template slot="label">
288   - 建成时间
289   - </template>
290   - 2022-02-22
291   - </el-descriptions-item>
292   - <el-descriptions-item>
293   - <template slot="label">
294   - 房屋类型
295   - </template>
296   - -
297   - </el-descriptions-item>
298   - <el-descriptions-item>
299   - <template slot="label">
300   - 主要设施
301   - </template>
302   - -
303   - </el-descriptions-item>
304   - <el-descriptions-item>
305   - <template slot="label">
306   - 平面图
307   - </template>
308   - -
309   - </el-descriptions-item>
310   - <el-descriptions-item>
311   - <template slot="label">
312   - 收费标准
313   - </template>
314   - -
315   - </el-descriptions-item>
316   - <el-descriptions-item>
317   - <template slot="label">
318   - 标签
319   - </template>
320   - -
321   - </el-descriptions-item>
322   - <el-descriptions-item>
323   - <template slot="label">
324   - 备注信息
325   - </template>
326   - -
327   - </el-descriptions-item>
328   - <el-descriptions-item>
329   - <template slot="label">
330   - 宣传视频
331   - </template>
332   - -
333   - </el-descriptions-item>
334   - <el-descriptions-item>
335   - <template slot="label">
336   - 宣传图片
337   - </template>
338   - -
339   - </el-descriptions-item>
340   - <el-descriptions-item>
341   - <template slot="label">
342   - 备注信息
343   - </template>
344   - -
  256 + {{xiangData.state}}
345 257 </el-descriptions-item>
346 258 </el-descriptions>
347 259 </div>
  260 +
348 261 <div style="font-size: 14px;padding: 20px 0;color: #000;">合同信息</div>
349 262 <div>
350   - <el-descriptions class="margin-top" :column="3" border labelStyle="width:150px;height:42px;">
  263 + <el-descriptions class="margin-top" :column="3" border :labelStyle="labelStyle"
  264 + :contentStyle="contentStyle">
351 265 <el-descriptions-item>
352 266 <template slot="label">
353 267 合同编号
354 268 </template>
355   - 296747
  269 + {{heData.contractNumber}}
356 270 </el-descriptions-item>
357 271 <el-descriptions-item>
358 272 <template slot="label">
359 273 标段号
360 274 </template>
361   - 7346sfgh
  275 + {{heData.sectionNumber}}
362 276 </el-descriptions-item>
363 277 <el-descriptions-item>
364 278 <template slot="label">
365 279 合同名称
366 280 </template>
367   - 火星商铺
  281 + {{heData.contractName}}
  282 +
368 283 </el-descriptions-item>
369 284 <el-descriptions-item>
370 285 <template slot="label">
371 286 合同金额
372 287 </template>
373   - 6000
  288 + {{heData.contractAmount}}
  289 +
374 290 </el-descriptions-item>
375 291 <el-descriptions-item>
376 292 <template slot="label">
377 293 保证金
378 294 </template>
379   - 3000
  295 + {{heData.earnestMoney}}
  296 +
380 297 </el-descriptions-item>
381 298 <el-descriptions-item>
382 299 <template slot="label">
383 300 合同签订日期
384 301 </template>
385   - 2022-02-22
  302 + {{heData.contractSigningDate}}
  303 +
386 304 </el-descriptions-item>
387 305 <el-descriptions-item>
388 306 <template slot="label">
389 307 合同终止日期
390 308 </template>
391   - 254
  309 + {{heData.contractTerminationDate}}
  310 +
392 311 </el-descriptions-item>
393 312 <el-descriptions-item>
394 313 <template slot="label">
395 314 起租日期
396 315 </template>
397   - 245
  316 + {{heData.leaseStartDate}}
  317 +
398 318 </el-descriptions-item>
399 319 <el-descriptions-item>
400 320 <template slot="label">
401 321 出租人名称
402 322 </template>
403   - 245
  323 + {{heData.lessorName}}
  324 +
404 325 </el-descriptions-item>
405 326 <el-descriptions-item>
406 327 <template slot="label">
407 328 联系电话
408 329 </template>
409   - 688
  330 + {{heData.telephone}}
  331 +
410 332 </el-descriptions-item>
411 333 <el-descriptions-item>
412 334 <template slot="label">
413 335 银行账号
414 336 </template>
415   - 2435
  337 + {{heData.bankAccount}}
  338 +
416 339 </el-descriptions-item>
417 340 <el-descriptions-item>
418 341 <template slot="label">
419 342 承租人名称
420 343 </template>
421   - 976543
  344 + {{heData.tenantName}}
  345 +
422 346 </el-descriptions-item>
423   - <el-descriptions-item>
  347 + <el-descriptions-item>
424 348 <template slot="label">
425 349 承租人联系电话
426 350 </template>
427   - 23123
  351 + {{heData.tenantTelephone}}
  352 +
428 353 </el-descriptions-item>
429 354 <el-descriptions-item>
430 355 <template slot="label">
431 356 承租人银行账号
432 357 </template>
433   - 7654
  358 + {{heData.tenantBankAccount}}
  359 +
434 360 </el-descriptions-item>
435 361 <el-descriptions-item>
436 362 <template slot="label">
437 363 商铺编号
438 364 </template>
439   - 876543
  365 + {{heData.shopNumber}}
  366 +
440 367 </el-descriptions-item>
441 368 <el-descriptions-item>
442 369 <template slot="label">
443 370 商铺名称
444 371 </template>
445   - 87654
  372 + {{heData.shopName}}
  373 +
446 374 </el-descriptions-item>
447 375 <el-descriptions-item>
448 376 <template slot="label">
449 377 商铺地址
450 378 </template>
451   - 765
  379 + {{heData.shopAddress}}
  380 +
452 381 </el-descriptions-item>
453 382 <el-descriptions-item>
454 383 <template slot="label">
455 384 商铺面积
456 385 </template>
457   - 76543
  386 + {{heData.shopArea}}
  387 +
458 388 </el-descriptions-item>
459 389 <el-descriptions-item>
460 390 <template slot="label">
461 391 商品业态
462 392 </template>
463   - 76543
  393 + {{heData.storeFormats}}
  394 +
464 395 </el-descriptions-item>
465 396 <el-descriptions-item>
466 397 <template slot="label">
467 398 经营项目
468 399 </template>
469   - 7654
  400 + {{heData.businessProjects}}
  401 +
470 402 </el-descriptions-item>
471 403 <el-descriptions-item>
472 404 <template slot="label">
473 405 合同附件
474 406 </template>
475   - 765
  407 + {{heData.appendicesContract}}
  408 +
476 409 </el-descriptions-item>
477 410 </el-descriptions>
478 411 </div>
... ... @@ -629,57 +562,35 @@
629 562 <div style="padding:20px;">
630 563 <div style="font-size: 14px;padding-bottom: 20px;color: #000;">退租单</div>
631 564  
632   - <el-form ref="form" :model="zhong" label-width="120px">
633   - <el-form-item label="甲方">
634   - <el-input v-model="zhong.qweqrq" disabled placeholder="张三" ></el-input>
635   - </el-form-item>
636   - <el-form-item label="乙方">
637   - <el-input v-model="zhong.qwetv" disabled placeholder="四川省成都市太平洋有限公司" ></el-input>
638   - </el-form-item>
639   - <el-form-item label="商铺名称">
640   - <el-input v-model="zhong.bsn" disabled placeholder="成华公园南门口沿街铺" ></el-input>
641   - </el-form-item>
642   - <el-form-item label="商铺地址">
643   - <el-input v-model="zhong.bqwwe" disabled placeholder="南门口沿街铺" ></el-input>
644   - </el-form-item>
645   - <el-form-item label="租赁合同编号">
646   - <el-input v-model="zhong.basd" ></el-input>
647   - </el-form-item>
648   - <el-form-item label="起租日期">
649   - <el-input v-model="zhong.qwz" ></el-input>
650   - </el-form-item>
651   - <el-form-item label="租赁期限">
652   - <el-input v-model="zhong.qtx" ></el-input>
653   - </el-form-item>
654   - <el-form-item label="退租申请日期">
655   - <el-input v-model="zhong.srq" ></el-input>
656   - </el-form-item>
657   - <el-form-item label="退租原因">
658   - <el-input v-model="zhong.yywq" ></el-input>
659   - </el-form-item>
660   - <el-form-item label="应付租金">
661   - <el-input v-model="zhong.yfzd" ></el-input>
662   - </el-form-item>
663   - <el-form-item label="已付租金">
664   - <el-input v-model="zhong.zsd" ></el-input>
665   - </el-form-item>
666   - <el-form-item label="使用用途">
667   - <el-input v-model="zhong.yt" ></el-input>
668   - </el-form-item>
669   - <el-form-item label="物业管理费">
670   - <el-input v-model="zhong.wu" ></el-input>
671   - </el-form-item>
672   - <el-form-item label="水电费">
673   - <el-input v-model="zhong.sd" ></el-input>
674   - </el-form-item>
675   -
676   - <el-form-item label="退租注意事项">
677   - <wang-editor v-model="zhong.textarea" ref="editor" :height="200"></wang-editor>
678   - </el-form-item>
679   - <el-form-item label="其他备注信息">
680   - <wang-editor v-model="zhong.textarea" ref="editor" :height="200"></wang-editor>
681   - </el-form-item>
682   - </el-form>
  565 + <el-form ref="form" :model="xudan" label-width="120px">
  566 + <el-form-item label="退租日期">
  567 + <el-input v-model="xudan.tuizhu" disabled ></el-input>
  568 + </el-form-item>
  569 + <el-form-item label="退租原因">
  570 + <el-select v-model="xudan.yuan" placeholder="请选择" style="margin-top:5px;width: 100%;">
  571 + <el-option label="正常退租" value="正常退租"></el-option>
  572 + </el-select>
  573 + </el-form-item>
  574 + <el-form-item label="待缴租金">
  575 + <el-input v-model="xudan.daijiao" placeholder="请输入"></el-input>
  576 + </el-form-item>
  577 + <el-form-item label="支付类型">
  578 + <el-select v-model="xudan.zhifu" placeholder="请选择" style="margin-top:5px;width: 100%;">
  579 + <el-option label="线上支付" value="线上支付"></el-option>
  580 + <el-option label="线下支付" value="线下支付"></el-option>
  581 + </el-select>
  582 + </el-form-item>
  583 + <el-form-item label="支付方式说明">
  584 + <wang-editor v-model="xudan.zhifushuo" ref="editor" :height="200"></wang-editor>
  585 + </el-form-item>
  586 +
  587 + <el-form-item label="退租注意事项">
  588 + <wang-editor v-model="xudan.zhuangxiu" ref="editor" :height="200"></wang-editor>
  589 + </el-form-item>
  590 + <el-form-item label="其他备注信息">
  591 + <wang-editor v-model="xudan.noto" ref="editor" :height="200"></wang-editor>
  592 + </el-form-item>
  593 + </el-form>
683 594  
684 595  
685 596  
... ... @@ -687,7 +598,7 @@
687 598 <div style="padding-top:20px;display:flex;justify-content: flex-end;">
688 599 <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
689 600 @click="tuizhuDanShow = false">取消</el-button>
690   - <el-button @click="addbuss()" style="background-color: #3F9B6A;color: #fff" >保存</el-button>
  601 + <!-- <el-button @click="addbuss()" style="background-color: #3F9B6A;color: #fff" >保存</el-button> -->
691 602 <el-button @click="yulan =true" style="background-color: #3F9B6A;color: #fff" >预览</el-button>
692 603  
693 604 </div>
... ... @@ -696,87 +607,41 @@
696 607 <el-dialog :visible.sync="yulan" custom-class="actSpye_dialog" style="padding: 0;" width="50%" center :close-on-click-modal="false" append-to-body>
697 608 <div style="padding:20px 0">
698 609 <div class="form-container" ref="contentToConvert" style="background-color:#fff;">
699   - <div class="form-header">退租单</div>
700   - <div class="form-group">
701   - <label for="partyA">甲方:</label>
702   - <input type="text" id="partyA" >
703   - </div>
704   - <div class="form-group">
705   - <label for="partyB">乙方:</label>
706   - <input type="text" id="partyB" >
707   - </div>
708   - <div class="form-group">
709   - <label for="shopName">商铺名称:</label>
710   - <input type="text" id="shopName" >
711   - </div>
712   - <div class="form-group">
713   - <label for="shopAddress">商铺地址:</label>
714   - <input type="text" id="shopAddress" >
715   - </div>
  610 + <div class="form-header">退租单</div>
  611 + <div class="form-group">
  612 + <label for="partyA">退租日期:</label>
  613 + <input type="text" id="partyA" disabled v-model="xudan.tuizhu">
  614 + </div>
  615 + <div class="form-group">
  616 + <label for="partyB">退租原因:</label>
  617 + <input type="text" id="partyB" v-model="xudan.yuan" disabled>
  618 + </div>
  619 + <div class="form-group">
  620 + <label for="partyB">待缴租金:</label>
  621 + <input type="text" id="partyB" v-model="xudan.daijiao" disabled>
  622 + </div>
  623 + <div class="form-group">
  624 + <label for="partyB">支付类型:</label>
  625 + <input type="text" id="partyB" v-model="xudan.zhifu" disabled>
  626 + </div>
  627 + <div class="form-group">
  628 + <label for="renovationRules">支付方式说明:</label>
  629 + <div style="padding:20px;width:100%;border: 1px solid #ccc;" v-html="xudan.zhifushuo"></div>
  630 + </div>
  631 + <div class="form-group">
  632 + <label for="renovationRules">退租注意事项:</label>
  633 + <div style="padding:20px;width:100%;border: 1px solid #ccc;" v-html="xudan.zhuangxiu"></div>
  634 + </div>
  635 + <div class="form-group">
  636 + <label for="remarks">其他备注信息:</label>
  637 + <div style="padding:20px;width:100%;border: 1px solid #ccc;" v-html="xudan.noto"></div>
  638 + </div>
716 639  
717   - <div class="form-group">
718   - <label for="shopArea">租赁合同编号:</label>
719   - <input type="text" id="shopArea" >
720   - </div>
721   - <div class="form-group">
722   - <label for="shopArea">起租日期:</label>
723   - <input type="text" id="shopArea" >
724   - </div>
725   - <div class="form-group">
726   - <label>租赁期限:</label>
727   - <input type="text" id="startDate">
728   - </div>
729   - <div class="form-group">
730   - <label for="leaseTerm">退租申请日期:</label>
731   - <input type="text" id="leaseTerm" >
732   - </div>
733   - <div class="form-group">
734   - <label for="rentAmount">退租原因:</label>
735   - <input type="text" id="rentAmount" >
736 640 </div>
737   - <div class="form-group">
738   - <label for="paymentMethod">应付租金:</label>
739   - <input type="text" id="paymentMethod" >
740   - </div>
741   - <div class="form-group">
742   - <label>已付租金:</label>
743   - <input type="text" id="paymentDate">
744   - </div>
745   - <div class="form-group">
746   - <label>欠付租金:</label>
747   - <input type="text" id="paymentDate">
748   - </div>
749   - <div class="form-group">
750   - <label for="depositAmount">使用用途:</label>
751   - <input type="text" id="depositAmount" >
752   - </div>
753   - <div class="form-group">
754   - <label for="otherFees">物业管理费:</label>
755   - <textarea id="otherFees" ></textarea>
756   - </div>
757   - <div class="form-group">
758   - <label for="usePurpose">水电费:</label>
759   - <input type="text" id="usePurpose" >
760   - </div>
761   - <div class="form-group">
762   - <label for="renovationRules">退租注意事项:</label>
763   - <div style="padding:20px;width:100%;border: 1px solid #ccc;" v-html="zhong.summary"></div>
764   - </div>
765   - <div class="form-group">
766   - <label for="remarks">其他备注信息:</label>
767   - <div style="padding:20px;width:100%;border: 1px solid #ccc;" v-html="zhong.summary"></div>
768   - </div>
769   -
770   -
771   -
772   -
773   -
774   -
775   - </div>
776 641 <div style="justify-content:flex-end;margin:20px 20px 0 0;display:flex;">
777 642 <el-button @click="downloadPdf" style="background-color: #3F9B6A;color: #fff">下载</el-button>
778   - <el-button style="background-color: #3F9B6A;color: #fff">打印</el-button>
779   - <el-button style="background-color: #3F9B6A;color: #fff">发送</el-button>
  643 + <!-- <el-button style="background-color: #3F9B6A;color: #fff">打印</el-button>
  644 + <el-button style="background-color: #3F9B6A;color: #fff">发送</el-button> -->
780 645  
781 646 </div>
782 647 </div>
... ... @@ -803,7 +668,8 @@
803 668 import {
804 669 rentalGetAll,
805 670 rentalDel,
806   - rentalAdd
  671 + rentalAdd,
  672 + excelManagementOfFinalAccountsForRentals
807 673 } from '../../../api/rentalMan.js'
808 674 import {
809 675 businessListGetAll,
... ... @@ -854,12 +720,16 @@
854 720 appendicesContract: '',
855 721 },
856 722 tableData: [],
  723 + leaseStartDate:[],
857 724 formSel: {
858   - shopName:'',
859   - search:'',
860   - createUser:'',
861   - page: '1', // 当前页
862   - pageSize: '10' // 每页记录数
  725 + leaseName:'',
  726 + leaseType:'',
  727 + cereContractInformation:{
  728 + leaseStartDate:'',
  729 + },
  730 + pageNumber: 1,
  731 + pageSize: 10,
  732 +
863 733 },
864 734 pageindex: {
865 735 pageNumber: 1,
... ... @@ -880,6 +750,15 @@
880 750 textarea: ''
881 751  
882 752 },
  753 + xudan:{
  754 + tuizhu:'',
  755 + yuan:'',
  756 + daijiao:'',
  757 + zhifu:'',
  758 + zhifushuo:'',
  759 + zhuangxiu:'',
  760 + noto:'',
  761 + },
883 762 detaiList: {},
884 763 tuiZuSet: {
885 764 weitui: '10%',
... ... @@ -890,6 +769,17 @@
890 769 },
891 770 tuizhuDanShow: false,
892 771 yulan:false,
  772 + xiangData:{},
  773 + heData:{},
  774 + contentStyle:{
  775 + width:'20%',
  776 + height:'42px',
  777 + },
  778 + labelStyle:{
  779 + width:'150px',
  780 + height:'42px',
  781 + color:'#000',
  782 + },
893 783 }
894 784 },
895 785 created() {
... ... @@ -900,10 +790,9 @@
900 790 },
901 791 methods: {
902 792 async getAll(val) {
903   - // const res = await rentalGetAll(this.pageindex)
904   - // console.log(res.data.content)
905   - // this.tableData = res.data.content
906   - // this.total = res.data.content.length
  793 + const res = await rentalGetAll(this.pageindex)
  794 + this.total = res.data.numberOfElements
  795 + this.tableData = res.data.content
907 796 },
908 797  
909 798 // 退租确定按钮
... ... @@ -929,95 +818,9 @@
929 818 //详情
930 819 async details(index, val) {
931 820 this.index = index
  821 + this.xiangData = val
  822 + this.heData = val.cereContractInformation
932 823 this.detbox = true
933   - console.log(val)
934   -
935   - console.log(res.data)
936   - this.detaiList = val
937   - // 租赁人
938   - this.ggwName = res.data.tenant
939   - this.shunNum = res.data.intendedLeaseTerm
940   - this.duanK = res.data.intentionalRent
941   - this.tableData1[0].names = res.data.leasingEntity
942   - this.tableData1[0].shuns = res.data.operator
943   - this.tableData1[0].duans = res.data.state
944   - // 租赁类型
945   - this.zuLei = res.data.leaseType
946   - this.bianHao = res.data.leaseCode
947   - this.oneName = res.data.leaseName
948   - this.tableData1_one[0].names = res.data.administrativeRegion
949   - this.tableData1_one[0].shuns = val.leaseAddress
950   - this.tableData1_one[0].duans = val.owner
951   - this.tableData1_one[1].names = val.commander
952   - this.tableData1_one[1].shuns = val.telephone
953   - this.tableData1_one[1].duans = val.range
954   -
955   - this.tableData1_one[2].names = val.area
956   - this.tableData1_one[2].shuns = val.completionTime
957   - this.tableData1_one[2].duans = val.houseType
958   -
959   - this.tableData1_one[3].names = val.mainFacilities
960   - this.tableData1_one[3].shuns = val.planeFigure
961   - this.tableData1_one[3].duans = val.feeStandards
962   - this.tableData1_one[4].names = val.label
963   - this.tableData1_one[4].shuns = val.promotionVideo
964   - this.tableData1_one[4].duans = val.promotionImage
965   -
966   - this.tableData1_one[5].names = val.notes
967   -
968   - // 合同信息
969   - this.zlr = val.contractNumber
970   - this.zlData = val.sectionNumber
971   - this.tfData = val.contractName
972   - this.tableData2[0].names = val.contractAmount
973   - this.tableData2[0].shuns = val.earnestMoney
974   - this.tableData2[0].duans = val.contractSigningDate
975   - this.tableData2[1].names = val.contractTerminationDate
976   - this.tableData2[1].shuns = val.leaseStartDate
977   - this.tableData2[1].duans = val.lessorName
978   -
979   - this.tableData2[2].names = val.telephone
980   - this.tableData2[2].shuns = val.bankAccount
981   - this.tableData2[2].duans = val.tenantName
982   -
983   - this.tableData2[3].names = val.tenantTelephone
984   - this.tableData2[3].shuns = val.tenantBankAccount
985   - this.tableData2[3].duans = val.shopNumber
986   -
987   - this.tableData2[4].names = val.shopName
988   - this.tableData2[4].shuns = val.shopAddress
989   - this.tableData2[4].duans = val.shopArea
990   -
991   - this.tableData2[5].names = val.storeFormats
992   - this.tableData2[5].shuns = val.businessProjects
993   - this.tableData2[5].duans = val.appendicesContract
994   -
995   - this.djl = val.contractNumber
996   - this.gpTime = val.sectionNumber
997   - this.pjPrice = val.contractName
998   -
999   - this.tableData3[0].names = val.contractAmount
1000   - this.tableData3[0].shuns = val.earnestMoney
1001   - this.tableData3[0].duans = val.renewalTime
1002   - this.tableData3[1].names = val.contractTerminationDate
1003   - this.tableData3[1].shuns = val.leaseStartDate
1004   - this.tableData3[1].duans = val.lessorName
1005   -
1006   - this.tableData3[2].names = val.telephone
1007   - this.tableData3[2].shuns = val.bankAccount
1008   - this.tableData3[2].duans = val.tenantName
1009   -
1010   - this.tableData3[3].names = val.tenantTelephone
1011   - this.tableData3[3].shuns = val.tenantBankAccount
1012   - this.tableData3[3].duans = val.shopNumber
1013   -
1014   - this.tableData3[4].names = val.shopName
1015   - this.tableData3[4].shuns = val.shopAddress
1016   - this.tableData3[4].duans = val.shopArea
1017   -
1018   - this.tableData3[5].names = val.storeFormats
1019   - this.tableData3[5].shuns = val.businessProjects
1020   - this.tableData3[5].duans = val.appendicesContract
1021 824  
1022 825  
1023 826  
... ... @@ -1025,12 +828,13 @@
1025 828 addbuss(item) {
1026 829 this.detbox = false
1027 830 this.ggXin = true
1028   -
1029   - this.zhong.Num = item?.contractNumber || this.detaiList.contractNumber
1030   - this.zhong.Name = item?.contractName || this.detaiList.contractName
1031   - this.zhong.Time = item?.contractSigningDate || this.detaiList.contractSigningDate
1032   - this.zhong.Data = item?.contractTerminationDate || this.detaiList.contractTerminationDate
1033   - this.zhong.id = item?.id || this.detaiList.id
  831 + this.zhong.lessorName = item.cereContractInformation.lessorName
  832 + this.zhong.tenantName = item.cereContractInformation.tenantName
  833 + this.zhong.leaseAddress = item.leaseAddress
  834 + this.zhong.leaseName = item.leaseName
  835 + this.zhong.completionTime = item.completionTime
  836 + this.zhong.intendedLeaseTerm = item.intendedLeaseTerm
  837 + this.zhong.intentionalRent = item.intentionalRent
1034 838  
1035 839 },
1036 840 handleSizeChange(val) {
... ... @@ -1103,20 +907,27 @@
1103 907 },
1104 908 // 查询按钮
1105 909 async onSubmit() {
1106   - const res = await businessListGetAll(this.formSel)
1107   - this.total = res.data.total
1108   - this.tableData = res.data.list
  910 + if(this.leaseStartDate.length !=0){
  911 + this.formSel.cereContractInformation.leaseStartDate = this.leaseStartDate.join(',')
  912 + }
  913 + const res = await rentalGetAll(this.formSel)
  914 + this.total = res.data.numberOfElements
  915 + this.tableData = res.data.content
1109 916 },
1110 917 //重置按钮
1111 918 resetting() {
1112 919 this.formSel={
1113   - shopName:'',
1114   - search:'',
1115   - createUser:'',
1116   - page: '1', // 当前页
1117   - pageSize: '10' // 每页记录数
1118   - },
1119   - this.tableData = []
  920 + leaseName:'',
  921 + leaseType:'',
  922 + cereContractInformation:{
  923 + leaseStartDate:'',
  924 + },
  925 + pageNumber: 1,
  926 + pageSize: 10,
  927 +
  928 + }
  929 + this.leaseStartDate = []
  930 + this.getAll()
1120 931 },
1121 932 tuizuSetWit() {
1122 933 this.tuizuSet = true
... ... @@ -1147,7 +958,34 @@
1147 958 // 保存 PDF 文件
1148 959 pdf.save('downloaded.pdf');
1149 960 },
1150   -
  961 +async daochu(){
  962 +
  963 + let res = await excelManagementOfFinalAccountsForRentals(this.pageindex)
  964 + if(!res){
  965 + return
  966 + }
  967 + const blob = new Blob([res], { type: 'application/vnd.ms-excel' })
  968 + const fileName = '退租决算管理列表.xls'
  969 + if ('download' in document.createElement('a')) {
  970 + // 非IE下载
  971 + const elink = document.createElement('a')
  972 + elink.download = fileName
  973 + elink.style.display = 'none'
  974 + elink.href = URL.createObjectURL(blob)
  975 + document.body.appendChild(elink)
  976 + elink.click()
  977 + URL.revokeObjectURL(elink.href) // 释放URL 对象
  978 + document.body.removeChild(elink)
  979 + } else {
  980 + // IE10+下载
  981 + navigator.msSaveBlob(blob, fileName)
  982 + }
  983 + this.$message({
  984 + message: '导出成功',
  985 + type: 'success'
  986 + })
  987 +
  988 +},
1151 989 }
1152 990 }
1153 991 </script>
... ...
yanshouban/src/views/shopRental/rentalMan/index.vue
... ... @@ -12,17 +12,14 @@
12 12 <el-form-item label="商户名称">
13 13 <el-input v-model="formSel.leaseName" placeholder="请输入" style="width:168px;" />
14 14 </el-form-item>
15   - <el-form-item label="合同名称">
16   - <el-input v-model="formSel.cereContractInformation.contractName" placeholder="请输入" style="width:168px;" />
17   - </el-form-item>
18   - <el-form-item label="签订时间">
19   - <el-date-picker style="width:160px;margin-right:5px" v-model="formSel.cereContractInformation.contractSigningDate"
20   - value-format="yyyy-M-d" type="daterange" range-separator="-" start-placeholder=""
21   - end-placeholder="" prefix-icon="none" >
22   - </el-date-picker>
  15 + <el-form-item label="承租人">
  16 + <el-input v-model="formSel.cereContractInformation.tenantName" placeholder="请输入" style="width:168px;" />
23 17 </el-form-item>
  18 + <!-- <el-form-item label="资源名称">
  19 + <el-input v-model="formSel.cereContractInformation.shopName" placeholder="请输入" style="width:168px;" />
  20 + </el-form-item> -->
24 21 <el-form-item label="起租日期">
25   - <el-date-picker style="width:160px;margin-right:5px" v-model="formSel.cereContractInformation.leaseStartDate"
  22 + <el-date-picker style="width:160px;margin-right:5px" v-model="leaseStartDate"
26 23 value-format="yyyy-M-d" type="daterange" range-separator="-" start-placeholder=""
27 24 end-placeholder="" prefix-icon="none" >
28 25 </el-date-picker>
... ... @@ -36,60 +33,59 @@
36 33 </el-button>
37 34 </div>
38 35 </div>
39   - <!-- <div style="margin-bottom: 20px;">
  36 + <div style="margin-bottom: 20px;">
40 37 <div>
  38 + <!-- <el-button
  39 + style="background-color: #3F9B6A;color: #fff;padding:8px 15px;">批量导出</el-button> -->
41 40 <el-button
42   - style="background-color: #3F9B6A;color: #fff;padding:8px 15px;">批量导出</el-button>
43   - <el-button
44   - style="background-color: #3F9B6A;color: #fff;padding:8px 15px;">导出</el-button>
  41 + style="background-color: #3F9B6A;color: #fff;padding:8px 15px;" @click="daochu">导出</el-button>
45 42 </div>
46   - </div> -->
  43 + </div>
47 44 <!-- 表格 -->
48 45  
49   - <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
  46 + <el-table :data="tableData"
50 47 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
51 48 >
52   - <el-table-column label="合同编号" min-width="150" >
  49 + <el-table-column label="商户名称" min-width="150" >
  50 + <template slot-scope="scope">
  51 + {{scope.row.leaseName}}
  52 +
  53 + </template>
  54 + </el-table-column>
  55 + <el-table-column label="承租人" min-width="150" >
53 56 <template slot-scope="scope">
54   - {{scope.row.cereContractInformation.contractNumber}}
  57 + {{scope.row.cereContractInformation.tenantName}}
55 58  
56 59 </template>
57 60 </el-table-column>
58   - <el-table-column label="合同名称" min-width="200">
  61 + <el-table-column label="租赁类型" min-width="150" >
59 62 <template slot-scope="scope">
60   - {{scope.row.cereContractInformation.contractName}}
  63 + {{scope.row.leaseType}}
61 64  
62 65 </template>
63 66 </el-table-column>
64   - <el-table-column label="合同金额" min-width="100">
65   - <template slot-scope="scope">
66   - {{scope.row.cereContractInformation.contractAmount}}
  67 + <el-table-column label="资源名称" min-width="200">
  68 + <template slot-scope="scope">
  69 + {{scope.row.cereContractInformation.contractName}}
67 70  
68   - </template>
  71 + </template>
69 72 </el-table-column>
70   - <el-table-column label="签订日期" min-width="150">
71   - <template slot-scope="scope">
72   - {{scope.row.cereContractInformation.contractSigningDate}}
  73 + <el-table-column label="合同编号" min-width="150" >
  74 + <template slot-scope="scope">
  75 + {{scope.row.cereContractInformation.contractNumber}}
73 76  
74   - </template>
  77 + </template>
75 78 </el-table-column>
76   - <el-table-column label="起租日期" min-width="300">
  79 +
  80 + <el-table-column label="起租日期" min-width="200">
77 81 <template slot-scope="scope">
78 82 {{scope.row.cereContractInformation.leaseStartDate}}
79 83  
80 84 </template>
81 85 </el-table-column>
82   - <el-table-column label="出租人名称" min-width="100">
83   - <template slot-scope="scope">
84   - {{scope.row.cereContractInformation.lessorName}}
85 86  
86   - </template>
87   - </el-table-column>
88   - <el-table-column label="承租人名称" min-width="150">
89   - <template slot-scope="scope">
90   - {{scope.row.cereContractInformation.tenantName}}
  87 + <el-table-column label="租赁状态" min-width="150">
91 88  
92   - </template>
93 89 </el-table-column>
94 90  
95 91  
... ... @@ -111,346 +107,765 @@
111 107 </div>
112 108  
113 109 </div>
  110 + <el-dialog :visible.sync="outdan" custom-class="tongyong_css" style="padding: 0;" width="60%"
  111 + class="dialog_css_Xq" center :close-on-click-modal="false" :show-close="false">
  112 + <div style="padding:20px;">
  113 + <div style="font-size: 14px;padding-bottom: 20px;color: #000;">出租单</div>
  114 + <div>
  115 + <el-tabs v-model="xiangTabs">
  116 + <el-tab-pane label="商户档案信息" name="first">
  117 + <div style="width: 100%">
  118 + <el-form ref="ruleForm" :model="ruleForm" label-width="130px">
  119 + <el-form-item label="商家类型" prop="intentCustomerName">
  120 + <el-select v-model="ruleForm.entityType" placeholder="线上商家" style="width:100%" disabled>
  121 + <el-option label="线上商家" value="线上商家" />
  122 + <el-option label="实体商家" value="实体商家" />
  123 + </el-select>
  124 + </el-form-item>
  125 + <el-form-item label="经营主体" prop="entityType">
  126 + <el-select v-model="ruleForm.entityType" placeholder="企业" style="width:100%" disabled>
  127 + <el-option label="企业" value="企业" />
  128 + <el-option label="个人" value="个人" />
  129 + </el-select>
  130 + </el-form-item>
  131 + <el-form-item label="经营范围" prop="玩偶的设计、生产、销售及网上销售;玩偶相关配件及服饰的设计、生产与销售;玩偶的定制服务玩偶的进出口业务;玩偶文化的推广与传播,:以及与玩偶相关的技术咨询、技术服务">
  132 + <el-input v-model="ruleForm.contactPhone" placeholder="请输入" disabled/>
  133 + </el-form-item>
  134 + <el-form-item label="开店名称" prop="成都火星">
  135 + <el-input v-model="ruleForm.contactPhone" placeholder="请输入" disabled/>
  136 + </el-form-item>
  137 + <el-form-item label="地址" prop="contactPhone">
  138 + <el-input v-model="ruleForm.contactPhone" placeholder="成都市金牛区万达广场1585号" disabled/>
  139 + </el-form-item>
  140 + <el-form-item label="主体名称" prop="contactPhone">
  141 + <el-input v-model="ruleForm.contactPhone" placeholder="成都火星科技有限公司" disabled/>
  142 + </el-form-item>
  143 + <el-form-item label="统一社会信用代码" prop="contactPhone">
  144 + <el-input v-model="ruleForm.contactPhone" placeholder="321564545" disabled/>
  145 + </el-form-item>
  146 + <el-form-item label="类型" prop="entityType">
  147 + <el-select v-model="ruleForm.entityType" placeholder="有限责任公司" style="width:100%" disabled>
  148 + <el-option label="有限责任公司" value="有限责任公司" />
  149 + </el-select>
  150 + </el-form-item>
  151 + <el-form-item label="法定代表人" prop="contactPhone">
  152 + <el-input v-model="ruleForm.contactPhone" placeholder="张三" disabled/>
  153 + </el-form-item>
  154 + <el-form-item label="注册资本" prop="registeredCapital">
  155 + <el-input v-model="ruleForm.registeredCapital" placeholder="请输入" disabled/>
  156 +
  157 + </el-form-item>
  158 + <el-form-item label="成立日期" prop="establishmentDate">
  159 + <el-input v-model="ruleForm.establishmentDate" placeholder="请输入" disabled/>
  160 + </el-form-item>
  161 + <el-form-item label="住所" prop="address">
  162 + <el-input v-model="ruleForm.address" placeholder="请输入" disabled/>
  163 + </el-form-item>
  164 + <el-form-item label="邮箱地址" prop="emailAddress">
  165 + <el-input v-model="ruleForm.emailAddress" placeholder="请输入" disabled/>
  166 + </el-form-item>
  167 + <el-form-item label="营业期限" prop="idCardPhotoBack">
  168 + <el-date-picker v-model="businessStartTime" type="daterange" range-separator="至" disabled
  169 + start-placeholder="开始时间" end-placeholder="结束时间" value-format="yyyy-MM-dd" />
  170 + </el-form-item>
  171 + <el-form-item label="营业执照" prop="businessLicense">
  172 + <!-- <upimg v-model="ruleForm.businessLicense" :limit="1" :fileSize="1"></upimg> -->
  173 + <img :src="ruleForm.businessLicense" alt="">
  174 + </el-form-item>
  175 + <el-form-item label="经营者姓名" prop="registeredCapital">
  176 + <el-input v-model="ruleForm.registeredCapital" placeholder="请输入" disabled/>
  177 +
  178 + </el-form-item>
  179 + <el-form-item label="证件类型" prop="idCardType">
  180 + <el-select v-model="ruleForm.idCardType" placeholder="请选择" style="width:100%" disabled>
  181 + <el-option label="身份证" value="身份证" />
  182 + </el-select>
  183 + </el-form-item>
  184 + <el-form-item label="身份证号" prop="idCardNumber">
  185 + <el-input v-model="ruleForm.idCardNumber" placeholder="请输入" disabled/>
  186 + </el-form-item>
  187 +
  188 + <el-form-item label="身份证有效期" prop="idCardNumber">
  189 + <el-date-picker v-model="idCardValidStart" type="daterange" range-separator="至" start-placeholder="开始时间" disabled
  190 + end-placeholder="结束时间" value-format="yyyy-MM-dd" />
  191 + </el-form-item>
  192 + <el-form-item label="身份证照片(正面)" prop="idCardPhotoFront">
  193 + <!-- <upimg v-model="ruleForm.idCardPhotoFront" :limit="1" :fileSize="1"></upimg> -->
  194 + <img :src="ruleForm.idCardPhotoFront" alt="">
  195 + </el-form-item>
  196 + <el-form-item label="身份证照片(反面)" prop="idCardPhotoBack">
  197 + <!-- <upimg v-model="ruleForm.idCardPhotoBack" :limit="1" :fileSize="1"></upimg> -->
  198 + <img :src="ruleForm.idCardPhotoBack" alt="">
  199 + </el-form-item>
  200 + <el-form-item label="是否为法人" prop="isLegalPerson">
  201 + <el-select v-model="ruleForm.isLegalPerson" placeholder="请选择" style="width:100%" disabled>
  202 + <el-option label="否" value="0" />
  203 + <el-option label="是" value="1" />
  204 +
  205 + </el-select>
  206 + </el-form-item>
  207 + <el-form-item label="企业授权书" prop="enterpriseAuthorization">
  208 + <!-- <upimg v-model="ruleForm.enterpriseAuthorization" :limit="1" :fileSize="1"></upimg> -->
  209 + <img :src="ruleForm.enterpriseAuthorization" alt="">
  210 + </el-form-item>
  211 + </el-form>
  212 +
  213 + </div>
  214 + </el-tab-pane>
  215 + <el-tab-pane label="商铺租赁信息" name="second">
  216 + <div style="width: 100%">
  217 + <!-- <div class="editcss">
  218 + <div class="titles">
  219 + 资源类型
  220 + </div>
  221 + <div style="padding: 20px;">
  222 + <el-form :model="ruleForm" ref="ruleForm" label-width="140px" class="demo-ruleForm">
  223 + <el-form-item label="商铺名称" prop="shopName">
  224 + <el-input v-model="ruleForm.shopName" placeholder="请输入" style="margin-top: 5px;" :disabled="edit"></el-input>
  225 + </el-form-item>
  226 + <el-form-item label="场地编号" prop="venueNumber">
  227 + <el-input v-model="ruleForm.venueNumber" disabled placeholder="将根据类型自动为资源编号" style="margin-top:5px;" disabled></el-input>
  228 + </el-form-item>
  229 + <el-form-item label="门牌号" prop="houseNumber">
  230 + <el-input v-model="ruleForm.houseNumber" placeholder="请输入" style="margin-top:5px;" :disabled="edit"></el-input>
  231 + </el-form-item>
  232 +
  233 + <el-form-item label="建筑形式" prop="architecturalForm">
  234 + <el-select v-model="ruleForm.architecturalForm" placeholder="请选择" style="margin-top:5px;width: 100%;" :disabled="edit">
  235 + <el-option label="框剪结构" value="框剪结构"></el-option>
  236 + <el-option label="区域二" value="区域二"></el-option>
  237 + </el-select>
  238 + </el-form-item>
  239 + <el-form-item label="所属绿道段" prop="belongingGreenwaySection">
  240 + <el-select v-model="ruleForm.belongingGreenwaySection" placeholder="请选择" style="margin-top:5px;width: 100%;" :disabled="edit" >
  241 + <el-option :label="item.name" :value="item.code" v-for="(item,index) in lvdaoList" :key="index"></el-option>
  242 +
  243 + </el-select>
  244 + </el-form-item>
  245 + <el-form-item label="所属公园/步道" prop="belongingParkTrail">
  246 + <el-select v-model="ruleForm.belongingParkTrail" placeholder="请选择" style="margin-top:5px;width: 100%;" :disabled="edit">
  247 + <el-option :label="item.name" :value="item.code" v-for="(item,index) in biangongyuanList"></el-option>
  248 + </el-select>
  249 + </el-form-item>
  250 + <el-form-item label="建筑面积" prop="floorSpace">
  251 + <el-input v-model="ruleForm.floorSpace" placeholder="请输入" style="margin-top:5px;" :disabled="edit">
  252 + <template slot="append">M<sup>2</sup></template>
  253 + </el-input>
  254 + </el-form-item>
  255 + <el-form-item label="实际使用面积" prop="actualUsableArea">
  256 + <el-input v-model="ruleForm.actualUsableArea" placeholder="请输入" style="margin-top:5px;" :disabled="edit">
  257 + <template slot="append">M<sup>2</sup></template>
  258 + </el-input>
  259 + </el-form-item>
  260 + <el-form-item label="所属区域" prop="belongingRegion">
  261 + <el-select v-model="ruleForm.belongingRegion" placeholder="请选择" style="margin-top:5px;width: 100%;" :disabled="edit">
  262 + <el-option label="成华区" value="成华区"></el-option>
  263 + <el-option label="武侯区" value="武侯区"></el-option>
  264 + <el-option label="锦江区" value="锦江区"></el-option>
  265 + <el-option label="青羊区" value="青羊区"></el-option>
  266 + <el-option label="金牛区" value="金牛区"></el-option>
  267 + <el-option label="双流区" value="双流区"></el-option>
  268 + </el-select>
  269 + </el-form-item>
  270 + <el-form-item label="归属部门" prop="belongingDepartment">
  271 + <el-input v-model="ruleForm.belongingDepartment" placeholder="请输入" style="margin-top:5px;" :disabled="edit">
  272 + </el-input>
  273 + </el-form-item>
  274 + <el-form-item label="负责人" prop="head">
  275 + <el-input v-model="ruleForm.head" placeholder="请输入" style="margin-top:5px;" :disabled="edit">
  276 + </el-input>
  277 + </el-form-item>
  278 + <el-form-item label="详细位置" prop="detailedLocation">
  279 + <el-input v-model="ruleForm.detailedLocation" placeholder="请输入" style="margin-top:5px;" :disabled="edit">
  280 + </el-input>
  281 + </el-form-item>
  282 + <el-form-item label="地图标点" prop="mapPunctuation">
  283 + <div style="width: 100%;height: 100px;border: 1px solid #3F9B6A;">
  284 + <MapXian :message="parentMessage" :edit='edit' :sendMap='getChildDate'></MapXian>
  285 + </div>
  286 + </el-form-item>
  287 + <el-form-item label="建筑图纸" prop="architecturalDrawings">
  288 +
  289 + <img :src="ruleForm.architecturalDrawings" alt="" style="width:140px;height:140px;">
  290 + </el-form-item>
  291 + <el-form-item label="商铺描述" prop="shopDescription">
  292 + <el-input type="textarea" v-model="ruleForm.shopDescription" style="margin-top:5px;" placeholder="请输入" :disabled="edit" ></el-input>
  293 + </el-form-item>
  294 + <el-form-item label="展示主图" prop="displayMainImage">
  295 +
  296 + <img :src="ruleForm.displayMainImage" alt="" style="width:140px;height:140px;">
  297 + </el-form-item>
  298 + <el-form-item label="其他图片/视频" prop="displayMainVidio">
  299 +
  300 + <img :src="ruleForm.displayMainVidio" alt="" style="width:140px;height:140px;">
  301 + </el-form-item>
  302 + </el-form>
  303 + </div>
  304 + </div> -->
  305 +
  306 + <div class="editcss">
  307 + <div class="titles">
  308 + 租赁信息
  309 + </div>
  310 + <div style="margin-bottom: 10px;">
  311 + <el-descriptions class="margin-top" :column="3" border :labelStyle="labelStyle"
  312 + :contentStyle="contentStyle">
  313 + <el-descriptions-item>
  314 + <template slot="label">
  315 + 租赁人
  316 + </template>
  317 + {{xiangData.tenant}}
  318 + </el-descriptions-item>
  319 + <el-descriptions-item>
  320 + <template slot="label">
  321 + 意向租期
  322 + </template>
  323 + {{xiangData.intendedLeaseTerm}}
  324 + </el-descriptions-item>
  325 + <el-descriptions-item>
  326 + <template slot="label">
  327 + 意向租金
  328 + </template>
  329 + {{xiangData.intentionalRent}}
  330 + </el-descriptions-item>
  331 + <el-descriptions-item>
  332 + <template slot="label">
  333 + 租赁主体
  334 + </template>
  335 + {{xiangData.leasingEntity}}
  336 + </el-descriptions-item>
  337 + <el-descriptions-item>
  338 + <template slot="label">
  339 + 经营者
  340 + </template>
  341 + {{xiangData.operator}}
  342 + </el-descriptions-item>
  343 + <el-descriptions-item>
  344 + <template slot="label">
  345 + 状态
  346 + </template>
  347 + {{xiangData.state}}
  348 + </el-descriptions-item>
  349 + </el-descriptions>
  350 + </div>
  351 + </div>
  352 + <div class="editcss">
  353 + <div class="titles">
  354 + 合同信息
  355 + </div>
  356 + <div>
  357 + <el-descriptions class="margin-top" :column="3" border :labelStyle="labelStyle"
  358 + :contentStyle="contentStyle">
  359 + <el-descriptions-item>
  360 + <template slot="label">
  361 + 合同编号
  362 + </template>
  363 + {{heData.contractNumber}}
  364 + </el-descriptions-item>
  365 + <el-descriptions-item>
  366 + <template slot="label">
  367 + 标段号
  368 + </template>
  369 + {{heData.sectionNumber}}
  370 + </el-descriptions-item>
  371 + <el-descriptions-item>
  372 + <template slot="label">
  373 + 合同名称
  374 + </template>
  375 + {{heData.contractName}}
  376 +
  377 + </el-descriptions-item>
  378 + <el-descriptions-item>
  379 + <template slot="label">
  380 + 合同金额
  381 + </template>
  382 + {{heData.contractAmount}}
  383 +
  384 + </el-descriptions-item>
  385 + <el-descriptions-item>
  386 + <template slot="label">
  387 + 保证金
  388 + </template>
  389 + {{heData.earnestMoney}}
  390 +
  391 + </el-descriptions-item>
  392 + <el-descriptions-item>
  393 + <template slot="label">
  394 + 合同签订日期
  395 + </template>
  396 + {{heData.contractSigningDate}}
  397 +
  398 + </el-descriptions-item>
  399 + <el-descriptions-item>
  400 + <template slot="label">
  401 + 合同终止日期
  402 + </template>
  403 + {{heData.contractTerminationDate}}
  404 +
  405 + </el-descriptions-item>
  406 + <el-descriptions-item>
  407 + <template slot="label">
  408 + 起租日期
  409 + </template>
  410 + {{heData.leaseStartDate}}
  411 +
  412 + </el-descriptions-item>
  413 + <el-descriptions-item>
  414 + <template slot="label">
  415 + 出租人名称
  416 + </template>
  417 + {{heData.lessorName}}
  418 +
  419 + </el-descriptions-item>
  420 + <el-descriptions-item>
  421 + <template slot="label">
  422 + 联系电话
  423 + </template>
  424 + {{heData.telephone}}
  425 +
  426 + </el-descriptions-item>
  427 + <el-descriptions-item>
  428 + <template slot="label">
  429 + 银行账号
  430 + </template>
  431 + {{heData.bankAccount}}
  432 +
  433 + </el-descriptions-item>
  434 + <el-descriptions-item>
  435 + <template slot="label">
  436 + 承租人名称
  437 + </template>
  438 + {{heData.tenantName}}
  439 +
  440 + </el-descriptions-item>
  441 + <el-descriptions-item>
  442 + <template slot="label">
  443 + 承租人联系电话
  444 + </template>
  445 + {{heData.tenantTelephone}}
  446 +
  447 + </el-descriptions-item>
  448 + <el-descriptions-item>
  449 + <template slot="label">
  450 + 承租人银行账号
  451 + </template>
  452 + {{heData.tenantBankAccount}}
  453 +
  454 + </el-descriptions-item>
  455 + <el-descriptions-item>
  456 + <template slot="label">
  457 + 商铺编号
  458 + </template>
  459 + {{heData.shopNumber}}
  460 +
  461 + </el-descriptions-item>
  462 + <el-descriptions-item>
  463 + <template slot="label">
  464 + 商铺名称
  465 + </template>
  466 + {{heData.shopName}}
  467 +
  468 + </el-descriptions-item>
  469 + <el-descriptions-item>
  470 + <template slot="label">
  471 + 商铺地址
  472 + </template>
  473 + {{heData.shopAddress}}
  474 +
  475 + </el-descriptions-item>
  476 + <el-descriptions-item>
  477 + <template slot="label">
  478 + 商铺面积
  479 + </template>
  480 + {{heData.shopArea}}
  481 +
  482 + </el-descriptions-item>
  483 + <el-descriptions-item>
  484 + <template slot="label">
  485 + 商品业态
  486 + </template>
  487 + {{heData.storeFormats}}
  488 +
  489 + </el-descriptions-item>
  490 + <el-descriptions-item>
  491 + <template slot="label">
  492 + 经营项目
  493 + </template>
  494 + {{heData.businessProjects}}
  495 +
  496 + </el-descriptions-item>
  497 + <el-descriptions-item>
  498 + <template slot="label">
  499 + 合同附件
  500 + </template>
  501 + {{heData.appendicesContract}}
  502 +
  503 + </el-descriptions-item>
  504 + </el-descriptions>
  505 + </div>
  506 + </div>
  507 + </div>
  508 + </el-tab-pane>
  509 + <div style="margin-top: 20px;display: flex;justify-content: flex-end;">
  510 + <el-button @click="outdan =false" class="buttonHover"
  511 + style="color: #000;border: 1px solid #DBDBDB;background-color: #fff;">返回</el-button>
  512 + <!-- <el-button @click="bianji" style="background-color: #3F9B6A;color: #fff;">编辑</el-button> -->
  513 +
  514 + </div>
  515 + </el-tabs>
  516 + </div>
  517 + </div>
  518 +
  519 +
  520 + </el-dialog>
114 521 <!-- 详情框 -->
115 522 <el-dialog :visible.sync="detbox" custom-class='bian_css' style="padding: 0;" width="75%"
116 523 center :close-on-click-modal="false" :show-close="false">
117 524 <div style="padding:20px;">
118 525 <div style="font-size: 14px;padding-bottom: 20px;color: #000;">租赁信息</div>
119 526 <div style="margin-bottom: 10px;">
120   - <el-descriptions class="margin-top" :column="3" border labelStyle="width:150px;height:42px;" contentStyle="width:20%;height:42px;">
  527 + <el-descriptions class="margin-top" :column="3" border :labelStyle="labelStyle"
  528 + :contentStyle="contentStyle">
121 529 <el-descriptions-item>
122 530 <template slot="label">
123 531 租赁人
124 532 </template>
125   - <span v-if="bianZt">{{formInline.tenant}}</span>
126   - <el-input v-model="formInline.tenant" placeholder="请输入" style="width:100%;" v-else/>
  533 + <span v-if="bianZt">{{xiangData.tenant}}</span>
  534 + <el-input v-model="xiangData.tenant" placeholder="请输入" style="width:100%;" v-else/>
127 535 </el-descriptions-item>
128 536 <el-descriptions-item>
129 537 <template slot="label">
130 538 意向租期
131 539 </template>
132   - <span v-if="bianZt">{{formInline.intendedLeaseTerm}}</span>
133   - <el-input v-model="formInline.intendedLeaseTerm" placeholder="请输入" style="width:100%;" v-else/>
  540 + <span v-if="bianZt">{{xiangData.intendedLeaseTerm}}</span>
  541 + <el-input v-model="xiangData.intendedLeaseTerm" placeholder="请输入" style="width:100%;" v-else/>
134 542 </el-descriptions-item>
135 543 <el-descriptions-item>
136 544 <template slot="label">
137 545 意向租金
138 546 </template>
139   - <span v-if="bianZt">{{formInline.intentionalRent}}</span>
140   - <el-input v-model="formInline.intentionalRent" placeholder="请输入" style="width:100%;" v-else/>
  547 + <span v-if="bianZt">{{xiangData.intentionalRent}}</span>
  548 + <el-input v-model="xiangData.intentionalRent" placeholder="请输入" style="width:100%;" v-else/>
141 549 </el-descriptions-item>
142 550 <el-descriptions-item>
143 551 <template slot="label">
144 552 租赁主体
145 553 </template>
146   - <span v-if="bianZt">{{formInline.leasingEntity}}</span>
147   - <el-input v-model="formInline.leasingEntity" placeholder="请输入" style="width:100%;" v-else/>
  554 + <span v-if="bianZt">{{xiangData.leasingEntity}}</span>
  555 + <el-input v-model="xiangData.leasingEntity" placeholder="请输入" style="width:100%;" v-else/>
148 556 </el-descriptions-item>
149 557 <el-descriptions-item>
150 558 <template slot="label">
151 559 经营者
152 560 </template>
153   - <span v-if="bianZt">{{formInline.operator}}</span>
154   - <el-input v-model="formInline.operator" placeholder="请输入" style="width:100%;" v-else/>
  561 + <span v-if="bianZt">{{xiangData.operator}}</span>
  562 + <el-input v-model="xiangData.operator" placeholder="请输入" style="width:100%;" v-else/>
155 563 </el-descriptions-item>
156 564 <el-descriptions-item>
157 565 <template slot="label">
158 566 状态
159 567 </template>
160   - <span v-if="bianZt">{{formInline.state}}</span>
161   - <el-input v-model="formInline.state" placeholder="请输入" style="width:100%;" v-else/>
  568 + <span v-if="bianZt">{{xiangData.state}}</span>
  569 + <el-input v-model="xiangData.state" placeholder="请输入" style="width:100%;" v-else/>
162 570 </el-descriptions-item>
163 571 </el-descriptions>
164 572 </div>
165 573 <div style="">
166   - <el-descriptions class="margin-top" :column="3" border labelStyle="width:150px;height:42px;" contentStyle="width:20%;height:42px;">
  574 + <el-descriptions class="margin-top" :column="3" border :labelStyle="labelStyle"
  575 + :contentStyle="contentStyle">
167 576 <el-descriptions-item>
168 577 <template slot="label">
169 578 租赁类型
170 579 </template>
171   - <span v-if="bianZt">{{formInline.leaseType}}</span>
172   - <el-input v-model="formInline.leaseType" placeholder="请输入" style="width:100%;" v-else/>
  580 + <span v-if="bianZt">{{xiangData.leaseType}}</span>
  581 + <el-input v-model="xiangData.leaseType" placeholder="请输入" style="width:100%;" v-else/>
173 582 </el-descriptions-item>
174 583 <el-descriptions-item>
175 584 <template slot="label">
176 585 编号
177 586 </template>
178   - <span v-if="bianZt">{{formInline.leaseCode}}</span>
179   - <el-input v-model="formInline.leaseCode" placeholder="请输入" style="width:100%;" v-else/>
  587 + <span v-if="bianZt">{{xiangData.leaseCode}}</span>
  588 + <el-input v-model="xiangData.leaseCode" placeholder="请输入" style="width:100%;" v-else/>
180 589 </el-descriptions-item>
181 590 <el-descriptions-item>
182 591 <template slot="label">
183 592 名称
184 593 </template>
185   - <span v-if="bianZt">{{formInline.leaseName}}</span>
186   - <el-input v-model="formInline.leaseName" placeholder="请输入" style="width:100%;" v-else/>
  594 + <span v-if="bianZt">{{xiangData.leaseName}}</span>
  595 + <el-input v-model="xiangData.leaseName" placeholder="请输入" style="width:100%;" v-else/>
187 596 </el-descriptions-item>
188 597 <el-descriptions-item>
189 598 <template slot="label">
190 599 行政区
191 600 </template>
192   - <span v-if="bianZt">{{formInline.administrativeRegion}}</span>
193   - <el-input v-model="formInline.administrativeRegion" placeholder="请输入" style="width:100%;" v-else/>
  601 + <span v-if="bianZt">{{xiangData.administrativeRegion}}</span>
  602 + <el-input v-model="xiangData.administrativeRegion" placeholder="请输入" style="width:100%;" v-else/>
194 603 </el-descriptions-item>
195 604 <el-descriptions-item>
196 605 <template slot="label">
197 606 地址
198 607 </template>
199   - <span v-if="bianZt">{{formInline.leaseAddress}}</span>
200   - <el-input v-model="formInline.leaseAddress" placeholder="请输入" style="width:100%;" v-else/>
  608 + <span v-if="bianZt">{{xiangData.leaseAddress}}</span>
  609 + <el-input v-model="xiangData.leaseAddress" placeholder="请输入" style="width:100%;" v-else/>
201 610 </el-descriptions-item>
202 611 <el-descriptions-item>
203 612 <template slot="label">
204 613 所属主体
205 614 </template>
206   - <span v-if="bianZt">{{formInline.owner}}</span>
207   - <el-input v-model="formInline.owner" placeholder="请输入" style="width:100%;" v-else/>
  615 + <span v-if="bianZt">{{xiangData.owner}}</span>
  616 + <el-input v-model="xiangData.owner" placeholder="请输入" style="width:100%;" v-else/>
208 617 </el-descriptions-item>
209 618 <el-descriptions-item>
210 619 <template slot="label">
211 620 负责人
212 621 </template>
213   - <span v-if="bianZt">{{formInline.commander}}</span>
214   - <el-input v-model="formInline.commander" placeholder="请输入" style="width:100%;" v-else/>
  622 + <span v-if="bianZt">{{xiangData.commander}}</span>
  623 + <el-input v-model="xiangData.commander" placeholder="请输入" style="width:100%;" v-else/>
215 624 </el-descriptions-item>
216 625 <el-descriptions-item>
217 626 <template slot="label">
218 627 联系电话
219 628 </template>
220   - <span v-if="bianZt">{{formInline.telephone}}</span>
221   - <el-input v-model="formInline.telephone" placeholder="请输入" style="width:100%;" v-else/>
  629 + <span v-if="bianZt">{{xiangData.telephone}}</span>
  630 + <el-input v-model="xiangData.telephone" placeholder="请输入" style="width:100%;" v-else/>
222 631 </el-descriptions-item>
223 632 <el-descriptions-item>
224 633 <template slot="label">
225 634 范围
226 635 </template>
227   - <span v-if="bianZt">{{formInline.scope}}</span>
228   - <el-input v-model="formInline.scope" placeholder="请输入" style="width:100%;" v-else/>
  636 + <span v-if="bianZt">{{xiangData.scope}}</span>
  637 + <el-input v-model="xiangData.scope" placeholder="请输入" style="width:100%;" v-else/>
229 638 </el-descriptions-item>
230 639 <el-descriptions-item>
231 640 <template slot="label">
232 641 面积
233 642 </template>
234   - <span v-if="bianZt">{{formInline.area}}</span>
235   - <el-input v-model="formInline.area" placeholder="请输入" style="width:100%;" v-else/>
  643 + <span v-if="bianZt">{{xiangData.area}}</span>
  644 + <el-input v-model="xiangData.area" placeholder="请输入" style="width:100%;" v-else/>
236 645 </el-descriptions-item>
237 646 <el-descriptions-item>
238 647 <template slot="label">
239 648 建成时间
240 649 </template>
241   - <span v-if="bianZt">{{formInline.completionTime}}</span>
242   - <el-input v-model="formInline.completionTime" placeholder="请输入" style="width:100%;" v-else/>
  650 + <span v-if="bianZt">{{xiangData.completionTime}}</span>
  651 + <el-input v-model="xiangData.completionTime" placeholder="请输入" style="width:100%;" v-else/>
243 652 </el-descriptions-item>
244 653 <el-descriptions-item>
245 654 <template slot="label">
246 655 房屋类型
247 656 </template>
248   - <span v-if="bianZt">{{formInline.houseType}}</span>
249   - <el-input v-model="formInline.houseType" placeholder="请输入" style="width:100%;" v-else/>
  657 + <span v-if="bianZt">{{xiangData.houseType}}</span>
  658 + <el-input v-model="xiangData.houseType" placeholder="请输入" style="width:100%;" v-else/>
250 659 </el-descriptions-item>
251 660 <el-descriptions-item>
252 661 <template slot="label">
253 662 主要设施
254 663 </template>
255   - <span v-if="bianZt">{{formInline.mainFacilities}}</span>
256   - <el-input v-model="formInline.mainFacilities" placeholder="请输入" style="width:100%;" v-else/>
  664 + <span v-if="bianZt">{{xiangData.mainFacilities}}</span>
  665 + <el-input v-model="xiangData.mainFacilities" placeholder="请输入" style="width:100%;" v-else/>
257 666 </el-descriptions-item>
258 667 <el-descriptions-item>
259 668 <template slot="label">
260 669 平面图
261 670 </template>
262   - <span v-if="bianZt">{{formInline.planeFigure}}</span>
263   - <el-input v-model="formInline.planeFigure" placeholder="请输入" style="width:100%;" v-else/>
  671 + <span v-if="bianZt">{{xiangData.planeFigure}}</span>
  672 + <el-input v-model="xiangData.planeFigure" placeholder="请输入" style="width:100%;" v-else/>
264 673 </el-descriptions-item>
265 674 <el-descriptions-item>
266 675 <template slot="label">
267 676 收费标准
268 677 </template>
269   - <span v-if="bianZt">{{formInline.feeStandards}}</span>
270   - <el-input v-model="formInline.feeStandards" placeholder="请输入" style="width:100%;" v-else/>
  678 + <span v-if="bianZt">{{xiangData.feeStandards}}</span>
  679 + <el-input v-model="xiangData.feeStandards" placeholder="请输入" style="width:100%;" v-else/>
271 680 </el-descriptions-item>
272 681 <el-descriptions-item>
273 682 <template slot="label">
274 683 标签
275 684 </template>
276   - <span v-if="bianZt">{{formInline.label}}</span>
277   - <el-input v-model="formInline.label" placeholder="请输入" style="width:100%;" v-else/>
  685 + <span v-if="bianZt">{{xiangData.label}}</span>
  686 + <el-input v-model="xiangData.label" placeholder="请输入" style="width:100%;" v-else/>
278 687 </el-descriptions-item>
279 688  
280 689 <el-descriptions-item>
281 690 <template slot="label">
282 691 宣传视频
283 692 </template>
284   - <span v-if="bianZt">{{formInline.promotionVideo}}</span>
285   - <el-input v-model="formInline.promotionVideo" placeholder="请输入" style="width:100%;" v-else/>
  693 + <span v-if="bianZt">{{xiangData.promotionVideo}}</span>
  694 + <el-input v-model="xiangData.promotionVideo" placeholder="请输入" style="width:100%;" v-else/>
286 695 </el-descriptions-item>
287 696 <el-descriptions-item>
288 697 <template slot="label">
289 698 宣传图片
290 699 </template>
291   - <span v-if="bianZt">{{formInline.promotionImage}}</span>
292   - <el-input v-model="formInline.promotionImage" placeholder="请输入" style="width:100%;" v-else/>
  700 + <span v-if="bianZt">{{xiangData.promotionImage}}</span>
  701 + <el-input v-model="xiangData.promotionImage" placeholder="请输入" style="width:100%;" v-else/>
293 702 </el-descriptions-item>
294 703 <el-descriptions-item>
295 704 <template slot="label">
296 705 备注信息
297 706 </template>
298   - <span v-if="bianZt">{{formInline.notes}}</span>
299   - <el-input v-model="formInline.notes" placeholder="请输入" style="width:100%;" v-else/>
  707 + <span v-if="bianZt">{{xiangData.notes}}</span>
  708 + <el-input v-model="xiangData.notes" placeholder="请输入" style="width:100%;" v-else/>
300 709 </el-descriptions-item>
301 710 </el-descriptions>
302 711 </div>
303 712 <div style="font-size: 14px;padding: 20px 0;color: #000;">合同信息</div>
304 713 <div>
305   - <el-descriptions class="margin-top" :column="3" border labelStyle="width:150px;height:42px;" contentStyle="width:20%;height:42px;">
306   - <el-descriptions-item>
307   - <template slot="label">
308   - 合同编号
309   - </template>
310   - <span v-if="bianZt">{{formInline.contractNumber}}</span>
311   - <el-input v-model="formInline.contractNumber" placeholder="请输入" style="width:100%;" v-else/>
312   - </el-descriptions-item>
313   - <el-descriptions-item>
314   - <template slot="label">
315   - 标段号
316   - </template>
317   - <span v-if="bianZt">{{formInline.sectionNumber}}</span>
318   - <el-input v-model="formInline.sectionNumber" placeholder="请输入" style="width:100%;" v-else/>
319   - </el-descriptions-item>
320   - <el-descriptions-item>
321   - <template slot="label">
322   - 合同名称
323   - </template>
324   - <span v-if="bianZt">232132</span>
325   - <el-input v-model="formInline.search" placeholder="请输入" style="width:100%;" v-else/>
326   - </el-descriptions-item>
327   - <el-descriptions-item>
328   - <template slot="label">
329   - 合同金额
330   - </template>
331   - <span v-if="bianZt">232132</span>
332   - <el-input v-model="formInline.search" placeholder="请输入" style="width:100%;" v-else/>
333   - </el-descriptions-item>
334   - <el-descriptions-item>
335   - <template slot="label">
336   - 保证金
337   - </template>
338   - <span v-if="bianZt">1</span>
339   - <el-input v-model="formInline.search" placeholder="请输入" style="width:100%;" v-else/>
340   - </el-descriptions-item>
341   - <el-descriptions-item>
342   - <template slot="label">
343   - 合同签订日期
344   - </template>
345   - <span v-if="bianZt">1</span>
346   - <el-input v-model="formInline.search" placeholder="请输入" style="width:100%;" v-else/>
347   - </el-descriptions-item>
348   - <el-descriptions-item>
349   - <template slot="label">
350   - 合同终止日期
351   - </template>
352   - <span v-if="bianZt">1</span>
353   - <el-input v-model="formInline.search" placeholder="请输入" style="width:100%;" v-else/>
354   - </el-descriptions-item>
355   - <el-descriptions-item>
356   - <template slot="label">
357   - 起租日期
358   - </template>
359   - <span v-if="bianZt">1</span>
360   - <el-input v-model="formInline.search" placeholder="请输入" style="width:100%;" v-else/>
361   - </el-descriptions-item>
362   - <el-descriptions-item>
363   - <template slot="label">
364   - 出租人名称
365   - </template>
366   - <span v-if="bianZt">1</span>
367   - <el-input v-model="formInline.search" placeholder="请输入" style="width:100%;" v-else/>
368   - </el-descriptions-item>
369   - <el-descriptions-item>
370   - <template slot="label">
371   - 联系电话
372   - </template>
373   - <span v-if="bianZt">1</span>
374   - <el-input v-model="formInline.search" placeholder="请输入" style="width:100%;" v-else/>
375   - </el-descriptions-item>
376   - <el-descriptions-item>
377   - <template slot="label">
378   - 银行账号
379   - </template>
380   - <span v-if="bianZt">1</span>
381   - <el-input v-model="formInline.search" placeholder="请输入" style="width:100%;" v-else/>
382   - </el-descriptions-item>
383   - <el-descriptions-item>
384   - <template slot="label">
385   - 承租人名称
386   - </template>
387   - <span v-if="bianZt">1</span>
388   - <el-input v-model="formInline.search" placeholder="请输入" style="width:100%;" v-else/>
389   - </el-descriptions-item>
390   - <el-descriptions-item>
391   - <template slot="label">
392   - 承租人联系电话
393   - </template>
394   - <span v-if="bianZt">1</span>
395   - <el-input v-model="formInline.search" placeholder="请输入" style="width:100%;" v-else/>
396   - </el-descriptions-item>
397   - <el-descriptions-item>
398   - <template slot="label">
399   - 承租人银行账号
400   - </template>
401   - <span v-if="bianZt">1</span>
402   - <el-input v-model="formInline.search" placeholder="请输入" style="width:100%;" v-else/>
403   - </el-descriptions-item>
404   - <el-descriptions-item>
405   - <template slot="label">
406   - 商铺编号
407   - </template>
408   - <span v-if="bianZt">1</span>
409   - <el-input v-model="formInline.search" placeholder="请输入" style="width:100%;" v-else/>
410   - </el-descriptions-item>
411   - <el-descriptions-item>
412   - <template slot="label">
413   - 商铺名称
414   - </template>
415   - <span v-if="bianZt">1</span>
416   - <el-input v-model="formInline.search" placeholder="请输入" style="width:100%;" v-else/>
417   - </el-descriptions-item>
418   - <el-descriptions-item>
419   - <template slot="label">
420   - 商铺地址
421   - </template>
422   - <span v-if="bianZt">1</span>
423   - <el-input v-model="formInline.search" placeholder="请输入" style="width:100%;" v-else/>
424   - </el-descriptions-item>
425   - <el-descriptions-item>
426   - <template slot="label">
427   - 商铺面积
428   - </template>
429   - <span v-if="bianZt">1</span>
430   - <el-input v-model="formInline.search" placeholder="请输入" style="width:100%;" v-else/>
431   - </el-descriptions-item>
432   - <el-descriptions-item>
433   - <template slot="label">
434   - 商品业态
435   - </template>
436   - <span v-if="bianZt">1</span>
437   - <el-input v-model="formInline.search" placeholder="请输入" style="width:100%;" v-else/>
438   - </el-descriptions-item>
439   - <el-descriptions-item>
440   - <template slot="label">
441   - 经营项目
442   - </template>
443   - <span v-if="bianZt">1</span>
444   - <el-input v-model="formInline.search" placeholder="请输入" style="width:100%;" v-else/>
445   - </el-descriptions-item>
446   - <el-descriptions-item>
447   - <template slot="label">
448   - 合同附件
449   - </template>
450   - <span v-if="bianZt">点击上传</span>
451   - <el-input v-model="formInline.search" placeholder="请输入" style="width:100%;" v-else/>
452   - </el-descriptions-item>
453   - </el-descriptions>
  714 + <el-descriptions class="margin-top" :column="3" border :labelStyle="labelStyle"
  715 + :contentStyle="contentStyle">
  716 + <el-descriptions-item>
  717 + <template slot="label">
  718 + 合同编号
  719 + </template>
  720 + <div v-if="bianZt">{{heData.contractNumber}}</div>
  721 + <el-input v-model="heData.contractNumber" style="width:100%;" v-else placeholder="请输入"/>
  722 + </el-descriptions-item>
  723 + <el-descriptions-item>
  724 + <template slot="label">
  725 + 标段号
  726 + </template>
  727 + <div v-if="bianZt">{{heData.sectionNumber}}</div>
  728 + <el-input v-model="heData.sectionNumber" style="width:100%;" v-else placeholder="请输入"/>
  729 +
  730 + </el-descriptions-item>
  731 + <el-descriptions-item>
  732 + <template slot="label">
  733 + 合同名称
  734 + </template>
  735 + <div v-if="bianZt">{{heData.contractName}}</div>
  736 + <el-input v-model="heData.contractName" style="width:100%;" v-else placeholder="请输入"/>
  737 + </el-descriptions-item>
  738 + <el-descriptions-item>
  739 + <template slot="label">
  740 + 合同金额
  741 + </template>
  742 + <div v-if="bianZt">{{heData.contractAmount}}</div>
  743 + <el-input v-model="heData.contractAmount" style="width:100%;" v-else placeholder="请输入"/>
  744 + </el-descriptions-item>
  745 + <el-descriptions-item>
  746 + <template slot="label">
  747 + 保证金
  748 + </template>
  749 + <div v-if="bianZt">{{heData.contractAmount}}</div>
  750 + <el-input v-model="heData.contractAmount" style="width:100%;" v-else placeholder="请输入"/>
  751 +
  752 + <!-- <el-input v-model="heData.earnestMoney" placeholder="请输入" style="width:100%;" /> -->
  753 + </el-descriptions-item>
  754 + <el-descriptions-item>
  755 + <template slot="label">
  756 + 合同签订日期
  757 + </template>
  758 + <div v-if="bianZt">{{heData.contractSigningDate}}</div>
  759 + <el-input v-model="heData.contractSigningDate" style="width:100%;" v-else placeholder="请输入"/>
  760 + </el-descriptions-item>
  761 + <el-descriptions-item>
  762 + <template slot="label">
  763 + 合同终止日期
  764 + </template>
  765 + <div v-if="bianZt">{{heData.contractTerminationDate}}</div>
  766 + <el-input v-model="heData.contractTerminationDate" style="width:100%;" v-else placeholder="请输入"/>
  767 + </el-descriptions-item>
  768 + <el-descriptions-item>
  769 + <template slot="label">
  770 + 起租日期
  771 + </template>
  772 + <div v-if="bianZt">{{heData.leaseStartDate}}</div>
  773 + <el-input v-model="heData.leaseStartDate" style="width:100%;" v-else placeholder="请输入"/>
  774 + </el-descriptions-item>
  775 + <el-descriptions-item>
  776 + <template slot="label">
  777 + 出租人名称
  778 + </template>
  779 + <div v-if="bianZt">{{heData.lessorName}}</div>
  780 + <el-input v-model="heData.lessorName" style="width:100%;" v-else placeholder="请输入"/>
  781 + </el-descriptions-item>
  782 + <el-descriptions-item>
  783 + <template slot="label">
  784 + 联系电话
  785 + </template>
  786 + <div v-if="bianZt">{{heData.telephone}}</div>
  787 + <el-input v-model="heData.telephone" style="width:100%;" v-else placeholder="请输入"/>
  788 + </el-descriptions-item>
  789 + <el-descriptions-item>
  790 + <template slot="label">
  791 + 银行账号
  792 + </template>
  793 + <div v-if="bianZt">{{heData.bankAccount}}</div>
  794 + <el-input v-model="heData.bankAccount" style="width:100%;" v-else placeholder="请输入"/>
  795 + </el-descriptions-item>
  796 + <el-descriptions-item>
  797 + <template slot="label">
  798 + 承租人名称
  799 + </template>
  800 + <div v-if="bianZt">{{heData.tenantName}}</div>
  801 + <el-input v-model="heData.tenantName" style="width:100%;" v-else placeholder="请输入"/>
  802 + </el-descriptions-item>
  803 + <el-descriptions-item>
  804 + <template slot="label">
  805 + 承租人联系电话
  806 + </template>
  807 + <div v-if="bianZt">{{heData.tenantTelephone}}</div>
  808 + <el-input v-model="heData.tenantTelephone" style="width:100%;" v-else placeholder="请输入"/>
  809 + </el-descriptions-item>
  810 + <el-descriptions-item>
  811 + <template slot="label">
  812 + 承租人银行账号
  813 + </template>
  814 + <div v-if="bianZt">{{heData.tenantBankAccount}}</div>
  815 + <el-input v-model="heData.tenantBankAccount" style="width:100%;" v-else placeholder="请输入"/>
  816 + </el-descriptions-item>
  817 + <el-descriptions-item>
  818 + <template slot="label">
  819 + 商铺编号
  820 + </template>
  821 + <div v-if="bianZt">{{heData.shopNumber}}</div>
  822 + <el-input v-model="heData.shopNumber" style="width:100%;" v-else placeholder="请输入"/>
  823 + </el-descriptions-item>
  824 + <el-descriptions-item>
  825 + <template slot="label">
  826 + 商铺名称
  827 + </template>
  828 + <div v-if="bianZt">{{heData.shopName}}</div>
  829 + <el-input v-model="heData.shopName" style="width:100%;" v-else placeholder="请输入"/>
  830 + </el-descriptions-item>
  831 + <el-descriptions-item>
  832 + <template slot="label">
  833 + 商铺地址
  834 + </template>
  835 + <div v-if="bianZt">{{heData.shopAddress}}</div>
  836 + <el-input v-model="heData.shopAddress" style="width:100%;" v-else placeholder="请输入"/>
  837 + </el-descriptions-item>
  838 + <el-descriptions-item>
  839 + <template slot="label">
  840 + 商铺面积
  841 + </template>
  842 + <div v-if="bianZt">{{heData.shopArea}}</div>
  843 + <el-input v-model="heData.shopArea" style="width:100%;" v-else placeholder="请输入"/>
  844 + </el-descriptions-item>
  845 + <el-descriptions-item>
  846 + <template slot="label">
  847 + 商铺业态
  848 + </template>
  849 + <div v-if="bianZt">{{heData.storeFormats}}</div>
  850 + <el-input v-model="heData.storeFormats" style="width:100%;" v-else placeholder="请输入"/>
  851 + </el-descriptions-item>
  852 + <el-descriptions-item>
  853 + <template slot="label">
  854 + 经营项目
  855 + </template>
  856 + <div v-if="bianZt">{{heData.businessProjects}}</div>
  857 + <el-input v-model="heData.businessProjects" style="width:100%;" v-else placeholder="请输入"/>
  858 + </el-descriptions-item>
  859 + <el-descriptions-item>
  860 + <template slot="label">
  861 + 合同附件
  862 + </template>
  863 + <!-- <el-upload class="video-uploader" :action="uploadFileUrl" :on-remove="hefuRemove"
  864 + :on-success="hefuSuccess" :auto-upload="true" :file-list="hefuData" v-if="index==1">
  865 + <div slot="trigger" style="color:#3f9b6a"> +点击上传</div>
  866 + </el-upload> -->
  867 + </el-descriptions-item>
  868 + </el-descriptions>
454 869 </div>
455 870  
456 871 <div style="padding-top:20px;display:flex;justify-content: flex-end;">
... ... @@ -470,50 +885,38 @@
470 885 <div>
471 886 <div style="margin-bottom: 20px;">
472 887 <el-form ref="form" :model="zhong" label-width="120px">
473   - <el-form-item label="甲方">
474   - <el-input v-model="zhong.name" disabled placeholder="张三"></el-input>
475   - </el-form-item>
476   - <el-form-item label="乙方">
477   - <el-input v-model="zhong.name" disabled placeholder="成都火星科技有限公司"></el-input>
478   - </el-form-item>
479   - <el-form-item label="商铺名称">
480   - <el-input v-model="zhong.name" disabled placeholder="星空步道纪念品"></el-input>
481   - </el-form-item>
482   - <el-form-item label="商铺地址">
483   - <el-input v-model="zhong.name" disabled placeholder="成都市金牛区万达广场1585号"></el-input>
484   - </el-form-item>
485   - <el-form-item label="商铺面积" >
486   - <el-input v-model="zhong.name" disabled placeholder="104.2"></el-input>
487   - </el-form-item>
488   - <el-form-item label="起租日期">
489   - <el-input v-model="zhong.name" disabled placeholder="2024-10-2"></el-input>
490   - </el-form-item>
491   - <el-form-item label="租赁期限">
492   - <el-input v-model="zhong.name" disabled placeholder="3年"></el-input>
493   - </el-form-item>
494   - <el-form-item label="租金金额">
495   - <el-input v-model="zhong.name" disabled placeholder="6000"></el-input>
496   - </el-form-item>
497   - <el-form-item label="租金支付方式">
498   - <el-input v-model="zhong.name" disabled placeholder="微信"></el-input>
  888 + <el-form-item label="租金">
  889 + <el-input v-model="zhong.intentionalRent" ></el-input>
499 890 </el-form-item>
500   - <el-form-item label="租金支付日期">
501   - <el-input v-model="zhong.name" disabled placeholder="2024-10-3"></el-input>
  891 + <el-form-item label="付款周期">
  892 + <el-select v-model="zhong.belongingDepartment" placeholder="请选择" style="margin-top:5px;width: 100%;">
  893 + <el-option label="按年" value="按年"></el-option>
  894 + <el-option label="按月" value="按月"></el-option>
  895 + <el-option label="按日" value="按日"></el-option>
  896 + <el-option label="季度" value="季度"></el-option>
  897 + </el-select>
502 898 </el-form-item>
503   - <el-form-item label="押金金额">
504   - <el-input v-model="zhong.name" disabled></el-input>
  899 + <el-form-item label="付款日">
  900 + <el-select v-model="zhong.name" placeholder="请选择" style="margin-top:5px;width: 100%;">
  901 + <el-option :label="val+'号'" :value="val+'号'" v-for="val in 31"></el-option>
  902 + </el-select>
505 903 </el-form-item>
506   - <el-form-item label="其他费用">
507   - <el-input v-model="zhong.name" disabled></el-input>
  904 + <el-form-item label="支付类型">
  905 + <el-select v-model="zhong.zhifu" placeholder="请选择" style="margin-top:5px;width: 100%;">
  906 + <el-option label="线上支付" value="线上支付"></el-option>
  907 + <el-option label="线下支付" value="线下支付"></el-option>
  908 + </el-select>
508 909 </el-form-item>
509   - <el-form-item label="使用用途">
510   - <el-input v-model="zhong.name" disabled></el-input>
  910 +
  911 +
  912 + <el-form-item label="支付方式说明">
  913 + <wang-editor v-model="zhong.zhifushuo" ref="editor" :height="200"></wang-editor>
511 914 </el-form-item>
512 915 <el-form-item label="装修与改造规定">
513   - <wang-editor v-model="zhong.summary" ref="editor" :height="200"></wang-editor>
  916 + <wang-editor v-model="zhong.gaizao" ref="editor" :height="200"></wang-editor>
514 917 </el-form-item>
515 918 <el-form-item label="其他备注信息">
516   - <wang-editor v-model="zhong.summary" ref="editor" :height="200"></wang-editor>
  919 + <wang-editor v-model="zhong.noto" ref="editor" :height="200"></wang-editor>
517 920 </el-form-item>
518 921 </el-form>
519 922  
... ... @@ -521,7 +924,7 @@
521 924 <div style="display: flex;justify-content: flex-end;">
522 925 <el-button @click="closeFn(1)" class="buttonHover"
523 926 style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">返回</el-button>
524   - <el-button @click="addCheck(4)" style="background-color: #3F9B6A;color: #fff">保存</el-button>
  927 + <!-- <el-button @click="addCheck(4)" style="background-color: #3F9B6A;color: #fff">保存</el-button> -->
525 928 <el-button @click="yulan =true" style="background-color: #3F9B6A;color: #fff">预览</el-button>
526 929 </div>
527 930 </div>
... ... @@ -530,64 +933,33 @@
530 933 <div class="form-container" ref="contentToConvert" style="background-color:#fff;">
531 934 <div class="form-header">入驻单</div>
532 935 <div class="form-group">
533   - <label for="partyA">甲方:</label>
534   - <input type="text" id="partyA" >
535   - </div>
536   - <div class="form-group">
537   - <label for="partyB">乙方:</label>
538   - <input type="text" id="partyB" >
539   - </div>
540   - <div class="form-group">
541   - <label for="shopName">商铺名称:</label>
542   - <input type="text" id="shopName" >
543   - </div>
544   - <div class="form-group">
545   - <label for="shopAddress">商铺地址:</label>
546   - <input type="text" id="shopAddress" >
547   - </div>
548   - <div class="form-group">
549   - <label for="shopArea">商铺面积:</label>
550   - <input type="text" id="shopArea" >
551   - </div>
552   - <div class="form-group">
553   - <label>起租日期:</label>
554   - <input type="text" id="startDate">
  936 + <label for="rentAmount">租金:</label>
  937 + <input type="text" id="rentAmount" v-model="zhong.intentionalRent" disabled>
555 938 </div>
556 939 <div class="form-group">
557   - <label for="leaseTerm">租赁期限:</label>
558   - <input type="text" id="leaseTerm" >
  940 + <label for="paymentMethod">付款周期:</label>
  941 + <input type="text" id="paymentMethod" v-model="zhong.belongingDepartment" disabled>
559 942 </div>
560 943 <div class="form-group">
561   - <label for="rentAmount">租金金额:</label>
562   - <input type="text" id="rentAmount" >
  944 + <label>付款日:</label>
  945 + <input type="text" id="paymentDate" v-model="zhong.name" disabled>
563 946 </div>
564 947 <div class="form-group">
565   - <label for="paymentMethod">租金支付方式:</label>
566   - <input type="text" id="paymentMethod" >
567   - </div>
568   - <div class="form-group">
569   - <label>租金支付日期:</label>
570   - <input type="text" id="paymentDate">
571   - </div>
572   - <div class="form-group">
573   - <label for="depositAmount">押金金额:</label>
574   - <input type="text" id="depositAmount" >
575   - </div>
576   - <div class="form-group">
577   - <label for="otherFees">其他费用:</label>
578   - <textarea id="otherFees" ></textarea>
  948 + <label for="depositAmount">支付类型:</label>
  949 + <input type="text" id="depositAmount" v-model="zhong.zhifu" disabled>
579 950 </div>
  951 +
580 952 <div class="form-group">
581   - <label for="usePurpose">使用用途:</label>
582   - <input type="text" id="usePurpose" >
  953 + <label for="renovationRules">支付方式说明:</label>
  954 + <div style="padding:20px;width:100%;border: 1px solid #ccc;" v-html="zhong.zhifushuo"></div>
583 955 </div>
584 956 <div class="form-group">
585 957 <label for="renovationRules">装修与改造规定:</label>
586   - <div style="padding:20px;width:100%;border: 1px solid #ccc;" v-html="zhong.summary"></div>
  958 + <div style="padding:20px;width:100%;border: 1px solid #ccc;" v-html="zhong.gaizao"></div>
587 959 </div>
588 960 <div class="form-group">
589 961 <label for="remarks">其他备注信息:</label>
590   - <div style="padding:20px;width:100%;border: 1px solid #ccc;" v-html="zhong.summary"></div>
  962 + <div style="padding:20px;width:100%;border: 1px solid #ccc;" v-html="zhong.noto"></div>
591 963 </div>
592 964 </div>
593 965  
... ... @@ -600,403 +972,7 @@
600 972 </div>
601 973 </el-dialog>
602 974 </el-dialog>
603   - <!-- 出租单查看 -->
604   - <el-dialog :visible.sync="outdan" custom-class="tongyong_css" style="padding: 0;" width="60%"
605   - class="dialog_css_Xq" center :close-on-click-modal="false" :show-close="false">
606   - <div style="padding:20px;">
607   - <div style="font-size: 14px;padding-bottom: 20px;color: #000;">出租单</div>
608   - <div>
609   - <el-tabs v-model="xiangTabs">
610   - <el-tab-pane label="商户档案信息" name="first">
611   - <div style="width: 100%">
612   - <el-form ref="ruleForm" :model="ruleForm" label-width="130px">
613   - <el-form-item label="商家类型" prop="intentCustomerName">
614   - <el-select v-model="ruleForm.entityType" placeholder="线上商家" style="width:100%" disabled>
615   - <el-option label="线上商家" value="线上商家" />
616   - <el-option label="实体商家" value="实体商家" />
617   - </el-select>
618   - </el-form-item>
619   - <el-form-item label="经营主体" prop="entityType">
620   - <el-select v-model="ruleForm.entityType" placeholder="企业" style="width:100%" disabled>
621   - <el-option label="企业" value="企业" />
622   - <el-option label="个人" value="个人" />
623   - </el-select>
624   - </el-form-item>
625   - <el-form-item label="经营范围" prop="玩偶的设计、生产、销售及网上销售;玩偶相关配件及服饰的设计、生产与销售;玩偶的定制服务玩偶的进出口业务;玩偶文化的推广与传播,:以及与玩偶相关的技术咨询、技术服务">
626   - <el-input v-model="ruleForm.contactPhone" placeholder="请输入" disabled/>
627   - </el-form-item>
628   - <el-form-item label="开店名称" prop="成都火星">
629   - <el-input v-model="ruleForm.contactPhone" placeholder="请输入" disabled/>
630   - </el-form-item>
631   - <el-form-item label="地址" prop="contactPhone">
632   - <el-input v-model="ruleForm.contactPhone" placeholder="成都市金牛区万达广场1585号" disabled/>
633   - </el-form-item>
634   - <el-form-item label="主体名称" prop="contactPhone">
635   - <el-input v-model="ruleForm.contactPhone" placeholder="成都火星科技有限公司" disabled/>
636   - </el-form-item>
637   - <el-form-item label="统一社会信用代码" prop="contactPhone">
638   - <el-input v-model="ruleForm.contactPhone" placeholder="321564545" disabled/>
639   - </el-form-item>
640   - <el-form-item label="类型" prop="entityType">
641   - <el-select v-model="ruleForm.entityType" placeholder="有限责任公司" style="width:100%" disabled>
642   - <el-option label="有限责任公司" value="有限责任公司" />
643   - </el-select>
644   - </el-form-item>
645   - <el-form-item label="法定代表人" prop="contactPhone">
646   - <el-input v-model="ruleForm.contactPhone" placeholder="张三" disabled/>
647   - </el-form-item>
648   - <el-form-item label="注册资本" prop="registeredCapital">
649   - <el-input v-model="ruleForm.registeredCapital" placeholder="请输入" disabled/>
650   -
651   - </el-form-item>
652   - <el-form-item label="成立日期" prop="establishmentDate">
653   - <el-input v-model="ruleForm.establishmentDate" placeholder="请输入" disabled/>
654   - </el-form-item>
655   - <el-form-item label="住所" prop="address">
656   - <el-input v-model="ruleForm.address" placeholder="请输入" disabled/>
657   - </el-form-item>
658   - <el-form-item label="邮箱地址" prop="emailAddress">
659   - <el-input v-model="ruleForm.emailAddress" placeholder="请输入" disabled/>
660   - </el-form-item>
661   - <el-form-item label="营业期限" prop="idCardPhotoBack">
662   - <el-date-picker v-model="businessStartTime" type="daterange" range-separator="至" disabled
663   - start-placeholder="开始时间" end-placeholder="结束时间" value-format="yyyy-MM-dd" />
664   - </el-form-item>
665   - <el-form-item label="营业执照" prop="businessLicense">
666   - <!-- <upimg v-model="ruleForm.businessLicense" :limit="1" :fileSize="1"></upimg> -->
667   - <img :src="ruleForm.businessLicense" alt="">
668   - </el-form-item>
669   - <el-form-item label="经营者姓名" prop="registeredCapital">
670   - <el-input v-model="ruleForm.registeredCapital" placeholder="请输入" disabled/>
671   -
672   - </el-form-item>
673   - <el-form-item label="证件类型" prop="idCardType">
674   - <el-select v-model="ruleForm.idCardType" placeholder="请选择" style="width:100%" disabled>
675   - <el-option label="身份证" value="身份证" />
676   - </el-select>
677   - </el-form-item>
678   - <el-form-item label="身份证号" prop="idCardNumber">
679   - <el-input v-model="ruleForm.idCardNumber" placeholder="请输入" disabled/>
680   - </el-form-item>
681   -
682   - <el-form-item label="身份证有效期" prop="idCardNumber">
683   - <el-date-picker v-model="idCardValidStart" type="daterange" range-separator="至" start-placeholder="开始时间" disabled
684   - end-placeholder="结束时间" value-format="yyyy-MM-dd" />
685   - </el-form-item>
686   - <el-form-item label="身份证照片(正面)" prop="idCardPhotoFront">
687   - <!-- <upimg v-model="ruleForm.idCardPhotoFront" :limit="1" :fileSize="1"></upimg> -->
688   - <img :src="ruleForm.idCardPhotoFront" alt="">
689   - </el-form-item>
690   - <el-form-item label="身份证照片(反面)" prop="idCardPhotoBack">
691   - <!-- <upimg v-model="ruleForm.idCardPhotoBack" :limit="1" :fileSize="1"></upimg> -->
692   - <img :src="ruleForm.idCardPhotoBack" alt="">
693   - </el-form-item>
694   - <el-form-item label="是否为法人" prop="isLegalPerson">
695   - <el-select v-model="ruleForm.isLegalPerson" placeholder="请选择" style="width:100%" disabled>
696   - <el-option label="否" value="0" />
697   - <el-option label="是" value="1" />
698   -
699   - </el-select>
700   - </el-form-item>
701   - <el-form-item label="企业授权书" prop="enterpriseAuthorization">
702   - <!-- <upimg v-model="ruleForm.enterpriseAuthorization" :limit="1" :fileSize="1"></upimg> -->
703   - <img :src="ruleForm.enterpriseAuthorization" alt="">
704   - </el-form-item>
705   - </el-form>
706   -
707   - </div>
708   - </el-tab-pane>
709   - <el-tab-pane label="商铺租赁信息" name="second">
710   - <div style="width: 100%">
711   - <div class="editcss">
712   - <div class="titles">
713   - 资源类型
714   - </div>
715   - <div style="padding: 20px;">
716   - <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="140px" class="demo-ruleForm">
717   - <el-form-item label="商铺名称" prop="shopName">
718   - <el-input v-model="ruleForm.shopName" placeholder="请输入" style="margin-top: 5px;" :disabled="edit"></el-input>
719   - </el-form-item>
720   - <el-form-item label="场地编号" prop="venueNumber">
721   - <el-input v-model="ruleForm.venueNumber" disabled placeholder="将根据类型自动为资源编号" style="margin-top:5px;" disabled></el-input>
722   - </el-form-item>
723   - <el-form-item label="门牌号" prop="houseNumber">
724   - <el-input v-model="ruleForm.houseNumber" placeholder="请输入" style="margin-top:5px;" :disabled="edit"></el-input>
725   - </el-form-item>
726   -
727   - <el-form-item label="建筑形式" prop="architecturalForm">
728   - <el-select v-model="ruleForm.architecturalForm" placeholder="请选择" style="margin-top:5px;width: 100%;" :disabled="edit">
729   - <el-option label="框剪结构" value="框剪结构"></el-option>
730   - <el-option label="区域二" value="区域二"></el-option>
731   - </el-select>
732   - </el-form-item>
733   - <el-form-item label="所属绿道段" prop="belongingGreenwaySection">
734   - <el-select v-model="ruleForm.belongingGreenwaySection" placeholder="请选择" style="margin-top:5px;width: 100%;" :disabled="edit" @change="lvdaoBian">
735   - <el-option :label="item.name" :value="item.code" v-for="(item,index) in lvdaoList" :key="index"></el-option>
736   -
737   - </el-select>
738   - </el-form-item>
739   - <el-form-item label="所属公园/步道" prop="belongingParkTrail">
740   - <el-select v-model="ruleForm.belongingParkTrail" placeholder="请选择" style="margin-top:5px;width: 100%;" :disabled="edit">
741   - <el-option :label="item.name" :value="item.code" v-for="(item,index) in biangongyuanList"></el-option>
742   - </el-select>
743   - </el-form-item>
744   - <el-form-item label="建筑面积" prop="floorSpace">
745   - <el-input v-model="ruleForm.floorSpace" placeholder="请输入" style="margin-top:5px;" :disabled="edit">
746   - <template slot="append">M<sup>2</sup></template>
747   - </el-input>
748   - </el-form-item>
749   - <el-form-item label="实际使用面积" prop="actualUsableArea">
750   - <el-input v-model="ruleForm.actualUsableArea" placeholder="请输入" style="margin-top:5px;" :disabled="edit">
751   - <template slot="append">M<sup>2</sup></template>
752   - </el-input>
753   - </el-form-item>
754   - <el-form-item label="所属区域" prop="belongingRegion">
755   - <el-select v-model="ruleForm.belongingRegion" placeholder="请选择" style="margin-top:5px;width: 100%;" :disabled="edit">
756   - <el-option label="成华区" value="成华区"></el-option>
757   - <el-option label="武侯区" value="武侯区"></el-option>
758   - <el-option label="锦江区" value="锦江区"></el-option>
759   - <el-option label="青羊区" value="青羊区"></el-option>
760   - <el-option label="金牛区" value="金牛区"></el-option>
761   - <el-option label="双流区" value="双流区"></el-option>
762   - </el-select>
763   - </el-form-item>
764   - <el-form-item label="归属部门" prop="belongingDepartment">
765   - <el-input v-model="ruleForm.belongingDepartment" placeholder="请输入" style="margin-top:5px;" :disabled="edit">
766   - </el-input>
767   - </el-form-item>
768   - <el-form-item label="负责人" prop="head">
769   - <el-input v-model="ruleForm.head" placeholder="请输入" style="margin-top:5px;" :disabled="edit">
770   - </el-input>
771   - </el-form-item>
772   - <el-form-item label="详细位置" prop="detailedLocation">
773   - <el-input v-model="ruleForm.detailedLocation" placeholder="请输入" style="margin-top:5px;" :disabled="edit">
774   - </el-input>
775   - </el-form-item>
776   - <el-form-item label="地图标点" prop="mapPunctuation">
777   - <div style="width: 100%;height: 100px;border: 1px solid #3F9B6A;">
778   - <MapXian :message="parentMessage" :edit='edit' :sendMap='getChildDate'></MapXian>
779   - </div>
780   - </el-form-item>
781   - <el-form-item label="建筑图纸" prop="architecturalDrawings">
782   - <!-- <upimg v-model="ruleForm.architecturalDrawings" :limit="5" :fileSize="1" v-if="edit==false"></upimg> -->
783   - <img :src="ruleForm.architecturalDrawings" alt="" style="width:140px;height:140px;">
784   - </el-form-item>
785   - <el-form-item label="商铺描述" prop="shopDescription">
786   - <el-input type="textarea" v-model="ruleForm.shopDescription" style="margin-top:5px;" placeholder="请输入" :disabled="edit" ></el-input>
787   - </el-form-item>
788   - <el-form-item label="展示主图" prop="displayMainImage">
789   - <!-- <upimg v-model="ruleForm.displayMainImage" :limit="1" :fileSize="1" v-if="edit==false"></upimg> -->
790   - <img :src="ruleForm.displayMainImage" alt="" style="width:140px;height:140px;">
791   - </el-form-item>
792   - <el-form-item label="其他图片/视频" prop="displayMainVidio">
793   - <!-- <upvidio v-model="ruleForm.displayMainVidio" :limit="3" v-if="edit==false"></upvidio> -->
794   - <img :src="ruleForm.displayMainVidio" alt="" style="width:140px;height:140px;">
795   - </el-form-item>
796   - </el-form>
797   - </div>
798   - </div>
799 975  
800   - <div class="editcss">
801   - <div class="titles">
802   - 租赁信息
803   - </div>
804   - <div style="padding: 20px;">
805   - <el-descriptions class="margin-top" :column="3" border labelStyle="width:150px;height:42px;" contentStyle="width:20%;height:42px;">
806   - <el-descriptions-item>
807   - <template slot="label">
808   - 租赁人
809   - </template>
810   - <span v-if="bianZt">qweqw</span>
811   - <el-input v-model="formInline.search" placeholder="请输入" style="width:100%;" v-else/>
812   - </el-descriptions-item>
813   - <el-descriptions-item>
814   - <template slot="label">
815   - 意向租期
816   - </template>
817   - <span v-if="bianZt">qweqw</span>
818   - <el-input v-model="formInline.search" placeholder="请输入" style="width:100%;" v-else/>
819   - </el-descriptions-item>
820   - <el-descriptions-item>
821   - <template slot="label">
822   - 意向租金
823   - </template>
824   - <span v-if="bianZt">qweqw</span>
825   - <el-input v-model="formInline.search" placeholder="请输入" style="width:100%;" v-else/>
826   - </el-descriptions-item>
827   - <el-descriptions-item>
828   - <template slot="label">
829   - 租赁主体
830   - </template>
831   - <span v-if="bianZt">qweqw</span>
832   - <el-input v-model="formInline.search" placeholder="请输入" style="width:100%;" v-else/>
833   - </el-descriptions-item>
834   - <el-descriptions-item>
835   - <template slot="label">
836   - 经营者
837   - </template>
838   - <span v-if="bianZt">qweqw</span>
839   - <el-input v-model="formInline.search" placeholder="请输入" style="width:100%;" v-else/>
840   - </el-descriptions-item>
841   - <el-descriptions-item>
842   - <template slot="label">
843   - 状态
844   - </template>
845   - <span v-if="bianZt">qweqw</span>
846   - <el-input v-model="formInline.search" placeholder="请输入" style="width:100%;" v-else/>
847   - </el-descriptions-item>
848   - </el-descriptions>
849   - </div>
850   - </div>
851   - <div class="editcss">
852   - <div class="titles">
853   - 合同信息
854   - </div>
855   - <div style="padding: 20px;">
856   - <el-descriptions class="margin-top" :column="3" border labelStyle="width:150px;height:42px;" contentStyle="width:20%;height:42px;">
857   - <el-descriptions-item>
858   - <template slot="label">
859   - 合同编号
860   - </template>
861   -
862   - </el-descriptions-item>
863   - <el-descriptions-item>
864   - <template slot="label">
865   - 标段号
866   - </template>
867   -
868   - </el-descriptions-item>
869   - <el-descriptions-item>
870   - <template slot="label">
871   - 合同名称
872   - </template>
873   -
874   - </el-descriptions-item>
875   - <el-descriptions-item>
876   - <template slot="label">
877   - 合同金额
878   - </template>
879   -
880   - </el-descriptions-item>
881   - <el-descriptions-item>
882   - <template slot="label">
883   - 保证金
884   - </template>
885   -
886   - </el-descriptions-item>
887   - <el-descriptions-item>
888   - <template slot="label">
889   - 合同签订日期
890   - </template>
891   -
892   - </el-descriptions-item>
893   - <el-descriptions-item>
894   - <template slot="label">
895   - 合同终止日期
896   - </template>
897   -
898   - </el-descriptions-item>
899   - <el-descriptions-item>
900   - <template slot="label">
901   - 起租日期
902   - </template>
903   -
904   - </el-descriptions-item>
905   - <el-descriptions-item>
906   - <template slot="label">
907   - 出租人名称
908   - </template>
909   -
910   - </el-descriptions-item>
911   - <el-descriptions-item>
912   - <template slot="label">
913   - 联系电话
914   - </template>
915   -
916   - </el-descriptions-item>
917   - <el-descriptions-item>
918   - <template slot="label">
919   - 银行账号
920   - </template>
921   -
922   - </el-descriptions-item>
923   - <el-descriptions-item>
924   - <template slot="label">
925   - 承租人名称
926   - </template>
927   -
928   - </el-descriptions-item>
929   - <el-descriptions-item>
930   - <template slot="label">
931   - 承租人联系电话
932   - </template>
933   -
934   - </el-descriptions-item>
935   - <el-descriptions-item>
936   - <template slot="label">
937   - 承租人银行账号
938   - </template>
939   -
940   - </el-descriptions-item>
941   - <el-descriptions-item>
942   - <template slot="label">
943   - 商铺编号
944   - </template>
945   -
946   - </el-descriptions-item>
947   - <el-descriptions-item>
948   - <template slot="label">
949   - 商铺名称
950   - </template>
951   -
952   - </el-descriptions-item>
953   - <el-descriptions-item>
954   - <template slot="label">
955   - 商铺地址
956   - </template>
957   -
958   - </el-descriptions-item>
959   - <el-descriptions-item>
960   - <template slot="label">
961   - 商铺面积
962   - </template>
963   -
964   - </el-descriptions-item>
965   - <el-descriptions-item>
966   - <template slot="label">
967   - 商品业态
968   - </template>
969   -
970   - </el-descriptions-item>
971   - <el-descriptions-item>
972   - <template slot="label">
973   - 经营项目
974   - </template>
975   -
976   - </el-descriptions-item>
977   - <el-descriptions-item>
978   - <template slot="label">
979   - 合同附件
980   - </template>
981   -
982   - </el-descriptions-item>
983   - </el-descriptions>
984   - </div>
985   - </div>
986   - </div>
987   - </el-tab-pane>
988   - <div style="margin-top: 20px;display: flex;justify-content: flex-end;">
989   - <el-button @click="outdan =false" class="buttonHover"
990   - style="color: #000;border: 1px solid #DBDBDB;background-color: #fff;">返回</el-button>
991   - <!-- <el-button @click="bianji" style="background-color: #3F9B6A;color: #fff;">编辑</el-button> -->
992   -
993   - </div>
994   - </el-tabs>
995   - </div>
996   - </div>
997   -
998   -
999   - </el-dialog>
1000 976 </div>
1001 977  
1002 978  
... ... @@ -1010,7 +986,8 @@
1010 986 import {
1011 987 rentalGetAll,
1012 988 rentalDel,
1013   - rentalAdd
  989 + rentalAdd,
  990 + excelRentOutQueryByPage
1014 991 } from '../../../api/rentalMan.js'
1015 992 import {
1016 993 businessListGetAll,
... ... @@ -1062,23 +1039,29 @@ import {
1062 1039 appendicesContract:'',
1063 1040 },
1064 1041 tableData: [],
  1042 + leaseStartDate:[],
1065 1043 formSel: {
1066   - shopName:'',
1067   - search:'',
1068   - createUser:'',
1069   - page: '1', // 当前页
1070   - pageSize: '10' // 每页记录数
  1044 + leaseName:'',
  1045 + cereContractInformation:{
  1046 + tenantName:'',
  1047 + shopName:'',
  1048 + leaseStartDate:'',
  1049 + },
  1050 + pageNumber: 1,
  1051 + pageSize: 10,
1071 1052 },
1072 1053 pageindex: {
1073 1054 pageNumber: 1,
1074 1055 pageSize: 10,
1075 1056 },
1076 1057 zhong:{
1077   - Num:'',
1078   - Name:'',
1079   - Time:'',
1080   - Data:'',
1081   - textarea:''
  1058 + intentionalRent:'',
  1059 + belongingDepartment:'',
  1060 + name:'',
  1061 + zhifu:'',
  1062 + zhifushuo:'',
  1063 + gaizao:'',
  1064 + noto:'',
1082 1065 },
1083 1066 detaiList:{},
1084 1067 bianZt:true,//编辑切换
... ... @@ -1086,6 +1069,21 @@ import {
1086 1069 xiangTabs:'first',
1087 1070 ruleForm:{},
1088 1071 edit:true,
  1072 + businessStartTime:[],
  1073 + idCardValidStart:[],
  1074 + lvdaoList:[],
  1075 + biangongyuanList:[],
  1076 + xiangData:{},
  1077 + heData:{},
  1078 + contentStyle:{
  1079 + width:'20%',
  1080 + height:'42px',
  1081 + },
  1082 + labelStyle:{
  1083 + width:'150px',
  1084 + height:'42px',
  1085 + color:'#000',
  1086 + },
1089 1087 }
1090 1088 },
1091 1089 created() {
... ... @@ -1097,20 +1095,22 @@ import {
1097 1095 methods: {
1098 1096 chenge(val){
1099 1097 this.formSel={
1100   - shopName:'',
1101   - search:'',
1102   - createUser:'',
1103   - page: '1', // 当前页
1104   - pageSize: '10' // 每页记录数
  1098 + leaseName:'',
  1099 + cereContractInformation:{
  1100 + tenantName:'',
  1101 + shopName:'',
  1102 + leaseStartDate:'',
  1103 + },
  1104 + pageNumber: 1,
  1105 + pageSize: 10,
1105 1106 }
1106 1107 this.leixing = !this.leixing
1107 1108  
1108 1109 },
1109 1110 async getAll(val) {
1110   - // const res = await rentalGetAll(this.pageindex)
1111   - // console.log(res.data.content)
1112   - // this.tableData = res.data.content
1113   - // this.total = res.data.content.length
  1111 + const res = await rentalGetAll(this.pageindex)
  1112 + this.total = res.data.numberOfElements
  1113 + this.tableData = res.data.content
1114 1114 },
1115 1115  
1116 1116 // 新增确定按钮
... ... @@ -1135,7 +1135,9 @@ import {
1135 1135 },
1136 1136  
1137 1137 //详情
1138   - async details(val,item){
  1138 + details(val,item){
  1139 + this.xiangData = item
  1140 + this.heData = item.cereContractInformation
1139 1141 if(val == 1){
1140 1142 this.bianZt = false
1141 1143 }else{
... ... @@ -1149,6 +1151,13 @@ import {
1149 1151 this.index = val
1150 1152 this.detbox = false
1151 1153 this.ggXin = true
  1154 + this.zhong.lessorName = item.cereContractInformation.lessorName
  1155 + this.zhong.tenantName = item.cereContractInformation.tenantName
  1156 + this.zhong.leaseAddress = item.leaseAddress
  1157 + this.zhong.leaseName = item.leaseName
  1158 + this.zhong.completionTime = item.completionTime
  1159 + this.zhong.intendedLeaseTerm = item.intendedLeaseTerm
  1160 + this.zhong.intentionalRent = item.intentionalRent
1152 1161 },
1153 1162 handleSizeChange(val) {
1154 1163 this.pageSize = val
... ... @@ -1176,20 +1185,27 @@ import {
1176 1185 },
1177 1186 // 查询按钮
1178 1187 async onSubmit() {
1179   - const res = await businessListGetAll(this.formSel)
1180   - this.total = res.data.total
1181   - this.tableData = res.data.list
  1188 + if(this.leaseStartDate.length !=0){
  1189 + this.formSel.cereContractInformation.leaseStartDate = this.leaseStartDate.join(',')
  1190 + }
  1191 + const res = await rentalGetAll(this.formSel)
  1192 + this.total = res.data.numberOfElements
  1193 + this.tableData = res.data.content
1182 1194 },
1183 1195 //重置按钮
1184 1196 resetting(){
1185 1197 this.formSel={
1186   - shopName:'',
1187   - search:'',
1188   - createUser:'',
1189   - page: '1', // 当前页
1190   - pageSize: '10' // 每页记录数
  1198 + leaseName:'',
  1199 + cereContractInformation:{
  1200 + tenantName:'',
  1201 + shopName:'',
  1202 + leaseStartDate:'',
  1203 + },
  1204 + pageNumber: 1,
  1205 + pageSize: 10,
1191 1206 },
1192   - this.tableData = []
  1207 + this.leaseStartDate = []
  1208 + this.getAll()
1193 1209 },
1194 1210 // 下载
1195 1211 async downloadPdf() {
... ... @@ -1215,6 +1231,8 @@ import {
1215 1231 },
1216 1232 // 出租单查看
1217 1233 outlook(item){
  1234 + this.xiangData = item
  1235 + this.heData = item.cereContractInformation
1218 1236 this.outdan = true
1219 1237 },
1220 1238 delList(){
... ... @@ -1241,6 +1259,33 @@ import {
1241 1259 })
1242 1260  
1243 1261 },
  1262 + async daochu(){
  1263 + let res = await excelRentOutQueryByPage(this.pageindex)
  1264 + if(!res){
  1265 + return
  1266 + }
  1267 + const blob = new Blob([res], { type: 'application/vnd.ms-excel' })
  1268 + const fileName = '出租管理列表.xls'
  1269 + if ('download' in document.createElement('a')) {
  1270 + // 非IE下载
  1271 + const elink = document.createElement('a')
  1272 + elink.download = fileName
  1273 + elink.style.display = 'none'
  1274 + elink.href = URL.createObjectURL(blob)
  1275 + document.body.appendChild(elink)
  1276 + elink.click()
  1277 + URL.revokeObjectURL(elink.href) // 释放URL 对象
  1278 + document.body.removeChild(elink)
  1279 + } else {
  1280 + // IE10+下载
  1281 + navigator.msSaveBlob(blob, fileName)
  1282 + }
  1283 + this.$message({
  1284 + message: '导出成功',
  1285 + type: 'success'
  1286 + })
  1287 +
  1288 + },
1244 1289 }
1245 1290 }
1246 1291 </script>
... ...
yanshouban/src/views/shopRental/warning/index.vue
... ... @@ -10,10 +10,10 @@
10 10 <div class="formSearch">
11 11 <el-form :inline="true" :model="formSel">
12 12 <el-form-item label="合同名称">
13   - <el-input v-model="formSel.contractName" placeholder="请输入" style="width:168px;"/>
  13 + <el-input v-model="formSel.cereContractInformation.contractName" placeholder="请输入" style="width:168px;"/>
14 14 </el-form-item>
15 15 <el-form-item label="乙方名称">
16   - <el-input v-model="formSel.tenantName" placeholder="请输入" style="width:168px;"/>
  16 + <el-input v-model="formSel.cereContractInformation.tenantName" placeholder="请输入" style="width:168px;"/>
17 17  
18 18 </el-form-item>
19 19 <el-form-item label="联系方式">
... ... @@ -767,8 +767,11 @@
767 767 tableData4: [],
768 768 tableData5: [],
769 769 formSel: {
770   - contractName:'',
771   - tenantName:'',
  770 + cereContractInformation:{
  771 + contractName:'',
  772 + tenantName:'',
  773 + },
  774 +
772 775 telephone:'',
773 776 pageNumber: 1,
774 777 pageSize: 10,
... ... @@ -805,8 +808,11 @@
805 808 methods: {
806 809 chenge(val){
807 810 this.formSel={
808   - contractName:'',
809   - tenantName:'',
  811 + cereContractInformation:{
  812 + contractName:'',
  813 + tenantName:'',
  814 + },
  815 +
810 816 telephone:'',
811 817 pageNumber: 1,
812 818 pageSize: 10,
... ... @@ -901,13 +907,17 @@
901 907 //重置按钮
902 908 resetting(){
903 909 this.formSel={
904   - contractName:'',
905   - tenantName:'',
  910 + cereContractInformation:{
  911 + contractName:'',
  912 + tenantName:'',
  913 + },
  914 +
906 915 telephone:'',
907 916 pageNumber: 1,
908 917 pageSize: 10,
909 918 }
910   - }
  919 + this.getAll()
  920 + },
911 921  
912 922 }
913 923 }
... ...