bonus
/
Zlpt_Portal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

冲突合并

This commit is contained in:
BianLzhaoMin 2024-11-27 15:17:34 +08:00
parent d3f9ddc80a a29e449ebe
commit 8725fe5796
9 changed files with 1037 additions and 578 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
auto-imports.d.ts vendored
View File

@ -82,6 +82,6 @@ declare global {
// for type re-export
declare global {
// @ts-ignore
export type { Component, ComponentPublicInstance, ComputedRef, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue'
export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
import('vue')
}

84
components.d.ts vendored
View File

@ -3,50 +3,46 @@
// @ts-nocheck
// Generated by unplugin-vue-components
// Read more: https://github.com/vuejs/core/pull/3399
export {}
export { }
declare module 'vue' {
export interface GlobalComponents {
Breadcrumb: typeof import('./src/components/Breadcrumb/index.vue')['default']
ElButton: typeof import('element-plus/es')['ElButton']
ElCarousel: typeof import('element-plus/es')['ElCarousel']
ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
ElCascader: typeof import('element-plus/es')['ElCascader']
ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
ElCol: typeof import('element-plus/es')['ElCol']
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
ElDialog: typeof import('element-plus/es')['ElDialog']
ElForm: typeof import('element-plus/es')['ElForm']
ElFormItem: typeof import('element-plus/es')['ElFormItem']
ElIcon: typeof import('element-plus/es')['ElIcon']
ElImage: typeof import('element-plus/es')['ElImage']
ElInput: typeof import('element-plus/es')['ElInput']
ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
ElMenu: typeof import('element-plus/es')['ElMenu']
ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
ElOption: typeof import('element-plus/es')['ElOption']
ElPagination: typeof import('element-plus/es')['ElPagination']
ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm']
ElProgress: typeof import('element-plus/es')['ElProgress']
ElRow: typeof import('element-plus/es')['ElRow']
ElSelect: typeof import('element-plus/es')['ElSelect']
ElTable: typeof import('element-plus/es')['ElTable']
ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
ElUpload: typeof import('element-plus/es')['ElUpload']
EquipCard: typeof import('./src/components/equipCard.vue')['default']
EquipCardHall: typeof import('./src/components/equipCardHall/index.vue')['default']
EquipCardNew: typeof import('./src/components/equipCardNew/index.vue')['default']
EquipDetailTable: typeof import('./src/components/equipDetailTable.vue')['default']
FooterInfo: typeof import('./src/components/FooterInfo/index.vue')['default']
FormComponent: typeof import('./src/components/FormComponent/index.vue')['default']
Header: typeof import('./src/components/header/index.vue')['default']
Navmenu: typeof import('./src/components/Navmenu/index.vue')['default']
PagingComponent: typeof import('./src/components/PagingComponent/index.vue')['default']
RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView']
TableComponent: typeof import('./src/components/TableComponent/index.vue')['default']
UploadComponent: typeof import('./src/components/uploadComponent/index.vue')['default']
UploadImg: typeof import('./src/components/uploadImg.vue')['default']
}
export interface GlobalComponents {
Breadcrumb: typeof import('./src/components/Breadcrumb/index.vue')['default']
ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
ElButton: typeof import('element-plus/es')['ElButton']
ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
ElCol: typeof import('element-plus/es')['ElCol']
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
ElForm: typeof import('element-plus/es')['ElForm']
ElFormItem: typeof import('element-plus/es')['ElFormItem']
ElHeader: typeof import('element-plus/es')['ElHeader']
ElIcon: typeof import('element-plus/es')['ElIcon']
ElImage: typeof import('element-plus/es')['ElImage']
ElInput: typeof import('element-plus/es')['ElInput']
ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
ElMenu: typeof import('element-plus/es')['ElMenu']
ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
ElOption: typeof import('element-plus/es')['ElOption']
ElPagination: typeof import('element-plus/es')['ElPagination']
ElRow: typeof import('element-plus/es')['ElRow']
ElSelect: typeof import('element-plus/es')['ElSelect']
ElStep: typeof import('element-plus/es')['ElStep']
ElSteps: typeof import('element-plus/es')['ElSteps']
EquipCard: typeof import('./src/components/equipCard.vue')['default']
EquipCardHall: typeof import('./src/components/equipCardHall/index.vue')['default']
EquipCardNew: typeof import('./src/components/equipCardNew/index.vue')['default']
EquipDetailTable: typeof import('./src/components/equipDetailTable.vue')['default']
FooterInfo: typeof import('./src/components/FooterInfo/index.vue')['default']
FormComponent: typeof import('./src/components/FormComponent/index.vue')['default']
Header: typeof import('./src/components/header/index.vue')['default']
Navmenu: typeof import('./src/components/Navmenu/index.vue')['default']
PagingComponent: typeof import('./src/components/PagingComponent/index.vue')['default']
RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView']
TableComponent: typeof import('./src/components/TableComponent/index.vue')['default']
UploadComponent: typeof import('./src/components/uploadComponent/index.vue')['default']
UploadImg: typeof import('./src/components/uploadImg.vue')['default']
}
}

1
src/components/uploadComponent/index.vue
View File

@ -35,6 +35,7 @@
import { ElMessage } from 'element-plus'
// import { Base64 } from 'js-base64'
const tmpUploadUrl = import.meta.env.VITE_API_URL + '/zlpt-file/file/cos/upload'
console.log(tmpUploadUrl)
import { mainStore } from 'store/main'
const store = mainStore()
const headerInfo = reactive({

6
src/http/api/usercenter/goodsmang.ts
View File

@ -8,12 +8,12 @@ export const getEquipmentListApi = (data: any) => {
}
//获取装备详情
export const getDetail = (id = '') => {
return get(`/material-mall/dev/getInfo/${id}`)
export const getDetailApi = (id: any) => {
return get(`/material-mall/dev/getInfo/${id}`, {})
}
// 新增装备
export const equipmentDeploymentApi = (data: any) => {
export const equipmentAddApi = (data: any) => {
return post('/material-mall/dev', data)
}

4
src/http/api/usercenter/seekorder.ts
View File

@ -3,6 +3,6 @@
import { get, post } from '../../index'
// 获取订单列表
export const getOrderListApi = () => {
return get('/zlpt-order/info/list', {})
export const getOrderListApi = (data: any) => {
return get('/material-mall/order/getOrderDetails', data)
}

12
src/router/index.ts
View File

@ -225,6 +225,18 @@ const routes: Array<RouteRecordRaw> = [
isLogin: true
},
},
/* 订单管理（订单详情） */
{
path: 'orderManagementInfo',
name: 'orderManagementInfo',
component: () => import('@/views/user/orderManagement/detail.vue'),
meta: {
title: '订单详情',
keepAlive: true,
AuthFlag: false,
isLogin: false
},
},
/* 订单管理（退租） */
{
path: 'rentinTermination',

984
src/views/user/goodsManagement/index.vue
View File

File diff suppressed because it is too large Load Diff

205
src/views/user/orderManagement/detail.vue Normal file
View File

@ -0,0 +1,205 @@
<script setup lang="ts">
import { ref } from 'vue'
import PagingComponent from 'components/PagingComponent/index.vue'
import { useRouter } from 'vue-router'
import { getOrderListApi } from 'http/api/usercenter/seekorder'
const route = useRoute()
const cardList = ref<any>([])
const orderStatusTemp = ref<Number>(0)
const titleStaus = ref<any>('')
// 获取数据列表
// const getList = async () => {
// const res: any = await getOrderListApi()
// console.log('获取数据列表***', res)
// tableData.value = res.rows
// total.value = res.total
// }
// onMounted(() => {
// getList()
// })
// 根据步骤的 Id 返回对应的标题
const getStepTitle = (stepId:number)=> {
if (orderStatusTemp.value === 1) {
titleStaus.value= '待出库' ;
return stepId === 1 ? '待出库' : '';
} else if (orderStatusTemp.value === 2) {
titleStaus.value= '待收货' ;
return stepId === 1 ? '已出库' : stepId === 2 ? '待收货' : '';
} else if (orderStatusTemp.value === 3) {
titleStaus.value= '租赁中' ;
return stepId === 1 ? '已出库' : stepId === 2 ? '已收货' : stepId === 3 ? '租赁中' : '';
} else if (orderStatusTemp.value === 4) {
titleStaus.value= '发起费用结算' ;
return stepId === 1 ? '已出库' : stepId === 2 ? '已收货' : stepId === 3 ? '租赁结束' : stepId === 4 ? '发起费用结算' : '';
} else if (orderStatusTemp.value === 5) {
titleStaus.value= '已完成' ;
return stepId === 1 ? '已出库' : stepId === 2 ? '已收货' : stepId === 3 ? '租赁结束' : stepId === 4 ? '已退租' : stepId === 5 ? '已完成' : '';
}
titleStaus.value=''
return ''; // 默认返回空字符串
}
const getId = ()=>{
orderStatusTemp.value = Number(route.query.orderStatusTemp)
}
onBeforeMount(()=>{
getId()
})
const time = ref([])
</script>
<template>
<!-- 订单管理 -->
<div class="container">
<el-breadcrumb separator="/">
<el-breadcrumb-item :to="{ path: '/myuser/orderManagement' }">订单管理</el-breadcrumb-item>
<el-breadcrumb-item>订单明细</el-breadcrumb-item>
</el-breadcrumb>
<div class="section">
<el-header>
<el-row type="flex" justify="space-between" align="middle">
<el-col :span="3">
<span>订单流程</span>
</el-col>
<el-col :span="2" style="text-align:right;margin-right:20px;font-size: 20px;">
<div style="color:green;">{{titleStaus}}</div>
</el-col>
</el-row>
</el-header>
<el-steps class="step" :space="400" :active="orderStatusTemp.value" finish-status="success">
<el-step :title="getStepTitle(1)" ></el-step>
<el-step :title="getStepTitle(2)" ></el-step>
<el-step :title="getStepTitle(3)" ></el-step>
<el-step :title="getStepTitle(4)" ></el-step>
<el-step :title="getStepTitle(5)" :finish-status="orderStatusTemp.value >= 5 ? 'success' : ''"></el-step>
</el-steps>
</div>
</div>
</template>
<style lang="scss" scoped>
.step{
margin-left:80px;;
}
.section {
margin-top: 20px;
margin-bottom: 20px;
}
.container {
width: 800px;
margin: 0 auto;
padding: 10px;
background: #eeeff6;
font-size: 14px;
.cart-title {
margin-top: 10px;
padding: 10px 0;
display: flex;
align-items: center;
font-size: 14px;
font-weight: bold;
letter-spacing: 1px;
}
.cart-title div:first-child {
width: 5px;
height: 20px;
background-color: #4fabfe;
}
.cart-th {
margin: 15px 0;
div {
text-align: center;
}
}
.cart-tbody {
background: #fff;
padding: 8px 12px;
margin: 10px;
.cart-user-info {
display: flex;
align-items: center;
font-size: 13px;
.code,
.orderTime {
padding: 3px 18px;
border: 1px solid #ccc;
}
.czcompanyName {
margin-left: 20px;
border-right: none;
}
}
.cart-list {
margin: 15px 0;
display: flex;
align-items: center;
font-size: 13px;
div {
text-align: center;
}
.goods-info {
display: flex;
align-content: center;
img {
width: 140px;
height: 80px;
}
.goods-code {
margin-left: 70px;
display: flex;
flex-direction: column;
justify-content: space-around;
div {
text-align: left;
}
}
}
.lease-date {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
font-size: 12px;
}
.red-font {
color: #ff4800;
font-weight: bold;
}
}
}
.protocol-handle {
background: #fff;
padding: 8px 12px;
margin: 10px;
font-size: 13px;
.checkbox-container a {
color: #ff4800;
text-decoration: underline;
}
}
}
</style>

317
src/views/user/orderManagement/index.vue
View File

@ -3,13 +3,27 @@ import { ref } from 'vue'
import PagingComponent from 'components/PagingComponent/index.vue'
import { useRouter } from 'vue-router'
import { getOrderListApi } from 'http/api/usercenter/seekorder'
const queryParams = ref({})
/* 查询参数 */
const queryParams: any = ref({
deviceName: '',
orderStatus: '',
czcompanyName: '',
companyName: '',
lowerBound:'',
upperBound:'',
pageSize: 10,
pageNum: 1,
startTime:'',
endTime:'',
})
const time = ref([])
const router = useRouter()
const pageSize = 10
const pageNumber = 1
const total: any = ref(0)
const cardList = ref<any>([])
const status = 0
const statusList = [{id:'0',name:'未下单'},{id:'1',name:'已下单'},{id:'2',name:'待出库'},{id:'3',name:'已出库'},{id:'4',name:'租赁中'},{id:'5',name:'已退租'},{id:'5',name:'已完成'}]
// 获取数据列表
// const getList = async () => {
// const res: any = await getOrderListApi()
@ -19,125 +33,25 @@ const status = 0
// }
/** 查询列表 */
const getList = async () => {
// if(this.dateRange.length>0){
// this.queryParams.startTime=this.dateRange[0]
// this.queryParams.endTime=this.dateRange[1]
// }else{
// this.queryParams.startTime=undefined
// this.queryParams.endTime=undefined
// }
cardList.value = [
{
company_name: '安徽博诺斯有限公司',
user_name: '王先生',
user_phone: '18725632356',
isChecked: false,
good_list: [
{
goods_pic:
'https://fc1tn.baidu.com/it/u=4185529537,1682541874&fm=202&src=766&fc=tdmatt&mola=new&crop=v1',
goods_name: 'W190挖掘机',
goods_code: '995221_JHL',
goods_type: '挖地型号996',
lease_date: '',
lease_pic: 300,
lease_day: 1,
goods_num: 0,
totalAmount: 0,
isChecked: false,
lease_date_string: '',
},
],
},
{
company_name: '安徽博诺斯有限公司',
user_name: '王先生',
user_phone: '18725632356',
isChecked: false,
good_list: [
{
goods_pic:
'https://fc1tn.baidu.com/it/u=4185529537,1682541874&fm=202&src=766&fc=tdmatt&mola=new&crop=v1',
goods_name: 'W190挖掘机',
goods_code: '995221_JHL',
goods_type: '挖地型号996',
lease_date: '',
lease_pic: 300,
lease_day: 0,
goods_num: 0,
totalAmount: 0,
isChecked: false,
lease_date_string: '',
},
{
goods_pic:
'https://fc1tn.baidu.com/it/u=4185529537,1682541874&fm=202&src=766&fc=tdmatt&mola=new&crop=v1',
goods_name: 'W190挖掘机',
goods_code: '995221_JHL',
goods_type: '挖地型号996',
lease_date: '',
lease_pic: 300,
lease_day: 0,
goods_num: 0,
totalAmount: 0,
isChecked: false,
lease_date_string: '',
},
{
goods_pic:
'https://fc1tn.baidu.com/it/u=4185529537,1682541874&fm=202&src=766&fc=tdmatt&mola=new&crop=v1',
goods_name: 'W190挖掘机',
goods_code: '995221_JHL',
goods_type: '挖地型号996',
lease_date: '',
lease_pic: 300,
lease_day: 0,
goods_num: 0,
totalAmount: 0,
isChecked: false,
lease_date_string: '',
},
],
},
{
company_name: '安徽博诺斯有限公司',
user_name: '王先生',
user_phone: '18725632356',
isChecked: false,
good_list: [
{
goods_pic:
'https://fc1tn.baidu.com/it/u=4185529537,1682541874&fm=202&src=766&fc=tdmatt&mola=new&crop=v1',
goods_name: 'W190挖掘机',
goods_code: '995221_JHL',
goods_type: '挖地型号996',
lease_date: '',
lease_pic: 300,
lease_day: 0,
goods_num: 0,
totalAmount: 0,
isChecked: false,
lease_date_string: '',
},
{
goods_pic:
'https://fc1tn.baidu.com/it/u=4185529537,1682541874&fm=202&src=766&fc=tdmatt&mola=new&crop=v1',
goods_name: 'W190挖掘机',
goods_code: '995221_JHL',
goods_type: '挖地型号996',
lease_date: '',
lease_pic: 300,
lease_day: 0,
goods_num: 0,
totalAmount: 0,
isChecked: false,
lease_date_string: '',
},
],
},
]
total.value = cardList.value.length
console.log(total.value)
if(time.value.length>0){
console.log('time',time)
queryParams.value.startTime=time.value[0]
queryParams.value.endTime=time.value[1]
}else{
queryParams.value.startTime=undefined
queryParams.value.endTime=undefined
}
const res: any = await getOrderListApi(queryParams.value)
cardList.value = res.rows
total.value = res.total
}
//订单详情
const handleViewOrder=(index:Number,row:any)=>{
router.push({
name: 'orderManagementInfo' ,
query: { orderStatusTemp:Number(row.orderStatus) }
})
}
onMounted(() => {
@ -149,7 +63,6 @@ const queryTableList = () => {
getList()
}
const tableData = ref([])
/* 退租按钮 */
const clickRentingTermination = () => {
@ -191,17 +104,16 @@ const clickConfirmReceipt = (row: any) => {
})
}
const time = ref([])
</script>
<template>
<!-- 订单管理 -->
<div class="container">
<el-form :model="queryParams" :inline="true" size="small">
<el-form-item label="订单编号：" prop="menuName">
<el-input />
<el-form-item label="装备名称：" prop="deviceName">
<el-input v-model.trim="queryParams.deviceName" style="width: 160px" clearable/>
</el-form-item>
<el-form-item label="创建时间：" prop="menuName">
<el-form-item prop="dateRange">
<el-date-picker
v-model="time"
type="daterange"
@ -212,18 +124,55 @@ const time = ref([])
style="width: 180px"
/>
</el-form-item>
<el-form-item label="状态：" prop="menuName">
<el-input />
<el-form-item label="订单状态" prop="orderStatus">
<el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态" style="width:120px" 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 label="装备类型：" prop="menuName">
<el-input />
<el-form-item label="出租单位：" prop="czcompanyName">
<el-input
v-model.trim="queryParams.czcompanyName"
clearable
maxlength="20"
style="width: 160px"
/>
</el-form-item>
<el-form-item label="装备名称：" prop="menuName">
<el-input />
<el-form-item label="承租单位：" prop="companyName">
<el-input
v-model.trim="queryParams.companyName"
clearable
maxlength="20"
style="width: 160px"
/>
</el-form-item>
<el-form-item prop="lowerBound">
<el-input
v-model.trim="queryParams.lowerBound"
placeholder="租金/元"
clearable
maxlength="20"
style="width:60px"
/>
<span style="display: flex;
justify-content: center;width:20px;text-align:center;margin-left:25px">——</span>
</el-form-item>
<el-form-item prop="upperBound">
<el-input
v-model.trim="queryParams.upperBound"
placeholder="租金/元"
clearable
maxlength="20"
style="width:60px;"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="queryTableList">查询</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
@ -240,31 +189,31 @@ const time = ref([])
</el-col>
<el-col :span="22">
<el-row>
<el-col :span="7">
<div
class="item"
style="flex-shrink: 0; margin-bottom: 5px; font-size: 12px"
>
<span>订单编号:</span>
{{ item.company_name }}
</div>
</el-col>
<el-col :span="7">
<div
class="item"
style="flex-shrink: 0; margin-bottom: 5px; font-size: 12px"
>
<span class="user-name">下单时间:</span>
{{ item.user_name }}
</div>
</el-col>
<el-col :span="6">
<div
class="item"
style="flex-shrink: 0; margin-bottom: 5px; font-size: 12px"
>
<span class="user-phone">装备所属公司:</span>
{{ item.user_phone }}
<span>订单编号:</span>
{{ item.code }}
</div>
</el-col>
<el-col :span="7">
<div
class="item"
style="flex-shrink: 0; margin-bottom: 5px; font-size: 12px"
>
<span >下单时间:</span>
{{ item.orderTime }}
</div>
</el-col>
<el-col :span="7">
<div
class="item"
style="flex-shrink: 0; margin-bottom: 5px; font-size: 12px"
>
<span >装备所属公司:</span>
{{ item.czcompanyName }}
</div>
</el-col>
<el-col :span="4">
@ -288,13 +237,13 @@ const time = ref([])
</el-row>
<el-row>
<el-col :span="7">
<el-col :span="6">
<div
class="item"
style="flex-shrink: 0; margin-bottom: 5px; font-size: 12px"
>
<span>出租方联系电话:</span>
{{ item.company_name }}
<span>出租方电话:</span>
{{ item.personPhone }}
</div>
</el-col>
<el-col :span="7">
@ -302,8 +251,8 @@ const time = ref([])
class="item"
style="flex-shrink: 0; margin-bottom: 5px; font-size: 12px"
>
<span class="user-name">承租方联系电话:</span>
{{ item.user_name }}
<span>承租方电话:</span>
{{ item.phoneNumber }}
</div>
</el-col>
<el-col :span="7">
@ -311,53 +260,59 @@ const time = ref([])
class="item"
style="flex-shrink: 0; margin-bottom: 5px; font-size: 12px"
>
<span class="user-phone">承租方地址:</span>
{{ item.user_phone }}
<span >承租方地址:</span>
{{ item.companyName }}
</div>
</el-col>
</el-row>
</el-col>
</el-row>
<el-row class="cart-list" v-for="(goods, j) in item.good_list" :key="j">
<el-row class="cart-list" v-for="(goods, j) in item.detailsList" :key="j">
<el-col :span="1">
<div style="text-align: center">
<el-checkbox v-model="goods.isChecked" @change="onChangeGoods(index)">
</el-checkbox>
</div>
</el-col>
<el-col :span="8" class="goods-info">
<el-col :span="9" class="goods-info">
<el-col :span="7">
<img :src="goods.goods_pic" alt="" />
<img :src="goods.url" alt="" />
</el-col>
<div class="goods-code">
<div style="font-size: 12px; font-weight: bold">{{ goods.goods_name }}</div>
<div>租期： {{ goods.lease_day }}{{ ' ' + '天' }}</div>
<div>租金：{{ goods.lease_pic }}{{ ' ' + '元/天' }}</div>
<div>数量：{{ goods.goods_num }}{{ ' ' + '台' }}</div>
<div style="font-size: 10px; font-weight: bold">{{ goods.deviceName }}</div>
<div>租期：{{ goods.days }}{{ ' ' + '天' }}</div>
<div>租金：{{ goods.dayLeasePrice }}{{ ' ' + '元/天' }}</div>
<div>数量：{{ goods.num }}{{ ' ' + '台' }}</div>
</div>
</el-col>
<el-col :span="2">
<div style="font-size: 14px; font-weight: bold; margin-bottom: 10px">
总费用
</div>
<div class="red-font">1500</div>
<div class="red-font">{{goods.costs}}</div>
</el-col>
<el-col :span="6">
<div style="font-size: 14px; font-weight: bold; margin-bottom: 10px">租期</div>
<div style="color: black; font-weight: bold">
{{ '2024-10-11' + ' ' }}{{ '至' }}{{ ' ' + '2024-10-11' }}
{{ goods.rentBeginTime }}
</div>
<div style="margin-top:3px;margin-bottom:3px">{{ '至' }}</div>
<div style="color: black; font-weight: bold">{{ goods.rentEndTime }}</div>
</el-col>
<el-col :span="2">
<div style="font-size: 14px; font-weight: bold; margin-bottom: 10px">
{{ '待出租' }}
</div>
<div v-if="goods.orderStatus=='0'" style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color:blue">{{"未下单"}}</div>
<div v-if="goods.orderStatus=='1'" style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color:blue">{{"已下单"}}</div>
<div v-if="goods.orderStatus=='2'" style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color:blue">{{"待出库"}}</div>
<div v-if="goods.orderStatus=='3'" style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color:blue">{{"待收货"}}</div>
<div v-if="goods.orderStatus=='4'" style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color:blue">{{"租赁中"}}</div>
<div v-if="goods.orderStatus=='5'" style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color:blue">{{"已退租"}}</div>
<div v-if="goods.orderStatus=='6'" style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color:blue">{{"已完成"}}</div>
</el-col>
<el-col :span="3">
<div>
<el-button
@click="handleViewOrder(j)"
@click="handleViewOrder(j,item.detailsList[j])"
type="text"
size="mini"
style="color: #blue; font-weight: bold"
@ -391,13 +346,13 @@ const time = ref([])
</div>
</el-col>
</el-row>
<PagingComponent
@getList="getList"
:pageSize="pageSize"
:pageNumber="pageNumber"
:total="total"
/>
</div>
<PagingComponent
@getList="getList"
:pageSize="pageSize"
:pageNumber="pageNumber"
:total="total"
/>
</div>
</template>
@ -442,13 +397,13 @@ const time = ref([])
align-items: center;
font-size: 13px;
.user-name,
.user-phone {
.code,
.orderTime {
padding: 3px 18px;
border: 1px solid #ccc;
}
.user-name {
.czcompanyName {
margin-left: 20px;
border-right: none;
}