liangbin
/
JSDW
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修复日期格式和路由跳转问题 

统一将日期格式从'yyyy-MM-dd'改为'YYYY-MM-DD'
修改登录后默认跳转至企业管理系统
修复账号管理页面跳转参数错误
移除首页路由配置
优化出入证签发时间处理和显示
This commit is contained in:
liangbin 2026-02-03 09:48:09 +08:00
parent 4db148f33a
commit c0917ad406
11 changed files with 49 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/router/index.js
View File

@ -57,19 +57,19 @@ export const constantRoutes = [
component: () => import("@/views/error/401"),
hidden: true,
},
{
path: "",
component: Layout,
redirect: "/index",
children: [
{
path: "/index",
component: () => import("@/views/index"),
name: "Index",
meta: { title: "首页", icon: "dashboard", affix: true },
},
],
},
// {
// path: "",
// component: Layout,
// redirect: "/index",
// children: [
// {
// path: "/index",
// component: () => import("@/views/index"),
// name: "Index",
// meta: { title: "首页", icon: "dashboard", affix: true },
// },
// ],
// },
// 物业模块START
{

2
src/views/Logistics/FilingReview/index.vue
View File

@ -14,7 +14,7 @@
</el-select>
</el-form-item> -->
<el-form-item label="提交时间">
<el-date-picker v-model="queryForm.dateRange" type="daterange" value-format="yyyy-MM-dd"
<el-date-picker v-model="queryForm.dateRange" type="daterange" value-format="YYYY-MM-DD"
range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item>

2
src/views/Logistics/ProjectOverviewQuery/index.vue
View File

@ -54,7 +54,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="作业时间">
<el-date-picker v-model="queryForm.dateRange" type="daterange" value-format="yyyy-MM-dd"
<el-date-picker v-model="queryForm.dateRange" type="daterange" value-format="YYYY-MM-DD"
range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item>
</el-col>

10
src/views/Proprietor/EntryExitPermitIssue/DialogBox.vue
View File

@ -47,7 +47,7 @@
<el-form label-width="120px" label-position="top" :model="formData">
<el-form-item label="出入证有效期">
<div style="width: 200px;">
<el-date-picker v-model="formData.dateRange" type="daterange" value-format="yyyy-MM-dd"
<el-date-picker v-model="formData.dateRange" type="daterange" value-format="YYYY-MM-DD"
range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
</div>
@ -96,6 +96,7 @@
</template>
<script setup>
import dayjs from 'dayjs'
import { ref, onMounted } from 'vue'
import { Delete } from '@element-plus/icons-vue'
import { ElMessage } from 'element-plus'
@ -167,6 +168,13 @@ const handleSubmit = async () => {
...detailData.value,
vehicleList: vehicleList.value
}
if (!formData.value.dateRange || formData.value.dateRange.length !== 2) {
ElMessage.error('请选择作业时间')
return
} else {
pamams.validityStartTime = dayjs(formData.value.dateRange[0]).format('YYYY-MM-DD 08:00:00')
pamams.validityEndTime = dayjs(formData.value.dateRange[1]).format('YYYY-MM-DD 18:00:00')
}
let res = await SignPassageway(pamams)
if (res.code === 200) {
ElMessage.success('签发成功')

18
src/views/Proprietor/EntryExitPermitIssue/index.vue
View File

@ -42,11 +42,15 @@
<el-button type="info" size="default">打印</el-button>
</div>
</div>
<el-table :data="tableData" :loading="loading">
<el-table :data="tableData" :loading="loading" height="480px">
<el-table-column prop="projectName" label="项目名称"></el-table-column>
<el-table-column prop="permitNumber" label="票证编号"></el-table-column>
<el-table-column prop="projectName" label="施工单位"></el-table-column>
<el-table-column prop="validityStartTime;" label="作业时间"></el-table-column>
<el-table-column prop="constructionUnitName" label="施工单位"></el-table-column>
<el-table-column prop="validityStartTime;" label="作业时间">
<template #default="scope">
{{ formatTime(scope.row.validityStartTime) }} 至 {{ formatTime(scope.row.validityEndTime) }}
</template>
</el-table-column>
<el-table-column prop="sysUserListLength" label="成员数量">
<template #default="scope">
{{ scope.row.sysUserList?.length }}
@ -131,6 +135,14 @@ onMounted(() => {
getList();
});
// 格式化时间
const formatTime = (time) => {
if (!time) {
return '';
}
return dayjs(time).format('YYYY-MM-DD');
}
// 获取出入证状态类型
const getStatusType = (status) => {
if (status === null || status === undefined) {

2
src/views/Proprietor/TicketIssueAudit/index.vue
View File

@ -14,7 +14,7 @@
<el-input v-model="queryForm.keyword" placeholder="请输入项目名称/编号"></el-input>
</el-form-item>
<el-form-item label="提交时间">
<el-date-picker v-model="queryForm.dateRange" type="daterange" value-format="yyyy-MM-dd"
<el-date-picker v-model="queryForm.dateRange" type="daterange" value-format="YYYY-MM-DD"
range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item>
<el-form-item label="签发人">

4
src/views/Tenement/BallheadCamera/InventoryAudit.vue
View File

@ -3,7 +3,7 @@
<div class="MainBox">
<el-form :model="queryForm" inline class="card-box mb-4">
<el-form-item label="时间范围">
<el-date-picker v-model="queryForm.dateRange" type="daterange" value-format="yyyy-MM-dd"
<el-date-picker v-model="queryForm.dateRange" type="daterange" value-format="YYYY-MM-DD"
range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item>
<el-form-item label="所属项目">
@ -29,7 +29,7 @@
<el-table-column prop="projectName" label="所属项目"></el-table-column>
<el-table-column prop="remark" label="回收核验结果"></el-table-column>
<el-table-column prop="returnBy" label="回收人"></el-table-column>
<el-table-column prop="returnTime" label="提交入库时间" format="yyyy-MM-dd HH:mm:ss">
<el-table-column prop="returnTime" label="提交入库时间" format="YYYY-MM-DD HH:mm:ss">
<template #default="scope">
{{ formatDate(scope.row.returnTime) }}
</template>

2
src/views/Tenement/BallheadCamera/StandingBook.vue
View File

@ -50,7 +50,7 @@
<el-form :model="queryForm" inline class="card-box mb-4">
<el-form-item label="采购时间">
<el-date-picker v-model="queryForm.dateRange" type="daterange" value-format="yyyy-MM-dd"
<el-date-picker v-model="queryForm.dateRange" type="daterange" value-format="YYYY-MM-DD"
range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item label="设备状态">

4
src/views/Tenement/EnterpriseManagement/AccountManagement.vue
View File

@ -14,7 +14,7 @@
<el-form :model="queryForm" inline class="card-box mb-4">
<el-form-item label="时间范围">
<el-date-picker v-model="queryForm.dateRange" type="daterange" value-format="yyyy-MM-dd"
<el-date-picker v-model="queryForm.dateRange" type="daterange" value-format="YYYY-MM-DD"
range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item label="状态">
@ -47,7 +47,7 @@
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="userName" label="账号名"></el-table-column>
<el-table-column prop="nickName" label="姓名"></el-table-column>
<el-table-column prop="roleName" label="角色"></el-table-column>
<el-table-column prop="roleNames" label="角色"></el-table-column>
<el-table-column prop="phonenumber" label="手机号"></el-table-column>
<el-table-column prop="status" label="状态">
<template #default="scope">

5
src/views/Tenement/EnterpriseManagement/index.vue
View File

@ -44,7 +44,7 @@
{{ getUnitTypeName(scope.row.deptType) }}
</template>
</el-table-column>
<el-table-column prop="areaName" label="所属区域"></el-table-column>
<el-table-column prop="address" label="所属区域"></el-table-column>
<el-table-column prop="createTime" label="建档时间"></el-table-column>
<el-table-column prop="status" label="状态">
<template #default="scope">
@ -175,14 +175,13 @@ const handlePageChange = (val) => {
// 跳转到新增单位建档
const handleAddEnterprise = () => {
console.log("新增单位建档", router);
router.push(`/Tenement/newEnterprise?enterpriseType=${activeTab.value}`);
};
// 跳转到账号管理
const handleAccountManagement = (row) => {
console.log("账号管理", row);
router.push(`/Tenement/accountManagement?enterpriseName=${row.unitName || row.name}&unitId=${row.unitId || row.id}&deptId=${row.deptId}`);
router.push(`/Tenement/accountManagement?enterpriseName=${row.deptName}&unitId=${row.unitId || row.id}&deptId=${row.deptId}`);
};
// 跳转到编辑单位建档

3
src/views/login.vue
View File

@ -128,7 +128,8 @@ function handleLogin() {
}
return acc
}, {})
router.push({ path: redirect.value || "/", query: otherQueryParams })
console.log("登录成功-跳转页面",redirect.value)
router.push({ path: "/Tenement/enterpriseManagement", query: otherQueryParams })
}).catch(() => {
loading.value = false
// 重新获取验证码