时间->日期

src/api/system/depart.js

@@ -4,7 +4,7 @@ import request from "@/utils/request"
 export function getMainList(params) {
     return request({
         url: "/qdport-system/sys/dept/tree",
-        method: "GET",
+        method: "get",
         params
     })
 }

src/api/system/user.js

@@ -1,13 +1,5 @@
 import request from "@/utils/request"
 
-// 获取部门树
-export function getDeptTree() {
-    return request({
-        url: "/qdport-system/sys/dept/tree",
-        method: "GET",
-
-    })
-}
 //用户列表
 export function getUserList(params) {
     return request({
@@ -17,17 +9,7 @@ export function getUserList(params) {
     })
 }
 
-
-//角色表
-export function getRoleList(params) {
-    return request({
-        url: "/qdport-system/sys/role/list",
-        method: "GET",
-        params
-    })
-}
 //用户拥有的角色
-
 export function byUserIdfnRole(userId) {
     return request({
         url: `/qdport-system/sys/user/${userId}/role/list`,

src/config/config.js

@@ -28,11 +28,11 @@ const configSource = {
     // 服务端接口路径
     serverUrl: ENV.VITE_BASE_SERVER_URL,
     //国际化默认语言
-    globalI18n: 'zh-cn',
+    globalI18n: "zh-cn",
     // 客户端id
-    clientId: 'pcManageId',
+    clientId: "pcManageId",
     // 客户端密钥
-    clientSecret: 'pcManageSecret',
+    clientSecret: "pcManageSecret",
 }
 
 /**
@@ -61,12 +61,12 @@ const setConfig = cfg => {
  * @return {*} 新的全局配置项
  */
 const getConfig = key => {
-    if (typeof key === 'string') {
-        const arr = key.split('.')
+    if (typeof key === "string") {
+        const arr = key.split(".")
         if (arr && arr.length) {
             let data = config
             arr.forEach(v => {
-                if (data && typeof data[v] !== 'undefined') {
+                if (data && typeof data[v] !== "undefined") {
                     data = data[v]
                 } else {
                     data = null
@@ -80,7 +80,7 @@ const getConfig = key => {
         if (key && key.length > 1) {
             let res = {}
             key.forEach(v => {
-                if (data && typeof data[v] !== 'undefined') {
+                if (data && typeof data[v] !== "undefined") {
                     res[v] = data[v]
                 } else {
                     res[v] = null

src/directive/index.js

@@ -1,5 +1,5 @@
+import hasPermi from "./permission/hasPermi"
 
-import hasPermi from './permission/hasPermi'
 export default function directive(app) {
-    app.directive('hasPermi', hasPermi)
+    app.directive("hasPermi", hasPermi)
 }

src/i18n/index.js

@@ -1,9 +1,9 @@
-import { createI18n } from 'vue-i18n'
+import { createI18n } from "vue-i18n"
 import { getConfig } from "@/config/config"
-import zhCnLocale from 'element-plus/dist/locale/zh-cn.mjs'
-import enLocale from 'element-plus/dist/locale/en.mjs'
-import nextZhCn from './lang/zh-cn'
-import nextEn from './lang/en'
+import zhCnLocale from "element-plus/dist/locale/zh-cn.mjs"
+import enLocale from "element-plus/dist/locale/en.mjs"
+import nextZhCn from "./lang/zh-cn"
+import nextEn from "./lang/en"
 const messages = {
     "zh-cn": {
         ...zhCnLocale,
@@ -18,7 +18,7 @@ const messages = {
 const i18n = createI18n({
     legacy: false,
     globalInjection: true,
-    locale: getConfig('globalI18n'),
+    locale: getConfig("globalI18n"),
     fallbackLocale: "zh-cn",
     messages,
 })

src/i18n/lang/en.js

@@ -1,6 +1,6 @@
 export default {
     test: {
-        home: 'home',
-        docsLink: 'System Docs ',
+        home: "home",
+        docsLink: "System Docs ",
     },
 }

src/i18n/lang/zh-cn.js

@@ -1,6 +1,6 @@
 export default {
     test: {
-        home: '首页',
-        docsLink: '系统指南',
+        home: "首页",
+        docsLink: "系统指南",
     },
 }

src/store/permission.js

@@ -41,19 +41,20 @@ export const usePermissionStore = defineStore(
 )
 
 function filterAsyncRouter(asyncRouterMap, httpSave = true) {
-    const blackList = ["/publicDomain", "/caseShare"
+    const blackList = ["/system/dataList", "/progress"]
+    const hideList = ["/publicDomain", "/caseShare"
         // "/workflow"
     ]
 
     let arr = []
     asyncRouterMap.filter(route => {
-        if (route.path != "/system/dataList") {
+        if (!blackList.includes(route.path)) {
             if (route.children != null && route.children && route.children.length && route.children[0].type != 2 && route.parentId == "1762659463383281665") {
                 let info = {
                     alwaysShow: true,
                     children: [],
                     component: Layout,
-                    hidden: blackList.includes(route.path),
+                    hidden: hideList.includes(route.path),
                     meta: {
                         icon: route.icon,
                         link: "",
@@ -74,7 +75,7 @@ function filterAsyncRouter(asyncRouterMap, httpSave = true) {
                     alwaysShow: true,
                     children: [],
                     component: ParentView,
-                    hidden: blackList.includes(route.path),
+                    hidden: hideList.includes(route.path),
                     meta: {
                         icon: route.icon,
                         link: "",
@@ -96,7 +97,7 @@ function filterAsyncRouter(asyncRouterMap, httpSave = true) {
                     component: Layout,
                     redirect: route.path,
                     alwaysShow: false,
-                    hidden: blackList.includes(route.path),
+                    hidden: hideList.includes(route.path),
                     meta: {
                         icon: route.icon,
                         title: route.name
@@ -106,7 +107,7 @@ function filterAsyncRouter(asyncRouterMap, httpSave = true) {
                             // alwaysShow: false, //菜单不支持设置
                             children: [],
                             component: loadView(route.path),
-                            hidden: blackList.includes(route.path),
+                            hidden: hideList.includes(route.path),
                             meta: {
                                 icon: route.icon,
                                 link: "",
@@ -137,7 +138,7 @@ function filterAsyncRouter(asyncRouterMap, httpSave = true) {
                     // alwaysShow: false, //菜单不支持设置
                     children: [],
                     component: loadView(route.path),
-                    hidden: blackList.includes(route.path),
+                    hidden: hideList.includes(route.path),
                     meta: {
                         icon: route.icon,
                         link: "",

src/views/caseShare/dialog.vue

@@ -28,8 +28,8 @@
                     </el-form-item>
                 </el-col>
                 <el-col v-if="form.id" :span="12">
-                    <el-form-item label="填报时间">
-                        <el-date-picker v-model="form.createTime" readonly format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
+                    <el-form-item label="填报日期">
+                        <el-date-picker v-model="form.createTime" readonly format="YYYY-MM-DD"></el-date-picker>
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">

src/views/caseShare/index.vue

@@ -141,6 +141,7 @@ export default {
     methods: {
         columnFormat(row, props) {
             if (props.includes(".")) return row[props.split(".")[0]][props.split(".")[1]];
+            if (props == "createTime") return row[props].split(" ")[0];
             if (props == "status") return statusDic[row[props]] || "";
             return row[props];
         },

src/views/caseShare/main.js

@@ -11,7 +11,7 @@ export const columns = [
     { label: "填报部门", props: "policyStrive.deptName" },
     { label: "填报单位", props: "policyStrive.companyName" },
     { label: "联系方式", props: "policyStrive.contactPhone" },
-    { label: "填报时间", props: "createTime" }
+    { label: "填报日期", props: "createTime", width: "120" }
 ]
 
 export const statusDic = {

src/views/manage/policyShare/dialog.vue

@@ -23,8 +23,8 @@
                     </el-form-item>
                 </el-col>
                 <el-col v-if="form.id" :span="12">
-                    <el-form-item label="填报时间">
-                        <el-date-picker v-model="form.createTime" readonly format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
+                    <el-form-item label="填报日期">
+                        <el-date-picker v-model="form.createTime" readonly format="YYYY-MM-DD"></el-date-picker>
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">

src/views/manage/policyShare/index.vue

@@ -128,6 +128,7 @@ export default {
 
     methods: {
         columnFormat(row, props) {
+            if (props == "createTime") return row[props].split(" ")[0];
             if (props == "isInWh") return whetherDic[row[props]] || "";
             if (props == "inWhType") return row.isInWh == 1 && row[props] || "";
             return row[props];

src/views/manage/policyShare/main.js

@@ -7,7 +7,7 @@ export const columns = [
     { label: "发布人", props: "createName" },
     { label: "发布单位", props: "companyName" },
     { label: "联系方式", props: "contactPhone" },
-    { label: "发布时间", props: "createTime" },
+    { label: "发布日期", props: "createTime", width: "120" },
     { label: "考核评分", props: "score", width: "100" },
     { label: "是否入库", props: "isInWh", width: "100" },
     { label: "入库类别", props: "inWhType", width: "100" }

src/views/policyShare/dialog.vue

@@ -23,8 +23,8 @@
                     </el-form-item>
                 </el-col>
                 <el-col v-if="form.id" :span="12">
-                    <el-form-item label="填报时间">
-                        <el-date-picker v-model="form.createTime" readonly format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
+                    <el-form-item label="填报日期">
+                        <el-date-picker v-model="form.createTime" readonly format="YYYY-MM-DD"></el-date-picker>
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">

src/views/policyShare/index.vue

@@ -178,6 +178,7 @@ export default {
 
     methods: {
         columnFormat(row, props) {
+            if (props == "createTime") return row[props].split(" ")[0];
             if (props == "status") return statusDic[row[props]] || "";
             if (props == "isInWh") return whetherDic[row[props]] || "";
             return row[props];

src/views/policyShare/main.js

@@ -7,7 +7,7 @@ export const columns = [
     { label: "政策文号", props: "docNo" },
     { label: "填报人", props: "createName" },
     { label: "填报单位", props: "companyName" },
-    { label: "填报时间", props: "createTime" },
+    { label: "填报日期", props: "createTime", width: "120" },
     { label: "联系方式", props: "contactPhone" },
     { label: "考核评分", props: "score", width: "100" },
     { label: "是否入库", props: "isInWh", width: "100" },

src/views/policyStrive/dialog.vue

@@ -23,8 +23,8 @@
                     </el-form-item>
                 </el-col>
                 <el-col v-if="form.id" :span="12">
-                    <el-form-item label="填报时间">
-                        <el-date-picker v-model="form.createTime" readonly format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
+                    <el-form-item label="填报日期">
+                        <el-date-picker v-model="form.createTime" readonly format="YYYY-MM-DD"></el-date-picker>
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
@@ -62,7 +62,7 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                    <el-form-item label="预计完成时间" prop="yjFinishTime">
+                    <el-form-item label="预计完成日期" prop="yjFinishTime">
                         <el-date-picker v-model="form.yjFinishTime" value-format="YYYY-MM-DD" placeholder="请选择预计完成时间"></el-date-picker>
                     </el-form-item>
                 </el-col>

src/views/policyStrive/explain.vue

@@ -23,8 +23,8 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                    <el-form-item label="填报时间">
-                        <el-date-picker v-model="form.createTime" format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
+                    <el-form-item label="填报日期">
+                        <el-date-picker v-model="form.createTime" format="YYYY-MM-DD"></el-date-picker>
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
@@ -62,7 +62,7 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                    <el-form-item label="预计完成时间" prop="yjFinishTime">
+                    <el-form-item label="预计完成日期" prop="yjFinishTime">
                         <el-date-picker v-model="form.yjFinishTime" value-format="YYYY-MM-DD" placeholder="请选择预计完成时间"></el-date-picker>
                     </el-form-item>
                 </el-col>
@@ -107,7 +107,7 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="实际完成时间" prop="sjFinishTime">
+                        <el-form-item label="实际完成日期" prop="sjFinishTime">
                             <el-date-picker v-model="form.sjFinishTime" value-format="YYYY-MM-DD" placeholder="请选择实际完成时间"></el-date-picker>
                         </el-form-item>
                     </el-col>

src/views/policyStrive/index.vue

@@ -176,6 +176,7 @@ export default {
 
     methods: {
         columnFormat(row, props) {
+            if (props == "createTime") return row[props].split(" ")[0];
             if (props == "status") return statusDic[row[props]] || "";
             if (props == "isLand") return whetherDic[row[props]] || "";
             return row[props];

src/views/policyStrive/main.js

@@ -8,13 +8,13 @@ export const columns = [
     { label: "项目类别", props: "zcType", width: "100" },
     { label: "政策文号", props: "docNo" },
     { label: "预计争取金额", props: "yjStriveAmount", width: "120" },
-    { label: "预计完成时间", props: "yjFinishTime", width: "120" },
+    { label: "预计完成日期", props: "yjFinishTime", width: "120" },
     { label: "责任人", props: "directorName" },
     { label: "填报人", props: "createName" },
     { label: "填报部门", props: "deptName" },
     { label: "填报单位", props: "companyName" },
     { label: "联系方式", props: "contactPhone" },
-    { label: "填报时间", props: "createTime" }
+    { label: "填报日期", props: "createTime", width: "120" }
 ]
 
 export const rewardTypeDic = {

src/views/publicDomain/index.vue

@@ -35,7 +35,9 @@
             <el-table v-loading="loading" row-key="id" header-cell-class-name="tjm_card_table_header" height="400" :data="tableData" border @row-click="(row, column) => !column.fixed && table_detail(row)">
                 <el-table-column type="index" label="序号" width="55"></el-table-column>
                 <template v-for="(item, index) in columns" :key="index">
-                    <el-table-column :label="item.label" :prop="item.props" :width="item.width || 180" show-overflow-tooltip></el-table-column>
+                    <el-table-column :label="item.label" :prop="item.props" :width="item.width || 180" show-overflow-tooltip>
+                        <template #default="scope">{{ columnFormat(scope.row, item.props) }}</template>
+                    </el-table-column>
                 </template>
                 <el-table-column label="操作" fixed="right" width="240">
                     <template #default="scope">
@@ -99,6 +101,11 @@ export default {
     },
 
     methods: {
+        columnFormat(row, props) {
+            if (props == "createTime") return row[props].split(" ")[0];
+            return row[props];
+        },
+
         reloadTable() {
             this.params.beginCreateTime = this.createTime && this.createTime.length && this.createTime[0] + " 00:00:00" || null;
             this.params.endCreateTime = this.createTime && this.createTime.length && this.createTime[1] + " 23:59:59" || null;

src/views/publicDomain/main.js

@@ -6,7 +6,7 @@ export const columns = [
     { label: "发布人", props: "createName" },
     { label: "发布单位", props: "companyName" },
     { label: "联系方式", props: "contactPhone" },
-    { label: "发布时间", props: "createTime" }
+    { label: "发布日期", props: "createTime", width: "120" }
 ]
 
 export const link_columns = [
@@ -18,7 +18,7 @@ export const link_columns = [
     { label: "项目类别", props: "zcType", width: "100" },
     { label: "政策文号", props: "docNo" },
     { label: "预计争取金额", props: "yjStriveAmount", width: "120" },
-    { label: "预计完成时间", props: "yjFinishTime", width: "120" },
+    { label: "预计完成日期", props: "yjFinishTime", width: "120" },
     { label: "责任人", props: "directorName" },
     { label: "填报人", props: "createName" },
     { label: "填报部门", props: "deptName" },

src/views/system/user.vue

@@ -1,8 +1,8 @@
 <script setup>
+import { getMainList } from '@/api/system/depart.js'
+import { getRoleList } from '@/api/system/role'
 import {
-    getDeptTree,
     getUserList,
-    getRoleList,
     addUser,
     modUser,
     byUserIdfnRole,
@@ -69,7 +69,7 @@ function treeNodeClick(value) {
 }
 //部门数据
 function getDeptTreeData() {
-    getDeptTree().then(res => {
+    getMainList().then(res => {
         deptOptions.value = res.data
         deptOptionsEdit.value = res.data
     })

src/views/toDo/case.vue

@@ -28,8 +28,8 @@
                     </el-form-item>
                 </el-col>
                 <el-col v-if="form.id" :span="12">
-                    <el-form-item label="填报时间">
-                        <el-date-picker v-model="form.createTime" readonly format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
+                    <el-form-item label="填报日期">
+                        <el-date-picker v-model="form.createTime" readonly format="YYYY-MM-DD"></el-date-picker>
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">

src/views/toDo/index.vue

@@ -32,7 +32,9 @@
                 <el-table-column label="填报人" prop="zcCreateName" min-width="180" show-overflow-tooltip></el-table-column>
                 <el-table-column label="填报单位" prop="zcCompanyName" min-width="180" show-overflow-tooltip></el-table-column>
                 <el-table-column label="联系方式" prop="zcContactPhone" width="180" show-overflow-tooltip></el-table-column>
-                <el-table-column label="填报时间" prop="zcCreateTime" width="180" show-overflow-tooltip></el-table-column>
+                <el-table-column label="填报日期" width="120" show-overflow-tooltip>
+                    <template #default="scope">{{ scope.row.zcCreateTime.split(" ")[0] }}</template>
+                </el-table-column>
                 <el-table-column label="操作" fixed="right" width="160">
                     <template #default="scope">
                         <el-button type="primary" link icon="circle-check" @click.stop="table_approve(scope.row)">通过</el-button>

src/views/toDo/share.vue

@@ -23,8 +23,8 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                    <el-form-item label="填报时间">
-                        <el-date-picker v-model="form.createTime" readonly format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
+                    <el-form-item label="填报日期">
+                        <el-date-picker v-model="form.createTime" readonly format="YYYY-MM-DD"></el-date-picker>
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">

src/views/toDo/strive.vue

@@ -23,8 +23,8 @@
                     </el-form-item>
                 </el-col>
                 <el-col v-if="form.id" :span="12">
-                    <el-form-item label="填报时间">
-                        <el-date-picker v-model="form.createTime" readonly format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
+                    <el-form-item label="填报日期">
+                        <el-date-picker v-model="form.createTime" readonly format="YYYY-MM-DD"></el-date-picker>
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
@@ -58,7 +58,7 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                    <el-form-item label="预计完成时间" prop="yjFinishTime">
+                    <el-form-item label="预计完成日期" prop="yjFinishTime">
                         <el-date-picker v-model="form.yjFinishTime" value-format="YYYY-MM-DD" placeholder="请选择预计完成时间"></el-date-picker>
                     </el-form-item>
                 </el-col>