修改分包合同、人员管理

oa-ui/src/components/FileUpload/index.vue

@@ -45,7 +45,7 @@
         <el-link :href="`${baseUrl}${file.url}`" :underline="false" target="_blank">
           <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
         </el-link>
-        <div class="ele-upload-list__item-content-action">
+        <div class="ele-upload-list__item-content-action" :disabled="disabled">
           <el-link :underline="false" @click="handleDelete(index)" type="danger"
             >删除</el-link
           >

oa-ui/src/views/flowable/form/business/contractForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-14 17:46:47
+ * @LastEditTime: 2024-05-15 11:51:21
 -->
 <template>
   <div class="app-container">
@@ -84,7 +84,7 @@
 
           </el-row>
           <el-form-item label="合同文件" prop="contractDocument">
-            <FileUpload v-if="taskName == '合同拟稿'" ref="contractFile" :limit="1" :filePathName="'合同文件'"
+            <FileUpload v-if="taskName == '合同拟稿'" ref="contractFile" :limit="1" :filePathName="'承接合同文件'"
               :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getContractPath"></FileUpload>
             <div v-if="taskName != '合同拟稿'">
               <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"
@@ -252,7 +252,7 @@
                     :disabled="taskName != '线上会审' || (taskName == '线上会审' && comment.userId != userId)"></el-input>
                 </td>
                 <td style="text-align:left;" @click="clickFile(comment)">
-                  <FileUpload v-if="comment.document == ''" ref="hs" :limit="1" :filePathName="'合同文件'"
+                  <FileUpload v-if="comment.document == ''" ref="hs" :limit="1" :filePathName="'承接合同文件'"
                     :disabled="taskName != '线上会审' || (taskName == '线上会审' && !comment.commentUser)"
                     :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="setCommentDocument">
                   </FileUpload>
@@ -329,7 +329,7 @@
               <tr>
                 <td>评审意见表</td>
                 <td colspan="5">
-                  <FileUpload v-if="taskName == '会议评审'" ref="contractFile" :limit="1" :filePathName="'合同文件'"
+                  <FileUpload v-if="taskName == '会议评审'" ref="contractFile" :limit="1" :filePathName="'承接合同文件'"
                     :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getMeetingPath"></FileUpload>
                   <!-- <el-input v-model="meetingForm.document" clearable :disabled="taskName != '会议评审'"></el-input> -->
                 </td>
@@ -382,7 +382,7 @@
           <el-form-item label="签订扫描件" prop="signScan">
             <!-- <el-input v-model="form.signScan" placeholder="请输入签订扫描件" :disabled="taskName != '合同签订'" /> -->
             <FileUpload v-if="form.signScan == null || form.signScan == ''" ref="contractFile" :limit="1"
-              :filePathName="'合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getSignScanPath">
+              :filePathName="'承接合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getSignScanPath">
             </FileUpload>
             <div v-if="form.signScan != null && form.signScan != ''">
               <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"

oa-ui/src/views/flowable/form/business/fileItem.vue

@@ -0,0 +1,45 @@
+<template>
+  <div>
+    <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
+      <li key="li01" class="el-upload-list__item ele-upload-list__item-content">
+        <el-link :href="`${baseUrl}${'/profile/upload' + document}`" :underline="false" target="_blank">
+          <span class="el-icon-document" style="color:#0011ff;text-decoration: underline;">
+            {{ getFileName(document) }}
+          </span>
+        </el-link>
+        <!-- <div class="ele-upload-list__item-content-action" v-if="taskName == '会议评审'">
+          <el-link :underline="false" @click="handleFileDelete(meetingForm, 'document')" type="danger">删除</el-link>
+        </div> -->
+      </li>
+    </transition-group>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    document: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      baseUrl: process.env.VUE_APP_BASE_API,
+    }
+  },
+  methods: {
+    getFileName(name) {
+      if (name) {
+        let arr = name.split('/')
+        return arr[arr.length - 1];
+      }
+    },
+    handleFileDelete() {
+
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

oa-ui/src/views/flowable/form/business/subContract.vue

@@ -1,9 +1,15 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-05-10 15:31:57
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-05-15 14:32:41
+-->
 <template>
   <div class="app-container">
     <el-row :gutter="20">
       <el-col :span="18" :xs="24">
         <h2 class="text-center">分包合同评审表</h2>
-        <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+        <el-form ref="form" :model="form" :rules="rules" label-width="130px" :formDisabled="formDisabled">
           <el-divider></el-divider>
           <el-form-item label="项目编号：" prop="projectId">
             <el-button type="primary" size="mini" @click="open = true" v-if="taskName == '合同拟稿'">选择项目</el-button>
@@ -194,13 +200,13 @@
           <el-form-item label="线上会审：" v-if="commentOpen">
             <table border="1">
               <tr>
-                <td>序号</td>
+                <td style="width: 50px;">序号</td>
                 <td>会审部门</td>
                 <td>会审人</td>
                 <td>会审意见</td>
-                <td>会审附件</td>
-                <td>签名</td>
-                <td>日期</td>
+                <td style="width: 200px;">会审附件</td>
+                <td style="width: 90px;">签名</td>
+                <td style="width: 100px;">日期</td>
               </tr>
               <tr v-for="(comment, index) in commentList" :key="index">
                 <td>
@@ -222,11 +228,31 @@
                 </td>
                 <td>
                   <el-input v-model="comment.comment" type="textarea" clearable :autosize="{ minRows: 4, maxRows: 10 }"
-                    :disabled="taskName != '线上会审' || (taskName == '线上会审' && !comment.commentUser)"></el-input>
+                    :disabled="taskName != '线上会审' || (taskName == '线上会审' && comment.userId != userId)"></el-input>
                 </td>
-                <td>
-                  <el-input v-model="comment.document" clearable
-                    :disabled="taskName != '线上会审' || (taskName == '线上会审' && !comment.commentUser)"></el-input>
+                <!-- 线上会审附件 -->
+                <td @click="clickFile(comment)">
+                  <FileUpload v-if="comment.document == ''" ref="hs" :limit="1" :filePathName="'分包合同文件'"
+                    :disabled="taskName != '线上会审' || (taskName == '线上会审' && !comment.commentUser)"
+                    :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="setCommentDocument">
+                  </FileUpload>
+                  <div v-if="comment.document != ''">
+                    <transition-group class="upload-file-list el-upload-list el-upload-list--text"
+                      name="el-fade-in-linear" tag="ul">
+                      <li key="li01" class="el-upload-list__item ele-upload-list__item-content">
+                        <el-link :href="`${baseUrl}${'/profile/upload' + comment.document}`" :underline="false"
+                          target="_blank">
+                          <span class="el-icon-document" style="color:#0011ff;text-decoration: underline;">
+                            {{ getFileName(comment.document) }}
+                          </span>
+                        </el-link>
+                        <div class="ele-upload-list__item-content-action" v-if="comment.userId == userId">
+                          <el-link :underline="false" @click="handleFileDelete(comment, 'document')"
+                            type="danger">删除</el-link>
+                        </div>
+                      </li>
+                    </transition-group>
+                  </div>
                 </td>
                 <td>
                   <span class="auditor"> {{ comment.commentUser ? comment.commentUser.nickName : '' }} </span>
@@ -279,10 +305,13 @@
               </tr>
               <tr>
                 <td>评审意见表</td>
-                <td colspan="5">
-                  <!-- <el-input v-model="meetingForm.document" clearable :disabled="taskName != '会议评审'"></el-input> -->
-                  <FileUpload v-if="taskName == '会议评审'" ref="contractFile" :limit="1" :filePathName="'合同文件'"
-                    :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getMeetingPath"></FileUpload>
+                <td colspan="5" style="text-align:left;">
+                  <FileUpload v-if="taskName == '会议评审'" ref="contractFile" :limit="1" :filePathName="'分包合同文件'"
+                    :disabled="taskName != '会议评审'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+                    @input="getMeetingPath"></FileUpload>
+                  <div v-if="taskName != '会议评审'">
+                    <file-item :document="meetingForm.document"></file-item>
+                  </div>
                 </td>
               </tr>
               <tr>
@@ -306,7 +335,8 @@
             </table>
           </el-form-item>
           <el-form-item label="分管审批意见" prop="remark">
-            <el-input v-model="form.managerComment" placeholder="请输入分管审批意见" :disabled="taskName != '分管审核'" />
+            <el-input v-model="form.managerComment" type="textarea" placeholder="请输入分管审批意见"
+              :disabled="taskName != '分管审核'" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
@@ -327,14 +357,19 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item label="签订备注" prop="signRemark">
-            <el-input v-model="form.signRemark" placeholder="请输入签订备注" :disabled="taskName != '合同签订'" />
+            <el-input v-model="form.signRemark" type="textarea" placeholder="请输入签订备注" :disabled="taskName != '合同签订'" />
           </el-form-item>
           <el-form-item label="签订扫描件" prop="signScan">
-            <el-input v-model="form.signScan" placeholder="请输入签订扫描件" :disabled="taskName != '合同签订'" />
+            <FileUpload v-if="taskName == '合同签订'" :limit="1" :filePathName="'分包合同文件'"
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getSignScanPath">
+            </FileUpload>
+            <div v-if="taskName != '合同签订'">
+              <file-item :document="form.signScan"></file-item>
+            </div>
           </el-form-item>
         </el-form>
         <div style="text-align: center;">
-          <el-button type="primary" @click="submitForm">提 交</el-button>
+          <el-button type="primary" @click="submitForm" :disabled="formDisabled">提 交</el-button>
         </div>
       </el-col>
       <el-col :span="6" :xs="24">
@@ -371,11 +406,14 @@ import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm, } from "@/api/flowable/todo";
 import projectChoose from '../components/chooseProject.vue';
+import FileItem from './fileItem.vue';
+import { mapGetters } from "vuex";
 export default {
   dicts: ['cmc_scale_grade', 'cmc_unit'],
   components: {
     flow,
-    projectChoose
+    projectChoose,
+    FileItem
   },
   props: {
     taskName: {
@@ -385,11 +423,19 @@ export default {
     taskForm: {
       type: Object,
       required: true
+    },
+    formDisabled: {
+      type: Boolean,
+      default: false
     }
   },
+  computed: {
+    ...mapGetters(["userId"]),
+  },
   name: "SubContract",
   data() {
     return {
+      baseUrl: process.env.VUE_APP_BASE_API,
       draftUser: '',
       draftTime: undefined,
       managerUser: '',
@@ -518,6 +564,7 @@ export default {
       isSelect: false,
       formTotal: 0,
       flowData: {},
+      clickTd:{}
     };
   },
   created() {
@@ -813,10 +860,8 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      console.log(this.form);
       this.$refs["form"].validate(valid => {
         if (valid) {
-          debugger
           if (this.formTotal != 0) {
             updateSubContract(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
@@ -825,7 +870,6 @@ export default {
             });
             const params = { taskId: this.taskForm.taskId };
             getNextFlowNode(params).then(res => {
-          debugger
               if (this.taskName == '分管审核') {
                 complete(this.taskForm).then(response => {
                   this.$modal.msgSuccess(response.msg);
@@ -846,7 +890,6 @@ export default {
                 })
               }
               else if (this.taskName == '会议评审') {
-                debugger
                 this.meetingForm.contractId = this.form.subContractId;
                 let formData = new FormData();
                 let jsonForm = JSON.stringify(this.meetingForm);
@@ -937,7 +980,7 @@ export default {
         this.chooseProject = val[0]
         this.isSelect = true
         this.form.projectId = val[0].projectId
-        listProjectContract({ projectId: val.projectId }).then(response => {
+        listProjectContract({ projectId: this.form.projectId }).then(response => {
           if (response.rows) {
             for (let row of response.rows) {
               getContract(row.contractId).then(r => {
@@ -955,8 +998,35 @@ export default {
         })
       }
     },
+    getFileName(name) {
+      if (name) {
+        let arr = name.split('/')
+        return arr[arr.length - 1];
+      }
+    },
     getMeetingPath(val) {
-
+      let arr = val.split('/upload')
+      this.meetingForm.document = arr[1]
+      if (val == "") {
+        this.meetingForm.document = ""
+      }
+    },
+    getSignScanPath(val) {
+      let arr = val.split('/upload')
+      this.form.signScan = arr[1]
+      if (val == "") {
+        this.form.signScan = ""
+      }
+    },
+    handleFileDelete(key, val) {
+      key[val] = ''
+    },
+    setCommentDocument(val) {
+      let arr = val.split('/upload');
+      this.clickTd.document = arr[1];
+    },
+    clickFile(val) {
+      this.clickTd = val
     },
   }
 };
@@ -966,13 +1036,36 @@ export default {
 @import "@/assets/styles/element-reset.scss";
 
 table {
-  /*居中*/
-  margin: 0 auto;
   /*边框*/
   /* border: 1px solid black; */
   text-align: center;
   border-collapse: collapse;
   /*设置背景颜色*/
   /* background-color: #bfa; */
+  td {
+    padding: 5px;
+  }
+}
+
+.upload-file-uploader {
+  margin-bottom: 5px;
+}
+
+.upload-file-list .el-upload-list__item {
+  border: 1px solid #e4e7ed;
+  line-height: 2;
+  margin-bottom: 10px;
+  position: relative;
+}
+
+.upload-file-list .ele-upload-list__item-content {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  color: inherit;
+}
+
+.ele-upload-list__item-content-action .el-link {
+  margin-right: 10px;
 }
 </style>

oa-ui/src/views/flowable/form/components/conditionDisplay.vue

@@ -2,23 +2,27 @@
  * @Author: ysh
  * @Date: 2024-04-23 17:08:16
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-14 13:45:45
+ * @LastEditTime: 2024-05-15 14:32:16
 -->
 <template>
   <div>
-    <sc-table :taskForm="taskForm" :tableForm="tableForm" v-if="taskForm.procDefName == '生产部门考核'"></sc-table>
-    <jy-table :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '经营发展部考核'"></jy-table>
-    <js-table :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '技术质量部考核'"></js-table>
-    <xm-table :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '项目管理部考核'"></xm-table>
-    <cw-table :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '财务部考核'"></cw-table>
-    <zh-table :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '综合事务部考核'"></zh-table>
-    <project-process :taskForm="taskForm" :taskName="''" v-else-if="taskForm.procDefName == '项目流转'"></project-process>
+    <sc-table :key="'sc'+taskForm.taskId" :taskForm="taskForm" :tableForm="tableForm" v-if="taskForm.procDefName == '生产部门考核'"></sc-table>
+    <jy-table :key="'jy'+taskForm.taskId" :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '经营发展部考核'"></jy-table>
+    <js-table :key="'js'+taskForm.taskId" :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '技术质量部考核'"></js-table>
+    <xm-table :key="'xm'+taskForm.taskId" :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '项目管理部考核'"></xm-table>
+    <cw-table :key="'cw'+taskForm.taskId" :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '财务部考核'"></cw-table>
+    <zh-table :key="'zh'+taskForm.taskId" :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '综合事务部考核'"></zh-table>
+    <project-process :key="'pro'+taskForm.taskId" :taskForm="taskForm" :taskName="''" v-else-if="taskForm.procDefName == '项目流转'"></project-process>
     <car-form :taskForm="taskForm" :taskName="''" v-else-if="taskForm.procDefName == '用车审批'"></car-form>
-    <technical-form :taskForm="taskForm" v-else-if="taskForm.procDefName == '技术交底'"></technical-form>
-    <safe-form :taskForm="taskForm" v-else-if="taskForm.procDefName == '安全交底'"></safe-form>
-    <settle-form :taskForm="taskForm" :taskName="''" :disabled="true" v-else-if="taskForm.procDefName == '项目结算'"></settle-form>
-    <budget-info :taskForm="taskForm" v-else-if="taskForm.procDefName == '项目预算'"></budget-info>
-    <contract-form :taskForm="taskForm" :taskName="''" :formDisabled="true" v-else-if="taskForm.procDefName == '承接合同评审'"></contract-form>
+    <technical-form :key="'tec'+taskForm.taskId" :taskForm="taskForm" v-else-if="taskForm.procDefName == '技术交底'"></technical-form>
+    <safe-form :key="'safe'+taskForm.taskId" :taskForm="taskForm" v-else-if="taskForm.procDefName == '安全交底'"></safe-form>
+    <settle-form :key="'fb'+taskForm.taskId" :taskForm="taskForm" :taskName="''" :disabled="true"
+      v-else-if="taskForm.procDefName == '项目结算'"></settle-form>
+    <budget-info :key="'budget'+taskForm.taskId" :taskForm="taskForm" v-else-if="taskForm.procDefName == '项目预算'"></budget-info>
+    <contract-form :key="'cj'+taskForm.taskId" :taskForm="taskForm" :taskName="''" :formDisabled="true"
+      v-else-if="taskForm.procDefName == '承接合同评审'"></contract-form>
+    <sub-contract :key="'sub'+taskForm.taskId" :taskForm="taskForm" :taskName="''" :formDisabled="true"
+      v-else-if="taskForm.procDefName == '分包合同评审'"></sub-contract>
   </div>
 </template>
 
@@ -36,15 +40,16 @@ import SafeForm from '@/views/flowable/form/safeForm.vue';
 import SettleForm from '@/views/flowable/form/settleForm.vue';
 import BudgetInfo from '../budget/budgetInfo.vue';
 import ContractForm from '../business/contractForm.vue';
+import SubContract from '../business/subContract.vue';
 export default {
   props: {
     passingParam: {
       type: Object
     }
   },
-  watch:{
-    passingParam(newval,old){
-      this.init(newval)
+  watch: {
+    'passingParam.taskId'(newval, old){
+      this.init(this.passingParam)
     }
   },
   components: {
@@ -60,7 +65,8 @@ export default {
     SafeForm,
     SettleForm,
     BudgetInfo,
-    ContractForm
+    ContractForm,
+    SubContract
   },
   data() {
     return {
@@ -74,7 +80,6 @@ export default {
   },
   methods: {
     init(val) {
-      console.log(val);
       this.taskForm = val
       this.taskName = val.taskName
       this.procDefName = val.procDefName

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-30 11:36:20
+ * @LastEditTime: 2024-05-15 14:40:45
 -->
 
 <template>
@@ -18,7 +18,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="合同编码：">
-            <el-input v-model="contractCode"></el-input>
+            <el-input v-model="contractCode" disabled></el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -29,7 +29,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="合同编号：">
-            <el-input v-model="contractNumber"></el-input>
+            <el-input v-model="contractNumber" disabled></el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -72,10 +72,16 @@
                 :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
             </td>
             <td>
-              <el-input v-model="work.scale" clearable></el-input>
+              <el-select v-model="work.scale" placeholder="请选择" clearable>
+                <el-option v-for="dict in dict.type.cmc_scale_grade" :key="dict.value" :label="dict.label"
+                  :value="dict.label" />
+              </el-select>
             </td>
             <td>
-              <el-input v-model="work.unit" clearable></el-input>
+              <el-select v-model="work.unit" placeholder="请选择" clearable>
+                <el-option v-for="dict in dict.type.cmc_unit" :key="dict.value" :label="dict.label"
+                  :value="dict.label" />
+              </el-select>
             </td>
             <td>
               <el-input v-model="work.workload" clearable></el-input>
@@ -133,6 +139,7 @@ import { listProjectWork, addProjectWork } from "@/api/oa/project/projectWork";
 import { listProjectContract, addProjectContract } from "@/api/oa/contract/projectContract";
 import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
 export default {
+  dicts: ['cmc_scale_grade', 'cmc_unit'],
   props: {
     disabled: {
       type: Boolean,
@@ -225,7 +232,7 @@ export default {
       })
     },
     getProjectWorkList() {
-      listProjectWork({projectId: this.taskForm.formId}).then(res => {
+      listProjectWork({ projectId: this.taskForm.formId }).then(res => {
         this.workList = res.rows;
       })
     },

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-03-27 09:52:37
+ * @LastEditTime: 2024-05-15 15:48:32
 -->
 
 <template>
@@ -197,7 +197,7 @@ export default {
           icon: 'dept',
           bgColor: '#20B2AA',
           boxShadow: '0 5px 20px rgba(32,178,170,0.5)',
-          path: '/staff/user'
+          path: '/staff/people'
         }, {
           id: 9,
           name: '预算管理',

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

@@ -49,54 +49,73 @@
 
       <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="50" align="center" />
+        <el-table-column label="序号" width="50" align="center" prop="userId">
+          <template slot-scope="scope">
+            {{ scope.row.userId - 1 }}
+          </template>
+        </el-table-column>
         <!-- <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" /> -->
-        <el-table-column label="姓名" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"
-          :show-overflow-tooltip="true" />
-        <el-table-column label="年龄" align="center" key="age" prop="age" v-if="columns[2].visible"
+        <el-table-column label="姓名" align="center" key="nickName" prop="nickName" v-if="columns[0].visible"
           :show-overflow-tooltip="true" />
+        <el-table-column label="年龄" align="center" key="age" prop="age" v-if="columns[1].visible">
+          <template slot-scope="scope">
+            {{ getAgeByIdCard(scope.row.idCard)  }}
+          </template>
+        </el-table-column>
         <el-table-column label="性别" align="center" key="sex" prop="sex" v-if="columns[2].visible"
           :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.sex == 0 ? '男' : '女' }}
           </template>
         </el-table-column>
-        <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible"
+        <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[3].visible"
           width="120" />
-        <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible"
+        <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[4].visible"
           :show-overflow-tooltip="true" />
-        <el-table-column label="岗级" align="center" key="postLevel" v-if="columns[3].visible"
+        <el-table-column label="岗级" align="center" key="postLevel" v-if="columns[5].visible"
           :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ formatLevel(scope.row.postLevel, scope.row.salaryLevel,
       dict.type.sys_user_postlevel, dict.type.sys_user_salarylevel) }}
           </template>
         </el-table-column>
-        <el-table-column label="职称" align="center" key="titles" prop="titles" v-if="columns[2].visible"
+        <el-table-column label="职称" align="center" key="titles" prop="titles" v-if="columns[6].visible"
           :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ (dict.type.sys_user_titles[scope.row.titles]) ? (dict.type.sys_user_titles[scope.row.titles]).label : ""
             }}
           </template>
         </el-table-column>
-        <el-table-column label="执业证书" align="center" key="certificates" prop="certificates" v-if="columns[2].visible"
+        <el-table-column label="执业证书" align="center" key="certificates" prop="certificates" v-if="columns[7].visible"
           :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ formatCrtificates(dict.type.sys_user_certificates, scope.row.certificates) }}
           </template>
         </el-table-column>
-        <el-table-column label="入职年月" align="center" key="entryDate" prop="entryDate" v-if="columns[2].visible"
+        <el-table-column label="入职年月" align="center" key="entryDate" prop="entryDate" v-if="columns[8].visible"
           :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.entryDate, '{y}-{m}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="固定成本(天)" align="center" key="salary" prop="salary.salary"v-if="columns[2].visible"
+        <el-table-column label="合同签订" align="center" key="contractSign" prop="contractSign" v-if="columns[8].visible"
           :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            {{ scope.row.salary ? scope.row.salary.salary : "" }}
+            <span>{{ parseTime(scope.row.contractSign, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
+        <el-table-column label="合同期满" align="center" key="contractExpire" prop="contractExpire" v-if="columns[8].visible"
+          :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.contractExpire, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="固定成本(天)" align="center" key="salary" prop="salary.salary" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            {{ scope.row.salary ? scope.row.salary.salary : "" }}
+          </template>
+        </el-table-column> -->
+        <el-table-column label="状态" align="center" key="status" v-if="columns[9].visible">
           <template slot-scope="scope">
             <el-tag type="success" v-if="scope.row.status == 0">在职</el-tag>
             <el-tag type="danger" v-if="scope.row.status == 1">离职</el-tag>
@@ -123,58 +142,23 @@
     </el-row>
 
     <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-row>
+        <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="姓名" prop="nickName">
               <el-input v-model="form.nickName" placeholder="请输入姓名" maxlength="30" />
             </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
-              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="入职年月" prop="entryDate">
-              <el-date-picker v-model="form.entryDate" type="month" placeholder="请输入入职年月" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="手机号码" prop="phonenumber">
-              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="出生年月" prop="birthday">
-              <el-date-picker v-model="form.birthday" type="month" placeholder="请输入出生年月" />
+            <el-form-item v-if="form.userId == undefined" label="登录账号" prop="userName">
+              <el-input v-model="form.userName" placeholder="请输入登录账号" maxlength="30" />
             </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
             <el-form-item label="用户性别">
-              <!-- <el-select v-model="form.sex" placeholder="请选择性别">
-                <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
-                  :value="dict.value"></el-option>
-              </el-select> -->
               <el-radio-group v-model="form.sex">
-                <el-radio v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.value">{{ dict.label
-                  }}</el-radio>
+                <el-radio v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.value">
+                  {{ dict.label }}
+                </el-radio>
               </el-radio-group>
             </el-form-item>
-          </el-col>
-          <el-col :span="12">
             <el-form-item label="状态">
               <el-radio-group v-model="form.status">
                 <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">
@@ -182,45 +166,98 @@
                 </el-radio>
               </el-radio-group>
             </el-form-item>
+            <el-form-item label="年龄" prop="age">
+              {{ form.age + '岁' }}
+            </el-form-item>
+            <el-form-item label="手机号码" prop="phonenumber">
+              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
+            </el-form-item>
+            <el-form-item label="身份证" prop="idCard">
+              <el-input v-model="form.idCard" placeholder="请输入身份证号码" maxlength="18" />
+            </el-form-item>
+            <el-form-item label="籍贯" prop="nativePlace">
+              <el-input v-model="form.nativePlace" placeholder="请输入籍贯" />
+            </el-form-item>
+            <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>
+            <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"
+                  :value="dict.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="家庭住址" prop="homePlace">
+              <el-input type="textarea" v-model="form.homePlace" placeholder="请输入家庭住址" />
+            </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
+
           <el-col :span="12">
+            <el-form-item label="归属部门" prop="deptId" style="width:100%;">
+              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+            </el-form-item>
+            <el-form-item label="入职年月" prop="entryDate">
+              <el-date-picker v-model="form.entryDate" type="month" placeholder="请输入入职年月" style="width:100%;"
+                value-format="yyyy-MM" />
+            </el-form-item>
+            <el-form-item label="合同签订" prop="contractSign">
+              <el-date-picker v-model="form.contractSign" type="month" placeholder="请输入合同签订" style="width:100%;"
+                value-format="yyyy-MM-dd" />
+            </el-form-item>
+            <el-form-item label="合同期满" prop="contractExpire">
+              <el-date-picker v-model="form.contractExpire" type="month" placeholder="请输入合同期满" style="width:100%;"
+                value-format="yyyy-MM-dd" />
+            </el-form-item>
+            <el-form-item label="出生年月" prop="birthday">
+              <el-date-picker v-model="form.birthday" type="month" placeholder="请输入出生年月" style="width:100%;"
+                value-format="yyyy-MM" />
+            </el-form-item>
+            <el-form-item label="政治面貌" prop="politicalAffiliation">
+              <el-select v-model="form.politicalAffiliation" multiple clearable placeholder="请选择政治面貌"
+                style="width:100%;">
+                <el-option v-for="dict in dict.type.sys_user_political" :key="dict.value" :label="dict.label"
+                  :value="dict.value" />
+              </el-select>
+            </el-form-item>
             <el-form-item label="技术职称">
-              <el-select v-model="form.titles" clearable placeholder="请输入技术职称">
+              <el-select v-model="form.titles" clearable placeholder="请输入技术职称" style="width:100%;">
                 <el-option v-for="dict in dict.type.sys_user_titles" :key="dict.value" :label="dict.label"
                   :value="dict.value" />
               </el-select>
             </el-form-item>
-          </el-col>
-          <el-col :span="12">
             <el-form-item label="执业证书">
-              <el-select v-model="form.certificates" multiple placeholder="请输入执业证书">
+              <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"
                   :value="dict.value" />
               </el-select>
             </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
+            <el-form-item label="项目经理">
+              <el-select v-model="form.pmLevel" placeholder="请输入项目经理等级" style="width:100%;">
+                <el-option v-for="dict in dict.type.sys_user_pmlevel" :key="dict.value" :label="dict.label"
+                  :value="dict.value" />
+              </el-select>
+            </el-form-item>
             <el-form-item label="岗位">
-              <el-select v-model="form.postIds" multiple placeholder="请选择岗位">
+              <el-select v-model="form.postIds" multiple placeholder="请选择岗位" style="width:100%;">
                 <el-option v-for="item in postOptions" :key="item.postId" :label="item.postName" :value="item.postId"
                   :disabled="item.status == 1"></el-option>
               </el-select>
             </el-form-item>
-          </el-col>
-          <el-col :span="12">
             <el-form-item label="岗级" prop="postlevel">
               <el-col :span="12">
-                <el-select v-model="form.postLevel" placeholder="请选择">
+                <el-select v-model="form.postLevel" placeholder="请选择" style="width:100%;">
                   <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="请选择">
+                <el-select v-model="form.salaryLevel" placeholder="请选择" style="width:100%;">
                   <el-option v-for="dict in dict.type.sys_user_salarylevel" :key="dict.value" :label="dict.label"
                     :value="dict.value" />
                 </el-select>
@@ -228,16 +265,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="项目经理">
-              <el-select v-model="form.pmLevel" placeholder="请输入项目经理等级">
-                <el-option v-for="dict in dict.type.sys_user_pmlevel" :key="dict.value" :label="dict.label"
-                  :value="dict.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注">
@@ -246,7 +273,8 @@
           </el-col>
         </el-row>
       </el-form>
-      <div slot="footer" class="dialog-footer">
+
+      <div slot="footer" class="text-center">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
@@ -283,8 +311,9 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
-  name: "User",
-  dicts: ['sys_normal_disable', 'sys_user_sex', 'sys_user_titles', 'sys_user_certificates', 'sys_user_pmlevel', 'sys_user_postlevel', 'sys_user_salarylevel'],
+  name: "Staff",
+  dicts: ['sys_normal_disable', 'sys_user_sex', 'sys_user_titles', 'sys_user_certificates',
+    'sys_user_pmlevel', 'sys_user_postlevel', 'sys_user_salarylevel', 'sys_user_political', 'sys_user_degree'],
   components: { Treeselect },
   data() {
     return {
@@ -350,7 +379,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 20,
         userName: undefined,
         phonenumber: undefined,
         status: undefined,
@@ -358,13 +387,16 @@ export default {
       },
       // 列信息
       columns: [
-        { key: 0, label: `用户编号`, visible: true },
-        { key: 1, label: `用户名称`, visible: true },
-        { key: 2, label: `用户昵称`, visible: true },
-        { key: 3, label: `部门`, visible: true },
-        { key: 4, label: `手机号码`, visible: true },
-        { key: 5, label: `状态`, visible: true },
-        { key: 6, label: `创建时间`, visible: true }
+        { key: 0, label: `姓名`, visible: true },
+        { key: 1, label: `年龄`, visible: true },
+        { key: 2, label: `性别`, visible: true },
+        { key: 3, label: `手机号码`, visible: true },
+        { key: 4, label: `部门`, visible: true },
+        { key: 5, label: `岗级`, visible: true },
+        { key: 6, label: `职称`, visible: true },
+        { key: 7, label: `执业证书`, visible: true },
+        { key: 8, label: `入职年月`, visible: true },
+        { key: 9, label: `状态`, visible: true },
       ],
       // 表单校验
       rules: {
@@ -417,7 +449,6 @@ export default {
       this.loading = true;
       listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
         this.userList = response.rows;
-        // this.userList = this.userList.slice(1)
         this.total = response.total;
         this.loading = false;
       }
@@ -539,6 +570,11 @@ export default {
       const userId = row.userId || this.ids;
       getUser(userId).then(response => {
         this.form = response.data;
+        if (this.form.politicalAffiliation) {
+          this.form.politicalAffiliation = this.form.politicalAffiliation.split('、')
+        }
+        this.form.birthday = this.getBirthdayByIdCard(this.form.idCard);
+        this.form.age = this.getAgeByIdCard(this.form.idCard);
         this.postOptions = response.posts;
         this.roleOptions = response.roles;
         this.$set(this.form, "postIds", response.postIds);
@@ -577,10 +613,12 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.userId != undefined) {
-            if (this.form.certificates != "" && this.form.certificates != undefined && this.form.certificates != null)
-              this.form.certificates = this.form.certificates.join(',')
-            else
-              this.form.certificates = '';
+            // if (this.form.certificates != "" && this.form.certificates != undefined && this.form.certificates != null)
+            //   this.form.certificates = this.form.certificates.join(',')
+            // else
+            //   this.form.certificates = '';
+            this.form.certificates = this.formatArrayToString(this.form.certificates,',');
+            this.form.politicalAffiliation = this.formatArrayToString(this.form.politicalAffiliation,'、')
             updateUser(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -659,6 +697,49 @@ export default {
         this.certificates = outCrtificates.join(' / ')
         return outCrtificates.join(' / ')
       }
+    },
+
+    getBirthdayByIdCard(idCard) {
+      // 使用 substring() 方法和 split() 方法提取出生年月日信息
+      const birthday = [idCard.substr(6, 4), idCard.substr(10, 2), idCard.substr(12, 2)].join('-')
+      // 使用 Date 对象的 toISOString() 方法将出生年月日信息转换为日期格式
+      const date = new Date(birthday);
+      const formattedDate = this.parseTime(date, '{y}-{m}-{d}')
+      return formattedDate;
+    },
+    getAgeByIdCard(idCard) {
+      const sexAndAge = {}
+      //获取用户身份证号码
+      const userCard = idCard
+      //如果用户身份证号码为undefined则返回空
+      if (!userCard) {
+        return sexAndAge
+      }
+      // 获取出生日期
+      const yearBirth = userCard.substring(6, 10)
+      const monthBirth = userCard.substring(10, 12)
+      const dayBirth = userCard.substring(12, 14)
+      // 获取当前年月日并计算年龄
+      const myDate = new Date()
+      const monthNow = myDate.getMonth() + 1
+      const dayNow = myDate.getDate()
+      let age = myDate.getFullYear() - yearBirth
+
+      if (monthNow < monthBirth || (monthNow == monthBirth && dayNow < dayBirth)) {
+        age--
+      }
+      // 得到年龄
+      sexAndAge.age = age
+      return sexAndAge.age
+    },
+    formatArrayToString(str, splitStr) {
+      let newStr ="";
+      if (str) {
+        newStr = str.join(splitStr)
+      } else {
+        newStr = ""
+      }
+      return newStr
     }
   }
 };

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-22 14:50:46
- * @LastEditors: wrh
- * @LastEditTime: 2024-03-27 16:33:09
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-05-15 19:09:21
 -->
 <template>
   <div class="bg">
@@ -21,7 +21,7 @@
             <img :src="avatar" class="user-avatar" />
           </div>
           <div class="user-name">{{ this.form.nickName }}</div>
-          <div class="user-sex">{{ this.form.age + '岁 ' }} {{ this.form.sex == '0' ? ' 男' : ' 女' }}</div>
+          <div class="user-sex">{{ getAgeByIdCard(this.form.idCard) + '岁' }} {{ this.form.sex == '0' ? ' 男' : ' 女' }}</div>
         </div>
         <div class="info-item">
           <div class="item-label">
@@ -102,8 +102,8 @@ export default {
     ...mapGetters(["avatar"]),
   },
   created() {
-
-    this.getUserInfo(this.$route.query.userId);
+    if (this.$route.query)
+      this.getUserInfo(this.$route.query.userId);
   },
   data() {
     return {
@@ -160,7 +160,32 @@ export default {
     goBack() {
       let obj = { path: "/staff/info" }
       this.$tab.closeOpenPage(obj);
-      this.$router.push({ path: '/staff/user' });
+      this.$router.push({ path: '/staff/people' });
+    },
+    getAgeByIdCard(idCard) {
+      const sexAndAge = {}
+      //获取用户身份证号码
+      const userCard = idCard
+      //如果用户身份证号码为undefined则返回空
+      if (!userCard) {
+        return sexAndAge
+      }
+      // 获取出生日期
+      const yearBirth = userCard.substring(6, 10)
+      const monthBirth = userCard.substring(10, 12)
+      const dayBirth = userCard.substring(12, 14)
+      // 获取当前年月日并计算年龄
+      const myDate = new Date()
+      const monthNow = myDate.getMonth() + 1
+      const dayNow = myDate.getDate()
+      let age = myDate.getFullYear() - yearBirth
+
+      if (monthNow < monthBirth || (monthNow == monthBirth && dayNow < dayBirth)) {
+        age--
+      }
+      // 得到年龄
+      sexAndAge.age = age
+      return sexAndAge.age
     },
   }
 }

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: wrh
  * @Date: 2024-03-25 17:38:39
- * @LastEditors: wrh
- * @LastEditTime: 2024-03-27 16:30:37
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-05-15 19:05:45
 -->
 <template>
   <div>
@@ -30,7 +30,7 @@
         <template slot="title">
           <div>
             <svg-icon icon-class="ArrowRight" class="info-icon"></svg-icon>
-            {{ item.projectNumber + ' ' + ' ' + item.projectName + ' ' + ' ' + item.projectLeaderUser.nickName }}
+            <!-- {{ item.projectNumber + ' ' + ' ' + item.projectName + ' ' + ' ' + item.projectLeaderUser.nickName }} -->
           </div>
         </template>
         <div>暂无信息，敬请期待</div>
@@ -42,7 +42,6 @@
 <script>
 
 import { listProject, getProject, getListByProjectLeader, delProject, addProject, updateProject } from "@/api/oa/project/project";
-
 export default {
   data() {
     return {
@@ -64,14 +63,19 @@ export default {
           projectLeader: 'XXX'
         }
       ],
-      activeNames: ['1']
+      activeNames: ['1'],
     }
   },
   created() {
-    this.getListByProjectLeader();
+    // this.getListByProjectLeader();
+    if(this.$route.query){
+      let userId = this.$route.query.userId
+      this.getUserInfo(userId)
+    }
   },
   methods: {
     handleChange(val) {
+
     },
     getListByProjectLeader() {
       let projectLeader = this.$route.query.userId;