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

冲突合并

This commit is contained in:
BianLzhaoMin 2024-11-28 19:07:54 +08:00
parent 4e541b67f8 525e5511f5
commit 2a6012d111
9 changed files with 2703 additions and 1068 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,3 +11,13 @@ export const getOrderListApi = (data: any) => {
export const getOrderListInfoApi = (data: any) => {
return get('/material-mall/order/getOrderDetailsById',data)
}
//出库
export const passApi = (data: any) => {
return post('/material-mall/order/updateOrderStatus',data)
}
//驳回
export const failApi = (data: any) => {
return post('/material-mall/order/updateOrderStatus',data)
}

28
src/router/index.ts
View File

@ -216,7 +216,7 @@ const routes: Array<RouteRecordRaw> = [
},
},
/* 订单管理（求租方） */
/* 订单管理（承租方） */
{
path: 'orderManagement',
name: 'orderManagement',
@ -228,7 +228,31 @@ const routes: Array<RouteRecordRaw> = [
isLogin: true
},
},
/* 订单管理（订单详情） */
/* 订单管理（出租方） */
{
path: 'orderManagementBuy',
name: 'orderManagementBuy',
component: () => import('@/views/user/orderManagementCz/index.vue'),
meta: {
title: '订单管理（求租）',
keepAlive: true,
AuthFlag: false,
isLogin: true
},
},
/* 订单管理（订单详情出租） */
{
path: 'orderManagementInfoBuy',
name: 'orderManagementInfoBuy',
component: () => import('@/views/user/orderManagementCz/detail.vue'),
meta: {
title: '订单详情',
keepAlive: true,
AuthFlag: false,
isLogin: false
},
},
/* 订单管理（订单详情承租） */
{
path: 'orderManagementInfo',
name: 'orderManagementInfo',

30
src/store/user.ts
View File

@ -26,20 +26,20 @@ export const useStore = defineStore('myUser', {
leaseAndLesseeList: [],
leaseAndLesseeUserList: [
{ title: '订单管理', name: 'orderManagementCz' },
{ title: '商品管理', name: 'goodsManagement' },
{ title: '商品上下架', name: 'goodsUpdown' },
{ title: '机手管理', name: 'operatorManagement' },
{ title: '寻源竞价', name: 'sourcingBidding' },
{ title: '专区管理', name: 'zoneManag' },
{ title: '装备管理', name: 'goodsManagement' },
// { title: '商品上下架', name: 'goodsUpdown' },
// { title: '机手管理', name: 'operatorManagement' },
// { title: '寻源竞价', name: 'sourcingBidding' },
// { title: '专区管理', name: 'zoneManag' },
],
isType: 1,
leaseUserList: [
{ title: '订单管理', name: 'orderManagementCz' },
{ title: '商品管理', name: 'goodsManagement' },
{ title: '商品上下架', name: 'goodsUpdown' },
{ title: '机手管理', name: 'operatorManagement' },
{ title: '寻源竞价', name: 'sourcingBidding' },
{ title: '专区管理', name: 'zoneManag' },
{ title: '装备管理管理', name: 'goodsManagement' },
// { title: '商品上下架', name: 'goodsUpdown' },
// { title: '机手管理', name: 'operatorManagement' },
// { title: '寻源竞价', name: 'sourcingBidding' },
// { title: '专区管理', name: 'zoneManag' },
],
lesseeUserList: [
{ title: '寻源需求', name: 'sourcingNeed' },
@ -144,11 +144,11 @@ export const useStore = defineStore('myUser', {
editUserMenuList(type: number) {
const leaseList: any = [
{ title: '订单管理', name: 'orderManagementCz' },
{ title: '商品管理', name: 'goodsManagement' },
{ title: '商品上下架', name: 'goodsUpdown' },
{ title: '机手管理', name: 'operatorManagement' },
{ title: '寻源竞价', name: 'sourcingBidding' },
{ title: '专区管理', name: 'zoneManag' },
{ title: '装备管理', name: 'goodsManagement' },
// { title: '商品上下架', name: 'goodsUpdown' },
// { title: '机手管理', name: 'operatorManagement' },
// { title: '寻源竞价', name: 'sourcingBidding' },
// { title: '专区管理', name: 'zoneManag' },
]
const lesseeList: any = [
{ title: '寻源需求', name: 'sourcingNeed' },

21
src/views/order/index.vue
View File

@ -198,6 +198,7 @@ const getOrderListData = async () => {
orderList.value.forEach((e: any) => {
e.isChecked = false;
e.goods_num = 1;
e.lease_day = 1;
// e.devInfoVoList.forEach((j: any) => {
// j.isChecked = false
// })
@ -208,13 +209,16 @@ const getOrderListData = async () => {
}
onMounted(() => {
getOrderListData()
setTimeout(()=>{
getOrderListData()
},500)
})
// 日期change事件
const onLeaseDateChange = (e: any, item: any) => {
item.lease_date_string = `${e[0]}至${e[1]}`
item.lease_day = moment(e[1]).diff(e[0], 'day')
item.lease_day = moment(e[1]).diff(e[0], 'day')
}
// 删除按钮
@ -300,6 +304,15 @@ const onCartSubmit = async () => {
})
return
}
console.log(amountDeviceList.value[0].lease_date==undefined)
if (amountDeviceList.value[0].lease_date==undefined) {
ElMessage({
showClose: false,
message: '请选择租期',
type: 'error',
})
return
}
if (!protocolChecked.value) {
ElMessage({
showClose: false,
@ -308,6 +321,8 @@ const onCartSubmit = async () => {
})
return
}
console.log('提交订单')
// 组装参数
const detailsList = amountDeviceList.value.map((e: any) => {
@ -328,7 +343,7 @@ const onCartSubmit = async () => {
cost: orderAmountPice.value,
detailsList,
}
console.log('submitParams',submitParams)
const res: any = await submitBookCarApi(submitParams)
if (res.code === 200) {
ElMessage({

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

@ -469,7 +469,7 @@
message: '保存成功'
})
dialogFormVisibleSettlein.value = false
ruleFormRef.value.resetField()
// ruleFormRef.value.resetField()
getList()
}
}
@ -504,7 +504,7 @@
message: '保存成功'
})
dialogFormVisibleSettlein.value = false
ruleFormRef.value.resetField()
// ruleFormRef.value.resetField()
getList()
}
}
@ -775,12 +775,12 @@
<!-- 装备弹框 -->
<el-dialog v-model="dialogFormVisibleSettlein" :title="settleinTitle"
width="60%" align-center :close-on-click-modal="false" :before-close="handleClose">
width="65%" align-center :close-on-click-modal="false" :before-close="handleClose">
<el-row :gutter="10" class="mb8" style="display: flex;align-items: center;">
<el-button type="" @click="closeDialogBtn">
关 闭
</el-button>
<el-button type="warning" @click="saveTemp">
<el-button type="warning" @click="saveTemp" v-if="!equipmentDeploymentParams.maStatus||equipmentDeploymentParams.maStatus==0">
草 稿
</el-button>
<el-button type="primary" @click="submitBtn" v-if="!disabledForm || isEditDisabled" >
@ -868,7 +868,7 @@
<el-date-picker
v-model="equipmentDeploymentParams.productionDate"
placeholder="请选择出厂日期"
value-format="yyyy-MM-dd"
value-format="YYYY-MM-DD"
type="date" style="width: 350px;">
</el-date-picker>
</el-form-item>
@ -1026,13 +1026,13 @@
<img class="picture-card" :src="item.fileUrl" alt="">
<div class="icon-list">
<span class="imgItem__icon hide" @click="handleDownload(item)">
<i class="el-icon-download"/>
<el-icon :size="20"><Download /></el-icon>
</span>
<span class="imgItem__icon hide" @click="picturePreview(item)">
<i class="el-icon-zoom-in"/>
<el-icon :size="20"><ZoomIn /></el-icon>
</span>
<span class="imgItem__icon hide" @click="handleRemove(mainFileList,index)">
<i class="el-icon-delete"/>
<el-icon :size="20"><Delete /></el-icon>
</span>
</div>
<p class="file-name">{{ item.fileName }}</p>
@ -1064,13 +1064,13 @@
<img class="picture-card" :src="item.fileUrl" alt="">
<div class="icon-list">
<span class="imgItem__icon hide" @click="handleDownload(item)">
<i class="el-icon-download"/>
<el-icon :size="20"><Download /></el-icon>
</span>
<span class="imgItem__icon hide" @click="picturePreview(item)">
<i class="el-icon-zoom-in"/>
<el-icon :size="20"><ZoomIn /></el-icon>
</span>
<span class="imgItem__icon hide" @click="handleRemove(detailsFileList,index)">
<i class="el-icon-delete"/>
<el-icon :size="20"><Delete /></el-icon>
</span>
</div>
<p class="file-name">{{ item.fileName }}</p>
@ -1106,13 +1106,13 @@
<img class="picture-card" :src="item.fileUrl" alt="">
<div class="icon-list">
<span class="imgItem__icon hide" @click="handleDownload(item)">
<i class="el-icon-download"/>
<el-icon :size="20"><Download /></el-icon>
</span>
<span class="imgItem__icon hide" @click="picturePreview(item)">
<i class="el-icon-zoom-in"/>
<el-icon :size="20"><ZoomIn /></el-icon>
</span>
<span class="imgItem__icon hide" @click="handleRemove(insurancePdf,index)">
<i class="el-icon-delete"/>
<el-icon :size="20"><Delete /></el-icon>
</span>
</div>
<p class="file-name">{{ item.fileName }}</p>
@ -1141,13 +1141,13 @@
<img class="picture-card" :src="item.fileUrl" alt="">
<div class="icon-list">
<span class="imgItem__icon hide" @click="handleDownload(item)">
<i class="el-icon-download"/>
<el-icon :size="20"><Download /></el-icon>
</span>
<span class="imgItem__icon hide" @click="picturePreview(item)">
<i class="el-icon-zoom-in"/>
<el-icon :size="20"><ZoomIn /></el-icon>
</span>
<span class="imgItem__icon hide" @click="handleRemove(examinationPdf,index)">
<i class="el-icon-delete"/>
<el-icon :size="20"><Delete /></el-icon>
</span>
</div>
<p class="file-name">{{ item.fileName }}</p>
@ -1167,7 +1167,7 @@
<!-- 图片查看弹窗 -->
<el-dialog v-model="dialogVisible" width="500px" height="500px">
<img width="100%" height="500px" :src="dialogImageUrl" />
<img width="500" height="500" :src="dialogImageUrl" alt="description" >
</el-dialog>
</template>
@ -1205,36 +1205,41 @@
margin-bottom: 20px;
}
.imgsBox{
width: auto;
width: 100%;
height: auto;
display: flex;
flex-wrap: wrap;
align-items: center;
margin-bottom: 30px;
margin-left: 20px;
.imgItem{
width: 160px;
height: 160px;
margin-right: 40px;
width: 150px;
height: 150px;
margin-right: 20px;
margin-bottom: 30px;
border: 1px dashed #bbb;
position: relative;
.picture-card{
width: 160px;
height: 160px;
width: 150px;
height: 150px;
}
.icon-list{
width: 60px;height: 20px;
position: absolute;
top: 70px;
left: 40px;
left: 30px;
display: flex;
align-items: center;
}
.imgItem__icon{
margin: 0 5px;
cursor: pointer;
}
.file-name{
font-size: 10px;
width: 100%;
word-break: break-all;
}
}

79
src/views/user/orderManagement/detail.vue
View File

@ -6,39 +6,62 @@ import { getOrderListInfoApi } from 'http/api/usercenter/seekorder'
const route = useRoute()
/* 查询参数 */
const cardList = ref<any>({})
const orderStatusTemp = ref<Number>(0)
const orderStatusTemp = ref<number>(0)
const idTemp = ref<string>('')
const titleStaus = ref<any>('')
// 获取数据列表
// const getList = async () => {
// const res: any = await getOrderListApi()
// console.log('获取数据列表***', res)
// tableData.value = res.rows
// total.value = res.total
// }
//描述信息
const operationDetails = ref<any>({
1: { title: '已出库', preOutboundUser: '', preOutboundTime: '' },
2: { title: '已收货', takeOverUser: '', takeOverTime: '' },
3: { title: '租赁结束', rentOverUser: '', rentOverTime: '' },
})
// 根据步骤的 Id 返回对应的标题
const getStepTitle = (stepId:number)=> {
if (orderStatusTemp.value === 1) {
if (orderStatusTemp.value === 2) {
titleStaus.value= '待出库' ;
return stepId === 1 ? '待出库' : '';
} else if (orderStatusTemp.value === 2) {
} else if (orderStatusTemp.value === 3) {
titleStaus.value= '待收货' ;
return stepId === 1 ? '已出库' : stepId === 2 ? '待收货' : '';
} else if (orderStatusTemp.value === 3) {
} else if (orderStatusTemp.value === 4) {
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 ? '已退租' : '';
} else if (orderStatusTemp.value === 6) {
titleStaus.value= '已完成' ;
return stepId === 1 ? '已出库' : stepId === 2 ? '已收货' : stepId === 3 ? '租赁结束' : stepId === 4 ? '已退租' : stepId === 5 ? '已完成' : '';
} else if(orderStatusTemp.value === 7) {
titleStaus.value= '已驳回' ;
return stepId === 1 ? '已驳回' : '';
}
titleStaus.value=''
return ''; // 默认返回空字符串
}
// 根据步骤的 Id 返回对应的描述
const getDescription=(desId:number)=>{
const operation = operationDetails.value[desId];
if (operation.title=="已出库" && titleStaus.value!= "待出库" ) {
return `
操作人：${operation.preOutboundUser==null ? ' ': operation.preOutboundUser}
操作时间：${operation.preOutboundTime==null ? ' ': operation.preOutboundTime}
`;
}else if(operation.title=="已收货" && titleStaus.value!= "待收货" && titleStaus.value!= "待出库"){
return `
操作人：${operation.takeOverUser==null ? ' ': operation.takeOverUser}
操作时间：${operation.takeOverTime==null ? ' ': operation.takeOverTime}
`;
}else if(operation.title=="租赁结束" && (titleStaus.value!= "待收货" && titleStaus.value!= "待出库" && titleStaus.value!= "租赁中")){
return `
操作人：${operation.rentOverUser==null ? ' ': operation.rentOverUser}
操作时间：${operation.rentOverTime==null ? ' ': operation.rentOverTime}
`;
}
return ''; // 默认返回空描述
}
const getId = ()=>{
orderStatusTemp.value = Number(route.query.orderStatusTemp)
idTemp.value = String(route.query.idTemp)
@ -52,6 +75,13 @@ const getList = async () => {
const res: any = await getOrderListInfoApi(params)
cardList.value = res.data
operationDetails.value[1].preOutboundUser = res.data.detailsList[0].preOutboundUser
operationDetails.value[1].preOutboundTime = res.data.detailsList[0].preOutboundTime
operationDetails.value[2].takeOverUser = res.data.detailsList[0].takeOverUser
operationDetails.value[2].takeOverTime = res.data.detailsList[0].takeOverTime
operationDetails.value[3].rentOverUser = res.data.detailsList[0].rentOverUser
operationDetails.value[3].rentOverTime = res.data.detailsList[0].rentOverTime
}
onBeforeMount(()=>{
@ -70,7 +100,7 @@ const time = ref([])
<!-- 订单管理 -->
<div class="container">
<el-breadcrumb separator="/">
<el-breadcrumb-item :to="{ path: '/myuser/orderManagement' }">订单管理</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/my-user/orderManagement' }">订单管理</el-breadcrumb-item>
<el-breadcrumb-item>订单明细</el-breadcrumb-item>
</el-breadcrumb>
<div class="section">
@ -85,12 +115,12 @@ const time = ref([])
</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-steps class="step" :space="400" :active="orderStatusTemp===7 ? 1 : orderStatusTemp-1" finish-status="success">
<el-step :title="getStepTitle(1)" :description="getDescription(1)"></el-step>
<el-step :title="getStepTitle(2)" :description="getDescription(2)"></el-step>
<el-step :title="getStepTitle(3)" :description="getDescription(3)"></el-step>
<el-step :title="getStepTitle(4)" ></el-step>
<el-step :title="getStepTitle(5)" :finish-status="orderStatusTemp.value >= 5 ? 'success' : ''"></el-step>
<el-step :title="getStepTitle(5)" ></el-step>
</el-steps>
</div>
@ -179,8 +209,9 @@ const time = ref([])
<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>
<div v-if="goods.orderStatus=='7'" style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color:blue">{{"已驳回"}}</div>
</el-col>
<el-col :span="3">
<!-- <el-col :span="3">
<div>
<el-button
@click="handleViewOrder(j)"
@ -199,7 +230,7 @@ const time = ref([])
驳回
</el-button>
</div>
</el-col>
</el-col> -->
</el-row>
</div>
@ -210,7 +241,7 @@ const time = ref([])
<style lang="scss" scoped>
.container {
width: 800px;
// width: 800px;
margin: 0 auto;
padding: 10px;
// background: #eeeff6;

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

File diff suppressed because it is too large Load Diff

331
src/views/user/orderManagementCz/detail.vue Normal file
View File

@ -0,0 +1,331 @@
<script setup lang="ts">
import { ref } from 'vue'
import PagingComponent from 'components/PagingComponent/index.vue'
import { useRouter } from 'vue-router'
import { getOrderListInfoApi } from 'http/api/usercenter/seekorder'
const route = useRoute()
/* 查询参数 */
const cardList = ref<any>({})
const orderStatusTemp = ref<number>(0)
const idTemp = ref<string>('')
const titleStaus = ref<any>('')
//描述信息
const operationDetails = ref<any>({
1: { title: '已出库', preOutboundUser: '', preOutboundTime: '' },
2: { title: '已收货', takeOverUser: '', takeOverTime: '' },
3: { title: '租赁结束', rentOverUser: '', rentOverTime: '' },
})
// 获取数据列表
// const getList = async () => {
// const res: any = await getOrderListApi()
// console.log('获取数据列表***', res)
// tableData.value = res.rows
// total.value = res.total
// }
// 根据步骤的 Id 返回对应的标题
const getStepTitle = (stepId:number)=> {
if (orderStatusTemp.value === 2) {
titleStaus.value= '待出库' ;
return stepId === 1 ? '待出库' : '';
} else if (orderStatusTemp.value === 3) {
titleStaus.value= '待收货' ;
return stepId === 1 ? '已出库' : stepId === 2 ? '待收货' : '';
} else if (orderStatusTemp.value === 4) {
titleStaus.value= '租赁中' ;
return stepId === 1 ? '已出库' : stepId === 2 ? '已收货' : stepId === 3 ? '租赁中' : '';
} else if (orderStatusTemp.value === 5) {
titleStaus.value= '已退租' ;
return stepId === 1 ? '已出库' : stepId === 2 ? '已收货' : stepId === 3 ? '租赁结束' : stepId === 4 ? '已退租' : '';
} else if (orderStatusTemp.value === 6) {
titleStaus.value= '已完成' ;
return stepId === 1 ? '已出库' : stepId === 2 ? '已收货' : stepId === 3 ? '租赁结束' : stepId === 4 ? '已退租' : stepId === 5 ? '已完成' : '';
} else if(orderStatusTemp.value === 7) {
titleStaus.value= '已驳回' ;
return stepId === 1 ? '已驳回' : '';
}
titleStaus.value=''
return ''; // 默认返回空字符串
}
// 根据步骤的 Id 返回对应的描述
const getDescription=(desId:number)=>{
const operation = operationDetails.value[desId];
if (operation.title=="已出库" && titleStaus.value!= "待出库" ) {
return `
操作人：${operation.preOutboundUser==null ? ' ': operation.preOutboundUser}
操作时间：${operation.preOutboundTime==null ? ' ': operation.preOutboundTime}
`;
}else if(operation.title=="已收货" && titleStaus.value!= "待收货" && titleStaus.value!= "待出库"){
return `
操作人：${operation.takeOverUser==null ? ' ': operation.takeOverUser}
操作时间：${operation.takeOverTime==null ? ' ': operation.takeOverTime}
`;
}else if(operation.title=="租赁结束" && (titleStaus.value!= "待收货" && titleStaus.value!= "待出库" && titleStaus.value!= "租赁中")){
return `
操作人：${operation.rentOverUser==null ? ' ': operation.rentOverUser}
操作时间：${operation.rentOverTime==null ? ' ': operation.rentOverTime}
`;
}
return ''; // 默认返回空描述
}
const getId = ()=>{
orderStatusTemp.value = Number(route.query.orderStatusTemp)
idTemp.value = String(route.query.idTemp)
}
/** 查询列表 */
const getList = async () => {
let params = {
id: idTemp.value
}
const res: any = await getOrderListInfoApi(params)
cardList.value = res.data
operationDetails.value[1].preOutboundUser = res.data.detailsList[0].preOutboundUser
operationDetails.value[1].preOutboundTime = res.data.detailsList[0].preOutboundTime
operationDetails.value[2].takeOverUser = res.data.detailsList[0].takeOverUser
operationDetails.value[2].takeOverTime = res.data.detailsList[0].takeOverTime
operationDetails.value[3].rentOverUser = res.data.detailsList[0].rentOverUser
operationDetails.value[3].rentOverTime = res.data.detailsList[0].rentOverTime
}
onBeforeMount(()=>{
getId()
})
onMounted(() => {
getList()
})
const time = ref([])
</script>
<template>
<!-- 订单管理 -->
<div class="container">
<el-breadcrumb separator="/">
<el-breadcrumb-item :to="{ path: '/my-user/orderManagementCz' }">订单管理</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===7 ? 1 : orderStatusTemp-1" finish-status="success">
<el-step :title="getStepTitle(1)" :description="getDescription(1)"></el-step>
<el-step :title="getStepTitle(2)" :description="getDescription(2)"></el-step>
<el-step :title="getStepTitle(3)" :description="getDescription(3)"></el-step>
<el-step :title="getStepTitle(4)" ></el-step>
<el-step :title="getStepTitle(5)" ></el-step>
</el-steps>
</div>
<div class="section">
<el-header style="height:30px">租赁信息
</el-header>
<div style="height: 80px;">
<div
class="info"
style="margin-top: 5px; display: flex; flex-wrap: wrap;"
>
<div class="item" style="width: 30%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;margin-left: 40px;opacity: 0.7">
<span>订单编号：{{cardList.code}}</span>
</div>
<div class="item" style="width: 30%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;opacity: 0.7">
<span>下单时间：{{cardList.orderTime}}</span>
</div>
<div class="item" style="width: 30%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;opacity: 0.7">
<span></span>
</div>
<div class="item" style="width: 30%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;margin-left: 40px;opacity: 0.7">
<span>出租单位：{{cardList.czcompanyName}}</span>
</div>
<div class="item" style="width: 30%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;opacity: 0.7">
<span>出租人：{{cardList.person}}</span>
</div>
<div class="item" style="width: 30%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;opacity: 0.7">
<span>出租人电话：{{cardList.personPhone}}</span>
</div>
<div class="item" style="width: 30%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;margin-left: 40px;opacity: 0.7">
<span>承租单位：{{cardList.companyName}}</span>
</div>
<div class="item" style="width: 30%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;opacity: 0.7">
<span>承租人：{{cardList.nickName}}</span>
</div>
<div class="item" style="width: 30%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;opacity: 0.7">
<span>承租人电话：{{cardList.phoneNumber}}</span>
</div>
<div class="item" style="width: 30%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;margin-left: 40px;opacity: 0.7">
<span>租赁协议：</span>
</div>
</div>
</div>
<div class="cart-tbody" >
<el-row class="cart-list" v-for="(goods, j) in cardList.detailsList" :key="j">
<el-col :span="9" class="goods-info">
<el-col :span="7">
<img :src="goods.url" alt="" />
</el-col>
<div class="goods-code">
<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">{{goods.costs}}</div>
</el-col>
<el-col :span="7">
<div style="font-size: 14px; font-weight: bold; margin-bottom: 10px">租期</div>
<div style="color: black; font-weight: bold">
{{ 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 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>
<div v-if="goods.orderStatus=='7'" 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)"
type="text"
size="mini"
style="color: #blue; font-weight: bold"
>
出库
</el-button>
<el-button
@click="handleViewOrder(j)"
type="text"
size="mini"
style="color: #blue; font-weight: bold"
>
驳回
</el-button>
</div>
</el-col> -->
</el-row>
</div>
</div>
</div>
</template>
<style lang="scss" scoped>
.container {
// width: 800px;
margin: 0 auto;
padding: 10px;
// background: #eeeff6;
font-size: 14px;
.step{
margin-left:80px;;
}
.section {
margin-top: 20px;
margin-bottom: 20px;
}
.cart-tbody {
background: #fff;
padding: 8px 12px;
margin: 10px;
border: 1px solid #ccc;
border-radius: 20px;
.cart-user-info {
display: flex;
align-items: center;
font-size: 13px;
.user-name,
.user-phone {
padding: 3px 18px;
border: 1px solid #ccc;
}
.user-name {
margin-left: 20px;
border-right: none;
}
}
.cart-list {
margin: 15px 0;
display: flex;
align-items: center;
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;
}
}
}
}
</style>

2054
src/views/user/orderManagementCz/index.vue
View File

File diff suppressed because it is too large Load Diff