新增项目管理界面

oa-ui/public/index.html

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <link rel="icon" href="<%= BASE_URL %>logo.png">
     <title><%= webpackConfig.name %></title>
     <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
 	  <style>

oa-ui/src/assets/styles/variables.scss

@@ -9,7 +9,8 @@ $yellow:#FEC171;
 $panGreen: #30B08F;
 
 // 默认菜单主题风格
-$base-menu-color:#bfcbd9;
+// $base-menu-color:#bfcbd9;
+$base-menu-color:#fff;
 $base-menu-color-active:#f4f4f5;
 $base-menu-background:#304156;
 $base-logo-title-color: #ffffff;

oa-ui/src/views/flowable/form/jsTable.vue

@@ -68,7 +68,8 @@
       </tr>
       <tr>
         <td class="table-title">入职年月</td>
-        <td style="text-align:left;padding-left:10px;">{{ tableForm.entryDate }}</td>
+        <td style="text-align:left;padding-left:10px;">{{ tableForm.entryDate != null ?
+          tableForm.entryDate.substring(0, 10) : tableForm.entryDate }}</td>
         <td class="table-title">年龄</td>
         <td style="text-align:left;padding-left:10px;">{{ tableForm.age }}</td>
       </tr>

oa-ui/src/views/flowable/form/jyTable.vue

@@ -63,7 +63,8 @@
       </tr>
       <tr>
         <td class="table-title">入职年月</td>
-        <td style="text-align:left;padding-left:10px;">{{ tableForm.entryDate }}</td>
+        <td style="text-align:left;padding-left:10px;">{{ tableForm.entryDate != null ?
+          tableForm.entryDate.substring(0, 10) : tableForm.entryDate }}</td>
         <td class="table-title">年龄</td>
         <td style="text-align:left;padding-left:10px;">{{ tableForm.age }}</td>
       </tr>

oa-ui/src/views/flowable/form/scTable.vue

@@ -89,7 +89,8 @@
       </tr>
       <tr>
         <td class="table-title">入职年月</td>
-        <td style="text-align:left;padding-left:10px;">{{ tableForm.entryDate }}</td>
+        <td style="text-align:left;padding-left:10px;">{{ tableForm.entryDate != null ?
+          tableForm.entryDate.substring(0, 10) : tableForm.entryDate }}</td>
         <td class="table-title">年龄</td>
         <td style="text-align:left;padding-left:10px;">{{ tableForm.age }}</td>
       </tr>

oa-ui/src/views/flowable/form/xmTable.vue

@@ -63,7 +63,8 @@
       </tr>
       <tr>
         <td class="table-title">入职年月</td>
-        <td style="text-align:left;padding-left:10px;">{{ tableForm.entryDate }}</td>
+        <td style="text-align:left;padding-left:10px;">{{ tableForm.entryDate != null ?
+          tableForm.entryDate.substring(0, 10) : tableForm.entryDate }}</td>
         <td class="table-title">年龄</td>
         <td style="text-align:left;padding-left:10px;">{{ tableForm.age }}</td>
       </tr>

oa-ui/src/views/flowable/form/zhTable.vue

@@ -63,7 +63,8 @@
       </tr>
       <tr>
         <td class="table-title">入职年月</td>
-        <td style="text-align:left;padding-left:10px;">{{ tableForm.entryDate }}</td>
+        <td style="text-align:left;padding-left:10px;">{{ tableForm.entryDate != null ?
+          tableForm.entryDate.substring(0, 10) : tableForm.entryDate }}</td>
         <td class="table-title">年龄</td>
         <td style="text-align:left;padding-left:10px;">{{ tableForm.age }}</td>
       </tr>

oa-ui/src/views/flowable/task/todo/detail/index.vue

@@ -90,6 +90,9 @@
             <el-input type="textarea" v-model="taskForm.comment" placeholder="请输入处理意见" />
           </el-form-item> -->
         </el-form>
+        <el-row v-if="!checkSendUser" style="text-align: center;">
+          <h2>已达到最后节点，点击确定后审核完成</h2>
+        </el-row>
         <span slot="footer" class="dialog-footer">
           <el-button @click="completeOpen = false">取 消</el-button>
           <el-button type="primary" @click="taskComplete">确 定</el-button>
@@ -346,10 +349,10 @@ export default {
     },
     // 获取需要处理的表单表格信息
     getAssessByAssessId(formId) {
-      
+
       getAssess(formId).then(res => {
         let data = res.data;
-        
+
         for (let d in data) {
           if (d.includes('role')) {
             if (data[d] != "" && data[d] != undefined && data[d] != null)
@@ -370,7 +373,7 @@ export default {
       // this.completeOpen = true;
       // this.completeTitle = "流程审批";
       // this.submitForm(null);
-      
+
       let formData = new FormData();
       this.tableForm.formId = this.tableForm.assessId;
       let form = JSON.stringify(this.tableForm);
@@ -420,7 +423,6 @@ export default {
     },
     /** 返回页面 */
     goBack() {
-      console.log(this.tableForm);
       // 关闭当前标签页并返回上个页面
       const obj = { path: "/task/todo", query: { t: Date.now() } };
       this.$tab.closeOpenPage(obj);
@@ -487,12 +489,12 @@ export default {
     /** 申请流程表单数据提交 */
     submitForm(formData, assessId) {
       listAssess({ assessId }).then(result => {
-        
+
         let list = result;
         if (list.total != 0) {
           modifyAssess(formData).then(res => {
           });
-        }else{
+        } else {
           submitAssess(formData)
         }
       })

oa-ui/src/views/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-02-27 10:33:41
+ * @LastEditTime: 2024-02-27 14:12:01
 -->
 <template>
   <div class="app-container home">
@@ -12,7 +12,7 @@
         <el-row align="bottom" :gutter="40">
           <el-col :span="4">
             <h3 style="font-weight: bold;text-align: right;font-size: 18px;"> {{ user.nickName }}，您好！ </h3>
-            <h2 style="text-align: right;font-size: 24px;font-weight: bold;"> {{ 10 }}℃ </h2>
+            <!-- <h2 style="text-align: right;font-size: 24px;font-weight: bold;"> {{ 10 }}℃ </h2> -->
             <el-row style="font-size:12px;text-align: right;"> {{ "2024-01-22" }} {{ "星期一" }} </el-row>
           </el-col>
           <el-col :span="4" style="text-align: center;">
@@ -20,7 +20,7 @@
           </el-col>
           <el-col :span="16">
             <el-row style="font-size: 20px;font-weight: bold;margin-bottom: 20px;">
-              {{ user.nickName }} <el-tag type="warning">{{ "高级工程师" }}</el-tag>
+              {{ user.nickName }} <el-tag type="warning">{{ titles }}</el-tag>
             </el-row>
             <el-row>
               <el-col :span="4">
@@ -28,7 +28,7 @@
                   入职时间
                 </el-row>
                 <el-row class="userinfo-data">
-                  {{ user.entryDate }}
+                  {{ user.entryDate != null ? user.entryDate.substring(0, 7) : user.entryDate }}
                 </el-row>
               </el-col>
               <el-col :span="4">
@@ -44,7 +44,7 @@
                   所在部门
                 </el-row>
                 <el-row class="userinfo-data">
-                  {{ }}
+                  {{ user.dept ? user.dept.deptName : '' }}
                 </el-row>
               </el-col>
               <el-col :span="4">
@@ -92,10 +92,14 @@
             <span class="title-text">我的待办</span>
           </div>
           <el-row>
-            <el-col :span="6" class="db-item">
+            <el-col :span="6" class="db-item" @click.native="$router.push({ path: '/task/todo' })">
               <el-row class="db-text">考核待审</el-row>
               <el-row class="db-number">{{ detail }}</el-row>
             </el-col>
+            <el-col :span="6" class="db-item" @click.native="$router.push({ path: '/task/finished' })">
+              <el-row class="db-text">已办任务</el-row>
+              <el-row class="db-number">{{ finish }}</el-row>
+            </el-col>
           </el-row>
         </el-col>
       </el-row>
@@ -116,7 +120,7 @@
           </el-table>
         </el-col>
         <el-col :span="8">
-          <el-calendar v-model="times">
+          <el-calendar v-model="times" style="margin-top: 80px;">
           </el-calendar>
         </el-col>
       </el-row>
@@ -127,13 +131,26 @@
         <span class="title-text">项目列表</span>
       </div>
       <el-table :data="projectData" style="width: 100%">
-        <el-table-column prop="isFinshed" label="状态"> {{ isFinished == '1' ? '已结束' : '进行中' }}
+        <el-table-column prop="isFinshed" label="状态" width="90px">
+          <template slot-scope="scope">
+            <el-tag :type="scope.row.isFinished === '0' ? 'success' : 'warning'" disable-transitions>
+              {{ scope.row.isFinished == '0' ? '进行中' : '已结束' }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="projectNumber" label="项目编号" width="90px">
         </el-table-column>
-        <el-table-column prop="projectNumber" label="项目编号">
+        <el-table-column prop="projectLeader" label="项目负责人" width="90px">
         </el-table-column>
         <el-table-column prop="projectName" label="项目名称">
         </el-table-column>
       </el-table>
+      <div style="text-align: right;margin-top: 20px;">
+        <el-pagination @current-change="getProject" :current-page.sync="projectQueryParams.pageNum"
+          :page-size="projectQueryParams.pageSize" layout="total, prev, pager, next,jumper" :total="projectTotal">
+        </el-pagination>
+      </div>
+
     </div>
   </div>
 </template>
@@ -143,6 +160,7 @@ import { mapGetters } from "vuex";
 import { getUserProfile } from "@/api/system/user";
 import { listProject } from "@/api/oa/project/project";
 import { todoList } from "@/api/flowable/todo";
+import { finishedList } from "@/api/flowable/finished";
 import { getDicts as getDicts, getData } from '@/api/system/dict/data'
 export default {
   name: "index",
@@ -156,10 +174,16 @@ export default {
       weather: {},
       noticeData: [],
       projectData: [],
+      projectQueryParams: {
+        pageNum: 1,
+        pageSize: 16
+      },
+      projectTotal: 0,
       times: new Date(),
       detail: 0,
+      finish: 0,
       engineerLevel: '',
-      titles: ''
+      titles: '',
     };
   },
   created() {
@@ -191,9 +215,13 @@ export default {
     gotoTask() {
       this.$router.push({ path: "/task/process" });
     },
+    goTodo() {
+      this.$router.push({ path: "/task/todo" });
+    },
     getProject() {
-      listProject({pageSize: 100}).then(response => {
+      listProject(this.projectQueryParams).then(response => {
         this.projectData = response.rows;
+        this.projectTotal = response.total;
       })
     },
     // 获取考核待办
@@ -207,12 +235,29 @@ export default {
         this.detail = response.data.total;
       });
     },
+    getFinish() {
+      finishedList({
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        category: null,
+        key: null,
+        tenantId: null,
+        deployTime: null,
+        derivedFrom: null,
+        derivedFromRoot: null,
+        parentDeploymentId: null,
+        engineVersion: null
+      }).then(response => {
+        this.finish = response.data.total;
+      })
+    },
     // 获取工龄
     getObtainSeniority(entryDate) {
       if (entryDate != "" && entryDate != undefined && entryDate != null) {
         let curYear = new Date();
-        let e = entryDate.substring(0, 5);
-        return curYear - parseInt(e)
+        let e = entryDate.substring(0, 4);
+        return (curYear.getFullYear() - parseInt(e)) + '年'
       }
 
 
@@ -279,6 +324,7 @@ export default {
         text-align: center;
         background-color: #F5F5F5;
         padding: 10px 20px;
+        margin: 0 5px;
         cursor: pointer;
 
         .db-text {}

oa-ui/src/views/project/list/index.vue

@@ -0,0 +1,190 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-02-27 14:49:15
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-02-27 16:57:10
+-->
+<template>
+  <div class="project-wrapper">
+    <!-- 搜索栏 -->
+    <el-row>
+      <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="88px">
+        <el-form-item label="项目编号" prop="projectNumber">
+          <el-input v-model="queryParams.projectNumber" placeholder="请输入项目编号" clearable
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="项目负责人" prop="projectLeader">
+          <el-input v-model="queryParams.projectLeader" placeholder="请输入项目负责人" clearable
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="项目名称" prop="projectName">
+          <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        </el-form-item>
+      </el-form>
+    </el-row>
+    <!-- 项目统计 -->
+    <el-row>
+      <el-col>
+        <el-row :gutter="10">
+          <el-col :span="8">
+            <el-card>
+              <el-col :span="12">
+                <div>项目数量</div>
+                <h2>127</h2>
+              </el-col>
+              <el-col :span="12"></el-col>
+            </el-card>
+          </el-col>
+          <el-col :span="8">
+            <el-card>
+              <el-col :span="12">
+                <div>预算金额</div>
+                <h2>679999</h2>
+              </el-col>
+              <el-col :span="12"></el-col>
+            </el-card>
+          </el-col>
+          <el-col :span="8">
+            <el-card>
+              <el-col :span="12">
+                <div>项目成本</div>
+                <h2>679999</h2>
+              </el-col>
+              <el-col :span="12"></el-col>
+            </el-card>
+          </el-col>
+        </el-row>
+      </el-col>
+    </el-row>
+    <!-- 项目列表 -->
+    <el-card style="margin-top: 20px;">
+      <div slot="header" class="card-header">
+        <div style="font-weight: bold;font-size: 20px;">项目列表</div>
+        <div>
+          <el-button style="float: right;margin-right: 10px;" type="warning" size="mini" icon="el-icon-plus"
+            @click="handleAdd">新增项目</el-button>
+        </div>
+      </div>
+      <el-table v-loading="loading" :data="projectList" style="margin-top: 30px;" header-row-class-name="table-header">
+        <el-table-column type="index" width="50">
+        </el-table-column>
+        <el-table-column prop="isFinshed" label="状态" width="90px">
+          <template slot-scope="scope">
+            <el-tag :type="scope.row.isFinished === '0' ? 'success' : 'warning'" disable-transitions>
+              {{ scope.row.isFinished == '0' ? '进行中' : '已结束' }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="项目编号" align="center" key="projectNumber" prop="projectNumber" />
+        <el-table-column label="项目名称" align="center" key="projectName" prop="projectName" />
+        <el-table-column label="项目负责人" align="center" key="projectLeader" prop="projectLeader" />
+        <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
+          <template slot-scope="scope" v-if="scope.row.userId !== 1">
+            <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+              v-hasPermi="['system:user:edit']">修改</el-button>
+            <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['system:user:remove']">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
+    </el-card>
+    <!-- 新建项目 -->
+    <el-dialog :title="title" :visible.sync="addOpen" :rules="rules" append-to-body>
+      <el-form :model="addForm" label-width="100px">
+        <el-form-item label="项目编号：" prop="projectNumber">
+          <el-input v-model="addForm.projectNumber"></el-input>
+        </el-form-item>
+        <el-form-item label="项目名称：" prop="projectName">
+          <el-input v-model="addForm.projectName"></el-input>
+        </el-form-item>
+        <el-form-item label="项目负责人：" prop="projectNumber">
+          <el-button type="primary" plain icon="el-icon-plus" size="mini">选择</el-button>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer" style="text-align: center;">
+        <el-button type="primary" @click="confirmAddForm">确 定</el-button>
+        <el-button @click="addOpen = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listProject } from "@/api/oa/project/project";
+
+export default {
+  data() {
+    return {
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        projectNumber: undefined,
+        projectLeader: undefined,
+        projectName: undefined,
+      },
+      projectList: [],
+      total: 0,
+      loading: true,
+      addOpen: false,
+      title: '',
+      addForm: {},
+      rules: {
+        projectNumber: [{ required: true, message: '请输入项目编号', trigger: 'blur' }]
+      }
+    }
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    // 查询项目列表
+    getList() {
+      this.loading = true
+      listProject(this.queryForm).then(response => {
+        this.projectList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      })
+    },
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    handleAdd() {
+      this.title = '新增项目'
+      this.addOpen = true
+    },
+    handleUpdate(row) {
+
+    },
+    handleDelete(row) {
+
+    },
+    confirmAddForm(){
+
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.project-wrapper {
+  padding: 25px;
+}
+
+.table-header {
+  background-color: #f5f5f5;
+}
+
+.card-header {
+  display: flex;
+  justify-content: space-between;
+  padding: 0 10px;
+}
+</style>

oa-ui/src/views/system/user/index.vue

@@ -548,7 +548,8 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.userId != undefined) {
-            this.form.titles = this.form.titles.join(',')
+            if(this.form.titles != "" && this.form.titles != undefined && this.form.titles != null)
+              this.form.titles = this.form.titles.join(',')
             updateUser(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;