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

优化

This commit is contained in:
binbin_pan 2024-12-26 17:30:58 +08:00
parent b3755db6a7
commit 2a6d9e2be0
8 changed files with 137 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/Navmenu/index.vue
View File

@ -10,7 +10,7 @@ const route = useRoute()
// // { name: '装备管理', routerName: '/home' }, // // { name: '装备管理', routerName: '/home' },
// { name: '订单管理', routerName: '/home' }, // { name: '订单管理', routerName: '/home' },
// // { name: '基础管理', routerName: '/home' }, // // { name: '基础管理', routerName: '/home' },
// { name: '通知', routerName: 'enterpriseZone' }, // { name: '通知公告', routerName: 'enterpriseZone' },
// // { name: '综合查询', routerName: 'enterpriseZone' }, // // { name: '综合查询', routerName: 'enterpriseZone' },
// ] // ]
@ -25,7 +25,7 @@ const navMenuList = computed(() => {
{ name: '装备管理', routerName: 'goodsManagement' }, { name: '装备管理', routerName: 'goodsManagement' },
{ name: '订单管理', routerName: 'orderManagementCz' }, { name: '订单管理', routerName: 'orderManagementCz' },
{ name: '接单管理', routerName: 'accept-orders' }, { name: '接单管理', routerName: 'accept-orders' },
{ name: '通知', routerName: 'enterpriseZone' }, { name: '通知公告', routerName: 'enterpriseZone' },
] ]
if (isType == 2) if (isType == 2)
return [ return [
@ -34,7 +34,7 @@ const navMenuList = computed(() => {
{ name: '租赁需求大厅', routerName: 'parity' }, { name: '租赁需求大厅', routerName: 'parity' },
{ name: '订单管理', routerName: 'orderManagement' }, { name: '订单管理', routerName: 'orderManagement' },
{ name: '需求管理', routerName: 'sourcingNeed' }, { name: '需求管理', routerName: 'sourcingNeed' },
{ name: '通知', routerName: 'enterpriseZone' }, { name: '通知公告', routerName: 'enterpriseZone' },
] ]
}) })

2
src/store/user.ts
View File

@ -134,7 +134,7 @@ export const useStore = defineStore('myUser', {
{ name: '租赁需求大厅', routerName: 'parity' }, { name: '租赁需求大厅', routerName: 'parity' },
{ name: '装备管理', routerName: '/home' }, { name: '装备管理', routerName: '/home' },
{ name: '订单管理', routerName: '/home' }, { name: '订单管理', routerName: '/home' },
{ name: '通知', routerName: 'enterpriseZone' }, { name: '通知公告', routerName: 'enterpriseZone' },
] ]
if (type == 1) { if (type == 1) {
this.leaseAndLesseeList = baseList this.leaseAndLesseeList = baseList

7
src/views/cart/components/date-picker-button.vue
View File

@ -10,7 +10,6 @@
v-model="selectedDate" v-model="selectedDate"
style="margin-top: -100px" style="margin-top: -100px"
:placeholder="placeholder" :placeholder="placeholder"
range-separator="To"
@change="handleDateChange" @change="handleDateChange"
:value-format="valueFormat" :value-format="valueFormat"
:disabled-date="disabledDate" :disabled-date="disabledDate"
@ -43,7 +42,7 @@ const props = defineProps({
}, },
pickerType: { pickerType: {
type: String, type: String,
default: 'datetimerange', default: 'daterange',
}, },
placeholder: { placeholder: {
type: String, type: String,
@ -51,11 +50,11 @@ const props = defineProps({
}, },
format: { format: {
type: String, type: String,
default: 'YYYY-MM-DD HH:mm:ss', default: 'YYYY-MM-DD',
}, },
valueFormat: { valueFormat: {
type: String, type: String,
default: 'YYYY-MM-DD HH:mm:ss', default: 'YYYY-MM-DD',
}, },
companyIndex: { companyIndex: {
type: Number, type: Number,

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

@ -563,8 +563,8 @@ const onCartSubmit = async () => {
itemsArray.push({ itemsArray.push({
maId: e.maId, maId: e.maId,
id: e.id, id: e.id,
rentBeginTime: e.rentBeginTime, rentBeginTime: e.rentBeginTime + ' ' + '00:00:00',
rentEndTime: e.rentEndTime, rentEndTime: e.rentEndTime + ' ' + '23:59:59',
manageType: e.manageType, manageType: e.manageType,
days: e.days, days: e.days,
num: e.num, num: e.num,
@ -702,8 +702,8 @@ const handleViewWord = async (index: any) => {
cardList.value[index].devInfoVoList.map((e: any) => { cardList.value[index].devInfoVoList.map((e: any) => {
if (e.isChecked) { if (e.isChecked) {
detailsList.push({ detailsList.push({
rentBeginTime: e.rentBeginTime, rentBeginTime: e.rentBeginTime + ' ' + '00:00:00',
rentEndTime: e.rentEndTime, rentEndTime: e.rentEndTime + ' ' + '23:59:59',
manageType: e.manageType, manageType: e.manageType,
days: e.days, days: e.days,
num: e.num, num: e.num,

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

@ -47,7 +47,7 @@ onMounted(() => {
> >
<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="createTime" label="消息发布时间" /> <el-table-column align="center" prop="createTime" label="消息发布时间" />
<el-table-column align="center" prop="noticeContent" label="消息标题"> <el-table-column align="center" prop="noticeContent" label="公告标题">
<template #default="{ row }"> <template #default="{ row }">
<div v-html="row.noticeTitle"></div> <div v-html="row.noticeTitle"></div>
</template> </template>

40
src/views/user/lessor/quality-manage/index.vue
View File

@ -125,7 +125,7 @@
装备质检记录 装备质检记录
</el-button> </el-button>
<el-popconfirm <!-- <el-popconfirm
width="220" width="220"
:icon="InfoFilled" :icon="InfoFilled"
icon-color="#626AEF" icon-color="#626AEF"
@ -148,7 +148,7 @@
确定 确定
</el-button> </el-button>
</template> </template>
</el-popconfirm> </el-popconfirm> -->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -380,7 +380,7 @@
> >
<el-table-column align="center" label="序号" type="index" width="80" /> <el-table-column align="center" label="序号" type="index" width="80" />
<el-table-column align="center" prop="qcCode" label="维修保养编码" /> <el-table-column align="center" prop="qcCode" label="维修保养编码" />
<el-table-column align="center" prop="qcName" label="维修保养名称" /> <!-- <el-table-column align="center" prop="qcName" label="维修保养名称" /> -->
<el-table-column align="center" prop="qcTime" label="维修保养日期" /> <el-table-column align="center" prop="qcTime" label="维修保养日期" />
<el-table-column align="center" prop="nickName" label="上传人" width="120" /> <el-table-column align="center" prop="nickName" label="上传人" width="120" />
<el-table-column align="center" prop="createTime" label="上传时间" /> <el-table-column align="center" prop="createTime" label="上传时间" />
@ -400,6 +400,34 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作" :width="80">
<template #default="{ row }">
<el-popconfirm
width="220"
:icon="InfoFilled"
icon-color="#626AEF"
title="确定删除该记录吗？"
@confirm="onDelete(row)"
>
<template #reference>
<el-button size="small" type="danger"> 删除 </el-button>
</template>
<template #actions="{ confirm }">
<el-button type="primary" class="primary-lease" size="small"
>取消</el-button
>
<el-button
size="small"
type="primary"
@click="confirm()"
class="primary-lease"
>
确定
</el-button>
</template>
</el-popconfirm>
</template>
</el-table-column>
</el-table> </el-table>
<PagingComponent <PagingComponent
@ -583,14 +611,16 @@ const onResetInDialog = () => {
getLeaseListDataInDialog() getLeaseListDataInDialog()
} }
// 删除 // 删除
const onDelete = async (id: any, maId: any) => { const onDelete = async (row: any) => {
const res: any = await qualityDeleteByIdApi({ maId }) console.log('🚀 ~ onDelete ~ row:', row)
const res: any = await qualityDeleteByIdApi({ fileId: row.fileId })
if (res.code === 200) { if (res.code === 200) {
ElMessage({ ElMessage({
type: 'success', type: 'success',
message: '删除成功', message: '删除成功',
}) })
getLeaseListData() getLeaseListData()
getLeaseListDataInDialog()
} }
} }

90
src/views/user/lessor/repair-manage/index.vue
View File

@ -72,7 +72,7 @@
<el-form-item> <el-form-item>
<el-button @click="onSearch" type="primary" class="primary-lease">查询</el-button> <el-button @click="onSearch" type="primary" class="primary-lease">查询</el-button>
<el-button @click="onReset" type="primary" class="primary-lease">重置</el-button> <el-button @click="onReset" type="primary" class="primary-lease">重置</el-button>
<el-button <!-- <el-button
@click=" @click="
() => { () => {
isRepublish = true isRepublish = true
@ -84,7 +84,7 @@
class="primary-lease" class="primary-lease"
> >
新建 新建
</el-button> </el-button> -->
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -104,8 +104,16 @@
<el-table-column align="center" prop="rmTime" label="最新维修保养日期" /> <el-table-column align="center" prop="rmTime" label="最新维修保养日期" />
<el-table-column align="center" prop="num" label="维修保养次数" /> <el-table-column align="center" prop="num" label="维修保养次数" />
<el-table-column align="center" prop="createTime" label="更新时间" /> <el-table-column align="center" prop="createTime" label="更新时间" />
<el-table-column align="center" label="操作" :width="220"> <el-table-column align="center" label="操作" :width="250">
<template #default="{ row }"> <template #default="{ row }">
<el-button
@click="handleAdd(row)"
type="primary"
size="small"
class="primary-lease"
>
新建
</el-button>
<el-button <el-button
size="small" size="small"
type="primary" type="primary"
@ -115,7 +123,7 @@
维修保养记录 维修保养记录
</el-button> </el-button>
<el-popconfirm <!-- <el-popconfirm
width="220" width="220"
:icon="InfoFilled" :icon="InfoFilled"
icon-color="#626AEF" icon-color="#626AEF"
@ -138,7 +146,7 @@
确定 确定
</el-button> </el-button>
</template> </template>
</el-popconfirm> </el-popconfirm> -->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -169,7 +177,7 @@
:model="addOrEditForm" :model="addOrEditForm"
:rules="addOrEditFormRules" :rules="addOrEditFormRules"
> >
<el-row :gutter="20"> <!-- <el-row :gutter="20">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="关联装备" style="width: 100%" prop="maId"> <el-form-item label="关联装备" style="width: 100%" prop="maId">
<el-select <el-select
@ -182,14 +190,14 @@
<el-option <el-option
:key="item.maId" :key="item.maId"
:value="item.maId * 1" :value="item.maId * 1"
:label="item.deviceName+' '+ '->' + ' '+item.code" :label="item.deviceName + ' ' + '->' + ' ' + item.code"
v-for="item in associationList" v-for="item in associationList"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row> -->
<el-row :gutter="20"> <!-- <el-row :gutter="20">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="维修保养名称" prop="rmName"> <el-form-item label="维修保养名称" prop="rmName">
<el-input <el-input
@ -198,7 +206,7 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row> -->
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24"> <el-col :span="24">
@ -347,7 +355,7 @@
> >
<el-table-column align="center" label="序号" type="index" width="80" /> <el-table-column align="center" label="序号" type="index" width="80" />
<el-table-column align="center" prop="rmCode" label="维修保养编码" /> <el-table-column align="center" prop="rmCode" label="维修保养编码" />
<el-table-column align="center" prop="rmName" label="维修保养名称" /> <!-- <el-table-column align="center" prop="rmName" label="维修保养名称" /> -->
<el-table-column align="center" prop="rmTime" label="维修保养日期" /> <el-table-column align="center" prop="rmTime" label="维修保养日期" />
<el-table-column align="center" prop="nickName" label="上传人" width="120" /> <el-table-column align="center" prop="nickName" label="上传人" width="120" />
<el-table-column align="center" prop="createTime" label="上传时间" /> <el-table-column align="center" prop="createTime" label="上传时间" />
@ -367,6 +375,34 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作" :width="80">
<template #default="{ row }">
<el-popconfirm
width="220"
:icon="InfoFilled"
icon-color="#626AEF"
title="确定删除该记录吗？"
@confirm="onDelete(row)"
>
<template #reference>
<el-button size="small" type="danger"> 删除 </el-button>
</template>
<template #actions="{ confirm }">
<el-button type="primary" class="primary-lease" size="small"
>取消</el-button
>
<el-button
size="small"
type="primary"
@click="confirm()"
class="primary-lease"
>
确定
</el-button>
</template>
</el-popconfirm>
</template>
</el-table-column>
</el-table> </el-table>
<PagingComponent <PagingComponent
@ -444,6 +480,20 @@ const addOrEditForm = ref<any>({
fileInfoTempList: [], fileInfoTempList: [],
}) })
const handleAdd = (row: any) => {
console.log('🚀 ~ handleAdd ~ row:', row)
addOrEditForm.value = {
maId: row.maId,
rmUser: '',
rmTime: '',
rmName: row.rmName,
fileInfoList: [],
fileInfoTempList: [],
}
dialogTitle.value = '新建维修保养'
addOrEditDialogVisible.value = true
}
const checkMinNum = (rule: any, value: any, callback: any) => { const checkMinNum = (rule: any, value: any, callback: any) => {
const maxNum = parseInt(searchParams.maxNum) const maxNum = parseInt(searchParams.maxNum)
@ -462,8 +512,8 @@ const checkMaxNum = (rule: any, value: any, callback: any) => {
} }
const addOrEditFormRules = reactive({ const addOrEditFormRules = reactive({
maId: [{ required: true, message: '请选择关联装备', trigger: 'change' }], // maId: [{ required: true, message: '请选择关联装备', trigger: 'change' }],
rmName: [{ required: true, message: '请输入维修保养名称', trigger: 'blur' }], // rmName: [{ required: true, message: '请输入维修保养名称', trigger: 'blur' }],
rmTime: [{ required: true, message: '请选择维修保养日期', trigger: 'change' }], rmTime: [{ required: true, message: '请选择维修保养日期', trigger: 'change' }],
fileInfoList: [{ required: true, message: '请上传维修保养附件', trigger: 'blur' }], fileInfoList: [{ required: true, message: '请上传维修保养附件', trigger: 'blur' }],
}) })
@ -548,20 +598,24 @@ const onResetInDialog = () => {
getLeaseListDataInDialog() getLeaseListDataInDialog()
} }
// 删除 // 删除
const onDelete = async (maId: any) => { const onDelete = async (row: any) => {
const res: any = await deleteRepairByIddApi({ maId }) console.log('🚀 ~ onDelete ~ row:', row)
const res: any = await deleteRepairByIddApi({ fileId: row.fileId })
if (res.code === 200) { if (res.code === 200) {
ElMessage({ ElMessage({
type: 'success', type: 'success',
message: '删除成功', message: '删除成功',
}) })
getLeaseListData() getLeaseListData()
getLeaseListDataInDialog()
} }
} }
// 提交 // 提交
const onSubmit = () => { const onSubmit = () => {
addOrEditForm.value.fileInfoList = addOrEditForm.value.fileInfoTempList addOrEditForm.value.fileInfoList = addOrEditForm.value.fileInfoTempList
console.log('🚀 ~ onSubmit ~ addOrEditForm.value:', addOrEditForm.value)
addOrEditFormRef.value.validate(async (valid: any) => { addOrEditFormRef.value.validate(async (valid: any) => {
if (valid) { if (valid) {
const res: any = await addRepairDataApi(addOrEditForm.value) const res: any = await addRepairDataApi(addOrEditForm.value)
@ -570,8 +624,10 @@ const onSubmit = () => {
type: 'success', type: 'success',
message: '提交成功', message: '提交成功',
}) })
addOrEditDialogVisible.value = false setTimeout(() => {
getLeaseListData() addOrEditDialogVisible.value = false
getLeaseListData()
}, 200)
} }
} }
}) })

28
src/views/user/lessor/security-certificate/index.vue
View File

@ -41,7 +41,7 @@
<el-button @click="onReset" type="primary" class="primary-lease" <el-button @click="onReset" type="primary" class="primary-lease"
>重置</el-button >重置</el-button
> >
<el-button <!-- <el-button
@click=" @click="
() => { () => {
dialogTitle = '证书新增' dialogTitle = '证书新增'
@ -52,7 +52,7 @@
class="primary-lease" class="primary-lease"
> >
新建 新建
</el-button> </el-button> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -73,11 +73,13 @@
<el-table-column align="center" prop="qcTime" label="证书附件"> <el-table-column align="center" prop="qcTime" label="证书附件">
<template #default="{ row }"> <template #default="{ row }">
<a <a
:href="row.url" v-if="row.fileInfoList && row.fileInfoList.length > 0"
:href="row.fileInfoList[0].fileUrl"
target="_blank" target="_blank"
style="color: #00a288; text-decoration: underline" style="color: #00a288; text-decoration: underline; cursor: pointer"
>查看</a >查看</a
> >
<span v-else>-</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" prop="nickName" label="上传人" width="120" /> <el-table-column align="center" prop="nickName" label="上传人" width="120" />
@ -91,7 +93,7 @@
class="primary-lease" class="primary-lease"
@click="onViewQualityRecord(row)" @click="onViewQualityRecord(row)"
> >
编辑 {{ row.fileInfoList && row.fileInfoList.length > 0 ? '编辑' : '上传' }}
</el-button> </el-button>
<el-popconfirm <el-popconfirm
@ -155,13 +157,13 @@
placeholder="请选择关联装备" placeholder="请选择关联装备"
v-model="addOrEditForm.maId" v-model="addOrEditForm.maId"
@change="onMaIdChange" @change="onMaIdChange"
:disabled="dialogTitle != '证书新增'" disabled
filterable filterable
> >
<el-option <el-option
:key="item.maId" :key="item.maId"
:value="item.maId * 1" :value="item.maId * 1"
:label="item.deviceName+' '+ '->' + ' '+item.code" :label="item.deviceName + ' ' + '->' + ' ' + item.code"
v-for="item in associationList" v-for="item in associationList"
/> />
</el-select> </el-select>
@ -191,7 +193,7 @@
listType="text" listType="text"
:justifyContent="`flex-start`" :justifyContent="`flex-start`"
@onFileChange="onFileChange" @onFileChange="onFileChange"
:acceptTypeList="['.jpg', '.png', '.pdf', '.doc']" :acceptTypeList="['.jpg', '.png']"
> >
<template v-slot:default> <template v-slot:default>
<!-- <el-icon size="48" color="#aaa"><Plus /></el-icon> --> <!-- <el-icon size="48" color="#aaa"><Plus /></el-icon> -->
@ -327,13 +329,17 @@ const onSubmit = () => {
if (valid) { if (valid) {
const SEN_API = dialogTitle.value === '证书修改' ? editSafeBookApi : addSafeBookApi const SEN_API = dialogTitle.value === '证书修改' ? editSafeBookApi : addSafeBookApi
const res: any = await SEN_API(addOrEditForm.value) const res: any = await SEN_API(addOrEditForm.value)
console.log('🚀 ~ addOrEditFormRef.value.validate ~ res:', res)
if (res.code === 200) { if (res.code === 200) {
ElMessage({ ElMessage({
type: 'success', type: 'success',
message: '提交成功', message: '提交成功',
duration: 1000,
}) })
addOrEditDialogVisible.value = false setTimeout(() => {
getLeaseListData() addOrEditDialogVisible.value = false
getLeaseListData()
}, 200)
} }
} }
}) })
@ -342,7 +348,7 @@ const onSubmit = () => {
// 编辑 // 编辑
const onViewQualityRecord = (row: any) => { const onViewQualityRecord = (row: any) => {
addOrEditForm.value.maId = row.maId addOrEditForm.value.maId = row.maId
dialogTitle.value = '证书修改' dialogTitle.value = row.fileInfoList && row.fileInfoList.length > 0 ? '证书修改' : '证书新增'
addOrEditDialogVisible.value = true addOrEditDialogVisible.value = true
} }