问题清单修复
This commit is contained in:
BianLzhaoMin
parent
9003ac1b3c
commit
98d2bce89c
|
|
@ -20,7 +20,6 @@ declare module 'vue' {
|
|||
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
|
||||
ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
|
||||
ElDialog: typeof import('element-plus/es')['ElDialog']
|
||||
ElEmpty: typeof import('element-plus/es')['ElEmpty']
|
||||
ElForm: typeof import('element-plus/es')['ElForm']
|
||||
ElFormItem: typeof import('element-plus/es')['ElFormItem']
|
||||
ElIcon: typeof import('element-plus/es')['ElIcon']
|
||||
|
|
|
|||
|
|
@ -13,6 +13,9 @@ const fileListAll = ref<any>([])
|
|||
const viewFileInfoList = ref<any>([])
|
||||
const overhaulDetails = ref<any>({})
|
||||
const innerVisible = ref(false)
|
||||
import moment from 'moment'
|
||||
|
||||
const momentInit = moment
|
||||
|
||||
const orderStatusTemp = ref<number>(0)
|
||||
const idTemp = ref<string>('')
|
||||
|
|
@ -301,7 +304,17 @@ const isOrderComplete = computed(() => {
|
|||
{{ goods.days }}{{ ' ' + '天' }}
|
||||
</span>
|
||||
<span v-if="props.orderStatus == 20">
|
||||
{{ 3 }}{{ ' ' + '天' }}
|
||||
{{
|
||||
momentInit(goods.takeOverTime).diff(
|
||||
goods.rentOverTime,
|
||||
'day',
|
||||
) == 0
|
||||
? 1
|
||||
: momentInit(goods.takeOverTime).diff(
|
||||
goods.rentOverTime,
|
||||
'day',
|
||||
)
|
||||
}}{{ ' ' + '天' }}
|
||||
</span>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
|
@ -358,9 +371,11 @@ const isOrderComplete = computed(() => {
|
|||
</el-col>
|
||||
|
||||
<el-col :span="5" class="order-items-info" style="border: none; font-size: 13px">
|
||||
<div>租赁总费用</div>
|
||||
<div>总费用</div>
|
||||
<div class="red-font" :style="isOrderComplete">{{ orderDetails.cost }} 元</div>
|
||||
<div class="red-font" v-if="props.orderStatus == 20">{{ 800 }} 元</div>
|
||||
<div class="red-font" v-if="props.orderStatus == 20">
|
||||
{{ overhaulDetails.totalCost }} 元
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
|
|
|
|||
|
|
@ -554,10 +554,7 @@ const costSubmit = () => {
|
|||
</div>
|
||||
</el-row>
|
||||
|
||||
<el-row
|
||||
style="border-bottom: 1px solid #ccc; margin-bottom: 5px"
|
||||
class="order-title-info"
|
||||
>
|
||||
<el-row class="order-title-info">
|
||||
<el-col :span="8">
|
||||
<span> 出租方联系电话： </span>
|
||||
<span>
|
||||
|
|
@ -578,6 +575,26 @@ const costSubmit = () => {
|
|||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row
|
||||
style="border-bottom: 1px solid #ccc; margin-bottom: 10px"
|
||||
class="order-title-info"
|
||||
>
|
||||
<el-col :span="8">
|
||||
<span> 出租方姓名： </span>
|
||||
<span> {{ item.sellerName }} </span>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<span> 承租方姓名： </span>
|
||||
<span> {{ item.buyerName }} </span>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<span> 承租方所属单位： </span>
|
||||
<span>
|
||||
{{ item.companyName }}
|
||||
</span>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<div
|
||||
|
|
|
|||
|
|
@ -13,6 +13,9 @@ const fileListAll = ref<any>([])
|
|||
const viewFileInfoList = ref<any>([])
|
||||
const overhaulDetails = ref<any>({})
|
||||
const innerVisible = ref(false)
|
||||
import moment from 'moment'
|
||||
|
||||
const momentInit = moment
|
||||
|
||||
const orderStatusTemp = ref<number>(0)
|
||||
const idTemp = ref<string>('')
|
||||
|
|
@ -160,6 +163,10 @@ const onViewFileImg = (row: any, index: number) => {
|
|||
viewFileInfoList.value = fileListAll.value.filter((e: any) => e.fileType == index)
|
||||
innerVisible.value = true
|
||||
}
|
||||
|
||||
const isOrderComplete = computed(() => {
|
||||
if (props.orderStatus == 20) return 'text-decoration: line-through'
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
|
|
@ -292,7 +299,24 @@ const onViewFileImg = (row: any, index: number) => {
|
|||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="3"> 租期 :</el-col>
|
||||
<el-col :span="18"> {{ goods.days }}{{ ' ' + '天' }} </el-col>
|
||||
<el-col :span="18">
|
||||
<span style="margin-right: 10px" :style="isOrderComplete">
|
||||
{{ goods.days }}{{ ' ' + '天' }}
|
||||
</span>
|
||||
<span v-if="props.orderStatus == 20">
|
||||
{{
|
||||
momentInit(goods.takeOverTime).diff(
|
||||
goods.rentOverTime,
|
||||
'day',
|
||||
) == 0
|
||||
? 1
|
||||
: momentInit(goods.takeOverTime).diff(
|
||||
goods.rentOverTime,
|
||||
'day',
|
||||
)
|
||||
}}{{ ' ' + '天' }}
|
||||
</span>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="3"> 租金 ：</el-col>
|
||||
|
|
@ -328,23 +352,37 @@ const onViewFileImg = (row: any, index: number) => {
|
|||
"
|
||||
>
|
||||
<div>租期</div>
|
||||
<div style="font-weight: bold; margin-top: 10px">
|
||||
<div
|
||||
style="font-weight: bold; margin-top: 10px"
|
||||
:style="isOrderComplete"
|
||||
>
|
||||
{{ goods.rentBeginTime }}至{{ goods.rentEndTime }}
|
||||
</div>
|
||||
<div
|
||||
style="font-weight: bold; margin-top: 10px"
|
||||
v-if="props.orderStatus == 20"
|
||||
>
|
||||
{{ goods.takeOverTime.slice(0, 10) }}至{{
|
||||
goods.rentOverTime.slice(0, 10)
|
||||
}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="5" class="order-items-info" style="border: none; font-size: 13px">
|
||||
<div>总费用</div>
|
||||
<div class="red-font">{{ orderDetails.cost }} 元</div>
|
||||
<div class="red-font" :style="isOrderComplete">{{ orderDetails.cost }} 元</div>
|
||||
<div class="red-font" v-if="props.orderStatus == 20">
|
||||
{{ overhaulDetails.totalCost }} 元
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<TitleTip :titleText="`退租检测/费用结算信息`" v-if="props.orderStatus == 20" />
|
||||
|
||||
<div style="padding: 0 15px" v-if="props.orderStatus == 20">
|
||||
<div style="padding: 6px 0 0 0; font-size: 18px; font-weight: bold; color: #eb190a">
|
||||
<div style="padding: 6px 0 0 0; font-size: 18px; color: #eb190a; font-weight: bold">
|
||||
总费用(元)： <span>{{ overhaulDetails.totalCost }}</span>
|
||||
</div>
|
||||
<TitleTip :titleText="`租赁费用明细`" />
|
||||
|
|
@ -375,7 +413,7 @@ const onViewFileImg = (row: any, index: number) => {
|
|||
</el-table-column>
|
||||
<el-table-column prop="costs" align="center" label="租赁费用(元)" width="160">
|
||||
</el-table-column>
|
||||
<el-table-column prop="changeCost" align="center" label="改价后费用(元)" />
|
||||
<el-table-column prop="changeCost" align="center" label="改价后实际费用(元)" />
|
||||
</el-table>
|
||||
|
||||
<TitleTip :titleText="`维修费用明细`" />
|
||||
|
|
@ -396,7 +434,7 @@ const onViewFileImg = (row: any, index: number) => {
|
|||
<el-table-column
|
||||
prop="repairChangePrice"
|
||||
align="center"
|
||||
label="改价后费用(元)"
|
||||
label="改价后实际费用(元)"
|
||||
/>
|
||||
<el-table-column align="center" label="附件" width="160">
|
||||
<template #default="{ row }">
|
||||
|
|
|
|||
|
|
@ -783,10 +783,7 @@ const wordUrl = ref('')
|
|||
>
|
||||
</div>
|
||||
</el-row>
|
||||
<el-row
|
||||
style="border-bottom: 1px solid #ccc; margin-bottom: 10px"
|
||||
class="order-title-info"
|
||||
>
|
||||
<el-row class="order-title-info">
|
||||
<el-col :span="8">
|
||||
<span> 出租方联系电话： </span>
|
||||
<span>
|
||||
|
|
@ -806,6 +803,25 @@ const wordUrl = ref('')
|
|||
</span>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row
|
||||
style="border-bottom: 1px solid #ccc; margin-bottom: 10px"
|
||||
class="order-title-info"
|
||||
>
|
||||
<el-col :span="8">
|
||||
<span> 出租方姓名： </span>
|
||||
<span> {{item.sellerName}} </span>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<span> 承租方姓名： </span>
|
||||
<span> {{item.buyerName}} </span>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<span> 承租方所属单位： </span>
|
||||
<span>
|
||||
{{ item.companyName }}
|
||||
</span>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
|
|
|
|||
Loading…
Reference in New Issue