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

冲突合并

This commit is contained in:
BianLzhaoMin 2024-12-03 09:17:37 +08:00
parent 033571ba2a 59e5b61c81
commit 954cb755d2
15 changed files with 618 additions and 467 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components.d.ts vendored
View File

@ -8,20 +8,34 @@ export {}
declare module 'vue' {
export interface GlobalComponents {
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']
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']
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']
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']
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']
ElTable: typeof import('element-plus/es')['ElTable']

2
src/components/Breadcrumb/index.vue
View File

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

4
src/components/equipCardNew/index.vue
View File

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

2
src/components/header/index.vue
View File

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

2
src/layout/header.vue
View File

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

6
src/style/scss/common.scss
View File

@ -2,10 +2,12 @@
--el-color-primary:#00a288;
--el-color-primary-light-3:#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 {
--el-color-primary:#00a288;
--el-color-primary-light-3:#00ad9d;
}

9
src/views/Login.vue
View File

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

5
src/views/cart/index.vue
View File

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

5
src/views/demand-details/index.vue
View File

@ -75,7 +75,10 @@
</div>
</div>
<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 style="text-align: right">
<el-button

34
src/views/equip/detail.vue
View File

@ -42,7 +42,7 @@
</div>
<div class="viewNnum">
<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" />
安徽省合肥市蜀山区
</div>
@ -68,25 +68,27 @@
<div class="options">
<div>
<el-button
<!-- <el-button
class="item_btn"
type="primary"
:disabled="pageData.isBookCar == 0 || isType == 1"
@click="onAddCart"
>加入预约车</el-button
> -->
<el-button
class="primary-lease"
type="primary"
:disabled="pageData.isBookCar == 0 || isType == 1"
@click="onAddCart"
>加入预约车</el-button
>
</div>
<div>
<el-button
class="item_btn applyFor"
class="item_btn applyFor primary-lease"
type="primary"
:disabled="pageData.isBookCar == 0 || isType == 1"
:style="
pageData.isBookCar == 0 || isType == 1
? 'opacity:0.5'
: ''
"
style="background-color: #1abc9c"
@click="onHandelLessee"
>
立即承租
@ -110,7 +112,13 @@
<div style="font-size: 20px">{{ pageData.personPhone }}</div>
</div>
<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>
@ -183,7 +191,11 @@
<div class="appearance">
<div class="publicTitle">出租记录</div>
<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" prop="orderCode" label="订单号" />
<el-table-column align="center" prop="leaseName" label="租赁方" />

5
src/views/home/index.vue
View File

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

6
src/views/user/accept-orders/index.vue
View File

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

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

@ -879,13 +879,17 @@ const handleRemove = (list: any, index: Number) => {
:title="settleinTitle"
width="65%"
align-center
destroy-on-close
: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="primary" class="primary-lease" @click="closeDialogBtn">
关 闭
</el-button>
<el-button
type="warning"
type="primary"
class="primary-lease"
@click="saveTemp"
v-if="
!equipmentDeploymentParams.maStatus || equipmentDeploymentParams.maStatus == 0
@ -893,7 +897,12 @@ const handleRemove = (list: any, index: Number) => {
>
草 稿
</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-row>
@ -1374,7 +1383,7 @@ const handleRemove = (list: any, index: Number) => {
display: inline-block;
width: 4px;
height: 16px;
background: #409eff;
background: #00a288;
}
.title-text {
font-weight: 700;

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

@ -50,8 +50,8 @@ const statusList = [
/** 查询列表 */
const getList = async () => {
if (time.value.length > 0) {
const dateStart = new Date(time.value[0]);
const dateEnd = new Date(time.value[1]);
const dateStart = new Date(time.value[0])
const dateEnd = new Date(time.value[1])
queryParams.value.startTime = dateStart.toLocaleDateString('en-CA')
queryParams.value.endTime = dateEnd.toLocaleDateString('en-CA')
} else {
@ -92,22 +92,22 @@ const resetTableList = (formEl: FormInstance | undefined) => {
// 全选事件
const onChangeCompany = (e: boolean, index: number, item: any) => {
cardList.value[index].detailsList.forEach((item: any) => {
if(item.orderStatus=="2"){
item.isChecked = e;
if (item.orderStatus == '2') {
item.isChecked = e
}
})
}
// 单选事件
const onChangeGoods = (index: number) => {
let flag = true;
let flag = true
for (let item of cardList.value[index].detailsList) {
if (item.orderStatus == "2" && item.isChecked != true) {
flag = false;
break;
if (item.orderStatus == '2' && item.isChecked != true) {
flag = false
break
}
}
cardList.value[index].isChecked = flag;
cardList.value[index].isChecked = flag
}
// 出库按钮
@ -116,56 +116,59 @@ const onChangeGoods = (index: number) => {
confirmButtonText: '确定',
cancelButtonText: '取消',
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])
}).then((res) => {
})
.then((res) => {
if (res.code === 200) {
ElMessage({
type: 'success',
message: '出库成功'
message: '出库成功',
})
numberTemp.value = numberTemp.value+1;
numberTemp.value = numberTemp.value + 1
getList()
}
}).catch(() => {})
})
.catch(() => {})
}
// 驳回按钮
const confirmFail = async (index: number) => {
ElMessageBox.confirm('是否确定取消？', {
confirmButtonText: '确定',
cancelButtonText: '取消',
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])
}).then((res) => {
})
.then((res) => {
if (res.code === 200) {
ElMessage({
type: 'success',
message: '取消成功'
message: '取消成功',
})
numberTemp.value = numberTemp.value+1;
numberTemp.value = numberTemp.value + 1
getList()
}
}).catch(() => {})
})
.catch(() => {})
}
// 计算是否过期
const isExpired = (goods: any) => {
// 获取当前日期并去掉时间部分
const today = new Date();
today.setHours(0, 0, 0, 0);
const today = new Date()
today.setHours(0, 0, 0, 0)
// 将endtime转为Date对象
const endTime = new Date(goods.endTime.replace(/-/g, "/"));
const endTime = new Date(goods.endTime.replace(/-/g, '/'))
// 判断endtime是否早于今天
return endTime < today;
return endTime < today
}
/* 退租按钮 */
@ -335,7 +338,7 @@ const handleFileSuccess2 = (response: any) => {
maStatus: 15,
detectionList: [],
insureList: [],
picList: []
picList: [],
}
// 打开退组检修弹框
dialogFormVisibleSettlein.value = true
@ -391,7 +394,7 @@ const tableData: any = ref([
jy7: '',
jy8: '',
remark: '备注2',
}
},
])
const partItems1: any = ref([{}])
@ -407,21 +410,21 @@ const dialogFormVisibleSettlemoney: any = ref(false)
maStatus: 15,
detectionList: [],
insureList: [],
picList: []
picList: [],
}
moneyParams2.value = {
/* 设备状态 */
maStatus: 15,
detectionList: [],
insureList: [],
picList: []
picList: [],
}
moneyParams3.value = {
/* 设备状态 */
maStatus: 15,
detectionList: [],
insureList: [],
picList: []
picList: [],
}
// 打开退组检修弹框
dialogFormVisibleSettlemoney.value = true
@ -429,31 +432,31 @@ const dialogFormVisibleSettlemoney: any = ref(false)
//维修费用
const addPartItem1 = () => {
partItems1.value.push({ partType: "", num: "", isCharge: "" });
partItems1.value.push({ partType: '', num: '', isCharge: '' })
}
const removePartItem1 = (index: number) => {
if (partItems1.value.length > 1) {
partItems1.value.splice(index, 1);
partItems1.value.splice(index, 1)
}
}
//报废费用
const addPartItem2 = () => {
partItems2.value.push({ partType: "", num: "", isCharge: "" });
partItems2.value.push({ partType: '', num: '', isCharge: '' })
}
const removePartItem2 = (index: number) => {
if (partItems2.value.length > 1) {
partItems2.value.splice(index, 1);
partItems2.value.splice(index, 1)
}
}
//报废费用 修改
const addPartItem3 = () => {
partItems3.value.push({ partType: "", num: "", isCharge: "" });
partItems3.value.push({ partType: '', num: '', isCharge: '' })
}
const removePartItem3 = (index: number) => {
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',
jy3: '2024-11-25 至2024-12-25',
jy4: '1600',
}
},
])
const tableData2: any = ref([
{
@ -496,7 +499,7 @@ const tableData2: any = ref([
jy1: '类型2',
jy2: '维修中',
jy3: '1500',
}
},
])
const tableData3: any = ref([
{
@ -512,7 +515,7 @@ const tableData3: any = ref([
name3: '3台',
jy1: '轻度维修',
jy2: '1400',
}
},
])
const tableData4: any = ref([
{
@ -526,7 +529,7 @@ const tableData4: any = ref([
name2: '测试4-2',
name3: '3台',
jy1: '1400',
}
},
])
//费用清单
const handleViewList = () => {
@ -536,7 +539,7 @@ const tableData4: any = ref([
maStatus: 15,
detectionList: [],
insureList: [],
picList: []
picList: [],
}
// 打开费用清单弹框
dialogFormVisibleSettleList.value = true
@ -570,7 +573,7 @@ const tableData5: any = ref([
jy7: '',
jy8: '',
remark: '备注2',
}
},
])
const settleRepairTitle = ref('')
// 检修详情弹框显示隐藏
@ -583,13 +586,12 @@ const dialogFormVisibleSettleRepair: any = ref(false)
maStatus: 15,
detectionList: [],
insureList: [],
picList: []
picList: [],
}
// 打开检修详情弹框
dialogFormVisibleSettleRepair.value = true
}
const settleWordTitle = ref('')
const dialogFormVisibleSettleWord: any = ref(false)
//租赁协议
@ -601,20 +603,23 @@ const dialogFormVisibleSettleWord: any = ref(false)
maStatus: 15,
detectionList: [],
insureList: [],
picList: []
picList: [],
}
// 打开租赁协议弹框
dialogFormVisibleSettleWord.value = true
}
</script>
<template>
<!-- 订单管理 -->
<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-col :span="6">
<el-form-item prop="deviceName">
@ -700,8 +705,15 @@ const dialogFormVisibleSettleWord: any = ref(false)
</el-col>
<el-col :span="12">
<el-form-item>
<el-button type="primary" @click="queryTableList">查询</el-button>
<el-button @click="resetTableList(queryFormRef)">重置</el-button>
<el-button type="primary" class="primary-lease" @click="queryTableList"
>查询</el-button
>
<el-button
type="primary"
class="primary-lease"
@click="resetTableList(queryFormRef)"
>重置</el-button
>
</el-form-item>
</el-col>
</el-row>
@ -724,7 +736,12 @@ const dialogFormVisibleSettleWord: any = ref(false)
<el-col :span="6">
<div
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>
{{ item.code }}
@ -733,7 +750,12 @@ const dialogFormVisibleSettleWord: any = ref(false)
<el-col :span="6">
<div
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>
{{ item.orderTime }}
@ -742,14 +764,28 @@ const dialogFormVisibleSettleWord: any = ref(false)
<el-col :span="7">
<div
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>
{{ item.czcompanyName }}
</div>
</el-col>
<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
v-if="item.orderStatus == '2'"
class="item"
@ -802,7 +838,10 @@ const dialogFormVisibleSettleWord: any = ref(false)
</el-col>
</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">
<!-- <div style="text-align: center">
<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="" />
</el-col>
<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 style="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
style="
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>
</el-col>
@ -850,38 +901,68 @@ const dialogFormVisibleSettleWord: any = ref(false)
</div>
<div
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
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>
</div>
<div
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
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
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
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>
@ -950,7 +1031,6 @@ const dialogFormVisibleSettleWord: any = ref(false)
v-model:currentPage="queryParams.pageNumber"
:total="total"
/>
</div>
<!-- 退租检修弹框 -->
<el-dialog
@ -1108,10 +1188,7 @@ const dialogFormVisibleSettleWord: any = ref(false)
<span class="imgItem__icon hide" @click="picturePreview(item)">
<i class="el-icon-zoom-in" />
</span>
<span
class="imgItem__icon hide"
@click="handleRemove(mainFileList, index)"
>
<span class="imgItem__icon hide" @click="handleRemove(mainFileList, index)">
<i class="el-icon-delete" />
</span>
</div>
@ -1541,7 +1618,8 @@ const dialogFormVisibleSettleWord: any = ref(false)
:title="settleListTitle"
width="65%"
align-center
:close-on-click-modal="false">
:close-on-click-modal="false"
>
<div style="height: 80px">
<div
class="info"
@ -1693,7 +1771,8 @@ const dialogFormVisibleSettleWord: any = ref(false)
v-model="dialogFormVisibleSettleRepair"
:title="settleRepairTitle"
width="65%"
:close-on-click-modal="false">
:close-on-click-modal="false"
>
<div style="height: 80px">
<div
class="info"
@ -1712,7 +1791,6 @@ const dialogFormVisibleSettleWord: any = ref(false)
<span>订单编号：10000212135656</span>
</div>
<div
class="item"
style="width: 48%; flex-shrink: 0; margin-bottom: 1px; font-size: 16px"
@ -1766,13 +1844,13 @@ const dialogFormVisibleSettleWord: any = ref(false)
v-model="dialogFormVisibleSettleWord"
:title="settleWordTitle"
width="50%"
:close-on-click-modal="false">
:close-on-click-modal="false"
>
<div>
<img src="@/assets/img/zuLin.png" style="
width: 600px;
height: 600px;
margin-left: 160px;
margin-right: 10px; "/>
<img
src="@/assets/img/zuLin.png"
style="width: 600px; height: 600px; margin-left: 160px; margin-right: 10px"
/>
</div>
<template #footer>
<span class="dialog-footer">

44
src/views/user/sourcingNeed/index.vue
View File

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