新增项目生产力的成果汇交，编写全名变量userList，让其可以全局访问

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectMapper.xml

@@ -88,7 +88,7 @@
             <if test="projectType != null  and projectType != ''"> and p.project_type = #{projectType}</if>
             <if test="projectLevel != null  and projectLevel != ''"> and p.project_level = #{projectLevel}</if>
             <if test="projectRegistrant != null "> and p.project_registrant = #{projectRegistrant}</if>
-            <if test="undertakingDept != null  and undertakingDept != ''"> and p.undertaking_dept = #{undertakingDept}</if>
+            <if test="undertakingDept != null  and undertakingDept != ''"> and p.undertaking_dept like concat('%', #{undertakingDept}, '%')</if>
             <if test="projectPlanner != null "> and p.project_planner = #{projectPlanner}</if>
             <if test="siteLeader != null "> and p.site_leader = #{siteLeader}</if>
             <if test="planTime != null "> and p.plan_time = #{planTime}</if>

oa-ui/src/router/index.js

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-29 09:47:50
+ * @LastEditTime: 2024-05-31 17:03:36
  */
 /*
  * @Author: ysh
@@ -296,6 +296,20 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    path: '/applyForm/archive',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: '',
+        component: () => import('@/views/flowable/task/todo/applyForm/archiIndex'),
+        name: 'archive',
+        meta: { title: '成果归档', icon: '' }
+
+      }
+    ]
+  },
   {
     path: '/project/info',
     component: Layout,

oa-ui/src/store/modules/user.js

@@ -1,4 +1,5 @@
 import { login, logout, getInfo } from '@/api/login'
+import { listUser} from '@/api/system/user'
 import { getToken, setToken, removeToken } from '@/utils/auth'
 
 const user = {
@@ -10,7 +11,8 @@ const user = {
     deptId:'',
     deptName:'',
     roles: [],
-    permissions: []
+    permissions: [],
+    userList:[],
   },
 
   mutations: {
@@ -37,7 +39,10 @@ const user = {
     },
     SET_PERMISSIONS: (state, permissions) => {
       state.permissions = permissions
-    }
+    },
+    SET_USERLIST:(state, userList) => {
+      state.userList = userList
+    },
   },
 
   actions: {
@@ -75,6 +80,9 @@ const user = {
           commit('SET_DEPTID',user.deptId)
           commit('SET_DEPTNAME',user.dept.deptName)
           commit('SET_AVATAR', avatar)
+          listUser({pageNum:1,pageSize:9999}).then(result=>{
+            commit('SET_USERLIST', result.rows)
+          })
           resolve(res)
         }).catch(error => {
           reject(error)

oa-ui/src/views/file/filesProject/achievement.vue

@@ -768,4 +768,6 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
+</style>

oa-ui/src/views/file/filesProject/project.vue

@@ -43,7 +43,7 @@
         </el-table-column>
         <el-table-column prop="projectNumber" label="项目编号" align="center" />
         <el-table-column prop="projectName" label="项目名称" width="200px" align="center" />
-        <el-table-column prop="projectLeader" label="项目负责人" align="center" />
+        <el-table-column prop="projectLeaderUser.nickName" label="项目负责人" align="center" />
         <el-table-column prop="partyA" label="甲方单位" align="center" />
         <el-table-column prop="undertakingSector" label="承担部门" align="center" />
         <el-table-column prop="requiredCompletionDate" label="项目要求完成日期" align="center" />
@@ -818,6 +818,9 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.modifyForm = row;
+      let leaderObj = this.$store.state.user.userList.find(obj => obj.userId == row.projectLeader);
+      if(leaderObj)
+        this.modifyForm.projectLeader = leaderObj.nickName
       this.modifyOpen = true;
       this.position = [];
       this.kmlFileName = row.projectKml;
@@ -1206,6 +1209,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
 .centerBox {
   border: 1px dashed #bccfec;
   padding: 5px;

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

@@ -14,29 +14,29 @@
             </el-select> -->
             <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="2" direction="vertical">
               <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
-              }}</el-descriptions-item>
+                }}</el-descriptions-item>
               <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
-              }}</el-descriptions-item>
+                }}</el-descriptions-item>
               <el-descriptions-item label="甲方单位" label-class-name="my-label">{{ chooseProject.partyA
-              }}</el-descriptions-item>
+                }}</el-descriptions-item>
               <el-descriptions-item label="合同编码" label-class-name="my-label">{{ contractCode
-              }}</el-descriptions-item>
+                }}</el-descriptions-item>
               <el-descriptions-item label="承担部门" label-class-name="my-label">{{
-                chooseProject.undertakingDeptName
-              }}</el-descriptions-item>
+      chooseProject.undertakingDeptName
+    }}</el-descriptions-item>
               <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser
-                ? chooseProject.projectLeaderUser.nickName : ''
-              }}</el-descriptions-item>
+      ? chooseProject.projectLeaderUser.nickName : ''
+                }}</el-descriptions-item>
               <el-descriptions-item label="技术负责人" label-class-name="my-label">{{
-                chooseProject.technicalDirectorUser ? chooseProject.technicalDirectorUser.nickName :
-                '' }}</el-descriptions-item>
+      chooseProject.technicalDirectorUser ? chooseProject.technicalDirectorUser.nickName :
+        '' }}</el-descriptions-item>
               <el-descriptions-item label="质检审核员" label-class-name="my-label">{{
-                chooseProject.qualityInspectorUser ? chooseProject.qualityInspectorUser.nickName : ''
-              }}</el-descriptions-item>
+      chooseProject.qualityInspectorUser ? chooseProject.qualityInspectorUser.nickName : ''
+    }}</el-descriptions-item>
               <el-descriptions-item label="坐标经度" label-class-name="my-label">{{ chooseProject.kmlLng
-              }}</el-descriptions-item>
+                }}</el-descriptions-item>
               <el-descriptions-item label="坐标纬度" label-class-name="my-label">{{ chooseProject.kmlLat
-              }}</el-descriptions-item>
+                }}</el-descriptions-item>
             </el-descriptions>
           </el-form-item>
           <el-form-item label="归档状态">
@@ -267,6 +267,14 @@ export default {
   },
   mounted() {
     this.initForm();
+    if (this.$route.query.projectId) {
+      getProject(this.$route.query.projectId).then(res => {
+        if (res.data) {
+          this.$set(this.form, 'projectId', res.data.projectId)
+          this.handleSelectProject(res.data.projectId)
+        }
+      })
+    }
   },
   created() {
     if (this.taskName == '部门检查') {

oa-ui/src/views/flowable/form/budget/budgetInfo.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-03 16:28:09
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-27 15:25:58
+ * @LastEditTime: 2024-05-31 15:35:26
 -->
 <template>
   <div class="main">
@@ -198,50 +198,52 @@ export default {
     initBudgetForm() {
       listBudget({ pageNum: 1, pageSize: 20, projectId: this.taskForm.formId }).then(res => {
         this.budgetForm = res.rows[0];
-        console.log(this.budgetForm);
-        listBudgetDevice({ budgetId: this.budgetForm.budgetId }).then(res => {
-          this.chooseDevice = res.rows;
-          this.deviceLen = res.rows.length + 1;
-        })
-        listBudgetStaff({ budgetId: this.budgetForm.budgetId }).then(res => {
-          this.chooseUser = res.rows;
-          this.userLen = res.rows.length + 1;
-          let days = 0;
-          for (let d of this.chooseUser) {
-            days = days + d.days
-          }
-          this.budgetForm.inOutPriceSum = Number(days) * Number(this.chooseUser[0].inOutPrice)
-        })
-        listBudgetCar({ budgetId: this.budgetForm.budgetId }).then(res => {
-          this.chooseCar = res.rows;
-          this.carLen = res.rows.length + 1;
-        })
-        listBudgetSettle({ budgetId: this.budgetForm.budgetId }).then(res => {
-          this.workList = res.rows;
-          this.workLen = res.rows.length;
+        if (this.budgetForm) {
+          listBudgetDevice({ budgetId: this.budgetForm.budgetId }).then(res => {
+            this.chooseDevice = res.rows;
+            this.deviceLen = res.rows.length + 1;
+          })
+          listBudgetStaff({ budgetId: this.budgetForm.budgetId }).then(res => {
+            this.chooseUser = res.rows;
+            this.userLen = res.rows.length + 1;
+            let days = 0;
+            for (let d of this.chooseUser) {
+              days = days + d.days
+            }
+            this.budgetForm.inOutPriceSum = Number(days) * Number(this.chooseUser[0].inOutPrice)
+          })
+          listBudgetCar({ budgetId: this.budgetForm.budgetId }).then(res => {
+            this.chooseCar = res.rows;
+            this.carLen = res.rows.length + 1;
+          })
+          listBudgetSettle({ budgetId: this.budgetForm.budgetId }).then(res => {
+            this.workList = res.rows;
+            this.workLen = res.rows.length;
 
-          for (let work of this.workList) {
-            if (work.groundType == '0') {
-              work.price = work.cmcPrice.commonPrice
-              work.scaleGrade = work.cmcPrice.scaleGrade
-              work.unit = work.cmcPrice.unit
-            } else {
-              work.price = work.cmcPrice.complexPrice
-              work.scaleGrade = work.cmcPrice.scaleGrade
-              work.unit = work.cmcPrice.unit
+            for (let work of this.workList) {
+              if (work.groundType == '0') {
+                work.price = work.cmcPrice.commonPrice
+                work.scaleGrade = work.cmcPrice.scaleGrade
+                work.unit = work.cmcPrice.unit
+              } else {
+                work.price = work.cmcPrice.complexPrice
+                work.scaleGrade = work.cmcPrice.scaleGrade
+                work.unit = work.cmcPrice.unit
+              }
+            }
+            this.getProjectWorkList();
+          })
+          listProjectContract({ projectId: this.taskForm.formId }).then(res => {
+            console.log(res);
+            if (res.total == 1) {
+              getContract(res.rows[0].contractId).then(response => {
+                this.contract = response.data;
+                this.profit = Number(this.contract.amount) - Number(this.budgetForm.totalBudget)
+              })
             }
-          }
-          this.getProjectWorkList();
-        })
-        listProjectContract({ projectId: this.taskForm.formId }).then(res => {
-          console.log(res);
-          if (res.total == 1) {
-            getContract(res.rows[0].contractId).then(response => {
-              this.contract = response.data;
-              this.profit = Number(this.contract.amount) - Number(this.budgetForm.totalBudget)
-            })
-          }
-        })
+          })
+        }
+
       });
     },
     getProjectWorkList() {

oa-ui/src/views/flowable/form/inProgress/achiData.vue

@@ -0,0 +1,159 @@
+<template>
+  <div class="mt20">
+    <div class="nav-btn">
+      <div>
+        <el-button class="mb20" type="primary" plain size="mini" icon="el-icon-plus" @click="addAchi">成果汇交</el-button>
+      </div>
+      <div>
+        <el-button icon="el-icon-refresh" circle size="mini" @click="getAchiData()"></el-button>
+      </div>
+    </div>
+
+    <el-table :data="achiList" style="width: 100%">
+      <el-table-column type="index" label="序号" width="50" />
+      <el-table-column label="成果汇交时间" prop="submitTime" width="100" />
+      <el-table-column label="生产部门检查员" prop="produceInspector" width="120">
+        <template slot-scope="scope">
+          {{ findUserName(scope.row.produceInspector) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="质量检查员" prop="qualityInspector" show-overflow-tooltip width="120">
+        <template slot-scope="scope">
+          {{ findUserName(scope.row.qualityInspector) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="技术部负责人" prop="deptLeader" show-overflow-tooltip width="120">
+        <template slot-scope="scope">
+          {{ findUserName(scope.row.deptLeader) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="归档人" prop="archiver" show-overflow-tooltip width="120">
+        <template slot-scope="scope">
+          {{ findUserName(scope.row.archiver) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="资料接受时间" prop="receiveTime" show-overflow-tooltip width="120" />
+      <el-table-column label="质量检查时间" prop="qualityTime" show-overflow-tooltip width="120" />
+      <el-table-column label="生产部门检查时间" prop="produceTime" show-overflow-tooltip width="130" />
+      <el-table-column label="归档时间" prop="archiveTime" show-overflow-tooltip width="120" />
+      <el-table-column label="生产部门意见" prop="produceComment" show-overflow-tooltip width="120" />
+      <el-table-column label="质量检查意见" prop="qualityComment" show-overflow-tooltip width="120" />
+      <el-table-column label="技术部审核意见" prop="deptComment" show-overflow-tooltip width="120" />
+      <el-table-column label="归档意见" prop="archiveComment" show-overflow-tooltip width="120" />
+      <el-table-column label="操作" fixed="right" header-align="center">
+        <template slot-scope="scope">
+          <el-button icon="el-icon-view" type="text" size="mini" @click="handleLook(scope.row)">查看明细</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { listArchive } from "@/api/oa/archive/archive"
+import { listDefinition } from "@/api/flowable/definition";
+import { getNextFlowNodeByStart } from "@/api/flowable/todo";
+import { definitionStart, flowXmlAndNode } from "@/api/flowable/definition";
+import { todoList } from "@/api/flowable/todo";
+import { Snowflake } from '@/utils/snowFlake.js'
+import { MessageBox } from 'element-ui'
+export default {
+  props: {
+    taskForm: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      achiList: [],
+      definitionList: [],
+    }
+  },
+  mounted() {
+    this.getAchiData()
+    this.listDefinition();
+  },
+  methods: {
+    getAchiData() {
+      listArchive({ projectId: this.taskForm.formId }).then(res => {
+        if (res.code == 200) {
+          this.achiList = res.rows
+        }
+      })
+    },
+    findUserName(id) {
+      let userList = this.$store.state.user.userList
+      let user = userList.find(obj => obj.userId == id)
+      if (user)
+        return user.nickName
+      else {
+        return ''
+      }
+    },
+    listDefinition() {
+      listDefinition({
+        pageNum: 1,
+        pageSize: 9999,
+        name: '成果归档'
+      }).then(response => {
+        this.definitionList = response.data.records;
+      });
+    },
+    handleLook(row) {
+
+    },
+    addAchi() {
+      let row = this.definitionList[0];
+      let formId = new Snowflake(1n, 1n, 0n).nextId().toString();
+      getNextFlowNodeByStart({ deploymentId: row.deploymentId, variables: { formId: formId } }).then(res => {
+        let data = res.data
+        const variables = {};
+        const formData = {};
+        formData.formId = formId
+        if (row.id) {
+          MessageBox.confirm('是否发起成果归档？', '系统提示', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' }).then(() => {
+            variables.variables = formData;
+            // 启动流程并将表单数据加入流程变量
+            definitionStart(row.id, JSON.stringify(variables)).then(res => {
+              this.$modal.msgSuccess(res.msg);
+              let procInstanceId = res.data;
+              todoList({
+                pageNum: 1,
+                pageSize: 99999999,
+                processInsId: procInstanceId
+              }).then(toDoRes => {
+                let records = toDoRes.data.records;
+                if (records.length == 1) {
+                  records = records[0]
+                }
+                this.$router.push({
+                  path: '/applyForm/archive',
+                  query: {
+                    procInsId: records.procInsId,
+                    executionId: records.executionId,
+                    deployId: records.deployId,
+                    taskId: records.taskId,
+                    taskName: records.taskName,
+                    startUser: records.startUserName + '--' + records.startDeptName,
+                    formId: formData.formId,
+                    procDefName: records.procDefName,
+                    projectId: this.taskForm.formId
+                  }
+                })
+              })
+            })
+          })
+        }
+      })
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.nav-btn {
+  display: flex;
+  justify-content: space-between;
+}
+</style>

oa-ui/src/views/flowable/form/inProgress/borrowData.vue

@@ -1,3 +1,9 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-05-10 14:45:08
+ * @LastEditors: 
+ * @LastEditTime: 2024-05-31 16:27:30
+-->
 <!--
  * @Author: ysh
  * @Date: 2024-04-25 17:17:53

oa-ui/src/views/flowable/form/inProgress/settleData.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-05-10 14:45:03
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-30 15:57:17
+ * @LastEditTime: 2024-05-31 14:51:49
 -->
 <template>
   <div class="mt20">
@@ -64,6 +64,10 @@ export default {
     taskForm: {
       type: Object,
       required: true
+    },
+    taskName: {
+      type: String,
+      default: ''
     }
   },
   data() {
@@ -74,7 +78,7 @@ export default {
       summaryList: [],
       workList: [],
       settleList: [],
-      userList:[],
+      userList: [],
       chooseProject: {},
       clickRow: {}
     }
@@ -83,7 +87,8 @@ export default {
     this.getUserList();
     this.getSettleData();
     this.listDefinition();
-    this.getChooseProject();
+    if (this.taskName != '项目登记')
+      this.getChooseProject();
   },
   methods: {
     getUserList() {
@@ -166,9 +171,9 @@ export default {
       this.getSettleWorkList(row.settleId)
       this.open = true
     },
-    getUserNickName(id){
-      for(let user of this.userList){
-        if(user.userId == id){
+    getUserNickName(id) {
+      for (let user of this.userList) {
+        if (user.userId == id) {
           return user.nickName
         }
       }

oa-ui/src/views/flowable/form/projectProcess/arrangeProject.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-19 09:24:06
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-29 16:44:31
+ * @LastEditTime: 2024-05-31 16:26:38
 -->
 <template>
   <div class="app-container">
@@ -21,7 +21,7 @@
         <el-col :span="12" :xs="24">
           <el-form-item label="部门负责人：" prop="deptLeader">
             <el-select v-model="form.deptLeader" multiple clearable style="width:100%">
-              <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId">
+              <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName" :value="item.userId">
               </el-option>
             </el-select>
           </el-form-item>
@@ -39,7 +39,7 @@
         <el-col :span="12" :xs="24">
           <el-form-item label="现场负责人：" prop="siteLeader">
             <el-select v-model="form.siteLeader" filterable clearable style="width:100%">
-              <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"
+              <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName" :value="item.userId"
                 v-if="item.nickName != 'admin'">
               </el-option>
             </el-select>
@@ -122,7 +122,6 @@ export default {
       form: {},
       rules: {},
       deptList: [],
-      userList: [],
       deptLeaderList: [],
       file: {
         fileList: []
@@ -141,7 +140,6 @@ export default {
       this.initForm();
       // this.form.projectId = this.taskForm.formId;
       this.getDeptList();
-      this.getUserList();
     }
   },
   methods: {
@@ -166,11 +164,6 @@ export default {
         this.$store.commit('SET_PROJECT', this.form)
       })
     },
-    getUserList() {
-      listUser({ pageSize: 9999, pageNum: 1 }).then(res => {
-        this.userList = res.rows
-      })
-    },
     getDeptList() {
       listDept({
         deptName: undefined,

oa-ui/src/views/flowable/form/projectProcess/inProgress.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-15 09:35:41
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-30 10:51:38
+ * @LastEditTime: 2024-05-31 16:53:29
 -->
 <template>
   <div>
@@ -15,22 +15,19 @@
       <el-form ref="progress" :model="form" :disabled="disabled" label-width="100px">
         <el-form-item label="参与人员：">
           <el-select v-model="participates" multiple disabled style="width:84%">
-            <el-option v-for="item in userList" :label="item.nickName" :value="item.userId" :key="item.userId">
+            <el-option v-for="item in $store.state.user.userList" :label="item.nickName" :value="item.userId" :key="item.userId">
             </el-option>
           </el-select>
-          <!-- <el-tag class="mr10" :key="item.userId" v-for="item in participates">{{ item.nickName }}</el-tag> -->
           <el-button class="ml10" @click="openPeople = true" type="primary" size="mini" icon="el-icon-plus"></el-button>
           <div v-if="participates.length == 0" style="color:#F56C6C">tips:请选择参与人员</div>
         </el-form-item>
         <el-form-item label="驾驶员：">
           <el-tooltip class="item" effect="dark" content="直接获取用车申请中的驾驶员,若无驾驶员,则需要先提交项目的用车申请" placement="top-end">
             <el-select v-model="form.drivers" multiple disabled style="width:90%">
-              <el-option v-for="item in userList" :label="item.nickName" :value="item.userId" :key="item.userId">
+              <el-option v-for="item in $store.state.user.userList" :label="item.nickName" :value="item.userId" :key="item.userId">
               </el-option>
             </el-select>
           </el-tooltip>
-          <!-- <el-tag class="mr10" :key="item" v-for="item in chooseDriver">{{ item.nickName }}</el-tag>
-          <el-button class="ml10" @click="openDriver = true" type="primary" size="mini" icon="el-icon-plus"></el-button> -->
         </el-form-item>
         <el-form-item label="使用车辆：">
           <el-tooltip class="item" effect="dark" content="直接获取用车申请中的车辆,若无车辆,则需要先提交项目的用车申请" placement="top-end">
@@ -40,9 +37,6 @@
               </el-option>
             </el-select>
           </el-tooltip>
-          <!-- <el-tag class="mr10" :key="item.licensePlate" v-for="item in chooseCar">{{ item.licensePlate + item.brand
-            }}</el-tag>
-          <el-button class="ml10" @click="openCar = true" type="primary" size="mini" icon="el-icon-plus"></el-button> -->
         </el-form-item>
         <el-form-item label="使用设备：">
           <el-tooltip class="item" effect="dark" content="直接获取设备申请中的设备,若无车辆,则需要先提交项目的设备申请" placement="top-end">
@@ -108,11 +102,12 @@
       <div class="headers">
         成果汇交
         <div class="line"></div>
+        <achi-data :taskForm="taskForm"></achi-data>
       </div>
       <div class="headers">
         产值结算（内部）
         <div class="line"></div>
-        <settle-data :taskForm="taskForm"></settle-data>
+        <settle-data :taskForm="taskForm" :taskName="taskName"></settle-data>
       </div>
       <div slot="footer" class="dialog-footer" style="text-align: center">
         <el-button @click="preserve()" :disabled="disabled" type="warning">保 存</el-button>
@@ -151,12 +146,14 @@ import SettleData from '../inProgress/settleData.vue';
 import ChoosePeople from '../budget/components/choosePeople.vue';
 import ChooseCar from '../budget/components/chooseCar.vue';
 import ChooseDevice from "../budget/components/chooseDevice.vue";
+import AchiData from '../inProgress/achiData.vue';
 export default {
   components: {
     borrowData,
     SettleData,
     ChoosePeople,
-    ChooseCar
+    ChooseCar,
+    AchiData
   },
   computed: {
     ...mapGetters(["name", "userId"]),
@@ -221,7 +218,6 @@ export default {
     if (this.taskName != "项目登记") {
       // this.doesItExistBudget(this.taskForm.formId);
       this.initProgress();
-      this.getUserList();
       this.getCarList();
       this.getDeviceList();
     }
@@ -262,7 +258,6 @@ export default {
     },
     getChooseUser(val) {
       this.participates = val.map(item => item.userId);
-      console.log(this.participates);
       this.openPeople = false;
     },
     getChooseCar(val) {
@@ -297,7 +292,6 @@ export default {
         }
       })
       listDeviceApproval({ projectId: this.taskForm.formId }).then(res => {
-        console.log(res.rows);
         if (res.rows) {
           this.form.devices = []
           for (let data of res.rows) {
@@ -347,12 +341,11 @@ export default {
         }
       }
       this.form.projectId = this.taskForm.formId;
-      this.form.cars = this.form.cars.length != 0 ? this.form.cars.join(',') : '';
-      this.form.drivers = this.form.drivers.length != 0 ? this.form.drivers.join(',') : '';
-      this.form.devices = this.form.devices.length != 0 ? this.form.devices.join(',') : '';
+      this.form.cars = this.form.cars.length != 0 ? this.form.cars.join(',') : null;
+      this.form.drivers = this.form.drivers.length != 0 ? this.form.drivers.join(',') : null;
+      this.form.devices = this.form.devices.length != 0 ? this.form.devices.join(',') : null;
       // this.participates = this.participates.map(item => item.userId)
       this.form.participates = this.participates.join(',')
-      console.log(this.form);
       updateProject(this.form).then(res => {
         this.$message.success("保存成功");
         this.form.cars = (this.form.cars.split(',')).map(Number);
@@ -360,12 +353,6 @@ export default {
         this.form.devices = (this.form.devices.split(',')).map(Number);
       });
     },
-    // 查询用户列表
-    getUserList() {
-      listUser(this.addDateRange({ pageSize: 9999, pageNum: 1, deptId: undefined }, [])).then(res => {
-        this.userList = res.rows
-      })
-    },
     // 查询车辆列表
     getCarList() {
       listCar({ pageSize: 9999, pageNum: 1 }).then(res => {

oa-ui/src/views/flowable/form/projectProcess/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-07 17:44:13
+ * @LastEditTime: 2024-05-31 14:33:25
 -->
 
 <template>

oa-ui/src/views/flowable/task/todo/applyForm/archiIndex.vue

@@ -0,0 +1,105 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-05-31 17:02:16
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-05-31 17:06:13
+-->
+<template>
+  <div class="app-container">
+    <nav-header :taskForm="taskForm" :taskName="taskName" :startUser="startUser"
+      :flowRecordList="flowRecordList"></nav-header>
+    <archive-form :taskForm="taskForm" :taskName="taskName" @goBack="goBack"></archive-form>
+  </div>
+</template>
+
+<script>
+import { flowRecord } from "@/api/flowable/finished";
+import { getProcessVariables } from "@/api/flowable/definition";
+import { flowTaskForm } from "@/api/flowable/todo";
+import ArchiveForm from '../../../form/archiveForm.vue';
+import navHeader from './components/navHeader.vue'
+export default {
+  components: {
+    navHeader,
+    ArchiveForm,
+  },
+  data() {
+    return {
+      taskForm: {
+        returnTaskShow: false, // 是否展示回退表单
+        delegateTaskShow: false, // 是否展示回退表单
+        defaultTaskShow: true, // 默认处理
+        comment: "", // 意见内容
+        procInsId: "", // 流程实例编号
+        instanceId: "", // 流程实例编号
+        deployId: "",  // 流程定义编号
+        taskId: "",// 流程任务编号
+        procDefId: "",  // 流程编号
+        targetKey: "",
+        variables: {
+          variables: {}
+        },
+      },
+      startUser: null, // 发起人信息,
+      taskName: null, // 任务节点
+      flowRecordList: []
+    }
+  },
+  created() {
+    if (this.$route.query) {
+      this.taskName = this.$route.query.taskName;
+      this.startUser = this.$route.query.startUser;
+      this.taskForm.deployId = this.$route.query.deployId;
+      this.taskForm.taskId = this.$route.query.taskId;
+      this.taskForm.procInsId = this.$route.query.procInsId;
+      this.taskForm.executionId = this.$route.query.executionId;
+      this.taskForm.instanceId = this.$route.query.procInsId;
+      this.taskForm.formId = this.$route.query.formId;
+      this.taskForm.procDefName = this.$route.query.procDefName;
+      // 流程任务获取变量信息
+      if (this.taskForm.taskId) {
+        this.processVariables(this.taskForm.taskId)
+        this.getFlowTaskForm(this.taskForm.taskId)
+      }
+      this.getFlowRecordList(this.taskForm.procInsId, this.taskForm.deployId);
+    }
+  },
+  methods: {
+    /** 获取流程变量内容 */
+    processVariables(taskId) {
+      if (taskId) {
+        // 提交流程申请时填写的表单存入了流程变量中后续任务处理时需要展示
+        getProcessVariables(taskId).then(res => {
+        });
+      }
+    },
+    /** 流程节点表单 */
+    getFlowTaskForm(taskId) {
+      if (taskId) {
+        // 提交流程申请时填写的表单存入了流程变量中后续任务处理时需要展示
+        flowTaskForm({ taskId: taskId }).then(res => {
+          this.taskForm.variables = res.data.formData;
+        });
+      }
+    },
+    /** 流程流转记录 */
+    getFlowRecordList(procInsId, deployId) {
+      const that = this
+      const params = { procInsId: procInsId, deployId: deployId }
+      flowRecord(params).then(res => {
+        that.flowRecordList = res.data.flowList;
+      }).catch(res => {
+        this.goBack();
+      })
+    },
+    goBack() {
+      // 关闭当前标签页并返回上个页面
+      const obj = this.$route;
+      this.$tab.closeOpenPage(obj);
+      this.$router.go(-1);
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

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-05-30 17:27:56
+ * @LastEditTime: 2024-05-31 14:24:08
 -->
 
 <template>
@@ -35,7 +35,7 @@
       <el-col :span="18" :xs="24">
         <div class="header">快捷入口</div>
         <div class="nav-wrapper">
-          <div class="nav-item" v-for="nav in navItem" @click="goToPath(nav.path)">
+          <div class="nav-item" v-for="nav in navItem" @click="goToPath(nav.path)" v-hasPermi="nav.privilege">
             <el-badge :value="formartBadge(nav.id)" :max="99" class="item">
               <div class="nav-logo" :style="{ 'background-color': nav.bgColor, 'box-shadow': nav.boxShadow }">
                 <div class="icon">
@@ -50,7 +50,7 @@
 
     </el-row>
     <el-row :gutter="20">
-      <el-col :span="8" :xs="24">
+      <el-col :span="5" :xs="24">
         <div class="header">日历</div>
         <div class="calendar-warpper">
           <!-- <Calendar></Calendar> -->
@@ -58,10 +58,10 @@
           </el-calendar>
         </div>
       </el-col>
-      <el-col :span="8" :xs="24">
+      <el-col :span="11" :xs="24">
         <div class="header">公告</div>
         <div class="notice-content">
-          <el-table v-loading="noticeLoading" :data="noticeList" height="320px">
+          <el-table v-loading="noticeLoading" :data="noticeList" height="320px" @row-click="handleRowClick">
             <!-- <el-table-column label="序号" align="center" prop="noticeId" width="100" /> -->
             <el-table-column label="公告类型" align="center" prop="noticeType" width="100">
               <template slot-scope="scope">
@@ -148,56 +148,64 @@ export default {
           icon: 'cascader',
           bgColor: '#785aee',
           boxShadow: '0 5px 20px rgba(120,90,238,0.5)',
-          path: '/task/process'
+          path: '/task/process',
+          privilege:['system:deployment:add']
         }, {
           id: 2,
           name: '待办任务',
           icon: 'log',
           bgColor: '#e66794',
           boxShadow: '0 5px 20px rgba(230,103,148,0.5)',
-          path: '/task/todo'
+          path: '/task/todo',
+          privilege:['system:deployment:add']
         }, {
           id: 3,
           name: '已办任务',
           icon: 'excel',
           bgColor: '#6389f4',
           boxShadow: '0 5px 20px rgba(99,137,244,0.5)',
-          path: '/task/finished'
+          path: '/task/finished',
+          privilege:['system:deployment:add']
         }, {
           id: 4,
-          name: '项目管理',
+          name: '项目台账',
           icon: 'dict',
           bgColor: '#e64c56',
           boxShadow: '0 5px 20px rgba(230,76,86,0.5)',
-          path: '/project'
+          path: '/project',
+          privilege:['oa:project:query']
         }, {
           id: 5,
           name: '车辆管理',
           icon: 'car',
           bgColor: '#eeb62f',
           boxShadow: '0 5px 20px rgba(238,182,47,0.5)',
-          path: '/car'
+          path: '/car',
+          privilege:['oa:car:list']
         }, {
           id: 6,
           name: '设备管理',
           icon: 'lock',
           bgColor: '#0be1bd',
           boxShadow: '0 5px 20px rgba(11,225,189,0.5)',
-          path: '/device/equipment'
+          path: '/device/equipment',
+          privilege:['oa:device:list']
         }, {
           id: 7,
           name: '投标管理',
           icon: 'example',
           bgColor: '#F7C59F',
           boxShadow: '0 5px 20px rgba(247,197,159,0.5)',
-          path: '/tender'
+          path: '/tender',
+          privilege:['oa:tender:query']
         }, {
           id: 8,
           name: '人事管理',
           icon: 'dept',
           bgColor: '#20B2AA',
           boxShadow: '0 5px 20px rgba(32,178,170,0.5)',
-          path: '/staff/people'
+          path: '/staff/people',
+          privilege:['oa:salary:list']
         }, 
         // {
         //   id: 9,
@@ -284,6 +292,9 @@ export default {
       } else {
         return null
       }
+    },
+    handleRowClick(row){
+      console.log(row);
     }
   }
 }

oa-ui/src/views/oa/contract/index.vue

@@ -9,30 +9,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="合同金额" prop="amount">
-        <el-input
-          v-model="queryParams.amount"
-          placeholder="请输入合同金额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="履约保证金" prop="deposit">
-        <el-input
-          v-model="queryParams.deposit"
-          placeholder="请输入履约保证金"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="合同文件" prop="contractDocument">
-        <el-input
-          v-model="queryParams.contractDocument"
-          placeholder="请输入合同文件"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="拟稿人" prop="drafter">
         <el-input
           v-model="queryParams.drafter"
@@ -57,22 +33,6 @@
           placeholder="请选择签订日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="签订备注" prop="signRemark">
-        <el-input
-          v-model="queryParams.signRemark"
-          placeholder="请输入签订备注"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="签订扫描件" prop="signScan">
-        <el-input
-          v-model="queryParams.signScan"
-          placeholder="请输入签订扫描件"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

oa-ui/src/views/oa/project/info.vue

@@ -378,7 +378,7 @@
       </div>
     </div>
     <el-dialog title="项目预算" :visible.sync="openBudget" width="1000px" append-to-body>
-      <budget-info :taskForm="taskForm" :taskName="''"></budget-info>
+      <budget-tab :taskForm="taskForm"></budget-tab>
     </el-dialog>
     <el-dialog title="安全交底记录表" :visible.sync="openSafe" width="1000px" append-to-body>
       <safe-tab :taskForm="taskForm"></safe-tab>
@@ -406,8 +406,9 @@ import SafeTab from '../../flowable/form/projectProcess/safeTab.vue';
 import TechnicalTab from '../../flowable/form/projectProcess/technicalTab.vue';
 import SettleData from '../../flowable/form/inProgress/settleData.vue';
 import BorrowData from '../../flowable/form/inProgress/borrowData.vue';
+import BudgetTab from '../../flowable/form/projectProcess/budgetTab.vue';
 export default {
-  components: { budgetInfo, SafeTab, TechnicalTab, SettleData, BorrowData },
+  components: { budgetInfo, SafeTab, TechnicalTab, SettleData, BorrowData, BudgetTab },
   created() {
     this.getUserList();
     this.getDeviceList();