|
@@ -36,7 +36,7 @@
|
|
|
|
|
|
</el-col>
|
|
|
<el-col :span="14" style="padding-top: 10px;">
|
|
|
- <el-steps :active="formData.status == 'WAIT'?1:formData.status == 'LEASE'?2:formData.status == 'OVER'?3:formData.status == 'RECOVER'?4:0" align-center>
|
|
|
+ <el-steps :active="formData.status == 'WAIT'?1:formData.status == 'LEASE'?2:formData.status == 'OVER'?3:formData.status == 'RECOVER'?5:0" align-center>
|
|
|
<el-step title="买家下单" :description="formData.createTime"></el-step>
|
|
|
<el-step title="商家确认" :description="formData.confirmTime ? formData.confirmTime : ''"></el-step>
|
|
|
<el-step title="租赁中" :description="formData.deliverTime ? formData.deliverTime : ''"></el-step>
|
|
@@ -158,7 +158,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="24">
|
|
|
- <el-form-item label="租赁合同" prop="fileUrl" :rules="formType==0?[]:[{ required: true, message: `请上传租赁合同`, trigger: 'change' }]">
|
|
|
+ <el-form-item label="租赁合同" prop="fileUrl" :rules="[{ required: true, message: `请上传租赁合同`, trigger: 'change' }]">
|
|
|
<ImageUpload :fileList="formData.fileUrl" :limit="1" :isEdit="formType==0 || formData.status == 'WAIT'" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
@@ -219,6 +219,57 @@
|
|
|
</el-form-item>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column prop="depositPrice" align="center" label="订金"></el-table-column>
|
|
|
+ <el-table-column prop="leasePrice" align="center" label="租价"></el-table-column>
|
|
|
+ <el-table-column prop="startDate" align="center" label="*起租日期">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-form-item :prop="'dataList.' + scope.$index + '.startDate'" :rules="[{ required: true, message: `请选择日期`, trigger: 'blur' }]">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="scope.row.startDate"
|
|
|
+ type="date"
|
|
|
+ @change="(e)=>{
|
|
|
+ getPrice(scope.row)
|
|
|
+ }"
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ placeholder="选择日期">
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="endDate" align="center" label="*到期日期">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-form-item :prop="'dataList.' + scope.$index + '.endDate'" :rules="[{ required: true, message: `请选择日期`, trigger: 'blur' }]">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="scope.row.endDate"
|
|
|
+ type="date"
|
|
|
+ @change="(e)=>{
|
|
|
+ getPrice(scope.row)
|
|
|
+ }"
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ placeholder="选择日期">
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="depositAmount" align="center" label="*押金">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-form-item :prop="'dataList.' + scope.$index + '.depositAmount'"
|
|
|
+ :rules="[{ required: true, message: `请输入押金`, trigger: 'blur' }]">
|
|
|
+ <el-input type="number" v-model="scope.row.depositAmount"placeholder="请输入"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="renewalPrice" align="center" label="*续期单价">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-form-item :prop="'dataList.' + scope.$index + '.renewalPrice'"
|
|
|
+ :rules="[{ required: true, message: `请输入押金`, trigger: 'blur' }]">
|
|
|
+ <el-input type="number" v-model="scope.row.renewalPrice" @input="(e)=>{
|
|
|
+ getPrice(scope.row)
|
|
|
+ }" placeholder="请输入"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="leaseAmount" align="center" label="总租金"></el-table-column>
|
|
|
<el-table-column label="操作" align="right" width="140">
|
|
|
<template slot-scope="scope" v-if="formType != 2">
|
|
|
<el-button size="mini" type="primary" v-if="scope.$index != isEdit"
|
|
@@ -306,6 +357,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="leaseAmount" align="center" label="总租金"></el-table-column>
|
|
|
+ <el-table-column prop="renewalLeaseAmount" align="center" label="续期租金"></el-table-column>
|
|
|
</el-table>
|
|
|
</el-form>
|
|
|
</div>
|
|
@@ -572,15 +624,22 @@
|
|
|
})
|
|
|
},
|
|
|
getPrice(item){
|
|
|
- // getPrice({
|
|
|
- // startDate: item.startDate,
|
|
|
- // endDate: item.endDate,
|
|
|
- // isRenewal: this.formData.status == 'WAIT'?false:true,
|
|
|
- // price: item.renewalPrice,
|
|
|
- // qty: item.qty,
|
|
|
- // }).then(res => {
|
|
|
- // item.leaseAmount = res.data
|
|
|
- // })
|
|
|
+ if(!item.startDate || !item.endDate){
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ getPrice({
|
|
|
+ startDate: item.startDate,
|
|
|
+ endDate: item.endDate,
|
|
|
+ isRenewal: (this.formData.status == 'WAIT' || !this.formData.status)?false:true,
|
|
|
+ price: (this.formData.status == 'WAIT' || !this.formData.status)?item.leasePrice:item.renewalPrice,
|
|
|
+ qty: item.qty,
|
|
|
+ }).then(res => {
|
|
|
+ if(this.formData.status == 'WAIT' || !this.formData.status){
|
|
|
+ item.leaseAmount = res.data
|
|
|
+ }else{
|
|
|
+ item.renewalLeaseAmount = (res.data*100 + this.formData.totalAmount*100)/100
|
|
|
+ }
|
|
|
+ })
|
|
|
},
|
|
|
getUserList(value){
|
|
|
getUserList({
|
|
@@ -608,6 +667,8 @@
|
|
|
item.goodsLeaseName = e.name
|
|
|
item.goodsLeaseId = e.id
|
|
|
item.goodsUnit = e.unit
|
|
|
+ item.depositPrice = e.depositPrice
|
|
|
+ item.leasePrice = e.leasePrice
|
|
|
},
|
|
|
userMobileInput(e){
|
|
|
if(e && e.length > 3){
|
|
@@ -630,6 +691,14 @@
|
|
|
goodsLeaseName: '',
|
|
|
goodsLeaseId: '',
|
|
|
goodsUnit: '',
|
|
|
+ depositPrice: null,
|
|
|
+ leasePrice: null,
|
|
|
+ startDate: '',
|
|
|
+ endDate: '',
|
|
|
+ realEndDate: '',
|
|
|
+ depositAmount: null,
|
|
|
+ renewalPrice: null,
|
|
|
+ leaseAmount: null,
|
|
|
})
|
|
|
}
|
|
|
})
|