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

冲突合并

This commit is contained in:
BianLzhaoMin 2024-12-02 15:55:35 +08:00
parent ccf00f726e d1067fb61a
commit bcde57e771
4 changed files with 571 additions and 453 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
components.d.ts vendored
View File

@ -3,7 +3,7 @@
// @ts-nocheck // @ts-nocheck
// Generated by unplugin-vue-components // Generated by unplugin-vue-components
// Read more: https://github.com/vuejs/core/pull/3399 // Read more: https://github.com/vuejs/core/pull/3399
export {} export { }
declare module 'vue' { declare module 'vue' {
export interface GlobalComponents { export interface GlobalComponents {
@ -13,8 +13,34 @@ declare module 'vue' {
ElCarousel: typeof import('element-plus/es')['ElCarousel'] ElCarousel: typeof import('element-plus/es')['ElCarousel']
ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem'] ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
ElCountdown: typeof import('element-plus/es')['ElCountdown']
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']
ElHeader: typeof import('element-plus/es')['ElHeader']
ElIcon: typeof import('element-plus/es')['ElIcon'] ElIcon: typeof import('element-plus/es')['ElIcon']
ElImage: typeof import('element-plus/es')['ElImage'] 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']
ElPageHeader: typeof import('element-plus/es')['ElPageHeader']
ElPagination: typeof import('element-plus/es')['ElPagination']
ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm']
ElProgress: typeof import('element-plus/es')['ElProgress']
ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
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']
ElTable: typeof import('element-plus/es')['ElTable']
ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
ElTag: typeof import('element-plus/es')['ElTag']
ElUpload: typeof import('element-plus/es')['ElUpload']
EquipCard: typeof import('./src/components/equipCard.vue')['default'] EquipCard: typeof import('./src/components/equipCard.vue')['default']
EquipCardHall: typeof import('./src/components/equipCardHall/index.vue')['default'] EquipCardHall: typeof import('./src/components/equipCardHall/index.vue')['default']
EquipCardNew: typeof import('./src/components/equipCardNew/index.vue')['default'] EquipCardNew: typeof import('./src/components/equipCardNew/index.vue')['default']

44
src/router/index.ts
View File

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

2
src/views/user/index.vue
View File

@ -47,6 +47,8 @@ import imgSrc from '@/assets/img/logo.png'
const handleSelect = (name: any, path: any) => { const handleSelect = (name: any, path: any) => {
// store.editcurrentMenuItem(name) // store.editcurrentMenuItem(name)
store.editcurrentMenuItem(name)
router.push({ router.push({
name, name,
}) })

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

@ -2,10 +2,10 @@
import { ref } from 'vue' import { ref } from 'vue'
import PagingComponent from 'components/PagingComponent/index.vue' import PagingComponent from 'components/PagingComponent/index.vue'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { getOrderListApi,passApi,failApi } from 'http/api/usercenter/seekorder' import { getOrderListApi, passApi, failApi } from 'http/api/usercenter/seekorder'
import uploadComponent from 'components/uploadComponent/index.vue' import uploadComponent from 'components/uploadComponent/index.vue'
import previewImg from './previewImg/index.vue' import previewImg from './previewImg/index.vue'
import { ElMessage,ElMessageBox } from 'element-plus' import { ElMessage, ElMessageBox } from 'element-plus'
import type { FormInstance } from 'element-plus' import type { FormInstance } from 'element-plus'
import { useStore } from 'store/user' import { useStore } from 'store/user'
const store = useStore() const store = useStore()
@ -45,8 +45,8 @@ const statusList = [
/** 查询列表 */ /** 查询列表 */
const getList = async () => { const getList = async () => {
if (time.value.length > 0) { if (time.value.length > 0) {
const dateStart = new Date(time.value[0]); const dateStart = new Date(time.value[0])
const dateEnd = new Date(time.value[1]); const dateEnd = new Date(time.value[1])
queryParams.value.startTime = dateStart.toLocaleDateString('en-CA') queryParams.value.startTime = dateStart.toLocaleDateString('en-CA')
queryParams.value.endTime = dateEnd.toLocaleDateString('en-CA') queryParams.value.endTime = dateEnd.toLocaleDateString('en-CA')
} else { } else {
@ -72,7 +72,7 @@ onMounted(() => {
// 查询按钮 // 查询按钮
const queryTableList = () => { const queryTableList = () => {
queryParams.value.pageNum=1 queryParams.value.pageNum = 1
getList() getList()
} }
@ -86,81 +86,117 @@ const resetTableList = (formEl: FormInstance | undefined) => {
// 全选事件 // 全选事件
const onChangeCompany = (e: boolean, index: number, item: any) => { const onChangeCompany = (e: boolean, index: number, item: any) => {
cardList.value[index].detailsList.forEach((item:any)=>{ cardList.value[index].detailsList.forEach((item: any) => {
if(item.orderStatus=="2"){ if (item.orderStatus == '2') {
item.isChecked = e; item.isChecked = e
} }
}) })
} }
// 单选事件 // 单选事件
const onChangeGoods = (index: number) => { const onChangeGoods = (index: number) => {
let flag = true; let flag = true
for (let item of cardList.value[index].detailsList) { for (let item of cardList.value[index].detailsList) {
if (item.orderStatus == "2" && item.isChecked != true) { if (item.orderStatus == '2' && item.isChecked != true) {
flag = false; flag = false
break; break
} }
} }
cardList.value[index].isChecked = flag; cardList.value[index].isChecked = flag
} }
// 出库按钮 // 出库按钮
const confirmPass = async (index: number) => { const confirmPass = async (index: number) => {
let ids: number[] = []
cardList.value[index].detailsList.forEach((item: any) => {
if (item.orderStatus == '2' && item.isChecked == true) {
console.log(2222222222)
ids.push(item.id)
}
})
console.log('ids', ids)
if (ids.length == 0) {
ElMessage({
showClose: false,
message: '请选择装备',
type: 'error',
})
return
} else {
ElMessageBox.confirm('是否确定出库？', { ElMessageBox.confirm('是否确定出库？', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning',
}).then(() => { })
return passApi({'orderId':cardList.value[index].orderId,'orderStatus':3}) .then(() => {
return passApi({ ids: ids, orderStatus: 3 })
// return removeDeviceApi([row.maId]) // return removeDeviceApi([row.maId])
}).then((res) => { })
.then((res) => {
if (res.code === 200) { if (res.code === 200) {
ElMessage({ ElMessage({
type: 'success', type: 'success',
message: '出库成功' message: '出库成功',
}) })
numberTemp.value = numberTemp.value+1; numberTemp.value = numberTemp.value + 1
getList() getList()
} }
}).catch(() => {}) })
.catch(() => {})
} }
}
// 驳回按钮 // 驳回按钮
const confirmFail = async (index: number) => { const confirmFail = async (index: number) => {
let ids: number[] = []
ElMessageBox.confirm('是否确定取消？', { cardList.value[index].detailsList.forEach((item: any) => {
if (item.orderStatus == '2' && item.isChecked == true) {
ids.push(item.id)
}
})
console.log('ids', ids)
if (ids.length == 0) {
ElMessage({
showClose: false,
message: '请选择装备',
type: 'error',
})
return
} else {
ElMessageBox.confirm('是否确定驳回？', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning',
}).then(() => { })
return failApi({'orderId':cardList.value[index].orderId,'orderStatus':7}) .then(() => {
return failApi({ ids: ids, orderStatus: 7 })
// return removeDeviceApi([row.maId]) // return removeDeviceApi([row.maId])
}).then((res) => { })
.then((res) => {
if (res.code === 200) { if (res.code === 200) {
ElMessage({ ElMessage({
type: 'success', type: 'success',
message: '取消成功' message: '驳回成功',
}) })
numberTemp.value = numberTemp.value+1; numberTemp.value = numberTemp.value + 1
getList() getList()
} }
}).catch(() => {}) })
.catch(() => {})
}
} }
// 计算是否过期 // 计算是否过期
const isExpired=(goods:any)=> { const isExpired = (goods: any) => {
// 获取当前日期并去掉时间部分 // 获取当前日期并去掉时间部分
const today = new Date(); const today = new Date()
today.setHours(0, 0, 0, 0); today.setHours(0, 0, 0, 0)
// 将endtime转为Date对象 // 将endtime转为Date对象
const endTime = new Date(goods.endTime.replace(/-/g, "/")); const endTime = new Date(goods.rentEndTime.replace(/-/g, '/'))
// 判断endtime是否早于今天 // 判断endtime是否早于今天
return endTime < today; return endTime < today
} }
/* 退租按钮 */ /* 退租按钮 */
@ -270,7 +306,7 @@ const handleFileSuccess2 = (response: any) => {
} }
} }
//退租检修 //退租检修
const handleViewBack = () => { const handleViewBack = () => {
settleinTitle.value = '退租检修' settleinTitle.value = '退租检修'
isEditDisabled.value = true isEditDisabled.value = true
equipmentDeploymentParams.value = { equipmentDeploymentParams.value = {
@ -330,11 +366,11 @@ const handleFileSuccess2 = (response: any) => {
maStatus: 15, maStatus: 15,
detectionList: [], detectionList: [],
insureList: [], insureList: [],
picList: [] picList: [],
} }
// 打开退组检修弹框 // 打开退组检修弹框
dialogFormVisibleSettlein.value = true dialogFormVisibleSettlein.value = true
} }
const settlemoneyTitle = ref('') const settlemoneyTitle = ref('')
const moneyParams1: any = ref({ const moneyParams1: any = ref({
@ -360,33 +396,33 @@ const moneyParams3: any = ref({
}) })
const tableData: any = ref([ const tableData: any = ref([
{ {
name1:'测试1', name1: '测试1',
name2:'测试1-1', name2: '测试1-1',
name3:'测试1-2', name3: '测试1-2',
jy1:'外观1-1', jy1: '外观1-1',
jy2:'故障1-2', jy2: '故障1-2',
jy3:'外观1-2', jy3: '外观1-2',
jy4:'故障1-2', jy4: '故障1-2',
jy5:'外观1-3', jy5: '外观1-3',
jy6:'故障1-3', jy6: '故障1-3',
jy7:'', jy7: '',
jy8:'', jy8: '',
remark:'备注1', remark: '备注1',
}, },
{ {
name1:'测试2', name1: '测试2',
name2:'测试2-1', name2: '测试2-1',
name3:'测试2-2', name3: '测试2-2',
jy1:'外观2-1', jy1: '外观2-1',
jy2:'故障2-2', jy2: '故障2-2',
jy3:'外观2-2', jy3: '外观2-2',
jy4:'故障2-2', jy4: '故障2-2',
jy5:'外观2-3', jy5: '外观2-3',
jy6:'故障2-3', jy6: '故障2-3',
jy7:'', jy7: '',
jy8:'', jy8: '',
remark:'备注2', remark: '备注2',
} },
]) ])
const partItems1: any = ref([{}]) const partItems1: any = ref([{}])
@ -395,221 +431,206 @@ const partItems3: any = ref([{}])
// 费用结算弹框显示隐藏 // 费用结算弹框显示隐藏
const dialogFormVisibleSettlemoney: any = ref(false) const dialogFormVisibleSettlemoney: any = ref(false)
//费用结算 //费用结算
const handleViewMoney = () => { const handleViewMoney = () => {
settlemoneyTitle.value = '费用结算' settlemoneyTitle.value = '费用结算'
moneyParams1.value = { moneyParams1.value = {
/* 设备状态 */ /* 设备状态 */
maStatus: 15, maStatus: 15,
detectionList: [], detectionList: [],
insureList: [], insureList: [],
picList: [] picList: [],
} }
moneyParams2.value = { moneyParams2.value = {
/* 设备状态 */ /* 设备状态 */
maStatus: 15, maStatus: 15,
detectionList: [], detectionList: [],
insureList: [], insureList: [],
picList: [] picList: [],
} }
moneyParams3.value = { moneyParams3.value = {
/* 设备状态 */ /* 设备状态 */
maStatus: 15, maStatus: 15,
detectionList: [], detectionList: [],
insureList: [], insureList: [],
picList: [] picList: [],
} }
// 打开退组检修弹框 // 打开退组检修弹框
dialogFormVisibleSettlemoney.value = true dialogFormVisibleSettlemoney.value = true
} }
//维修费用 //维修费用
const addPartItem1=()=> { const addPartItem1 = () => {
partItems1.value.push({ partType: "", num: "", isCharge: "" }); partItems1.value.push({ partType: '', num: '', isCharge: '' })
} }
const removePartItem1 =(index:number)=> { const removePartItem1 = (index: number) => {
if (partItems1.value.length > 1) { if (partItems1.value.length > 1) {
partItems1.value.splice(index, 1); partItems1.value.splice(index, 1)
}
} }
}
//报废费用 //报废费用
const addPartItem2=()=> { const addPartItem2 = () => {
partItems2.value.push({ partType: "", num: "", isCharge: "" }); partItems2.value.push({ partType: '', num: '', isCharge: '' })
} }
const removePartItem2 =(index:number)=> { const removePartItem2 = (index: number) => {
if (partItems2.value.length > 1) { if (partItems2.value.length > 1) {
partItems2.value.splice(index, 1); partItems2.value.splice(index, 1)
}
} }
}
//报废费用 修改 //报废费用 修改
const addPartItem3=()=> { const addPartItem3 = () => {
partItems3.value.push({ partType: "", num: "", isCharge: "" }); partItems3.value.push({ partType: '', num: '', isCharge: '' })
} }
const removePartItem3 =(index:number)=> { const removePartItem3 = (index: number) => {
if (partItems3.value.length > 1) { if (partItems3.value.length > 1) {
partItems3.value.splice(index, 1); partItems3.value.splice(index, 1)
}
} }
}
const settleListTitle = ref('') const settleListTitle = ref('')
// 费用清单弹框显示隐藏 // 费用清单弹框显示隐藏
const dialogFormVisibleSettleList: any = ref(false) const dialogFormVisibleSettleList: any = ref(false)
const tableData1: any = ref([ const tableData1: any = ref([
{ {
name1:'测试1', name1: '测试1',
name2:'测试1-1', name2: '测试1-1',
name3:'3台', name3: '3台',
jy1:'100', jy1: '100',
jy2:'31', jy2: '31',
jy3:'2024-11-25 至2024-12-25', jy3: '2024-11-25 至2024-12-25',
jy4:'1600', jy4: '1600',
}, },
{ {
name1:'测试2', name1: '测试2',
name2:'测试2-1', name2: '测试2-1',
name3:'3台', name3: '3台',
jy1:'100', jy1: '100',
jy2:'31', jy2: '31',
jy3:'2024-11-25 至2024-12-25', jy3: '2024-11-25 至2024-12-25',
jy4:'1600', jy4: '1600',
} },
]) ])
const tableData2: any = ref([ const tableData2: any = ref([
{ {
name1:'测试2', name1: '测试2',
name2:'测试2-1', name2: '测试2-1',
name3:'3台', name3: '3台',
jy1:'类型1', jy1: '类型1',
jy2:'维修中', jy2: '维修中',
jy3:'1500', jy3: '1500',
}, },
{ {
name1:'测试2', name1: '测试2',
name2:'测试2-2', name2: '测试2-2',
name3:'3台', name3: '3台',
jy1:'类型2', jy1: '类型2',
jy2:'维修中', jy2: '维修中',
jy3:'1500', jy3: '1500',
} },
]) ])
const tableData3: any = ref([ const tableData3: any = ref([
{ {
name1:'测试3', name1: '测试3',
name2:'测试3-1', name2: '测试3-1',
name3:'3台', name3: '3台',
jy1:'轻度维修', jy1: '轻度维修',
jy2:'1400', jy2: '1400',
}, },
{ {
name1:'测试3', name1: '测试3',
name2:'测试3-2', name2: '测试3-2',
name3:'3台', name3: '3台',
jy1:'轻度维修', jy1: '轻度维修',
jy2:'1400', jy2: '1400',
} },
]) ])
const tableData4: any = ref([ const tableData4: any = ref([
{ {
name1:'测试4', name1: '测试4',
name2:'测试4-1', name2: '测试4-1',
name3:'3台', name3: '3台',
jy1:'1400', jy1: '1400',
}, },
{ {
name1:'测试4', name1: '测试4',
name2:'测试4-2', name2: '测试4-2',
name3:'3台', name3: '3台',
jy1:'1400', jy1: '1400',
} },
]) ])
//费用清单 //费用清单
const handleViewList = () => { const handleViewList = () => {
settleListTitle.value = '费用清单' settleListTitle.value = '费用清单'
moneyParams1.value = { moneyParams1.value = {
/* 设备状态 */ /* 设备状态 */
maStatus: 15, maStatus: 15,
detectionList: [], detectionList: [],
insureList: [], insureList: [],
picList: [] picList: [],
} }
// 打开费用清单弹框 // 打开费用清单弹框
dialogFormVisibleSettleList.value = true dialogFormVisibleSettleList.value = true
} }
const tableData5: any = ref([ const tableData5: any = ref([
{ {
name1:'测试1', name1: '测试1',
name2:'测试1-1', name2: '测试1-1',
name3:'测试1-2', name3: '测试1-2',
jy1:'外观1-1', jy1: '外观1-1',
jy2:'故障1-2', jy2: '故障1-2',
jy3:'外观1-2', jy3: '外观1-2',
jy4:'故障1-2', jy4: '故障1-2',
jy5:'外观1-3', jy5: '外观1-3',
jy6:'故障1-3', jy6: '故障1-3',
jy7:'', jy7: '',
jy8:'', jy8: '',
remark:'备注1', remark: '备注1',
}, },
{ {
name1:'测试2', name1: '测试2',
name2:'测试2-1', name2: '测试2-1',
name3:'测试2-2', name3: '测试2-2',
jy1:'外观2-1', jy1: '外观2-1',
jy2:'故障2-2', jy2: '故障2-2',
jy3:'外观2-2', jy3: '外观2-2',
jy4:'故障2-2', jy4: '故障2-2',
jy5:'外观2-3', jy5: '外观2-3',
jy6:'故障2-3', jy6: '故障2-3',
jy7:'', jy7: '',
jy8:'', jy8: '',
remark:'备注2', remark: '备注2',
} },
]) ])
const settleRepairTitle = ref('') const settleRepairTitle = ref('')
// 检修详情弹框显示隐藏 // 检修详情弹框显示隐藏
const dialogFormVisibleSettleRepair: any = ref(false) const dialogFormVisibleSettleRepair: any = ref(false)
//检修详情 //检修详情
const handleViewRepair = () => { const handleViewRepair = () => {
settleListTitle.value = '检修详情' settleListTitle.value = '检修详情'
moneyParams1.value = { moneyParams1.value = {
/* 设备状态 */ /* 设备状态 */
maStatus: 15, maStatus: 15,
detectionList: [], detectionList: [],
insureList: [], insureList: [],
picList: [] picList: [],
} }
// 打开检修详情弹框 // 打开检修详情弹框
dialogFormVisibleSettleRepair.value = true dialogFormVisibleSettleRepair.value = true
} }
const settleWordTitle = ref('')
const dialogFormVisibleSettleWord: any = ref(false)
//租赁协议
const handleViewWord = () => {
settleWordTitle.value = '租赁协议'
console.log(12313131)
moneyParams1.value = {
/* 设备状态 */
maStatus: 15,
detectionList: [],
insureList: [],
picList: []
}
// 打开租赁协议弹框
dialogFormVisibleSettleWord.value = true
}
</script> </script>
<template> <template>
<!-- 订单管理 --> <!-- 订单管理 -->
<div class="container"> <div class="container">
<el-form :model="queryParams" ref="queryFormRef" :inline="true" size="default" label-width="0"> <el-form
:model="queryParams"
ref="queryFormRef"
:inline="true"
size="default"
label-width="0"
>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item prop="deviceName"> <el-form-item prop="deviceName">
@ -702,7 +723,7 @@ const dialogFormVisibleSettleWord: any = ref(false)
</el-row> </el-row>
</el-form> </el-form>
<div class="cart-tbody" v-for="(item, index) in cardList" :key="index" > <div class="cart-tbody" v-for="(item, index) in cardList" :key="index">
<el-row style="border-bottom: 1px solid #ccc"> <el-row style="border-bottom: 1px solid #ccc">
<el-col :span="1"> <el-col :span="1">
<!-- <div style="text-align: center"> <!-- <div style="text-align: center">
@ -719,7 +740,12 @@ const dialogFormVisibleSettleWord: any = ref(false)
<el-col :span="6"> <el-col :span="6">
<div <div
class="item" class="item"
style="flex-shrink: 0; margin-bottom: 5px; font-size: 15px; margin-top: 5px;" style="
flex-shrink: 0;
margin-bottom: 5px;
font-size: 15px;
margin-top: 5px;
"
> >
<span>订单编号:</span> <span>订单编号:</span>
{{ item.code }} {{ item.code }}
@ -728,7 +754,12 @@ const dialogFormVisibleSettleWord: any = ref(false)
<el-col :span="6"> <el-col :span="6">
<div <div
class="item" class="item"
style="flex-shrink: 0; margin-bottom: 5px; font-size: 15px; margin-top: 5px;" style="
flex-shrink: 0;
margin-bottom: 5px;
font-size: 15px;
margin-top: 5px;
"
> >
<span>下单时间:</span> <span>下单时间:</span>
{{ item.orderTime }} {{ item.orderTime }}
@ -737,14 +768,28 @@ const dialogFormVisibleSettleWord: any = ref(false)
<el-col :span="7"> <el-col :span="7">
<div <div
class="item" class="item"
style="flex-shrink: 0; margin-bottom: 5px; font-size: 15px; margin-top: 5px;" style="
flex-shrink: 0;
margin-bottom: 5px;
font-size: 15px;
margin-top: 5px;
"
> >
<span>装备所属公司:</span> <span>装备所属公司:</span>
{{ item.czcompanyName }} {{ item.czcompanyName }}
</div> </div>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<div style="flex-shrink: 0; margin-bottom: 1px; font-size: 7px; display: flex;justify-content: center; margin-top: 5px;"> <div
style="
flex-shrink: 0;
margin-bottom: 1px;
font-size: 7px;
display: flex;
justify-content: center;
margin-top: 5px;
"
>
<el-button <el-button
v-if="item.orderStatus == '2'" v-if="item.orderStatus == '2'"
class="item" class="item"
@ -797,38 +842,56 @@ const dialogFormVisibleSettleWord: any = ref(false)
</el-col> </el-col>
</el-row> </el-row>
<el-row class="cart-listAll" :style="{background: item.orderStatus=='6' ? '#EBEEF5':'white'}"> <el-row class="cart-list" v-for="(goods, j) in item.detailsList" :key="j">
<el-col :span="1" > <el-col :span="1">
<!-- <div style="text-align: center"> <div style="text-align: center">
<el-checkbox :key="numberTemp" v-model="goods.isChecked" @change="onChangeGoods(index)" :disabled="goods.orderStatus!='2'"> <el-checkbox
:key="numberTemp"
v-model="goods.isChecked"
@change="onChangeGoods(index)"
:disabled="goods.orderStatus != '2'"
>
</el-checkbox> </el-checkbox>
</div> --> </div>
-->
</el-col> </el-col>
<el-col :span="7" > <el-col :span="7">
<el-row class="cart-list" v-for="(goods, j) in item.detailsList" :key="j" > <el-row class="cart-list" v-for="(goods, j) in item.detailsList" :key="j">
<el-col class="goods-info"> <el-col class="goods-info">
<el-col :span="7"> <el-col :span="7">
<img :src="goods.url" alt="" /> <img :src="goods.url" alt="" />
</el-col> </el-col>
<div class="goods-code"> <div class="goods-code">
<div style="font-size: 10px; font-weight: bold">{{ goods.deviceName }}</div> <div style="font-size: 10px; font-weight: bold">
{{ goods.deviceName }}
</div>
<div>租期：{{ goods.days }}{{ ' ' + '天' }}</div> <div>租期：{{ goods.days }}{{ ' ' + '天' }}</div>
<div style="display:flex;justify-content:space-between;width:100%;"> <div
<div style="flex:1;text-align:left;width:220px">租金：{{ goods.dayLeasePrice }}{{ ' ' + '元/天' }}</div> style="
<div style="flex:1;text-align:left;">数量：{{ goods.num }}{{ ' ' + '台' }}</div> display: flex;
justify-content: space-between;
width: 100%;
"
>
<div style="flex: 1; text-align: left; width: 220px">
租金：{{ goods.dayLeasePrice }}{{ ' ' + '元/天' }}
</div>
<div style="flex: 1; text-align: left">
数量：{{ goods.num }}{{ ' ' + '台' }}
</div>
</div> </div>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
</el-col> </el-col>
<el-col :span="3" > <el-col :span="3">
<div style="font-size: 14px; font-weight: bold; margin-bottom: 10px"> <div style="font-size: 14px; font-weight: bold; margin-bottom: 10px">
总费用 总费用
</div> </div>
<div class="red-font">{{ item.cost }}</div> <div class="red-font">{{ item.cost }}</div>
</el-col> </el-col>
<el-col :span="4" > <el-col :span="4">
<div style="font-size: 14px; font-weight: bold; margin-bottom: 10px">租期</div> <div style="font-size: 14px; font-weight: bold; margin-bottom: 10px">租期</div>
<div style="color: black; font-weight: bold"> <div style="color: black; font-weight: bold">
{{ item.startTime }} {{ item.startTime }}
@ -836,7 +899,7 @@ const dialogFormVisibleSettleWord: any = ref(false)
<div style="margin-top: 3px; margin-bottom: 3px">{{ '至' }}</div> <div style="margin-top: 3px; margin-bottom: 3px">{{ '至' }}</div>
<div style="color: black; font-weight: bold">{{ item.endTime }}</div> <div style="color: black; font-weight: bold">{{ item.endTime }}</div>
</el-col> </el-col>
<el-col :span="4" > <el-col :span="4">
<div <div
v-if="item.orderStatus == '2'" v-if="item.orderStatus == '2'"
style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color: blue" style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color: blue"
@ -844,39 +907,69 @@ const dialogFormVisibleSettleWord: any = ref(false)
{{ '待出库' }} {{ '待出库' }}
</div> </div>
<div <div
v-if="item.orderStatus == '3'" v-if="goods.orderStatus == '3'"
style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color: #C76F60" style="
font-size: 14px;
font-weight: bold;
margin-bottom: 10px;
color: #c76f60;
"
> >
{{ '待收货' }} {{ '待收货' }}
</div> </div>
<div <div
v-if="item.orderStatus == '4' && isExpired(item)" v-if="goods.orderStatus == '4' && isExpired(goods)"
style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color: #008D06" style="
font-size: 14px;
font-weight: bold;
margin-bottom: 10px;
color: #008d06;
"
> >
{{ '租赁中' }} {{ '租赁中' }}
<span style="color: red">(已过期)</span> <span style="color: red">(已过期)</span>
</div> </div>
<div <div
v-if="item.orderStatus == '4' && !isExpired(item)" v-if="goods.orderStatus == '4' && !isExpired(goods)"
style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color: #008D06" style="
font-size: 14px;
font-weight: bold;
margin-bottom: 10px;
color: #008d06;
"
> >
{{ '租赁中' }} {{ '租赁中' }}
</div> </div>
<div <div
v-if="item.orderStatus == '5'" v-if="goods.orderStatus == '5'"
style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color: #5B33CC" style="
font-size: 14px;
font-weight: bold;
margin-bottom: 10px;
color: #5b33cc;
"
> >
{{ '已退租' }} {{ '已退租' }}
</div> </div>
<div <div
v-if="item.orderStatus == '6'" v-if="goods.orderStatus == '6'"
style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color: #C00017" style="
font-size: 14px;
font-weight: bold;
margin-bottom: 10px;
color: #c00017;
"
> >
{{ '已完成' }} {{ '已完成' }}
</div> </div>
<div <div
v-if="item.orderStatus == '7'" v-if="goods.orderStatus == '7'"
style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color: #797979" style="
font-size: 14px;
font-weight: bold;
margin-bottom: 10px;
color: #797979;
"
> >
{{ '已驳回' }} {{ '已驳回' }}
</div> </div>
@ -900,7 +993,7 @@ const dialogFormVisibleSettleWord: any = ref(false)
租赁协议 租赁协议
</el-button> </el-button>
<el-button <el-button
v-if="item.orderStatus=='5'" v-if="goods.orderStatus == '5'"
@click="handleViewBack(j)" @click="handleViewBack(j)"
type="primary" type="primary"
size="small" size="small"
@ -909,7 +1002,7 @@ const dialogFormVisibleSettleWord: any = ref(false)
退租检修 退租检修
</el-button> </el-button>
<el-button <el-button
v-if="item.orderStatus=='5'" v-if="goods.orderStatus == '5'"
@click="handleViewMoney(j)" @click="handleViewMoney(j)"
type="primary" type="primary"
size="small" size="small"
@ -918,7 +1011,7 @@ const dialogFormVisibleSettleWord: any = ref(false)
费用结算 费用结算
</el-button> </el-button>
<el-button <el-button
v-if="item.orderStatus=='6'" v-if="goods.orderStatus == '6'"
@click="handleViewRepair(j)" @click="handleViewRepair(j)"
type="primary" type="primary"
size="small" size="small"
@ -927,7 +1020,7 @@ const dialogFormVisibleSettleWord: any = ref(false)
检修详情 检修详情
</el-button> </el-button>
<el-button <el-button
v-if="item.orderStatus=='6'" v-if="goods.orderStatus == '6'"
@click="handleViewList(j)" @click="handleViewList(j)"
type="primary" type="primary"
size="small" size="small"
@ -945,7 +1038,6 @@ const dialogFormVisibleSettleWord: any = ref(false)
v-model:currentPage="queryParams.pageNumber" v-model:currentPage="queryParams.pageNumber"
:total="total" :total="total"
/> />
</div> </div>
<!-- 退租检修弹框 --> <!-- 退租检修弹框 -->
<el-dialog <el-dialog
@ -1103,10 +1195,7 @@ const dialogFormVisibleSettleWord: any = ref(false)
<span class="imgItem__icon hide" @click="picturePreview(item)"> <span class="imgItem__icon hide" @click="picturePreview(item)">
<i class="el-icon-zoom-in" /> <i class="el-icon-zoom-in" />
</span> </span>
<span <span class="imgItem__icon hide" @click="handleRemove(mainFileList, index)">
class="imgItem__icon hide"
@click="handleRemove(mainFileList, index)"
>
<i class="el-icon-delete" /> <i class="el-icon-delete" />
</span> </span>
</div> </div>
@ -1536,7 +1625,8 @@ const dialogFormVisibleSettleWord: any = ref(false)
:title="settleListTitle" :title="settleListTitle"
width="65%" width="65%"
align-center align-center
:close-on-click-modal="false"> :close-on-click-modal="false"
>
<div style="height: 80px"> <div style="height: 80px">
<div <div
class="info" class="info"
@ -1687,8 +1777,9 @@ const dialogFormVisibleSettleWord: any = ref(false)
<el-dialog <el-dialog
v-model="dialogFormVisibleSettleRepair" v-model="dialogFormVisibleSettleRepair"
:title="settleRepairTitle" :title="settleRepairTitle"
width="65%" width="60%"
:close-on-click-modal="false"> :close-on-click-modal="false"
>
<div style="height: 80px"> <div style="height: 80px">
<div <div
class="info" class="info"
@ -1707,7 +1798,6 @@ const dialogFormVisibleSettleWord: any = ref(false)
<span>订单编号：10000212135656</span> <span>订单编号：10000212135656</span>
</div> </div>
<div <div
class="item" class="item"
style="width: 48%; flex-shrink: 0; margin-bottom: 1px; font-size: 16px" style="width: 48%; flex-shrink: 0; margin-bottom: 1px; font-size: 16px"
@ -1761,13 +1851,13 @@ const dialogFormVisibleSettleWord: any = ref(false)
v-model="dialogFormVisibleSettleWord" v-model="dialogFormVisibleSettleWord"
:title="settleWordTitle" :title="settleWordTitle"
width="50%" width="50%"
:close-on-click-modal="false"> :close-on-click-modal="false"
<div > >
<img src="@/assets/img/zuLin.png" style=" <div>
width: 600px; <img
height: 600px; src="@/assets/img/zuLin.png"
margin-left: 160px; style="width: 600px; height: 600px; margin-left: 160px; margin-right: 10px"
margin-right: 10px; "/> />
</div> </div>
<template #footer> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">
@ -1910,7 +2000,7 @@ const dialogFormVisibleSettleWord: any = ref(false)
} }
} }
.cart-listAll{ .cart-listAll {
margin: 15px 0; margin: 15px 0;
display: flex; display: flex;
align-items: center; align-items: center;