diff --git a/src/components/Navmenu/index.vue b/src/components/Navmenu/index.vue index 48bdeda..1989e23 100644 --- a/src/components/Navmenu/index.vue +++ b/src/components/Navmenu/index.vue @@ -10,7 +10,7 @@ const route = useRoute() // // { name: '装备管理', routerName: '/home' }, // { name: '订单管理', routerName: '/home' }, // // { name: '基础管理', routerName: '/home' }, -// { name: '通知', routerName: 'enterpriseZone' }, +// { name: '通知公告', routerName: 'enterpriseZone' }, // // { name: '综合查询', routerName: 'enterpriseZone' }, // ] @@ -25,7 +25,7 @@ const navMenuList = computed(() => { { name: '装备管理', routerName: 'goodsManagement' }, { name: '订单管理', routerName: 'orderManagementCz' }, { name: '接单管理', routerName: 'accept-orders' }, - { name: '通知', routerName: 'enterpriseZone' }, + { name: '通知公告', routerName: 'enterpriseZone' }, ] if (isType == 2) return [ @@ -34,7 +34,7 @@ const navMenuList = computed(() => { { name: '租赁需求大厅', routerName: 'parity' }, { name: '订单管理', routerName: 'orderManagement' }, { name: '需求管理', routerName: 'sourcingNeed' }, - { name: '通知', routerName: 'enterpriseZone' }, + { name: '通知公告', routerName: 'enterpriseZone' }, ] }) diff --git a/src/store/user.ts b/src/store/user.ts index f879bb1..f151eab 100644 --- a/src/store/user.ts +++ b/src/store/user.ts @@ -134,7 +134,7 @@ export const useStore = defineStore('myUser', { { name: '租赁需求大厅', routerName: 'parity' }, { name: '装备管理', routerName: '/home' }, { name: '订单管理', routerName: '/home' }, - { name: '通知', routerName: 'enterpriseZone' }, + { name: '通知公告', routerName: 'enterpriseZone' }, ] if (type == 1) { this.leaseAndLesseeList = baseList diff --git a/src/views/cart/components/date-picker-button.vue b/src/views/cart/components/date-picker-button.vue index 1c86d12..afe0ce1 100644 --- a/src/views/cart/components/date-picker-button.vue +++ b/src/views/cart/components/date-picker-button.vue @@ -10,7 +10,6 @@ v-model="selectedDate" style="margin-top: -100px" :placeholder="placeholder" - range-separator="To" @change="handleDateChange" :value-format="valueFormat" :disabled-date="disabledDate" @@ -43,7 +42,7 @@ const props = defineProps({ }, pickerType: { type: String, - default: 'datetimerange', + default: 'daterange', }, placeholder: { type: String, @@ -51,11 +50,11 @@ const props = defineProps({ }, format: { type: String, - default: 'YYYY-MM-DD HH:mm:ss', + default: 'YYYY-MM-DD', }, valueFormat: { type: String, - default: 'YYYY-MM-DD HH:mm:ss', + default: 'YYYY-MM-DD', }, companyIndex: { type: Number, diff --git a/src/views/cart/index.vue b/src/views/cart/index.vue index d958c66..d3d3ebb 100644 --- a/src/views/cart/index.vue +++ b/src/views/cart/index.vue @@ -563,8 +563,8 @@ const onCartSubmit = async () => { itemsArray.push({ maId: e.maId, id: e.id, - rentBeginTime: e.rentBeginTime, - rentEndTime: e.rentEndTime, + rentBeginTime: e.rentBeginTime + ' ' + '00:00:00', + rentEndTime: e.rentEndTime + ' ' + '23:59:59', manageType: e.manageType, days: e.days, num: e.num, @@ -702,8 +702,8 @@ const handleViewWord = async (index: any) => { cardList.value[index].devInfoVoList.map((e: any) => { if (e.isChecked) { detailsList.push({ - rentBeginTime: e.rentBeginTime, - rentEndTime: e.rentEndTime, + rentBeginTime: e.rentBeginTime + ' ' + '00:00:00', + rentEndTime: e.rentEndTime + ' ' + '23:59:59', manageType: e.manageType, days: e.days, num: e.num, diff --git a/src/views/enterpriseZone/index.vue b/src/views/enterpriseZone/index.vue index dc01398..f30821b 100644 --- a/src/views/enterpriseZone/index.vue +++ b/src/views/enterpriseZone/index.vue @@ -47,7 +47,7 @@ onMounted(() => { > - + diff --git a/src/views/user/lessor/quality-manage/index.vue b/src/views/user/lessor/quality-manage/index.vue index ea28947..d9857a4 100644 --- a/src/views/user/lessor/quality-manage/index.vue +++ b/src/views/user/lessor/quality-manage/index.vue @@ -125,7 +125,7 @@ 装备质检记录 - - + --> @@ -380,7 +380,7 @@ > - + @@ -400,6 +400,34 @@ /> + + + { getLeaseListDataInDialog() } // 删除 -const onDelete = async (id: any, maId: any) => { - const res: any = await qualityDeleteByIdApi({ maId }) +const onDelete = async (row: any) => { + console.log('🚀 ~ onDelete ~ row:', row) + const res: any = await qualityDeleteByIdApi({ fileId: row.fileId }) if (res.code === 200) { ElMessage({ type: 'success', message: '删除成功', }) getLeaseListData() + getLeaseListDataInDialog() } } diff --git a/src/views/user/lessor/repair-manage/index.vue b/src/views/user/lessor/repair-manage/index.vue index 2e3d3bb..091e6d6 100644 --- a/src/views/user/lessor/repair-manage/index.vue +++ b/src/views/user/lessor/repair-manage/index.vue @@ -72,7 +72,7 @@ 查询 重置 - 新建 - + --> @@ -104,8 +104,16 @@ - + - + --> @@ -169,7 +177,7 @@ :model="addOrEditForm" :rules="addOrEditFormRules" > - + + @@ -347,7 +355,7 @@ > - + @@ -367,6 +375,34 @@ /> + + + ({ 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 maxNum = parseInt(searchParams.maxNum) @@ -462,8 +512,8 @@ const checkMaxNum = (rule: any, value: any, callback: any) => { } const addOrEditFormRules = reactive({ - maId: [{ required: true, message: '请选择关联装备', trigger: 'change' }], - rmName: [{ required: true, message: '请输入维修保养名称', trigger: 'blur' }], + // maId: [{ required: true, message: '请选择关联装备', trigger: 'change' }], + // rmName: [{ required: true, message: '请输入维修保养名称', trigger: 'blur' }], rmTime: [{ required: true, message: '请选择维修保养日期', trigger: 'change' }], fileInfoList: [{ required: true, message: '请上传维修保养附件', trigger: 'blur' }], }) @@ -548,20 +598,24 @@ const onResetInDialog = () => { getLeaseListDataInDialog() } // 删除 -const onDelete = async (maId: any) => { - const res: any = await deleteRepairByIddApi({ maId }) +const onDelete = async (row: any) => { + console.log('🚀 ~ onDelete ~ row:', row) + const res: any = await deleteRepairByIddApi({ fileId: row.fileId }) if (res.code === 200) { ElMessage({ type: 'success', message: '删除成功', }) getLeaseListData() + getLeaseListDataInDialog() } } // 提交 const onSubmit = () => { addOrEditForm.value.fileInfoList = addOrEditForm.value.fileInfoTempList + console.log('🚀 ~ onSubmit ~ addOrEditForm.value:', addOrEditForm.value) + addOrEditFormRef.value.validate(async (valid: any) => { if (valid) { const res: any = await addRepairDataApi(addOrEditForm.value) @@ -570,8 +624,10 @@ const onSubmit = () => { type: 'success', message: '提交成功', }) - addOrEditDialogVisible.value = false - getLeaseListData() + setTimeout(() => { + addOrEditDialogVisible.value = false + getLeaseListData() + }, 200) } } }) diff --git a/src/views/user/lessor/security-certificate/index.vue b/src/views/user/lessor/security-certificate/index.vue index 31cc1db..64b1771 100644 --- a/src/views/user/lessor/security-certificate/index.vue +++ b/src/views/user/lessor/security-certificate/index.vue @@ -41,7 +41,7 @@ 重置 - 新建 - + --> @@ -73,11 +73,13 @@ @@ -91,7 +93,7 @@ class="primary-lease" @click="onViewQualityRecord(row)" > - 编辑 + {{ row.fileInfoList && row.fileInfoList.length > 0 ? '编辑' : '上传' }} @@ -191,7 +193,7 @@ listType="text" :justifyContent="`flex-start`" @onFileChange="onFileChange" - :acceptTypeList="['.jpg', '.png', '.pdf', '.doc']" + :acceptTypeList="['.jpg', '.png']" >