bug修改

This commit is contained in:
bb_pan 2026-01-03 15:01:31 +08:00
parent 01f5b4673b
commit 26c789b1bd
4 changed files with 280 additions and 422 deletions

View File

@ -1,117 +1,70 @@
<template>
<div class="app-container app-container-content">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="auto"
>
<el-card class="search-box">
<el-row>
<el-col :span="24" style="display: flex; justify-content: space-between">
<el-col :span="5" style="width: 320px">
<el-form-item prop="deviceName" label="装备名称">
<el-input
v-model="queryParams.deviceName"
placeholder="请输入装备名称"
clearable
@keyup.enter.native="handleQuery"
maxlength="20"
/>
</el-form-item>
</el-col>
<el-card class="search-box">
<el-form
class="search-form"
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="auto"
>
<el-form-item prop="deviceName" label="装备名称">
<el-input
v-model="queryParams.deviceName"
placeholder="请输入装备名称"
clearable
@keyup.enter.native="handleQuery"
maxlength="20"
/>
</el-form-item>
<el-col :span="5" style="width: 320px">
<el-form-item prop="orderStatus" label="订单状态">
<el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态" clearable>
<el-option
v-for="item in statusList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-form-item prop="orderStatus" label="订单状态">
<el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态" clearable>
<el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
<el-col :span="5">
<el-form-item prop="dateRange" label="出库日期">
<el-date-picker
v-model="time"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
style="width: 240px"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-form-item prop="dateRange" label="出库日期">
<el-date-picker
v-model="time"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
style="width: 240px"
>
</el-date-picker>
</el-form-item>
<el-col :span="5" style="width: 320px">
<el-form-item prop="czcompanyName" label="出租单位">
<el-input
v-model="queryParams.czcompanyName"
placeholder="请输入出租单位"
clearable
@keyup.enter.native="handleQuery"
maxlength="20"
/>
</el-form-item>
</el-col>
<el-form-item prop="czcompanyName" label="出租单位">
<el-input
v-model="queryParams.czcompanyName"
placeholder="请输入出租单位"
clearable
@keyup.enter.native="handleQuery"
maxlength="20"
/>
</el-form-item>
<el-col :span="5" style="width: 320px">
<el-form-item prop="companyName" label="承租单位">
<el-input
v-model="queryParams.companyName"
placeholder="请输入承租单位"
clearable
@keyup.enter.native="handleQuery"
maxlength="20"
/>
</el-form-item>
</el-col>
</el-col>
</el-row>
<el-form-item prop="companyName" label="承租单位">
<el-input
v-model="queryParams.companyName"
placeholder="请输入承租单位"
clearable
@keyup.enter.native="handleQuery"
maxlength="20"
/>
</el-form-item>
<el-row>
<el-col :span="24" style="text-align: right">
<el-form-item style="margin-top: 10px; padding-right: 20px">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
>查询
</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-col>
</el-row>
<!-- <el-form-item prop="lowerBound">
<el-input
v-model.trim="queryParams.lowerBound"
placeholder="租金/元"
clearable
@keyup.enter.native="handleQuery"
maxlength="20"
style="width:100px"
/>
<span> </span>
</el-form-item>-->
<!-- <el-form-item prop="upperBound">
<el-input
v-model.trim="queryParams.upperBound"
placeholder="租金/元"
clearable
@keyup.enter.native="handleQuery"
maxlength="20"
style="width:100px"
/>
</el-form-item>-->
</el-card>
</el-form>
<el-form-item class="form-right">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询 </el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-card>
<el-card class="content-box">
<div class="table-container">
<template v-if="cardList.length > 0">
@ -120,45 +73,43 @@
<el-col :span="8">
<span> <i class="el-icon-document-copy"></i>订单编号 </span>
<span>
{{ item.code }}
</span>
{{ item.code }}
</span>
</el-col>
<el-col :span="8">
<span> 下单时间 </span>
<span>
{{ item.orderTime }}
</span>
{{ item.orderTime }}
</span>
</el-col>
<el-col :span="8">
<span> 装备所属公司 </span>
<span>
{{ item.czcompanyName }}
</span>
{{ item.czcompanyName }}
</span>
</el-col>
<div class="order-type-box">
<el-tag :type="orderType(item.orderStatus)" effect="light"
>{{ orderText(item.orderStatus) }}
</el-tag>
<el-tag :type="orderType(item.orderStatus)" effect="light">{{ orderText(item.orderStatus) }} </el-tag>
</div>
</el-row>
<el-row class="order-title-info">
<el-col :span="8">
<span> 出租方联系电话 </span>
<span>
{{ item.personPhone }}
</span>
{{ item.personPhone }}
</span>
</el-col>
<el-col :span="8">
<span> 承租方联系电话 </span>
<span>
{{ item.phoneNumber }}
</span>
{{ item.phoneNumber }}
</span>
</el-col>
<el-col :span="8">
<span> 收货地址 </span>
<span>
{{ item.address }}
</span>
{{ item.address }}
</span>
</el-col>
</el-row>
<el-row style="border-bottom: 1px solid #ccc; margin-bottom: 10px" class="order-title-info">
@ -173,8 +124,8 @@
<el-col :span="8">
<span> 承租方所属单位 </span>
<span>
{{ item.companyName }}
</span>
{{ item.companyName }}
</span>
</el-col>
</el-row>
@ -187,22 +138,23 @@
:style="j != item.detailsList.length - 1 ? 'border-bottom:1px solid #f0f0f0' : ''"
style="min-height: 80px"
>
<img v-if="goods.url" :src="goods.url" style="width: 110px; height: 70px" alt=""/>
<div v-else
style="width: 110px; height: 70px; display: flex;align-items: center;justify-content: center;"
<img v-if="goods.url" :src="goods.url" style="width: 110px; height: 70px" alt="" />
<div
v-else
style="width: 110px; height: 70px; display: flex; align-items: center; justify-content: center"
>
<img src="@/assets/images/no-img.png" style="width: 110px; height: 100px" alt=""/>
<img src="@/assets/images/no-img.png" style="width: 110px; height: 100px" alt="" />
</div>
<div
style="
min-height: 80px;
flex: 1;
display: flex;
justify-content: space-around;
flex-direction: column;
padding-left: 12px;
font-size: 13px;
"
min-height: 80px;
flex: 1;
display: flex;
justify-content: space-around;
flex-direction: column;
padding-left: 12px;
font-size: 13px;
"
>
<el-row style="color: #169bd5; font-weight: bold">
{{ goods.deviceName }}
@ -237,7 +189,7 @@
<div class="line"></div>
</el-col>
<!-- <el-col :span="4"> </el-col> -->
<el-col :span="12" style="padding-left: 6px;">编号{{ goods.code }}</el-col>
<el-col :span="12" style="padding-left: 6px">编号{{ goods.code }}</el-col>
</el-row>
<el-row>
<el-col :span="4"> 数量</el-col>
@ -273,14 +225,7 @@
:style="j != item.detailsList.length - 1 ? 'border-bottom:1px solid #f0f0f0' : ''"
style="min-height: 80px"
>
<div
style="
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
"
>
<div style="display: flex; justify-content: center; align-items: center; flex-direction: column">
<div>租期</div>
<div
style="font-weight: bold; margin-top: 10px"
@ -297,7 +242,7 @@
</div>
</el-col>
<el-col :span="4" style="display: flex; align-items: center;">
<el-col :span="4" style="display: flex; align-items: center">
<div class="handle-btn-4">
<!-- <el-button @click="handleViewOrder(item)" type="primary" size="small">
订单详情
@ -321,9 +266,7 @@
不同意
</el-button>
<el-button type="primary" plain size="small" @click="handleApprove(item)"
>查看
</el-button>
<el-button type="primary" plain size="small" @click="handleApprove(item)">查看 </el-button>
<el-button
v-show="item.orderStatus == '2' && item.taskStatus != '3'"
@click="handleOut(item)"
@ -367,21 +310,21 @@
<!-- <div style="padding: 6px 0 0 0; font-size: 18px; font-weight: bold; color: #eb190a">
总费用() <span>{{ overhaulDetails.totalCost }}</span>
</div>-->
<TitleTip :titleText="`共享费用明细`"/>
<TitleTip :titleText="`共享费用明细`" />
<el-table
border
:data="orderDetailDtoList"
show-overflow-tooltip
height="546"
:header-cell-style="{
color: '#fff',
background: '#00a288',
}"
color: '#fff',
background: '#00a288',
}"
>
<el-table-column prop="code" align="center" label="装备编号"/>
<el-table-column prop="deviceName" align="center" label="装备名称"/>
<el-table-column prop="typeName" align="center" label="型号"/>
<el-table-column prop="num" align="center" label="数量"/>
<el-table-column prop="code" align="center" label="装备编号" />
<el-table-column prop="deviceName" align="center" label="装备名称" />
<el-table-column prop="typeName" align="center" label="型号" />
<el-table-column prop="num" align="center" label="数量" />
<!-- <el-table-column align="center" label="共享单价(元/天)">
<template #default="{ row }">
<span style="color: #eb190a">
@ -389,7 +332,7 @@
</span>
</template>
</el-table-column> -->
<el-table-column prop="days" align="center" label="共享天数"/>
<el-table-column prop="days" align="center" label="共享天数" />
<el-table-column prop="days" align="center" label="租期">
<template #default="{ row }">
{{ formatDate(row.preOutboundTime) + '至' + formatDate(row.rentOverTime) }}
@ -433,37 +376,32 @@
</el-table-column>-->
</el-table>
<TitleTip :titleText="`维修费用明细`"/>
<TitleTip :titleText="`维修费用明细`" />
<el-table
:data="repairRecordList"
border
show-overflow-tooltip
height="546"
:header-cell-style="{
background: '#00a288',
color: '#fff',
}"
background: '#00a288',
color: '#fff',
}"
>
<el-table-column prop="code" align="center" label="装备编号"/>
<el-table-column prop="deviceName" align="center" label="装备名称"/>
<el-table-column prop="typeName" align="center" label="型号"/>
<el-table-column prop="repairNum" align="center" label="维修数量"/>
<el-table-column prop="code" align="center" label="装备编号" />
<el-table-column prop="deviceName" align="center" label="装备名称" />
<el-table-column prop="typeName" align="center" label="型号" />
<el-table-column prop="repairNum" align="center" label="维修数量" />
<el-table-column align="center" label="维修费用(元)">
<template #default="{ row }">
<template v-if="row.isCheck == 0">
{{ row.repairPrice }}
</template>
<template v-else>
<el-input
v-model="row.repairPrice"
style="width: 100%"
placeholder="请输入改价费用"
clearable
/>
<el-input v-model="row.repairPrice" style="width: 100%" placeholder="请输入改价费用" clearable />
</template>
</template>
</el-table-column>
<el-table-column prop="repairChangePrice" align="center" label="改价后费用(元)"/>
<el-table-column prop="repairChangePrice" align="center" label="改价后费用(元)" />
<el-table-column align="center" label="附件" width="160">
<template #default="{ row }">
<el-button type="primary" size="small" @click="onViewFileImg(row, 0)">查看</el-button>
@ -475,48 +413,43 @@
type="primary"
size="small"
@click="
() => {
row.isCheck == 0 ? (row.isCheck = 1) : (row.isCheck = 0)
}
"
() => {
row.isCheck == 0 ? (row.isCheck = 1) : (row.isCheck = 0)
}
"
>
{{ row.isCheck == 0 ? '改价' : '取消改价' }}
</el-button>
</template>
</el-table-column>
</el-table>
<TitleTip :titleText="`报废费用明细`"/>
<TitleTip :titleText="`报废费用明细`" />
<el-table
:data="scrapRecordList"
border
show-overflow-tooltip
height="546"
:header-cell-style="{
background: '#00a288',
color: '#fff',
}"
background: '#00a288',
color: '#fff',
}"
>
<el-table-column prop="code" align="center" label="装备编号"/>
<el-table-column prop="deviceName" align="center" label="装备名称"/>
<el-table-column prop="typeName" align="center" label="型号"/>
<el-table-column prop="scrapNum" align="center" label="报废数量"/>
<el-table-column prop="scrapReason" align="center" label="报废原因"/>
<el-table-column prop="code" align="center" label="装备编号" />
<el-table-column prop="deviceName" align="center" label="装备名称" />
<el-table-column prop="typeName" align="center" label="型号" />
<el-table-column prop="scrapNum" align="center" label="报废数量" />
<el-table-column prop="scrapReason" align="center" label="报废原因" />
<el-table-column prop="scrapPrice" align="center" label="报废费用(元)">
<template #default="{ row }">
<template v-if="row.isCheck == 0">
{{ row.scrapPrice }}
</template>
<template v-else>
<el-input
v-model="row.scrapPrice"
style="width: 100%"
placeholder="请输入改价费用"
clearable
/>
<el-input v-model="row.scrapPrice" style="width: 100%" placeholder="请输入改价费用" clearable />
</template>
</template>
</el-table-column>
<el-table-column prop="scrapChangePrice" align="center" label="改价后费用(元)"/>
<el-table-column prop="scrapChangePrice" align="center" label="改价后费用(元)" />
<el-table-column align="center" label="附件" width="160">
<template #default="{ row }">
<el-button type="primary" size="small" @click="onViewFileImg(row, 1)">查看</el-button>
@ -528,43 +461,38 @@
type="primary"
size="small"
@click="
() => {
row.isCheck == 0 ? (row.isCheck = 1) : (row.isCheck = 0)
}
"
() => {
row.isCheck == 0 ? (row.isCheck = 1) : (row.isCheck = 0)
}
"
>
{{ row.isCheck == 0 ? '改价' : '取消改价' }}
</el-button>
</template>
</el-table-column>
</el-table>
<TitleTip :titleText="`丢失费用明细`"/>
<TitleTip :titleText="`丢失费用明细`" />
<el-table
:data="lossRecordList"
border
show-overflow-tooltip
height="546"
:header-cell-style="{
background: '#00a288',
color: '#fff',
}"
background: '#00a288',
color: '#fff',
}"
>
<el-table-column prop="code" align="center" label="装备编号"/>
<el-table-column prop="deviceName" align="center" label="装备名称"/>
<el-table-column prop="typeName" align="center" label="型号"/>
<el-table-column prop="lossNum" align="center" label="丢失数量"/>
<el-table-column prop="code" align="center" label="装备编号" />
<el-table-column prop="deviceName" align="center" label="装备名称" />
<el-table-column prop="typeName" align="center" label="型号" />
<el-table-column prop="lossNum" align="center" label="丢失数量" />
<el-table-column prop="lossPrice" align="center" label="丢失费用(元)">
<template #default="{ row }">
<template v-if="row.isCheck == 0">
{{ row.lossPrice }}
</template>
<template v-else>
<el-input
v-model="row.lossPrice"
style="width: 100%"
placeholder="请输入改价费用"
clearable
/>
<el-input v-model="row.lossPrice" style="width: 100%" placeholder="请输入改价费用" clearable />
</template>
</template>
</el-table-column>
@ -585,11 +513,11 @@
show-overflow-tooltip
height="546"
:header-cell-style="{
background: '#00a288',
color: '#fff',
}"
background: '#00a288',
color: '#fff',
}"
>
<el-table-column prop="fileName" align="center" label="文件名称"/>
<el-table-column prop="fileName" align="center" label="文件名称" />
<el-table-column align="center" label="操作" width="120">
<template #default="{ row }">
<el-image
@ -608,12 +536,7 @@
</el-table-column>
</el-table>
</el-dialog>
<OrderDetailDialog
:visible.sync="showOrderDetail"
:orderId="orderId"
:orderStatus="orderStatus"
title="订单详情"
/>
<OrderDetailDialog :visible.sync="showOrderDetail" :orderId="orderId" :orderStatus="orderStatus" title="订单详情" />
</div>
</template>
@ -645,7 +568,7 @@ export default {
statusList: [
{ id: '1', name: '待确认' },
{ id: '2', name: '已确认' },
{ id: '3', name: '已驳回' }
{ id: '3', name: '已驳回' },
],
ids: [],
//
@ -665,7 +588,7 @@ export default {
keyWord: undefined,
status: undefined,
lowerBound: undefined,
upperBound: undefined
upperBound: undefined,
},
//
cardList: [],
@ -682,7 +605,7 @@ export default {
fileListAll: [],
innerVisible: false,
viewFileInfoList: [],
isShowDayLeasePrice: false
isShowDayLeasePrice: false,
}
},
created() {
@ -767,7 +690,7 @@ export default {
console.log('🚀 ~ item:', item)
this.$router.push({
path: '/equipmentShared/order/sharedOutList',
query: { id: item.orderId, isView: true }
query: { id: item.orderId, isView: true },
})
},
@ -787,7 +710,7 @@ export default {
this.viewOrderDetailsOrderId = ''
this.viewOrderDetailsOrderId = item.orderId
this.dialogTitle = '检修详情'
getOrderListInfoApi({ orderId: this.viewOrderDetailsOrderId }).then(async(res) => {
getOrderListInfoApi({ orderId: this.viewOrderDetailsOrderId }).then(async (res) => {
this.orderDetails = res.data
if (item.orderStatus == 20) {
await getOverhaulApi(this.viewOrderDetailsOrderId).then((resTwo) => {
@ -840,8 +763,8 @@ export default {
getPriceShowConfigApi().then((res) => {
this.isShowDayLeasePrice = res?.rows[0].status == 0 ? true : false
})
}
}
},
},
}
</script>
<style lang="scss" scoped>
@ -1089,6 +1012,7 @@ export default {
}
.search-box {
width: 100%;
margin-bottom: 20px;
border-radius: 8px;
padding: 0;

View File

@ -1,93 +1,65 @@
<template>
<div class="app-container app-container-content">
<!-- 搜索表单 -->
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="auto"
>
<el-card class="search-box">
<el-row :gutter="5" style="display: flex; justify-content: space-between">
<el-col :span="5" style="width: 320px">
<el-form-item prop="deviceName" label="装备名称">
<el-input
v-model="queryParams.deviceName"
placeholder="请输入装备名称"
clearable
@keyup.enter.native="handleQuery"
maxlength="20"
/>
</el-form-item>
</el-col>
<el-col :span="5" style="width: 320px">
<el-form-item prop="orderStatus" label="订单状态">
<el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态" clearable>
<el-option
v-for="item in statusList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item prop="dateRange" label="申请时间">
<el-date-picker
v-model="time"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
style="width: 240px"
/>
</el-form-item>
</el-col>
<el-col :span="5" style="width: 320px">
<el-form-item prop="czcompanyName" label="出租单位">
<el-input
v-model="queryParams.czcompanyName"
placeholder="请输入出租单位"
clearable
@keyup.enter.native="handleQuery"
maxlength="20"
/>
</el-form-item>
</el-col>
<el-col :span="5" style="width: 320px">
<el-form-item prop="companyName" label="承租单位">
<el-input
v-model="queryParams.companyName"
placeholder="请输入承租单位"
clearable
@keyup.enter.native="handleQuery"
maxlength="20"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24" style="text-align: right">
<el-form-item style="margin-top: 10px; padding-right: 20px">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
>查询
</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-col>
</el-row>
</el-card>
</el-form>
<el-card class="search-box">
<el-form
class="search-form"
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="auto"
>
<el-form-item prop="deviceName" label="装备名称">
<el-input
v-model="queryParams.deviceName"
placeholder="请输入装备名称"
clearable
@keyup.enter.native="handleQuery"
maxlength="20"
/>
</el-form-item>
<el-form-item prop="orderStatus" label="订单状态">
<el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态" clearable>
<el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item prop="dateRange" label="申请时间">
<el-date-picker
v-model="time"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
style="width: 240px"
/>
</el-form-item>
<el-form-item prop="czcompanyName" label="出租单位">
<el-input
v-model="queryParams.czcompanyName"
placeholder="请输入出租单位"
clearable
@keyup.enter.native="handleQuery"
maxlength="20"
/>
</el-form-item>
<el-form-item prop="companyName" label="承租单位">
<el-input
v-model="queryParams.companyName"
placeholder="请输入承租单位"
clearable
@keyup.enter.native="handleQuery"
maxlength="20"
/>
</el-form-item>
<el-form-item class="form-right">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询 </el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-card>
<el-card class="content-box">
<div class="table-container">
@ -154,22 +126,23 @@
:style="j != item.detailsList.length - 1 ? 'border-bottom:1px solid #f0f0f0' : ''"
style="min-height: 80px"
>
<img v-if="goods.url" :src="goods.url" style="width: 110px; height: 70px" alt=""/>
<div v-else
style="width: 110px; height: 70px; display: flex;align-items: center;justify-content: center;"
<img v-if="goods.url" :src="goods.url" style="width: 110px; height: 70px" alt="" />
<div
v-else
style="width: 110px; height: 70px; display: flex; align-items: center; justify-content: center"
>
<img src="@/assets/images/no-img.png" style="width: 110px; height: 100px" alt=""/>
<img src="@/assets/images/no-img.png" style="width: 110px; height: 100px" alt="" />
</div>
<div
style="
min-height: 80px;
flex: 1;
display: flex;
justify-content: space-around;
flex-direction: column;
padding-left: 12px;
font-size: 13px;
"
min-height: 80px;
flex: 1;
display: flex;
justify-content: space-around;
flex-direction: column;
padding-left: 12px;
font-size: 13px;
"
>
<el-row style="color: #169bd5; font-weight: bold">
{{ goods.deviceName }}
@ -177,32 +150,24 @@
<el-row>
<el-col :span="4">租期</el-col>
<el-col :span="8">
<span
style="margin-right: 10px"
:style="
item.orderStatus == 20 ? 'text-decoration: line-through' : ''
"
>
{{ goods.days }}
</span>
<span
style="margin-right: 10px"
:style="item.orderStatus == 20 ? 'text-decoration: line-through' : ''"
>
{{ goods.days }}
</span>
<span v-if="item.orderStatus == 20">
{{
momentInit(goods.takeOverTime).diff(
goods.rentOverTime,
'day'
) === 0
{{
momentInit(goods.takeOverTime).diff(goods.rentOverTime, 'day') === 0
? 1
: momentInit(goods.takeOverTime).diff(
goods.rentOverTime,
'day'
)
: momentInit(goods.takeOverTime).diff(goods.rentOverTime, 'day')
}}
</span>
</span>
<div class="line"></div>
</el-col>
<!-- <el-col :span="4"> </el-col> -->
<el-col :span="12" style="padding-left: 5px;">编号{{ goods.code }}</el-col>
<el-col :span="12" style="padding-left: 5px">编号{{ goods.code }}</el-col>
</el-row>
<el-row>
<el-col :span="4"> 数量</el-col>
@ -227,14 +192,7 @@
:style="j != item.detailsList.length - 1 ? 'border-bottom:1px solid #f0f0f0' : ''"
style="min-height: 80px"
>
<div
style="
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
"
>
<div style="display: flex; justify-content: center; align-items: center; flex-direction: column">
<div>租期</div>
<div
style="font-weight: bold; margin-top: 10px"
@ -268,17 +226,12 @@ style="min-height: 80px; width: 95%"
-->
<!-- 操作按钮 -->
<el-col :span="2" style="display: flex;align-items: center;justify-content: center">
<el-col :span="2" style="display: flex; align-items: center; justify-content: center">
<div class="handle-btn">
<!-- <el-button @click="handleViewOrder(item)" type="primary" size="small">
订单详情
</el-button> -->
<el-button
v-if="item.orderStatus == 20"
@click="handleViewRepair(item)"
type="primary"
size="small"
>
<el-button v-if="item.orderStatus == 20" @click="handleViewRepair(item)" type="primary" size="small">
检修详情
</el-button>
</div>
@ -315,7 +268,7 @@ style="min-height: 80px; width: 95%"
</el-row>
<!-- 共享费用明细 -->
<TitleTip :titleText="`共享费用明细`"/>
<TitleTip :titleText="`共享费用明细`" />
<el-table
border
:data="orderDetailDtoList"
@ -323,11 +276,11 @@ style="min-height: 80px; width: 95%"
:header-cell-style="{ color: '#fff', background: '#00a288' }"
height="546"
>
<el-table-column prop="code" align="center" label="装备编号"/>
<el-table-column prop="deviceName" align="center" label="装备名称"/>
<el-table-column prop="typeName" align="center" label="型号"/>
<el-table-column prop="num" align="center" label="数量"/>
<el-table-column prop="days" align="center" label="共享天数"/>
<el-table-column prop="code" align="center" label="装备编号" />
<el-table-column prop="deviceName" align="center" label="装备名称" />
<el-table-column prop="typeName" align="center" label="型号" />
<el-table-column prop="num" align="center" label="数量" />
<el-table-column prop="days" align="center" label="共享天数" />
<el-table-column align="center" label="租期">
<template #default="{ row }">
{{ formatDate(row.preOutboundTime) + '至' + formatDate(row.rentOverTime) }}
@ -336,7 +289,7 @@ style="min-height: 80px; width: 95%"
</el-table>
<!-- 维修费用明细 -->
<TitleTip :titleText="`维修费用明细`"/>
<TitleTip :titleText="`维修费用明细`" />
<el-table
:data="repairRecordList"
border
@ -344,26 +297,21 @@ style="min-height: 80px; width: 95%"
:header-cell-style="{ background: '#00a288', color: '#fff' }"
height="546"
>
<el-table-column prop="code" align="center" label="装备编号"/>
<el-table-column prop="deviceName" align="center" label="装备名称"/>
<el-table-column prop="typeName" align="center" label="型号"/>
<el-table-column prop="repairNum" align="center" label="维修数量"/>
<el-table-column prop="code" align="center" label="装备编号" />
<el-table-column prop="deviceName" align="center" label="装备名称" />
<el-table-column prop="typeName" align="center" label="型号" />
<el-table-column prop="repairNum" align="center" label="维修数量" />
<el-table-column align="center" label="维修费用(元)">
<template #default="{ row }">
<template v-if="row.isCheck == 0">
{{ row.repairPrice }}
</template>
<template v-else>
<el-input
v-model="row.repairPrice"
style="width: 100%"
placeholder="请输入改价费用"
clearable
/>
<el-input v-model="row.repairPrice" style="width: 100%" placeholder="请输入改价费用" clearable />
</template>
</template>
</el-table-column>
<el-table-column prop="repairChangePrice" align="center" label="改价后费用(元)"/>
<el-table-column prop="repairChangePrice" align="center" label="改价后费用(元)" />
<el-table-column align="center" label="附件" width="160">
<template #default="{ row }">
<el-button type="primary" size="small" @click="onViewFileImg(row, 0)">查看</el-button>
@ -379,7 +327,7 @@ style="min-height: 80px; width: 95%"
</el-table>
<!-- 报废费用明细 -->
<TitleTip :titleText="`报废费用明细`"/>
<TitleTip :titleText="`报废费用明细`" />
<el-table
:data="scrapRecordList"
border
@ -387,27 +335,22 @@ style="min-height: 80px; width: 95%"
:header-cell-style="{ background: '#00a288', color: '#fff' }"
height="546"
>
<el-table-column prop="code" align="center" label="装备编号"/>
<el-table-column prop="deviceName" align="center" label="装备名称"/>
<el-table-column prop="typeName" align="center" label="型号"/>
<el-table-column prop="scrapNum" align="center" label="报废数量"/>
<el-table-column prop="scrapReason" align="center" label="报废原因"/>
<el-table-column prop="code" align="center" label="装备编号" />
<el-table-column prop="deviceName" align="center" label="装备名称" />
<el-table-column prop="typeName" align="center" label="型号" />
<el-table-column prop="scrapNum" align="center" label="报废数量" />
<el-table-column prop="scrapReason" align="center" label="报废原因" />
<el-table-column prop="scrapPrice" align="center" label="报废费用(元)">
<template #default="{ row }">
<template v-if="row.isCheck == 0">
{{ row.scrapPrice }}
</template>
<template v-else>
<el-input
v-model="row.scrapPrice"
style="width: 100%"
placeholder="请输入改价费用"
clearable
/>
<el-input v-model="row.scrapPrice" style="width: 100%" placeholder="请输入改价费用" clearable />
</template>
</template>
</el-table-column>
<el-table-column prop="scrapChangePrice" align="center" label="改价后费用(元)"/>
<el-table-column prop="scrapChangePrice" align="center" label="改价后费用(元)" />
<el-table-column align="center" label="附件" width="160">
<template #default="{ row }">
<el-button type="primary" size="small" @click="onViewFileImg(row, 1)">查看</el-button>
@ -423,7 +366,7 @@ style="min-height: 80px; width: 95%"
</el-table>
<!-- 丢失费用明细 -->
<TitleTip :titleText="`丢失费用明细`"/>
<TitleTip :titleText="`丢失费用明细`" />
<el-table
:data="lossRecordList"
border
@ -431,22 +374,17 @@ style="min-height: 80px; width: 95%"
:header-cell-style="{ background: '#00a288', color: '#fff' }"
height="546"
>
<el-table-column prop="code" align="center" label="装备编号"/>
<el-table-column prop="deviceName" align="center" label="装备名称"/>
<el-table-column prop="typeName" align="center" label="型号"/>
<el-table-column prop="lossNum" align="center" label="丢失数量"/>
<el-table-column prop="code" align="center" label="装备编号" />
<el-table-column prop="deviceName" align="center" label="装备名称" />
<el-table-column prop="typeName" align="center" label="型号" />
<el-table-column prop="lossNum" align="center" label="丢失数量" />
<el-table-column prop="lossPrice" align="center" label="丢失费用(元)">
<template #default="{ row }">
<template v-if="row.isCheck == 0">
{{ row.lossPrice }}
</template>
<template v-else>
<el-input
v-model="row.lossPrice"
style="width: 100%"
placeholder="请输入改价费用"
clearable
/>
<el-input v-model="row.lossPrice" style="width: 100%" placeholder="请输入改价费用" clearable />
</template>
</template>
</el-table-column>
@ -467,7 +405,7 @@ style="min-height: 80px; width: 95%"
:header-cell-style="{ background: '#00a288', color: '#fff' }"
height="546"
>
<el-table-column prop="fileName" align="center" label="文件名称"/>
<el-table-column prop="fileName" align="center" label="文件名称" />
<el-table-column align="center" label="操作" width="120">
<template #default="{ row }">
<el-image
@ -488,12 +426,7 @@ style="min-height: 80px; width: 95%"
</el-dialog>
<!-- 订单详情弹窗 -->
<OrderDetailDialog
:visible.sync="showOrderDetail"
:orderId="orderId"
:orderStatus="orderStatus"
title="订单详情"
/>
<OrderDetailDialog :visible.sync="showOrderDetail" :orderId="orderId" :orderStatus="orderStatus" title="订单详情" />
</div>
</template>
@ -520,7 +453,7 @@ export default {
statusList: [
{ id: '1', name: '待确认' },
{ id: '2', name: '已确认' },
{ id: '3', name: '已驳回' }
{ id: '3', name: '已驳回' },
],
//
@ -532,7 +465,7 @@ export default {
keyWord: undefined,
status: undefined,
startTime: undefined,
endTime: undefined
endTime: undefined,
},
//
@ -553,7 +486,7 @@ export default {
//
momentInit: moment,
isShowDayLeasePrice: false
isShowDayLeasePrice: false,
}
},
created() {
@ -621,7 +554,7 @@ export default {
this.viewOrderDetailsOrderId = item.orderId
this.dialogTitle = '检修详情'
getOrderListInfoApi({ orderId: this.viewOrderDetailsOrderId }).then(async(res) => {
getOrderListInfoApi({ orderId: this.viewOrderDetailsOrderId }).then(async (res) => {
if (item.orderStatus === 20) {
await getOverhaulApi(this.viewOrderDetailsOrderId).then((resTwo) => {
this.orderDetailDtoList = resTwo.data.orderDetailDtoList || []
@ -661,8 +594,8 @@ export default {
getPriceShowConfigApi().then((res) => {
this.isShowDayLeasePrice = res?.rows[0].status == 0 ? true : false
})
}
}
},
},
}
</script>
@ -781,6 +714,7 @@ export default {
}
.search-box {
width: 100%;
margin-bottom: 20px;
border-radius: 8px;
padding: 0;

View File

@ -2837,13 +2837,13 @@ export default {
this.$router.push({ path: '/business/outbound/index' })
} else if (nodeId === 'toolsLedger') {
//
this.$router.push({ path: '/toolsManage/toolsLedger' })
this.$router.push({ path: '/equipment/toolsLedger' })
} else if (nodeId === 'equipmen') {
//
this.$router.push({ path: '/business/euqipmentUpOrDown/equipmen' })
this.$router.push({ path: '/equipmentShared/equipmen' })
} else if (nodeId === 'tool') {
//
this.$router.push({ path: '/business/euqipmentUpOrDown/tool' })
this.$router.push({ path: '/equipmentShared/tool' })
} else if (nodeId === 'auditList') {
//
this.$router.push({ path: '/business/outbound/auditList' })

View File

@ -110,13 +110,13 @@
</el-col>
<el-col :span="6">
<el-form-item label="生产厂家" prop="manufacturerId">
<div>
<div style="width: 100%; display: flex; align-items: center">
<i
class="el-icon-circle-plus-outline"
style="color: #13ce66; margin-right: 5px; cursor: pointer"
@click="openAddress"
/>
<el-select v-model="form.manufacturerId" placeholder="请选择生产厂家" clearable style="width: 93%">
<el-select v-model="form.manufacturerId" placeholder="请选择生产厂家" clearable style="flex: 1; width: 100%">
<el-option v-for="item in manufacturerList" :key="item.id" :label="item.label" :value="item.id"/>
</el-select>
</div>