样式优化

This commit is contained in:
BianLzhaoMin 2024-12-03 09:16:20 +08:00
parent 676edb43bd
commit 59e5b61c81
15 changed files with 618 additions and 467 deletions

14
components.d.ts vendored
View File

@ -8,20 +8,34 @@ export {}
declare module 'vue' { declare module 'vue' {
export interface GlobalComponents { export interface GlobalComponents {
Breadcrumb: typeof import('./src/components/Breadcrumb/index.vue')['default'] Breadcrumb: typeof import('./src/components/Breadcrumb/index.vue')['default']
ElBadge: typeof import('element-plus/es')['ElBadge']
ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
ElButton: typeof import('element-plus/es')['ElButton'] 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'] ElCascader: typeof import('element-plus/es')['ElCascader']
ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
ElCol: typeof import('element-plus/es')['ElCol'] ElCol: typeof import('element-plus/es')['ElCol']
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
ElCountdown: typeof import('element-plus/es')['ElCountdown']
ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
ElDialog: typeof import('element-plus/es')['ElDialog'] ElDialog: typeof import('element-plus/es')['ElDialog']
ElEmpty: typeof import('element-plus/es')['ElEmpty']
ElForm: typeof import('element-plus/es')['ElForm'] ElForm: typeof import('element-plus/es')['ElForm']
ElFormItem: typeof import('element-plus/es')['ElFormItem'] ElFormItem: typeof import('element-plus/es')['ElFormItem']
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'] ElInput: typeof import('element-plus/es')['ElInput']
ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenu: typeof import('element-plus/es')['ElMenu']
ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
ElOption: typeof import('element-plus/es')['ElOption'] ElOption: typeof import('element-plus/es')['ElOption']
ElPagination: typeof import('element-plus/es')['ElPagination'] 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'] ElRow: typeof import('element-plus/es')['ElRow']
ElSelect: typeof import('element-plus/es')['ElSelect'] ElSelect: typeof import('element-plus/es')['ElSelect']
ElTable: typeof import('element-plus/es')['ElTable'] ElTable: typeof import('element-plus/es')['ElTable']

View File

@ -1,5 +1,5 @@
<template> <template>
<el-breadcrumb separator="/"> <el-breadcrumb separator="/" class="primary-lease">
<el-breadcrumb-item :to="{ path: backPath }">{{ backName }}</el-breadcrumb-item> <el-breadcrumb-item :to="{ path: backPath }">{{ backName }}</el-breadcrumb-item>
<el-breadcrumb-item>{{ currentName }}</el-breadcrumb-item> <el-breadcrumb-item>{{ currentName }}</el-breadcrumb-item>
</el-breadcrumb> </el-breadcrumb>

View File

@ -19,8 +19,8 @@
<li> <li>
<span>{{ company }}</span> <span>{{ company }}</span>
<el-button <el-button
:style="isType == 1 ? 'opacity:0.5' : ''" class="primary-lease"
class="lessee-btn" type="primary"
:disabled="isType == 1" :disabled="isType == 1"
@click.stop="onHandelLessee" @click.stop="onHandelLessee"
>立即承租</el-button >立即承租</el-button

View File

@ -272,7 +272,7 @@ const onCarts = () => {
div:hover { div:hover {
color: #fff; color: #fff;
background-color: #1967d2; background-color: #00a288;
} }
} }

View File

@ -368,7 +368,7 @@ const onCarts = () => {
div:hover { div:hover {
color: #fff; color: #fff;
background-color: #1967d2; background-color: #00a288;
} }
} }

View File

@ -2,10 +2,12 @@
--el-color-primary:#00a288; --el-color-primary:#00a288;
--el-color-primary-light-3:#00ad9d; --el-color-primary-light-3:#00ad9d;
--el-color-primary-dark-2:#00ad9d; --el-color-primary-dark-2:#00ad9d;
--el-color-primary-light-5:#78d3cb --el-color-primary-light-5:#78d3cb;
--el-text-color-primary:#00a288;
} }
:root { :root {
--el-color-primary:#00a288; --el-color-primary:#00a288;
--el-color-primary-light-3:#00ad9d;
} }

View File

@ -110,11 +110,18 @@ const handlerLogin = async () => {
</div> </div>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <!-- <el-button
style="background-color: #009a91; padding: 20px 0" style="background-color: #009a91; padding: 20px 0"
type="primary" type="primary"
@click="handlerLogin" @click="handlerLogin"
> </el-button > </el-button
> -->
<el-button
style="padding: 20px 0"
class="primary-lease"
type="primary"
@click="handlerLogin"
> </el-button
> >
</el-form-item> </el-form-item>
<!-- <el-form-item class="forget-password"> <!-- <el-form-item class="forget-password">

View File

@ -1,7 +1,7 @@
<template> <template>
<Header /> <Header />
<div class="container"> <div class="container">
<el-breadcrumb separator="/"> <el-breadcrumb separator="/" class="primary-lease">
<el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item> <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
<el-breadcrumb-item>预约车</el-breadcrumb-item> <el-breadcrumb-item>预约车</el-breadcrumb-item>
</el-breadcrumb> </el-breadcrumb>
@ -468,6 +468,7 @@ const onCartSubmit = async () => {
width: 1200px; width: 1200px;
margin: 0 auto; margin: 0 auto;
padding: 10px; padding: 10px;
min-height: 550px;
background: #eeeff6; background: #eeeff6;
font-size: 14px; font-size: 14px;
@ -484,7 +485,7 @@ const onCartSubmit = async () => {
.cart-title div:first-child { .cart-title div:first-child {
width: 5px; width: 5px;
height: 20px; height: 20px;
background-color: #4fabfe; background-color: #00a288;
} }
.cart-th { .cart-th {

View File

@ -75,7 +75,10 @@
</div> </div>
</div> </div>
<div style="text-align: right"> <div style="text-align: right">
<el-button type="primary" round icon="ChatDotRound">在线聊</el-button> <!-- <el-button type="primary" round icon="ChatDotRound">在线聊</el-button> -->
<el-button type="primary" class="primary-lease" round icon="ChatDotRound"
>在线聊</el-button
>
</div> </div>
<div style="text-align: right"> <div style="text-align: right">
<el-button <el-button

View File

@ -42,7 +42,7 @@
</div> </div>
<div class="viewNnum"> <div class="viewNnum">
<div>浏览 {{ pageData.searchNum }}</div> <div>浏览 {{ pageData.searchNum }}</div>
<div style="color: #409eff; display: flex; align-items: center"> <div style="color: #00a288; display: flex; align-items: center">
<Location style="width: 1em; height: 1em; margin-right: 8px" /> <Location style="width: 1em; height: 1em; margin-right: 8px" />
安徽省合肥市蜀山区 安徽省合肥市蜀山区
</div> </div>
@ -68,25 +68,27 @@
<div class="options"> <div class="options">
<div> <div>
<el-button <!-- <el-button
class="item_btn" class="item_btn"
type="primary" type="primary"
:disabled="pageData.isBookCar == 0 || isType == 1" :disabled="pageData.isBookCar == 0 || isType == 1"
@click="onAddCart" @click="onAddCart"
>加入预约车</el-button >加入预约车</el-button
> -->
<el-button
class="primary-lease"
type="primary"
:disabled="pageData.isBookCar == 0 || isType == 1"
@click="onAddCart"
>加入预约车</el-button
> >
</div> </div>
<div> <div>
<el-button <el-button
class="item_btn applyFor" class="item_btn applyFor primary-lease"
type="primary"
:disabled="pageData.isBookCar == 0 || isType == 1" :disabled="pageData.isBookCar == 0 || isType == 1"
:style="
pageData.isBookCar == 0 || isType == 1
? 'opacity:0.5'
: ''
"
style="background-color: #1abc9c"
@click="onHandelLessee" @click="onHandelLessee"
> >
立即承租 立即承租
@ -110,7 +112,13 @@
<div style="font-size: 20px">{{ pageData.personPhone }}</div> <div style="font-size: 20px">{{ pageData.personPhone }}</div>
</div> </div>
<div style="text-align: right"> <div style="text-align: right">
<el-button type="primary" round icon="ChatDotRound">在线聊</el-button> <el-button
round
type="primary"
class="primary-lease"
icon="ChatDotRound"
>在线聊</el-button
>
</div> </div>
</div> </div>
</div> </div>
@ -183,7 +191,11 @@
<div class="appearance"> <div class="appearance">
<div class="publicTitle">出租记录</div> <div class="publicTitle">出租记录</div>
<div class="rental-record"> <div class="rental-record">
<el-table :data="pageData.leaseList" border style="width: 100%"> <el-table
:data="pageData.leaseList"
style="width: 100%"
:header-cell-style="{ background: '#00a288', color: '#fff' }"
>
<el-table-column align="center" type="index" label="序号" width="80" /> <el-table-column align="center" type="index" label="序号" width="80" />
<el-table-column align="center" prop="orderCode" label="订单号" /> <el-table-column align="center" prop="orderCode" label="订单号" />
<el-table-column align="center" prop="leaseName" label="租赁方" /> <el-table-column align="center" prop="leaseName" label="租赁方" />

View File

@ -278,7 +278,7 @@ const onSelectItem = (type: number) => {
} }
" "
style=" style="
color: #4296b1; color: #00a288;
font-weight: bold; font-weight: bold;
text-decoration: underline; text-decoration: underline;
font-size: 16px; font-size: 16px;
@ -435,7 +435,8 @@ const onSelectItem = (type: number) => {
color: #333; color: #333;
} }
div:hover { div:hover {
color: #38b2a4; color: #fff;
background-color: #00a288;
} }
} }
} }

View File

@ -71,8 +71,10 @@
</el-row> </el-row>
<el-form-item> <el-form-item>
<el-button @click="getLeaseListData" type="primary">查询</el-button> <el-button @click="getLeaseListData" type="primary" class="primary-lease"
<el-button @click="onReset">重置</el-button> >查询</el-button
>
<el-button @click="onReset" type="primary" class="primary-lease">重置</el-button>
<!-- <el-button <!-- <el-button
@click=" @click="
() => { () => {

View File

@ -877,13 +877,17 @@ const handleRemove = (list: any, index: Number) => {
:title="settleinTitle" :title="settleinTitle"
width="65%" width="65%"
align-center align-center
destroy-on-close
:close-on-click-modal="false" :close-on-click-modal="false"
:before-close="handleClose" :before-close="handleClose"
> >
<el-row :gutter="10" class="mb8" style="display: flex; align-items: center"> <el-row :gutter="10" class="mb8" style="display: flex; align-items: center">
<el-button type="" @click="closeDialogBtn"> </el-button> <el-button type="primary" class="primary-lease" @click="closeDialogBtn">
</el-button>
<el-button <el-button
type="warning" type="primary"
class="primary-lease"
@click="saveTemp" @click="saveTemp"
v-if=" v-if="
!equipmentDeploymentParams.maStatus || equipmentDeploymentParams.maStatus == 0 !equipmentDeploymentParams.maStatus || equipmentDeploymentParams.maStatus == 0
@ -891,7 +895,12 @@ const handleRemove = (list: any, index: Number) => {
> >
稿 稿
</el-button> </el-button>
<el-button type="primary" @click="submitBtn" v-if="!disabledForm || isEditDisabled"> <el-button
type="primary"
class="primary-lease"
@click="submitBtn"
v-if="!disabledForm || isEditDisabled"
>
</el-button> </el-button>
</el-row> </el-row>
@ -1372,7 +1381,7 @@ const handleRemove = (list: any, index: Number) => {
display: inline-block; display: inline-block;
width: 4px; width: 4px;
height: 16px; height: 16px;
background: #409eff; background: #00a288;
} }
.title-text { .title-text {
font-weight: 700; font-weight: 700;

View File

@ -50,8 +50,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 {
@ -92,22 +92,22 @@ 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
} }
// //
@ -116,56 +116,59 @@ const onChangeGoods = (index: number) => {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning',
}).then(() => { })
return passApi({'orderId':cardList.value[index].orderId,'orderStatus':3}) .then(() => {
return passApi({ orderId: cardList.value[index].orderId, 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) => {
ElMessageBox.confirm('是否确定取消?', { ElMessageBox.confirm('是否确定取消?', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning',
}).then(() => { })
return failApi({'orderId':cardList.value[index].orderId,'orderStatus':7}) .then(() => {
return failApi({ orderId: cardList.value[index].orderId, 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)
// endtimeDate // endtimeDate
const endTime = new Date(goods.endTime.replace(/-/g, "/")); const endTime = new Date(goods.endTime.replace(/-/g, '/'))
// endtime // endtime
return endTime < today; return endTime < today
} }
/* 退租按钮 */ /* 退租按钮 */
@ -335,7 +338,7 @@ const handleFileSuccess2 = (response: any) => {
maStatus: 15, maStatus: 15,
detectionList: [], detectionList: [],
insureList: [], insureList: [],
picList: [] picList: [],
} }
// 退 // 退
dialogFormVisibleSettlein.value = true dialogFormVisibleSettlein.value = true
@ -391,7 +394,7 @@ const tableData: any = ref([
jy7: '', jy7: '',
jy8: '', jy8: '',
remark: '备注2', remark: '备注2',
} },
]) ])
const partItems1: any = ref([{}]) const partItems1: any = ref([{}])
@ -407,21 +410,21 @@ const dialogFormVisibleSettlemoney: any = ref(false)
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
@ -429,31 +432,31 @@ const dialogFormVisibleSettlemoney: any = ref(false)
// //
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)
} }
} }
@ -478,7 +481,7 @@ const tableData1: any = ref([
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([
{ {
@ -496,7 +499,7 @@ const tableData2: any = ref([
jy1: '类型2', jy1: '类型2',
jy2: '维修中', jy2: '维修中',
jy3: '1500', jy3: '1500',
} },
]) ])
const tableData3: any = ref([ const tableData3: any = ref([
{ {
@ -512,7 +515,7 @@ const tableData3: any = ref([
name3: '3台', name3: '3台',
jy1: '轻度维修', jy1: '轻度维修',
jy2: '1400', jy2: '1400',
} },
]) ])
const tableData4: any = ref([ const tableData4: any = ref([
{ {
@ -526,7 +529,7 @@ const tableData4: any = ref([
name2: '测试4-2', name2: '测试4-2',
name3: '3台', name3: '3台',
jy1: '1400', jy1: '1400',
} },
]) ])
// //
const handleViewList = () => { const handleViewList = () => {
@ -536,7 +539,7 @@ const tableData4: any = ref([
maStatus: 15, maStatus: 15,
detectionList: [], detectionList: [],
insureList: [], insureList: [],
picList: [] picList: [],
} }
// //
dialogFormVisibleSettleList.value = true dialogFormVisibleSettleList.value = true
@ -570,7 +573,7 @@ const tableData5: any = ref([
jy7: '', jy7: '',
jy8: '', jy8: '',
remark: '备注2', remark: '备注2',
} },
]) ])
const settleRepairTitle = ref('') const settleRepairTitle = ref('')
// //
@ -583,13 +586,12 @@ const dialogFormVisibleSettleRepair: any = ref(false)
maStatus: 15, maStatus: 15,
detectionList: [], detectionList: [],
insureList: [], insureList: [],
picList: [] picList: [],
} }
// //
dialogFormVisibleSettleRepair.value = true dialogFormVisibleSettleRepair.value = true
} }
const settleWordTitle = ref('') const settleWordTitle = ref('')
const dialogFormVisibleSettleWord: any = ref(false) const dialogFormVisibleSettleWord: any = ref(false)
// //
@ -601,20 +603,23 @@ const dialogFormVisibleSettleWord: any = ref(false)
maStatus: 15, maStatus: 15,
detectionList: [], detectionList: [],
insureList: [], insureList: [],
picList: [] picList: [],
} }
// //
dialogFormVisibleSettleWord.value = true 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">
@ -700,8 +705,15 @@ const dialogFormVisibleSettleWord: any = ref(false)
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item> <el-form-item>
<el-button type="primary" @click="queryTableList">查询</el-button> <el-button type="primary" class="primary-lease" @click="queryTableList"
<el-button @click="resetTableList(queryFormRef)">重置</el-button> >查询</el-button
>
<el-button
type="primary"
class="primary-lease"
@click="resetTableList(queryFormRef)"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -724,7 +736,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 }}
@ -733,7 +750,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 }}
@ -742,14 +764,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"
@ -802,7 +838,10 @@ 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-listAll"
:style="{ background: item.orderStatus == '6' ? '#EBEEF5' : 'white' }"
>
<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'">
@ -817,11 +856,23 @@ const dialogFormVisibleSettleWord: any = ref(false)
<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>
@ -850,38 +901,68 @@ const dialogFormVisibleSettleWord: any = ref(false)
</div> </div>
<div <div
v-if="item.orderStatus == '3'" v-if="item.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="item.orderStatus == '4' && isExpired(item)"
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="item.orderStatus == '4' && !isExpired(item)"
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="item.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="item.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="item.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>
@ -950,7 +1031,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
@ -1108,10 +1188,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>
@ -1541,7 +1618,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"
@ -1693,7 +1771,8 @@ const dialogFormVisibleSettleWord: any = ref(false)
v-model="dialogFormVisibleSettleRepair" v-model="dialogFormVisibleSettleRepair"
:title="settleRepairTitle" :title="settleRepairTitle"
width="65%" width="65%"
:close-on-click-modal="false"> :close-on-click-modal="false"
>
<div style="height: 80px"> <div style="height: 80px">
<div <div
class="info" class="info"
@ -1712,7 +1791,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"
@ -1766,13 +1844,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> <div>
<img src="@/assets/img/zuLin.png" style=" <img
width: 600px; src="@/assets/img/zuLin.png"
height: 600px; style="width: 600px; height: 600px; margin-left: 160px; margin-right: 10px"
margin-left: 160px; />
margin-right: 10px; "/>
</div> </div>
<template #footer> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">

View File

@ -71,8 +71,10 @@
</el-row> </el-row>
<el-form-item> <el-form-item>
<el-button @click="getLeaseListData" type="primary">查询</el-button> <el-button @click="getLeaseListData" type="primary" class="primary-lease"
<el-button @click="onReset">重置</el-button> >查询</el-button
>
<el-button @click="onReset" type="primary" class="primary-lease">重置</el-button>
<el-button <el-button
@click=" @click="
() => { () => {
@ -81,7 +83,8 @@
dialogTitle = '新增' dialogTitle = '新增'
} }
" "
style="background-color: #17907f; color: #fff" type="primary"
class="primary-lease"
> >
需求新建 需求新建
</el-button> </el-button>
@ -93,8 +96,8 @@
:data="leaseList" :data="leaseList"
show-overflow-tooltip show-overflow-tooltip
:header-cell-style="{ :header-cell-style="{
background: '#fafafa', background: '#00a288',
color: '#333', color: '#fff',
}" }"
> >
<el-table-column align="center" label="序号" type="index" width="80" /> <el-table-column align="center" label="序号" type="index" width="80" />
@ -119,6 +122,7 @@
<el-button <el-button
text text
size="small" size="small"
class="primary-lease"
type="primary" type="primary"
v-if="row.leaseStatus === 2" v-if="row.leaseStatus === 2"
@click="onRepublish(row.id, true)" @click="onRepublish(row.id, true)"
@ -134,11 +138,22 @@
v-if="row.leaseStatus != 1" v-if="row.leaseStatus != 1"
> >
<template #reference> <template #reference>
<el-button size="small" text type="danger"> 删除 </el-button> <el-button size="small" text type="primary" class="primary-lease">
删除
</el-button>
</template> </template>
<template #actions="{ confirm }"> <template #actions="{ confirm }">
<el-button size="small">取消</el-button> <el-button type="primary" class="primary-lease" size="small"
<el-button type="danger" size="small" @click="confirm()"> 确定 </el-button> >取消</el-button
>
<el-button
class="primary-lease"
type="primary"
size="small"
@click="confirm()"
>
确定
</el-button>
</template> </template>
</el-popconfirm> </el-popconfirm>
</template> </template>
@ -369,9 +384,16 @@
</el-form> </el-form>
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button @click="onCancel">取消</el-button> <el-button type="primary" class="primary-lease" @click="onCancel">取消</el-button>
<el-button type="primary" @click="onSubmit(false)" v-if="isSave"> 保存 </el-button> <el-button
<el-button type="primary" @click="onSubmit(true)"> 提交 </el-button> type="primary"
class="primary-lease"
@click="onSubmit(false)"
v-if="isSave"
>
保存
</el-button>
<el-button class="primary-lease" @click="onSubmit(true)"> 提交 </el-button>
</div> </div>
</template> </template>
</el-dialog> </el-dialog>