消息列表页

src/layouts/MainLayout.vue

@@ -7,6 +7,12 @@
         <!-- <span class="city-name">123123</span> -->
       </div>
       <div class="header-right">
+        <div class="message-wrap" @click="toMessagePage">
+          <el-icon size="20">
+            <ChatDotSquare />
+          </el-icon>
+          <div class="count">{{ messageCount }}</div>
+        </div>
         <div>
           <el-dropdown>
             <span class="username">
@@ -62,8 +68,24 @@ const getResourceData = () => {
     },
   });
 };
+// 获取未读消息数量
+let messageCount = ref(0);
+const getMessageCount = () => {
+  proxy.$post({
+    url: "/api/message/getMesCount",
+    data: {},
+    callback: (data) => {
+      messageCount.value = data.count;
+    },
+  });
+};
+// 跳转消息列表页
+const toMessagePage = () => {
+  router.push("/message");
+}
 onMounted(() => {
   getResourceData();
+  getMessageCount();
 });
 // 处理退出登录
 const handleLogout = () => {
@@ -154,5 +176,24 @@ const handleLogout = () => {
 }
 .header-right {
   display: flex;
+  align-items: center;
+  .message-wrap{
+    position: relative;
+    margin-right: 10px;
+    cursor: pointer;
+    .count{
+      position: absolute;
+      top: -5px;
+      right: -5px;
+      min-width: 14px;
+      height: 14px;
+      border-radius: 50%;
+      background-color: red;
+      color: #fff;
+      font-size: 10px;
+      text-align: center;
+      line-height: 14px;
+    }
+  }
 }
 </style>

src/router/routes.js

@@ -71,7 +71,7 @@ const routes = [
             component: () => import("@/views/projectManage/projectAllPage.vue"),
           },
           {
-            path: "/addProject/:type",
+            path: "/addProject",
             name: "addProject",
             title: "新增项目",
             component: () => import("@/views/projectManage/addProject.vue"),

src/styles/manage.less

@@ -112,6 +112,7 @@
     &-header{
         display: flex;
         justify-content: space-between;
+        margin-bottom: 10px;
     }
     &-content{
         flex: 1;
@@ -121,6 +122,12 @@
         .tabs-content{
             flex: 1;
             height: 0;
+            display: flex;
+            flex-direction: column;
+            &>.el-tabs{
+                flex: 1;
+                height: 0;
+            }
         }
         .el-tabs{
             height: 100%;

src/views/investingManage/addStatement.vue

@@ -338,7 +338,6 @@
     import { useRouter, useRoute } from "vue-router";
     import { ElMessage, ElMessageBox } from "element-plus";
     import { useUserStore } from "@/stores/user.js";
-    import moment from "moment";
     const userStore = useUserStore();
     const router = useRouter();
     const route = useRoute();

src/views/projectManage/addProject.vue

@@ -2,19 +2,24 @@
     <div class="add-project-container">
         <div class="add-project-content" v-loading="loading">
             <div class="tabs-content">
-                <el-tabs v-model="pageActiveName" type="border-card">
-                    <el-tab-pane label="立项填报" name="立项填报">
-                        <div class="project-tab-content">
                 <div class="add-project-header">
                     <div class="header-left"></div>
                     <div class="header-right">
                         <el-button type="default" @click="backClick">返回</el-button>
                         <template v-if="!loading && !isPreview">
-                                        <el-button type="primary" v-if="formData.projectLzType == '1' || !formData.projectLzType" @click="saveClick('save')">保存</el-button>
+                            <el-button type="primary" v-if="['1', '5', '7'].includes(formData.projectLzType) || !formData.projectLzType" @click="saveClick('save')">保存</el-button>
                             <el-button type="primary" v-if="formData.projectLzType == '1'" @click="saveClick('submit')">发起立项填报</el-button>
+                            <el-button type="primary" v-if="jcFormData.projectLzType === '7'" @click="saveClick('submit')">发起决策信息填报</el-button>
                         </template>
+                        <!-- <el-button 
+                            v-if="isPreview && "
+                            type="primary" @click="auditDialogVisible = true"
+                        >审核</el-button> -->
                     </div>
                 </div>
+                <el-tabs v-model="pageActiveName" type="border-card">
+                    <el-tab-pane label="立项填报" name="立项填报">
+                        <div class="project-tab-content">
                             <el-tabs v-model="lxTabActiveName">
                                 <el-tab-pane label="基本信息" name="基本信息">
                                     <div class="tab-content">
@@ -88,7 +93,16 @@
                                                                 </el-radio-group>
                                                             </el-form-item>
                                                         </el-col>
-                                                        <el-col :span="9">
+                                                        <el-col :span="12">
+                                                            <el-form-item label="项目阶段">
+                                                                <el-select  v-model="formData.xmjd" placeholder="请选择" no-data-text="暂无数据">
+                                                                    <el-option v-for="item in xmjdList" :key="item.key"
+                                                                        :label="item.name" :value="item.key"
+                                                                    ></el-option>
+                                                                </el-select>
+                                                            </el-form-item>
+                                                        </el-col>
+                                                        <el-col :span="12">
                                                             <el-form-item label="财务报表类型">
                                                                 <el-select  v-model="formData.cwbblx" placeholder="请选择" no-data-text="暂无数据">
                                                                     <el-option v-for="item in cwbblxList" :key="item.key"
@@ -97,7 +111,7 @@
                                                                 </el-select>
                                                             </el-form-item>
                                                         </el-col>
-                                                        <el-col :span="9">
+                                                        <el-col :span="12">
                                                             <el-form-item label="政府审批（核准、备案）级别" :label-width="200">
                                                                 <el-select  v-model="formData.zfsphzbajb" placeholder="请选择" no-data-text="暂无数据">
                                                                     <el-option v-for="item in zfspjbList" :key="item.key"
@@ -106,7 +120,7 @@
                                                                 </el-select>
                                                             </el-form-item>
                                                         </el-col>
-                                                        <el-col :span="6">
+                                                        <el-col :span="12">
                                                             <el-form-item label="是否履行标前预审程序" :label-width="170">
                                                                 <el-radio-group v-model="formData.sflxbqyscx">
                                                                     <el-radio :value="1">是</el-radio>
@@ -869,16 +883,6 @@
                         :lazy="true"
                     >
                         <div class="project-tab-content">
-                            <div class="add-project-header">
-                                <div class="header-left"></div>
-                                <div class="header-right">
-                                    <el-button type="default" @click="backClick">返回</el-button>
-                                    <template v-if="!loading && !isPreview">
-                                        <el-button type="primary" @click="saveClick('save')">保存</el-button>
-                                        <el-button type="primary" v-if="jcFormData.projectLzType === '7'" @click="saveClick('submit')">发起决策信息填报</el-button>
-                                    </template>
-                                </div>
-                            </div>
                             <el-tabs v-model="jcTabActiveName">
                                 <el-tab-pane label="基本信息" name="基本信息">
                                     <div class="tab-content">
@@ -1109,7 +1113,16 @@
                                                                 </el-select>
                                                             </el-form-item>
                                                         </el-col>
-                                                        <el-col :span="12">
+                                                        <el-col :span="8">
+                                                            <el-form-item label="项目阶段">
+                                                                <el-select  v-model="formData.xmjd" placeholder="请选择" no-data-text="暂无数据">
+                                                                    <el-option v-for="item in xmjdList" :key="item.key"
+                                                                        :label="item.name" :value="item.key"
+                                                                    ></el-option>
+                                                                </el-select>
+                                                            </el-form-item>
+                                                        </el-col>
+                                                        <el-col :span="8">
                                                             <el-form-item label="主业/非主业">
                                                                 <el-select  v-model="jcFormData.zyfzy" placeholder="请选择" no-data-text="暂无数据">
                                                                     <el-option v-for="item in zyList" :key="item.key"
@@ -2517,6 +2530,27 @@
                 </el-tabs>      
             </div>
         </div>
+        <el-dialog v-model="auditDialogVisible" title="审批意见" width="500" align-center
+            @close="cancelAudit"
+        >
+            <el-form :model="auditFormData" ref="auditForm" :rules="auditRules" label-width="100">
+                <el-form-item label="是否同意" prop="approvalResult">
+                    <el-select v-model="auditFormData.approvalResult" placeholder="请选择">
+                        <el-option :value="true" label="同意"></el-option>
+                        <el-option :value="false" label="不同意"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="备注" prop="approvalMessage">
+                    <el-input type="textarea" v-model="auditFormData.approvalMessage" />
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button @click="cancelAudit">取消</el-button>
+                    <el-button type="primary" @click="submitAudit">确定</el-button>
+                </div>
+            </template>
+        </el-dialog>
     </div>
 </template>
 
@@ -3231,6 +3265,7 @@
     let zyList = reactive([]); // 主页/非主业
     let cwbblxList = reactive([]); // 财务报表类型
     let zfspjbList = reactive([]); // 政府审批（核准、备案）级别
+    let xmjdList = ref([]); // 项目阶段
     let jnwList = reactive([]); // 境内/外 // 级联
     let szjList = ref([]); // 省（境内）/洲际（境外） // 级联
     let dsgjList = ref([]); // 地市（境内）/国家（境外） // 级联
@@ -3416,6 +3451,9 @@
                 tzmdejflList.value = tzmdyjflList.filter(item => item.key == data.tzmdyjfl)[0]?.children || [];
                 tzznejflList.value = tzznyjflList.filter(item => item.key == data.tzznyjfl)[0]?.children || [];
 
+                if (Number(formData.projectLzType) >= 5) {
+                    pageActiveName.value = "决策信息填报";
+                }
                 // 决策
                 let jcData = res.juece || res.lixiang || {};
                 Object.assign(jcFormData, jcData);
@@ -3458,6 +3496,7 @@
         zyList = resourceData.zyfzy;
         cwbblxList = resourceData.cwbblx;
         zfspjbList = resourceData.spjb;
+        xmjdList = resourceData.xmjd;
         jnwList = resourceData.dqlx;
         xmqyList = resourceData.xmqy;
         bzList = resourceData.bizhong;
@@ -3557,6 +3596,25 @@
             })
         }
     };
+    // 审核
+    let auditFormData = ref({});
+    let auditForm = ref();
+    let auditDialogVisible = ref(false);
+    const auditRules = {
+        approvalResult: [
+            { required: true, message: "请选择审批意见", trigger: "change" }
+        ]
+    };
+    const cancelAudit = () => {
+        auditFormData.value = {};
+        auditForm.value.resetFields();
+        auditDialogVisible.value = false;
+    };
+    const submitAudit = () => {
+        auditForm.value.validate(valid => {
+            if (valid) {}
+        });
+    };
 </script>
 
 <style lang="less">

src/views/projectManage/projectAllPage.vue

@@ -181,9 +181,6 @@
     const previewProject = (item) => {
         router.push({
             name: "addProject",
-            params: {
-                type: "xmlingxuan"
-            },
             query: {
                 isPreview: true,
                 projectId: item.id

src/views/projectManage/projectArgument.vue

@@ -113,9 +113,6 @@
     const fillProject = (item) => {
         router.push({
             name: "addProject",
-            params: {
-                type: "xmlz"
-            },
             query: {
                 projectId: item.id
             }

src/views/projectManage/projectDecision.vue

@@ -24,7 +24,7 @@
                     <template #operations="{ row, index }">
                         <el-button link type="primary" size="small"
                             :loading="row.loading" @click="getResult(row)"
-                        >查询决策结果</el-button>
+                        >查询</el-button>
                     </template>
                 </common-table>
             </div>

src/views/projectManage/projectDraft.vue

@@ -113,14 +113,11 @@
         getProjectData();
     }
     const addProject = () => {
-        router.push("/addProject/xmlingxuan");
+        router.push("/addProject");
     };
     const editProject = (item) => {
         router.push({
             name: "addProject",
-            params: {
-                type: "xmlingxuan"
-            },
             query: {
                 projectId: item.id
             }
@@ -129,9 +126,6 @@
     const previewProject = (item) => {
         router.push({
             name: "addProject",
-            params: {
-                type: "xmlingxuan"
-            },
             query: {
                 isPreview: true,
                 projectId: item.id

src/views/projectManage/projectSetUp.vue

@@ -22,16 +22,16 @@
                     @current-page-change="handleCurrentPageChange"
                 >
                     <template #operations="{ row, index }">
-                        <!-- 立项审批中 -->
-                        <el-button link type="primary" size="small"
-                            v-if="row.projectLzType === '3'"
-                            :loading="row.loading" @click="getResult(row)"
-                        >查询审批结果</el-button>
                         <!-- 已立项 -->
                         <el-button link type="primary" size="small"
                             v-if="row.projectLzType === '5'"
                             @click="fillDecision(row)"
                         >决策填报</el-button>
+                        <!-- 立项审批中 -->
+                        <el-button link type="primary" size="small"
+                            v-else
+                            :loading="row.loading" @click="viewDecision(row)"
+                        >查看</el-button>
                     </template>
                 </common-table>
             </div>
@@ -116,33 +116,18 @@
         currentPage.value = page;
         getProjectData();
     }
-    const getResult = (item) => {
-        item.loading = true;
-        proxy.$post({
-            url: "/api/project/queryLixiangResult",
-            data: {
-                id: item.id
-            },
-            callback: (data) => {
-                item.loading = false;
+    const viewDecision = (item) => {
         router.push({
             name: "addProject",
-                    params: {
-                        type: "xmlx"
-                    },
             query: {
-                        projectId: item.id
+                projectId: item.id,
+                isPreview: true
             }
         });
-            }
-        })
     };
     const fillDecision = (item) => {
         router.push({
             name: "addProject",
-            params: {
-                type: "xmlx"
-            },
             query: {
                 projectId: item.id
             }

src/views/systemManage/message.vue

@@ -26,13 +26,40 @@
                 </template>
             </common-table>
         </div>
+        <el-dialog v-model="messageDialogVisible" title="" width="500" align-center
+            @close="closeDialog"
+        >
+            <div class="message-wrap">
+              <div class="message-title">{{ messageInfo.title }}</div>
+              <div class="message-content">
+                <div class="label">消息类型：</div>
+                <div class="info">{{ messageInfo.type === 2 ? "项目初步审核" : messageInfo.type === 3 ? "项目终审" : "系统消息" }}</div>
+              </div>
+              <div class="message-content">
+                <div class="label">时间：</div>
+                <div class="info">{{ proxy.moment(messageInfo.createdAt).format("YYYY-MM-DD HH:mm:SS") }}</div>
+              </div>
+              <div class="message-content">
+                <div class="label">备注：</div>
+                <div class="info">{{ messageInfo.content }}</div>
+              </div>
+            </div>
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button @click="closeDialog">关闭</el-button>
+                    <!-- <el-button type="primary" @click="toProjectPage">去处理</el-button> -->
+                </div>
+            </template>
+        </el-dialog>
     </div>
 </template>
 
 <script setup>
 import { ref, reactive, onMounted, getCurrentInstance, computed, nextTick } from "vue";
 import { ElMessage, ElMessageBox } from "element-plus";
+import { useRouter } from "vue-router";
 import CommonTable from "@/components/common/commonTable.vue";
+const router = useRouter();
 const { proxy } = getCurrentInstance();
 const loading = ref(false);
 // 表格数据
@@ -43,10 +70,37 @@ const pageSize = ref(10);
 // 表格列配置
 const tableColumns = [
   {
-    prop: "name",
+    prop: "title",
     label: "标题",
     minWidth: 100
   },
+  {
+    prop: "type",
+    label: "消息类型",
+    width: 120,
+    align: "center",
+    formatter: (data) => {
+        return data.type === 2 ? "项目初步审核" : data.type === 3 ? "项目终审" : "系统消息";
+    }
+  },
+  {
+    prop: "isRead",
+    label: "状态",
+    width: 90,
+    align: "center",
+    formatter: (data) => {
+        return data.isRead ? "已读" :  "未读";
+    }
+  },
+  {
+    prop: "createdAt",
+    label: "时间",
+    width: 180,
+    align: "center",
+    formatter: (data) => {
+        return proxy.moment(data.createdAt).format("YYYY-MM-DD HH:mm:SS");
+    }
+  },
   {
     prop: "operations",
     label: "操作",
@@ -88,8 +142,81 @@ const handleCurrentPageChange = (page) => {
 onMounted(() => {
   loadTableData();
 });
+// 获取信息详情
+let messageDialogVisible = ref(false);
+let messageInfo = ref({});
+const handlePreview = (item) => {
+  proxy.$post({
+    url: "/api/message/getMessageInfo",
+    data: {
+      id: item.id
+    },
+    callback: (data) => {
+      messageDialogVisible.value = true;
+      messageInfo.value = data;
+    },
+    error: (err) => {
+      ElMessage.error("加载数据失败");
+    },
+  });
+}
+const closeDialog = () => {
+  messageInfo.value = {};
+  messageDialogVisible.value = false;
+}
+// 跳转到对应项目
+const toProjectPage = () => {
+  router.push({
+      name: "addProject",
+      query: {
+          projectId: messageInfo.value.projectId,
+          isPreview: true
+      }
+  });
+}
+// 删除
+const handleDelete = (row) => {
+  ElMessageBox.confirm(`确定删除该条消息？`, "提示", {
+      confirmButtonText: "确定",
+      cancelButtonText: "取消",
+      type: "warning",
+    }).then(() => {
+      proxy.$post({
+        url: "/api/message/deleteMessage",
+        data: { id: row.id },
+        callback: (data) => {
+          ElMessage.success("删除成功");
+          loadTableData();
+        },
+        error: (err) => {
+          ElMessage.error("删除失败:", err);
+        },
+      });
+    });
+}
 </script>
 
 <style lang="less">
 @import "@/styles/manage.less";
+.message-wrap{
+  .message-title{
+    font-size: 16px;
+    font-weight: 600;
+    margin: 10px 0;
+  }
+  .message-content{
+    display: flex;
+    align-items: flex-start;
+    margin-bottom: 10px;
+    .label{
+      width: 80px;
+      text-align: justify;
+      text-align-last: justify; 
+    }
+    .info{
+      flex: 1;
+      width: 0;
+    }
+  }
+}
 </style>