新增人事管理初始学历专业等字段、新增管理员可发起项目预算流程

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

@@ -237,7 +237,6 @@ export default {
       }
     },
     changePage() {
-      debugger
       if (this.status == 'normal') {
         this.getContractList();
       } else {

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

@@ -491,7 +491,6 @@ export default {
     },
     confirmSucess(taskName) {
       const params = { taskId: this.taskForm.taskId };
-      debugger
       if (taskName == '分管审核') {
         if (this.budgetForm.managerComment == '' || this.budgetForm.managerComment == null) {
           this.$modal.msgError('请填写审核意见');

oa-ui/src/views/flowable/form/components/print/settlePrint.vue

@@ -205,7 +205,6 @@ export default {
     initTable() {
       this.deductionsList = []  //扣除列表
       this.deptSettleList = []  //部门分配列表
-      debugger
       for (let s of this.settleList) {
         if (s.tableNumber == '0') {
           this.deductionsList.push(s)

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

@@ -2,14 +2,14 @@
  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-01-09 11:43:24
+ * @LastEditTime: 2025-02-26 14:48:48
 -->
 <template>
   <div class="app-container" v-loading="loading">
     <el-row :gutter="20">
       <el-col :span="flowDisabled ? 19 : 24" :xs="24">
         <el-button type="success" icon="el-icon-printer" @click="printOpen = true">打印</el-button>
-        <h2 class="text-center">项目结算表</h2>
+        <h2 class="text-center">项目结算表 <span style="color:#f56c6c" v-if="isAppend">（追加结算）</span> </h2>
         <div class="mt20 mb20" v-if="showAlter && flowDisabled">
           <el-alert title="任务被退回，请修改后重新提交" type="error" :closable="false">
             <return-comment :taskForm="taskForm" @isReturn="isReturn"></return-comment>
@@ -90,34 +90,6 @@
               </el-link>
             </div>
           </el-form-item>
-          <!-- <el-form-item label="经营发展部审核结算单" prop="">
-            <FileUpload v-if="taskName == '经营发展部校核'" :limit="1" :filePathName="'项目结算/经营发展部审核结算单'"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="setModifyDocument">
-            </FileUpload>
-            <div v-if="form.modifyDocument" class="upload-list">
-              <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.modifyDocument}`)">
-                {{ getFileName(form.modifyDocument) }}
-              </el-link>
-              <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.modifyDocument}`"
-                :underline="false" target="_blank">
-                <span class="el-icon-download">下载文件</span>
-              </el-link>
-            </div>
-          </el-form-item>
-          <el-form-item label="分管领导审核结算单" prop="">
-            <FileUpload v-if="taskName == '分管审核'" :limit="1" :filePathName="'项目结算/分管领导审核结算单'"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="setFinalDocument">
-            </FileUpload>
-            <div v-if="form.finalDocument" class="upload-list">
-              <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.finalDocument}`)">
-                {{ getFileName(form.finalDocument) }}
-              </el-link>
-              <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.finalDocument}`"
-                :underline="false" target="_blank">
-                <span class="el-icon-download">下载文件</span>
-              </el-link>
-            </div>
-          </el-form-item> -->
 
           <div class="headers" v-hasRole="['leader', 'business']">
             合同信息
@@ -238,8 +210,10 @@
                 <!-- <el-input-number style="width:100px" v-model="work.settle" clearable :controls="false"></el-input-number> -->
                 <div>{{ work.settle }}</div>
                 <div v-if="taskName == '结算发起'">
-                  <el-button size="mini" type="text" v-if="Number(work.settle) <= 600 && Number(work.settle) != 0" @click="setSettle(work)">置为600</el-button>
-                  <el-button size="mini" type="text" v-if="Number(work.settle) <= 600 && Number(work.settle) != 0" @click="resetSettle(work)">还原</el-button>
+                  <el-button size="mini" type="text" v-if="Number(work.settle) <= 600 && Number(work.settle) != 0"
+                    @click="setSettle(work)">置为600</el-button>
+                  <el-button size="mini" type="text" v-if="Number(work.settle) <= 600 && Number(work.settle) != 0"
+                    @click="resetSettle(work)">还原</el-button>
                 </div>
               </td>
               <td>
@@ -282,7 +256,7 @@
                 <td style="width: 280px">备注</td>
                 <td style="width: 100px">操作</td>
               </tr>
-              <tr v-for="(  work, index  ) in settleSumList  " :key="index">
+              <tr v-for="(work, index) in settleSumList" :key="index">
                 <td>
                   {{ index + 1 }}
                 </td>
@@ -318,7 +292,7 @@
                 <td style="width: 280px">备注</td>
                 <td style="width: 100px">操作</td>
               </tr>
-              <tr v-for="(  dept, index  ) in deptSettleList  " :key="index" v-if="dept.content != '实际结算总金额'">
+              <tr v-for="(dept, index) in deptSettleList" :key="index" v-if="dept.content != '实际结算总金额'">
                 <td :rowspan="deptSettleList.length" v-if="index == 0">
                   {{ Number(actualSumSettle).toFixed(2) }}
                 </td>
@@ -526,7 +500,7 @@
     </el-dialog>
 
     <el-dialog title="导入结算工作量" :visible.sync="importOpen" width="400px" append-to-body>
-      <settle-import @getDataList="getImportSettleList" @cancel="importOpen = false" ></settle-import>
+      <settle-import @getDataList="getImportSettleList" @cancel="importOpen = false"></settle-import>
     </el-dialog>
   </div>
 </template>
@@ -536,23 +510,19 @@ import flow from "@/views/flowable/task/todo/detail/flow";
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import { parseTime } from "@/utils/ruoyi";
 import { listProject, getProject } from "@/api/oa/project/project";
-import { deepClone } from "@/utils";
-import { listSettle, getSettle, delSettle, addSettle, updateSettle } from "@/api/oa/settle/settle";
-import { listSettleSummary, getSettleSummary, addSettleSummary, delSettleSummary, updateSettleSummary } from "@/api/oa/settle/settleSummary";
-import { listSettleWork, getSettleWork, addSettleWork, updateSettleWork, delSettleWork } from "@/api/oa/settle/settleWork";
-import { listProjectContract, addProjectContract } from "@/api/oa/contract/projectContract";
+import { listSettle, getSettle, addSettle, updateSettle } from "@/api/oa/settle/settle";
+import { listSettleSummary, addSettleSummary, delSettleSummary } from "@/api/oa/settle/settleSummary";
+import { listSettleWork, addSettleWork, delSettleWork } from "@/api/oa/settle/settleWork";
 import { getPrice, getPriceRemarkByWorkType } from "@/api/oa/price/price";
 import ChoosePrice from "./components/choosePrice.vue";
 import { getUser } from "@/api/system/user";
 import { getUserByRole } from "@/api/system/role";
 import { getUserByPost } from "@/api/system/post";
-import { complete, getNextFlowNode, returnTask, findReCommitTask, taskRecommit } from "@/api/flowable/todo";
-import { getUsersDeptLeader, getUsersDeptLeaderByDept, getUsersManageLeaderByDept, } from "@/api/system/post.js";
+import { complete, getNextFlowNode, findReCommitTask, taskRecommit } from "@/api/flowable/todo";
+import { getUsersDeptLeaderByDept, getUsersManageLeaderByDept, } from "@/api/system/post.js";
 import { listBudget } from "@/api/oa/budget/budget";
 import { listBudgetSettle } from "@/api/oa/budget/budgetSettle";
 import SettlePrint from "./components/print/settlePrint.vue";
-import { getDept } from "@/api/system/dept";
-import { getContract } from "@/api/oa/contract/contract";
 import ChooseProject from "./components/chooseProject.vue";
 import projectContractInfo from "./projectContractInfo.vue";
 import ReturnComment from '@/views/flowable/form/components/flowBtn/returnComment.vue';
@@ -598,6 +568,7 @@ export default {
   data() {
     return {
       baseUrl: process.env.VUE_APP_BASE_API,
+      isAppend: false,//是否追加结算
       printOpen: false,
       loading: false,
       drawer: false,
@@ -663,7 +634,7 @@ export default {
       projectId: '',
       showAlter: true,
       returnOpen: false,
-      importOpen:false,
+      importOpen: false,
     };
   },
   created() {
@@ -708,6 +679,7 @@ export default {
       const res = await listSettle({ settleId: this.taskForm.formId });
       if (res.total === 1) {
         this.form = res.rows[0];
+        this.getIsAppend(this.taskForm.formId, res.rows[0].projectId) //判断是否为追加结算
         this.flag = true;
         const settleId = this.taskForm.formId;
         const [
@@ -797,7 +769,19 @@ export default {
       this.loading = false;
       this.deptList = this.$store.state.user.deptList
     },
-
+    async getIsAppend(settleId, projectId) {
+      let res = await listSettle({ projectId });
+      if (res.total > 1) {
+        let arr = res.rows
+        const target = arr.find(item => item.settleId === settleId);
+        const parseTime = (timeStr) => Date.parse(timeStr);
+        const allTimestamps = arr.map(item => parseTime(item.reportTime));
+        const minTimestamp = Math.min(...allTimestamps);
+        const targetTimestamp = parseTime(target.reportTime);
+        const isAppend = targetTimestamp !== minTimestamp;
+        this.isAppend = isAppend;
+      }
+    },
     async getBudgetSettle() {
       let budgetData = await listBudget({ projectId: this.form.projectId })
       if (budgetData.total == 1) {
@@ -1039,13 +1023,13 @@ export default {
       this.calculateActualSumSettle();
     },
     // 置为600
-    setSettle(work){
+    setSettle(work) {
       work.settle = 600;
       work.remark = '不足600，按600算';
       this.calculateSumSettle();
       this.calculateActualSumSettle();
     },
-    resetSettle(work){
+    resetSettle(work) {
       work.remark = '';
       this.calculateSettle(work)
     },
@@ -1187,12 +1171,19 @@ export default {
         }
       }
     },
-    confirmProject(val) {
+    async confirmProject(val) {
       if (val.length == 1) {
         this.prOpen = false;
         this.chooseProject = val[0];
-        this.$set(this.form, 'projectId', val[0].projectId)
-        this.isSelect = true;
+        let settleData = await listSettle({ projectId: val[0].projectId });
+        console.log(settleData)
+        if (settleData.total >= 1) {
+          this.$modal.confirm('该项目已经发起过项目结算，是否追加结算？').then(() => {
+            this.$set(this.form, 'projectId', val[0].projectId)
+            this.isSelect = true;
+            this.isAppend = true;
+          })
+        }
       } else {
         this.$message.error("项目只能选择一个！");
         return;
@@ -1203,12 +1194,6 @@ export default {
       getPriceRemarkByWorkType({ workType }).then((res) => {
         if (res.code == 200) {
           if (workType != undefined) this.$set(work, "noteTip", res.msg);
-          // this.$notify({
-          //   title: workType,
-          //   dangerouslyUseHTMLString: true,
-          //   message: res.msg,
-          //   duration: 0
-          // });
         }
       });
     },
@@ -1226,9 +1211,9 @@ export default {
         return this.form.dszComment
       }
     },
-    getImportSettleList(val){
+    getImportSettleList(val) {
       this.settleWorkList = val;
-      for(let work of this.settleWorkList){
+      for (let work of this.settleWorkList) {
         this.calculateSettle(work)
       }
       this.importOpen = false;

oa-ui/src/views/flowable/task/myProcess/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-10-25 14:05:06
+ * @LastEditTime: 2025-02-26 17:16:24
 -->
 <template>
   <div class="app-container">
@@ -75,6 +75,18 @@
 
     <!-- 发起流程 -->
     <el-dialog :title="title" :visible.sync="open" width="400px" append-to-body>
+      <div v-if="$store.getters.userId == 1">
+        <el-select v-model="queryType" style="width: 120px;">
+          <el-option label="项目编号" value="1"></el-option>
+          <el-option label="项目名称" value="2"></el-option>
+        </el-select>
+        <el-select v-model="projectId" clearable filterable remote reserve-keyword placeholder="请输入关键字"
+          :remote-method="remoteMethod" style="width: 300px;">
+          <el-option v-for="project in projectList" :key="project.projectId"
+            :label="project.projectNumber + '-' + project.projectName" :value="project.projectId">
+          </el-option>
+        </el-select>
+      </div>
       <progress-tree :definitionList="definitionList" @confirm="handleStartProcess"
         @close="open = false"></progress-tree>
     </el-dialog>
@@ -105,6 +117,7 @@ import { getProcessVariables } from "@/api/flowable/definition";
 import conditionDisplay from '@/views/flowable/form/components/conditionDisplay.vue';
 import { deleteResources } from "@/utils/deleteResource";
 import { listPerformance } from "@/api/oa/performance/performance";
+import { listProject } from '@/api/oa/project/project';
 export default {
   name: "Deploy",
   components: {
@@ -114,6 +127,9 @@ export default {
   },
   data() {
     return {
+      queryType: '1',
+      projectId: '',
+      projectList: [],
       // 遮罩层
       loading: true,
       processLoading: true,
@@ -276,6 +292,27 @@ export default {
         })
       }
     },
+    remoteMethod(val) {
+      let params1 = {
+        pageNum: 1,
+        pageSize: 20,
+        projectNumber: val
+      }
+      let params2 = {
+        pageNum: 1,
+        pageSize: 20,
+        projectName: val
+      }
+      let params = {};
+      if (this.queryType == '1') {
+        params = params1
+      } else {
+        params = params2
+      }
+      listProject(params).then(res => {
+        this.projectList = res.rows;
+      })
+    },
     /** 新增按钮操作 */
     handleAdd() {
       this.open = true;
@@ -305,7 +342,7 @@ export default {
       let formId = new Snowflake(1n, 1n, 0n).nextId().toString();
       getNextFlowNodeByStart({ deploymentId: row.deploymentId, variables: { formId: formId } }).then(res => {
         let data = res.data;
-        if (data.dataType === 'dynamic') {
+        if (data.dataType === 'dynamic' && row.name != '项目预算') {
           if (data.type === 'assignee') { // 指定人员
             this.checkSendUser = true;
             this.checkType = "single";
@@ -331,6 +368,10 @@ export default {
           if (row.id) {
             variables.variables = formData;
             let routePath = this.getRoutePath(row);
+            if (row.name == '项目预算') {
+              variables.approval = 1;
+              formData.formId = this.projectId;
+            }
             // 启动流程并将表单数据加入流程变量
             definitionStart(row.id, JSON.stringify(variables)).then(res => {
               this.$modal.msgSuccess(res.msg);
@@ -343,6 +384,11 @@ export default {
                 if (records.length == 1) {
                   records = records[0]
                 }
+                if(row.name == '项目预算'){
+                  this.open = false;
+                  this.getList();
+                  return
+                }
                 this.$router.push({
                   path: routePath,
                   query: {
@@ -357,23 +403,10 @@ export default {
                   }
                 })
               })
-              // this.goBack();
-              // this.$router.push({
-              //   path: '/flowable/task/myProcess/send/index',
-              //   query: {
-              //     deployId: row.deploymentId,
-              //     procDefId: row.id,
-              //     name: row.name
-              //   }
-              // })
             })
           }
         }
       })
-      // } else {
-
-      // }
-
     },
     getRoutePath(row) {
       let path;

oa-ui/src/views/flowable/task/myProcess/progressTree.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-18 15:14:45
- * @LastEditors: wrh
- * @LastEditTime: 2024-07-04 13:06:39
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-02-26 15:03:14
 -->
 <template>
   <div>
@@ -82,6 +82,11 @@ export default {
         else if (i.category == "project") {
           if (i.name != "项目预算" && i.name != "安全交底" && i.name != "技术交底" && i.name != "技术方案")
             this.treeData[1].children.push(i);
+          if (i.name == "项目预算") {
+            if (this.$store.getters.userId == 1) {
+              this.treeData[1].children.push(i);
+            }
+          }
         } else if (i.category == "finance") {
           this.treeData[2].children.push(i);
         } else if (i.category == "oa") {

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

@@ -11,7 +11,7 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item label="标题">
-        <el-input v-model="searchText" size="small"  @input="filterTitle()" clearable placeholder="仅搜索当前页面标题"></el-input>
+        <el-input v-model="searchText" size="small" @input="filterTitle()" clearable placeholder="仅搜索当前页面标题"></el-input>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -50,7 +50,8 @@
       </el-table-column>
     </el-table>
 
-    <div class="mt20" style="font-size:12px;color:#e45656;text-align:right;">tips:标题搜索只搜索当前页码列表，可在右下角调整每页条数，若当前页面未查询到，可点击下一页;</div>
+    <div class="mt20" style="font-size:12px;color:#e45656;text-align:right;">
+      tips:标题搜索只搜索当前页码列表，可在右下角调整每页条数，若当前页面未查询到，可点击下一页;</div>
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
       @pagination="getList" />
     <!--选择流程接收人-->
@@ -137,6 +138,8 @@ export default {
       this.filterList = this.todoList.filter(data => {
         if (data.title) {
           return !this.searchText || data.title.toLowerCase().includes(this.searchText.toLowerCase())
+        } else {
+          return data
         }
       })
     },
@@ -184,6 +187,9 @@ export default {
     // 跳转到处理页面
     handleProcess(row) {
       let path = this.getRoutePath(row);
+      if (this.$store.getters.userId == 1 && row.procDefName == '项目预算') {
+        path = '/applyForm/budgetApply'
+      }
       getProcessVariables(row.taskId).then(res => {
         this.$router.push({
           path: path,

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

@@ -207,7 +207,7 @@
               </el-radio-group>
             </el-form-item>
             <el-form-item label="年龄" prop="age" v-if="form.userId != undefined">
-              {{ form.age + '岁' }}
+              {{ String(form.age).slice(0,2) + '岁' }}
             </el-form-item>
             <el-form-item label="手机号码" prop="phonenumber">
               <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
@@ -221,17 +221,30 @@
             <el-form-item label="民族" prop="ethnic">
               <el-input v-model="form.ethnic" placeholder="请输入民族" />
             </el-form-item>
-            <el-form-item label="毕业学校" prop="graduateSchool">
-              <el-input v-model="form.graduateSchool" placeholder="请输入毕业学校" />
-            </el-form-item>
-            <el-form-item label="专业" prop="major">
-              <el-input v-model="form.major" placeholder="请输入专业" />
+            <el-form-item label="初始学历专业" prop="initialDegree">
+              <el-col :span="12">
+                <el-select v-model="form.initialDegree" placeholder="请选择" style="width:100%;" clearable>
+                  <el-option v-for="dict in dict.type.sys_user_degree" :key="dict.value" :label="dict.label"
+                  :value="dict.value" />
+                </el-select>
+              </el-col>
+              <el-col :span="12">
+                <el-input v-model="form.initialMajor" placeholder="请输入专业" />
+              </el-col>
             </el-form-item>
-            <el-form-item label="学历" prop="degree">
-              <el-select v-model="form.degree" clearable placeholder="请输入学历" style="width:100%;">
-                <el-option v-for="dict in dict.type.sys_user_degree" :key="dict.value" :label="dict.label"
+            <el-form-item label="最高学历专业" prop="degree">
+              <el-col :span="12">
+                <el-select v-model="form.degree" placeholder="请选择" style="width:100%;" clearable>
+                  <el-option v-for="dict in dict.type.sys_user_degree" :key="dict.value" :label="dict.label"
                   :value="dict.value" />
-              </el-select>
+                </el-select>
+              </el-col>
+              <el-col :span="12">
+                <el-input v-model="form.major" placeholder="请输入专业" />
+              </el-col>
+            </el-form-item>
+            <el-form-item label="毕业学校" prop="graduateSchool">
+              <el-input v-model="form.graduateSchool" placeholder="请输入毕业学校" />
             </el-form-item>
             <el-form-item label="家庭住址" prop="homePlace">
               <el-input type="textarea" v-model="form.homePlace" placeholder="请输入家庭住址" />
@@ -271,6 +284,9 @@
                   :value="dict.value" />
               </el-select>
             </el-form-item>
+            <el-form-item label="职称证书专业" prop="titleProfession">
+              <el-input type="textarea" v-model="form.titleProfession" placeholder="职称证书专业" />
+            </el-form-item>
             <el-form-item label="执业证书">
               <el-select v-model="form.certificates" multiple placeholder="请输入执业证书" style="width:100%;">
                 <el-option v-for="dict in dict.type.sys_user_certificates" :key="dict.value" :label="dict.label"
@@ -303,13 +319,13 @@
             </el-form-item>
             <el-form-item label="岗级" prop="postlevel">
               <el-col :span="12">
-                <el-select v-model="form.postLevel" placeholder="请选择" style="width:100%;">
+                <el-select v-model="form.postLevel" placeholder="请选择" style="width:100%;" clearable>
                   <el-option v-for="dict in dict.type.sys_user_postlevel" :key="dict.value" :label="dict.label"
                     :value="dict.value" />
                 </el-select>
               </el-col>
               <el-col :span="12">
-                <el-select v-model="form.salaryLevel" placeholder="请选择" style="width:100%;">
+                <el-select v-model="form.salaryLevel" placeholder="请选择" style="width:100%;" clearable>
                   <el-option v-for="dict in dict.type.sys_user_salarylevel" :key="dict.value" :label="dict.label"
                     :value="dict.value" />
                 </el-select>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-22 14:50:46
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-10-25 15:07:27
+ * @LastEditTime: 2025-02-26 17:09:25
 -->
 <template>
   <div class="bg" v-loading="loading">
@@ -196,10 +196,20 @@ export default {
               value: this.form.major
             },
             {
-              label: '学历：',
+              label: '最高学历：',
               icon: 'degree',
               value: this.selectDictLabel(this.dict.type.sys_user_degree, this.form.degree)
             },
+            {
+              label: '初始专业：',
+              icon: 'major',
+              value: this.form.initialMajor
+            },
+            {
+              label: '初始学历：',
+              icon: 'degree',
+              value: this.selectDictLabel(this.dict.type.sys_user_degree, this.form.initialDegree)
+            },
             {
               label: '合同签订：',
               icon: 'contractSign',