|
|
@@ -335,7 +335,11 @@
|
|
|
</el-form-item>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="realEndDate" align="center" label="实际到期日期"></el-table-column>
|
|
|
+ <el-table-column prop="realEndDate" align="center" label="实际到期日期">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{scope.row.realEndDate?scope.row.realEndDate.substring(0,10):''}}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column prop="depositAmount" align="center" label="*押金">
|
|
|
<template slot-scope="scope">
|
|
|
<el-form-item :prop="'dataList.' + scope.$index + '.depositAmount'"
|
|
|
@@ -377,12 +381,12 @@
|
|
|
<el-table-column prop="payValue" label="订金" align="center"></el-table-column>
|
|
|
<el-table-column prop="" align="center" label="租赁开始时间">
|
|
|
<template slot-scope="scope">
|
|
|
- {{scope.row.startDate.substring(0,10)}}
|
|
|
+ {{scope.row.startDate?scope.row.startDate.substring(0,10):''}}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="" align="center" label="租赁结束时间">
|
|
|
<template slot-scope="scope">
|
|
|
- {{scope.row.endDate.substring(0,10)}}
|
|
|
+ {{scope.row.endDate?scope.row.endDate.substring(0,10):''}}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="createBy" align="center" label="操作人"></el-table-column>
|
|
|
@@ -390,6 +394,22 @@
|
|
|
</el-table>
|
|
|
</div>
|
|
|
</el-card>
|
|
|
+ <el-card class="box-card" v-if="formType != 0">
|
|
|
+ <div slot="header" class="clearfix">
|
|
|
+ <span>报修记录</span>
|
|
|
+ </div>
|
|
|
+ <div class="table">
|
|
|
+ <el-table :data="formData.orderBases" element-loading-text="Loading" border fit highlight-current-row
|
|
|
+ stripe>
|
|
|
+ <el-table-column prop="id" label="报修单号" align="center"></el-table-column>
|
|
|
+ <el-table-column prop="createDate" label="提交时间" align="center"></el-table-column>
|
|
|
+ <el-table-column prop="appointmentTime" label="上门时间" align="center"></el-table-column>
|
|
|
+ <el-table-column prop="overDate" label="完工时间" align="center"></el-table-column>
|
|
|
+ <el-table-column prop="updateBy" align="center" label="操作人"></el-table-column>
|
|
|
+ <el-table-column prop="updateTime" align="center" label="操作时间"></el-table-column>
|
|
|
+ </el-table>
|
|
|
+ </div>
|
|
|
+ </el-card>
|
|
|
<div class="page-footer">
|
|
|
<div class="footer">
|
|
|
<el-button v-if="formType == 0" size="small" type="primary" @click="submit()">提交</el-button>
|
|
|
@@ -607,7 +627,7 @@
|
|
|
cityObj: {id: res.data.cityId},
|
|
|
areaObj: {id: res.data.areaId},
|
|
|
streetObj: {id: res.data.streetId},
|
|
|
- userInfo: res.data.userId?{userId: res.data.userId,userMobile: res.data.userMobile,userName: res.data.userName}:res.data.userMobile
|
|
|
+ userInfo: (res.data.userId && res.data.payType=="LINE")?{userId: res.data.userId,userMobile: res.data.userMobile,userName: res.data.userName}:res.data.userMobile
|
|
|
}
|
|
|
this.formData3.dataList = res.data.items
|
|
|
this.getinitlbslist()
|
pengyh