修改人员详情、变更记录

oa-ui/src/api/oa/price/price.js

@@ -1,8 +1,8 @@
 /*
  * @Author: wrh
  * @Date: 2024-03-21 10:27:54
- * @LastEditors: wrh
- * @LastEditTime: 2024-03-21 16:56:25
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-05-20 17:02:00
  */
 import request from '@/utils/request'
 
@@ -98,4 +98,13 @@ export function getUnitPrice(params) {
     method: 'get',
     params:params
   })
+}
+
+// 根据单价类别查询备注
+export function getPriceRemarkByWorkType(params) {
+  return request({
+    url: '/oa/price/remark',
+    method: 'get',
+    params:params
+  })
 }

oa-ui/src/assets/icons/svg/contractExpire.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><path fill="currentColor" d="m19 19.425l-1.425 1.4q-.275.275-.687.288t-.713-.288q-.275-.275-.275-.7t.275-.7l1.4-1.425l-1.4-1.425q-.275-.275-.288-.687t.288-.713q.275-.275.7-.275t.7.275l1.425 1.4l1.425-1.4q.275-.275.688-.288t.712.288q.275.275.275.7t-.275.7L20.425 18l1.4 1.425q.275.275.288.688t-.288.712q-.275.275-.7.275t-.7-.275zM10 9q-.425 0-.712-.288T9 8q0-.425.288-.712T10 7h7q.425 0 .713.288T18 8q0 .425-.288.713T17 9zm0 3q-.425 0-.712-.288T9 11q0-.425.288-.712T10 10h7q.425 0 .713.288T18 11q0 .425-.288.713T17 12zM6 22q-1.25 0-2.125-.875T3 19v-1q0-.825.588-1.412T5 16h1V4q0-.825.588-1.412T8 2h11q.825 0 1.413.588T21 4v8q0 .425-.288.713T20 13q-.425 0-.712-.288T19 12V4H8v12h4.15q.45 0 .738.35t.187.8q-.05.2-.062.425T13 18q0 .725.175 1.438T13.7 20.8q.225.425.025.813T13.1 22z"/></svg>

oa-ui/src/assets/icons/svg/contractSign.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><path fill="currentColor" d="M10 7h7q.425 0 .713.288T18 8q0 .425-.288.713T17 9h-7q-.425 0-.712-.288T9 8q0-.425.288-.712T10 7m0 3h7q.425 0 .713.288T18 11q0 .425-.288.713T17 12h-7q-.425 0-.712-.288T9 11q0-.425.288-.712T10 10m2 10H5zm-6 2q-1.25 0-2.125-.875T3 19v-2q0-.425.288-.712T4 16h2V4q0-.825.588-1.412T8 2h11q.825 0 1.413.588T21 4v6q0 .425-.288.713T20 11q-.425 0-.712-.288T19 10V4H8v12h3q.425 0 .713.288T12 17q0 .425-.288.713T11 18H5v1q0 .425.288.713T6 20h5q.425 0 .713.288T12 21q0 .425-.288.713T11 22zm8-1v-1.65q0-.2.075-.387t.225-.338l5.225-5.2q.225-.225.5-.325t.55-.1q.3 0 .575.113t.5.337l.925.925q.2.225.313.5t.112.55q0 .275-.1.563t-.325.512l-5.2 5.2q-.15.15-.337.225T16.65 22H15q-.425 0-.712-.287T14 21m7.5-5.575l-.925-.925zm-6 5.075h.95l3.025-3.05l-.45-.475l-.475-.45l-3.05 3.025zm3.525-3.525l-.475-.45l.925.925z"/></svg>

oa-ui/src/assets/icons/svg/degree.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><path fill="currentColor" d="M5 13.18v4L12 21l7-3.82v-4L12 17zM12 3L1 9l11 6l9-4.91V17h2V9z"/></svg>

oa-ui/src/assets/icons/svg/engineer.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><path fill="currentColor" d="m18.85 10l-.2-1.05q-.225-.075-.412-.188T17.9 8.5l-1.05.35l-.7-1.2l.85-.75q-.05-.125-.05-.2v-.4q0-.075.05-.2l-.85-.75l.7-1.2l1.05.35q.15-.15.338-.263t.412-.187l.2-1.05h1.4l.2 1.05q.225.075.413.188t.337.262l1.05-.35l.7 1.2l-.85.75q.05.125.05.2v.4q0 .075-.05.2l.85.75l-.7 1.2l-1.05-.35q-.15.15-.337.263t-.413.187l-.2 1.05h-1.4Zm.7-2.25q.525 0 .888-.363T20.8 6.5q0-.525-.363-.888t-.887-.362q-.525 0-.888.363T18.3 6.5q0 .525.363.888t.887.362Zm-3 7.25l-.15-.75q-.15-.05-.287-.113t-.263-.187l-.7.25l-.5-.9l.55-.5v-.6l-.55-.5l.5-.9l.7.25q.1-.1.25-.175t.3-.125l.15-.75h1l.15.75q.15.05.3.125t.25.175l.7-.25l.5.9l-.55.5v.6l.55.5l-.5.9l-.7-.25q-.125.125-.263.188t-.287.112l-.15.75h-1Zm.5-1.75q.3 0 .525-.225t.225-.525q0-.3-.225-.525t-.525-.225q-.3 0-.525.225t-.225.525q0 .3.225.525t.525.225Zm-8-.25q-1.65 0-2.825-1.175T5.05 9H4.3V8h.75q0-1.125.55-2.025T7.05 4.55v.95q0 .225.138.363T7.55 6q.225 0 .363-.138T8.05 5.5V4.15q.225-.075.475-.113T9.05 4q.275 0 .525.038t.475.112V5.5q0 .225.138.363T10.55 6q.225 0 .363-.138t.137-.362v-.95q.9.525 1.45 1.425T13.05 8h.75v1h-.75q0 1.65-1.175 2.825T9.05 13Zm0-2q.825 0 1.413-.588T11.05 9h-4q0 .825.588 1.413T9.05 11Zm-8 10v-2.8q0-.825.425-1.55t1.175-1.1q1.275-.65 2.875-1.1T9.05 14q1.925 0 3.525.45t2.875 1.1q.75.375 1.175 1.1t.425 1.55V21h-16Z"/></svg>

oa-ui/src/assets/icons/svg/flower.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 512 512"><circle cx="256" cy="256" r="48" fill="currentColor"/><path fill="currentColor" d="M475.93 303.91a67.49 67.49 0 0 0-44.34-115.53a5.2 5.2 0 0 1-4.58-3.21a5.21 5.21 0 0 1 1-5.51A67.83 67.83 0 0 0 378 66.33h-.25A67.13 67.13 0 0 0 332.35 84a5.21 5.21 0 0 1-5.52 1a5.23 5.23 0 0 1-3.22-4.58a67.68 67.68 0 0 0-135.23 0a5.2 5.2 0 0 1-3.21 4.58a5.21 5.21 0 0 1-5.52-1a67.11 67.11 0 0 0-45.44-17.69H134a67.91 67.91 0 0 0-50 113.34a5.21 5.21 0 0 1 1 5.51a5.2 5.2 0 0 1-4.58 3.21a67.71 67.71 0 0 0 0 135.23a5.23 5.23 0 0 1 4.58 3.23a5.22 5.22 0 0 1-1 5.52a67.54 67.54 0 0 0 50.08 113h.25A67.38 67.38 0 0 0 179.65 428a5.21 5.21 0 0 1 5.51-1a5.2 5.2 0 0 1 3.21 4.58a67.71 67.71 0 0 0 135.23 0a5.23 5.23 0 0 1 3.22-4.58a5.21 5.21 0 0 1 5.51 1a67.38 67.38 0 0 0 45.29 17.42h.25a67.48 67.48 0 0 0 50.08-113a5.22 5.22 0 0 1-1-5.52a5.23 5.23 0 0 1 4.58-3.22a67.31 67.31 0 0 0 44.4-19.77M256 336a80 80 0 1 1 80-80a80.09 80.09 0 0 1-80 80"/></svg>

oa-ui/src/assets/icons/svg/homePlace.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><path fill="currentColor" d="M15.19 21C14.12 19.43 13 17.36 13 15.5c0-1.83.96-3.5 2.4-4.5H15V9h2v1.23c.5-.14 1-.23 1.5-.23c.17 0 .34 0 .5.03V3H5v18h6v-3.5h2V21zM15 5h2v2h-2zM9 19H7v-2h2zm0-4H7v-2h2zm0-4H7V9h2zm0-4H7V5h2zm2-2h2v2h-2zm0 4h2v2h-2zm0 6v-2h2v2zm7.5-3c-1.9 0-3.5 1.61-3.5 3.5c0 2.61 3.5 6.5 3.5 6.5s3.5-3.89 3.5-6.5c0-1.89-1.6-3.5-3.5-3.5m0 4.81c-.7 0-1.2-.6-1.2-1.2c0-.7.6-1.2 1.2-1.2s1.2.59 1.2 1.2c.1.6-.5 1.2-1.2 1.2"/></svg>

oa-ui/src/assets/icons/svg/idCard.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><g fill="none" fill-rule="evenodd"><path d="M24 0v24H0V0zM12.593 23.258l-.011.002l-.071.035l-.02.004l-.014-.004l-.071-.035c-.01-.004-.019-.001-.024.005l-.004.01l-.017.428l.005.02l.01.013l.104.074l.015.004l.012-.004l.104-.074l.012-.016l.004-.017l-.017-.427c-.002-.01-.009-.017-.017-.018m.265-.113l-.013.002l-.185.093l-.01.01l-.003.011l.018.43l.005.012l.008.007l.201.093c.012.004.023 0 .029-.008l.004-.014l-.034-.614c-.003-.012-.01-.02-.02-.022m-.715.002a.023.023 0 0 0-.027.006l-.006.014l-.034.614c0 .012.007.02.017.024l.015-.002l.201-.093l.01-.008l.004-.011l.017-.43l-.003-.012l-.01-.01z"/><path fill="currentColor" d="M4 4a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2V6a2 2 0 0 0-2-2zm0 2h16v12H4zm6.25 3.75a1.75 1.75 0 1 1-3.5 0a1.75 1.75 0 0 1 3.5 0M5 14.5A2.5 2.5 0 0 1 7.5 12h2a2.5 2.5 0 0 1 2.5 2.5v.5a1 1 0 1 1-2 0v-.5a.5.5 0 0 0-.5-.5h-2a.5.5 0 0 0-.5.5v.5a1 1 0 1 1-2 0zm8-3.5a1 1 0 0 1 1-1h2a1 1 0 1 1 0 2h-2a1 1 0 0 1-1-1m1 2a1 1 0 1 0 0 2h4a1 1 0 1 0 0-2z"/></g></svg>

oa-ui/src/assets/icons/svg/major.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><path fill="currentColor" d="M22 18V3H2v15H0v2h24v-2zm-8 0h-4v-1h4zm6-3H4V5h16z"/></svg>

oa-ui/src/assets/icons/svg/operator.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><path fill="currentColor" d="M4 21q-.825 0-1.413-.588T2 19V5q0-.825.588-1.413T4 3h14q.825 0 1.413.588T20 5v2h2v2h-2v2h2v2h-2v2h2v2h-2v2q0 .825-.588 1.413T18 21H4Zm2-4h5v-4H6v4Zm6-7h4V7h-4v3Zm-6 2h5V7H6v5Zm6 5h4v-6h-4v6Z"/></svg>

oa-ui/src/assets/icons/svg/pmLevel.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><path fill="currentColor" d="M7.475 21Q5.2 21 3.6 19.4T2 15.525q0-2.15 1.438-3.713t3.587-1.737l-3.3-6.625q-.25-.5.038-.975T4.625 2h4.15q.575 0 1.038.3t.737.8L12 6l1.45-2.9q.275-.5.738-.8t1.037-.3h4.15q.575 0 .863.475t.037.975L17 10.025q2.125.2 3.563 1.763T22 15.5q0 2.3-1.6 3.9T16.5 21q-.225 0-.463-.013t-.462-.062q1.375-.9 2.15-2.337T18.5 15.5q0-2.725-1.888-4.612T12 9q-2.725 0-4.612 1.888T5.5 15.5q0 1.7.7 3.2t2.2 2.225q-.225.05-.463.063T7.476 21ZM12 20q-1.875 0-3.188-1.313T7.5 15.5q0-1.875 1.313-3.188T12 11q1.875 0 3.188 1.313T16.5 15.5q0 1.875-1.313 3.188T12 20Zm0-3.15l1.225.925q.15.125.3.013t.1-.288l-.475-1.525l1.225-.875q.15-.125.1-.288t-.25-.162h-1.5l-.475-1.625q-.05-.175-.25-.175t-.25.175l-.475 1.625h-1.5q-.2 0-.25.163t.1.287l1.225.875l-.475 1.525q-.05.175.1.288t.3-.013L12 16.85Z"/></svg>

oa-ui/src/assets/icons/svg/politicalAffiliation.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 50 50"><path fill="currentColor" d="M12.333 22H15v16h4V24h4v14h4V24h4v14h4V22h2.666c.736 0 1.334-.736 1.334-1.399c0-.401-.221-.853-.555-1.071l.002-.052l-.021-.037l.134-.033L26 12.939v-1.892c2 1.059 3.951-.765 7 .332V7.2c-3.051-1.096-5 .727-7-.332V6.6c0-.331-.631-.6-1-.6s-1 .269-1 .6v6.339l-12.559 6.456l.271.021l.288.011v.002c-1 .218-.776.77-.776 1.171c-.001.664.373 1.4 1.109 1.4M14 39l-3 3h28l-3-3zm22-16v15h.885l.391.553l2.666 2.499l.943.948H49V23zm6 12h-3v-3h3zm0-6h-3v-3h3zm4 6h-2v-3h2zm0-6h-2v-3h2zm-32.886 9H14V23H1v19h8.114l.942-.848l2.667-2.6zM6 35H4v-3h2zm0-6H4v-3h2zm5 6H8v-3h3zm0-6H8v-3h3z"/></svg>

oa-ui/src/assets/icons/svg/school.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 15 15"><path fill="none" stroke="currentColor" d="m7.5 4.5l4 2v8h-8v-8zm0 0V0M0 14.5h15m-13.5 0v-6h2m10 6v-6h-2m-5 6v-3h2v3m-1-14h3v2h-3m0 7a1 1 0 1 1 0-2a1 1 0 0 1 0 2Z"/></svg>

oa-ui/src/assets/icons/svg/titles.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><path fill="currentColor" d="M1 3h22v18H1zm2 2v14h18V5h-2v6.5l-3-2.25l-3 2.25V5zm12 0v2.5l1-.75l1 .75V5zM5 11h6v2H5zm0 4h14v2H5z"/></svg>

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

@@ -1,20 +1,9 @@
 <template>
   <div class="upload-file">
-    <el-upload
-      :action="uploadFileUrl"
-      :data="additionalData"
-      :before-upload="handleBeforeUpload"
-      :file-list="fileList"
-      :limit="limit"
-      :on-error="handleUploadError"
-      :on-exceed="handleExceed"
-      :on-success="handleUploadSuccess"
-      :show-file-list="false"
-      :headers="headers"
-      class="upload-file-uploader"
-      ref="fileUpload"
-      accept=".doc,.docx,.xls,.xlsx,.pdf"
-    >
+    <el-upload :action="uploadFileUrl" :data="additionalData" :before-upload="handleBeforeUpload" :file-list="fileList"
+      :limit="limit" :on-error="handleUploadError" :on-exceed="handleExceed" :on-success="handleUploadSuccess"
+      :show-file-list="false" :headers="headers" class="upload-file-uploader" ref="fileUpload"
+      accept=".doc,.docx,.xls,.xlsx,.pdf">
       <!-- 上传按钮 -->
       <el-button size="mini" type="primary" :disabled="disabled">选取文件</el-button>
       <!-- 上传提示 -->
@@ -31,24 +20,14 @@
     </el-upload>
 
     <!-- 文件列表 -->
-    <transition-group
-      class="upload-file-list el-upload-list el-upload-list--text"
-      name="el-fade-in-linear"
-      tag="ul"
-    >
-      <li
-        :key="file.url"
-        class="el-upload-list__item ele-upload-list__item-content"
-        v-for="(file, index) in fileList"
-        v-if="!isModify"
-      >
+    <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
+      <li :key="file.url" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in fileList"
+        v-if="!isModify">
         <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" :disabled="disabled">
-          <el-link :underline="false" @click="handleDelete(index)" type="danger"
-            >删除</el-link
-          >
+          <el-link :underline="false" @click="handleDelete(index)" type="danger">删除</el-link>
         </div>
       </li>
     </transition-group>
@@ -87,17 +66,20 @@ export default {
       type: Boolean,
       default: false,
     },
-    filePathName:{
+    filePathName: {
       type: String,
       default: '',
     },
-    disabled:{
+    disabled: {
       type: Boolean,
-      default:false,
+      default: false,
     }
   },
-  created(){
+  created() {
     this.additionalData.fileType = this.filePathName
+  },
+  mounted() {
+    
   },
   data() {
     return {

oa-ui/src/views/flowable/form/budget/components/chooseMoney.vue

@@ -123,7 +123,7 @@
               <el-input-number v-model="work.coefficient" :controls="false" :precision="2" :step="0.01" :max="10"
                 @blur="getTotal(work)" style="width:60px;">
               </el-input-number>
-              <!-- <el-input v-model="work.coefficient" placeholder="请输入系数" @blur="getTotal(work)"></el-input> -->
+              <el-button type="text" @click="getCoefficientRemark(work.workType)">系数备注</el-button>
             </td>
             <td class="workTotal">
               {{ work.settle }}
@@ -157,7 +157,9 @@
 <script>
 import { getWorkTypeList, getWorkItemList, getSubItemList, getScaleGradeList, getUnitPrice } from '@/api/oa/price/price'
 import { deepClone } from '@/utils'
+import { getPriceRemarkByWorkType } from '@/api/oa/price/price'
 export default {
+  components: {},
   props: {
     workList: {
       type: Array,
@@ -314,7 +316,7 @@ export default {
       }
       this.peopleNumber = days
       if (this.budgetForm.inOutPriceSum && this.budgetForm.inOutPriceSum != 0) {
-        if (this.inOutPriceSum ==0 ) {
+        if (this.inOutPriceSum == 0) {
           this.settle = Number(this.settle) + Number(this.budgetForm.inOutPriceSum)
           this.inOutPrice = Number(this.budgetForm.inOutPriceSum) / this.peopleNumber
           this.inOutPriceSum = this.budgetForm.inOutPriceSum
@@ -350,6 +352,21 @@ export default {
     },
     setValue(key, name, val) {
       this.$set(key, name, val)
+    },
+    getCoefficientRemark(workType) {
+      getPriceRemarkByWorkType({workType}).then(res => {
+        console.log(res);
+        if (res.code == 200) {
+          if(workType != undefined)
+            this.$notify({
+              title: workType ,
+              dangerouslyUseHTMLString: true,
+              message: res.msg,
+              duration: 0
+            });
+        }
+
+      })
     }
   }
 }

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-05-15 14:40:45
+ * @LastEditTime: 2024-05-20 16:15:23
 -->
 
 <template>
@@ -122,8 +122,8 @@
       </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer" style="text-align: center">
-      <el-button type="primary" @click="confirmAddForm" :disabled="disabled">确 定</el-button>
-      <el-button @click="cancel" :disabled="disabled">取 消</el-button>
+      <el-button type="primary" @click="confirmAddForm" :disabled="disabled">提 交</el-button>
+      <!-- <el-button @click="cancel" :disabled="disabled">取 消</el-button> -->
     </div>
   </div>
 </template>

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

@@ -2,12 +2,12 @@
  * @Author: ysh
  * @Date: 2024-03-19 09:24:06
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-26 16:58:04
+ * @LastEditTime: 2024-05-20 16:20:49
 -->
 <template>
   <div class="app-container">
     <h2 style="text-align: center;">项目安排</h2>
-    <el-form :model="form" :rules="rules" label-width="100px" :disabled="disabled">
+    <el-form :model="form" :rules="rules" label-width="120px" :disabled="disabled">
       <el-row :gutter="20">
         <el-col :span="12" :xs="24">
           <el-form-item label="承担部门：" prop="undertakingDept">
@@ -32,7 +32,7 @@
           <el-form-item label="项目负责人：" prop="projectLeader">
             <el-tag effect="plain" type="warning" style="margin-right: 10px;"
               v-if="form.projectLeader != '' && form.projectLeader != undefined">{{
-                form.projectLeaderName }}</el-tag>
+      form.projectLeaderName }}</el-tag>
             <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="choosePeople">选择</el-button>
           </el-form-item>
         </el-col>
@@ -46,20 +46,43 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12" :xs="24">
+          <el-form-item label="组织交底日期：" prop="organizeTime">
+            <el-date-picker style="width: 100%;" v-model="form.organizeTime" value-format="yyyy-MM-dd" type="date"
+              placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" :xs="24">
+          <el-form-item label="组织交底文档：" prop="organizeDocument">
+            <FileUpload ref="orz" :limit="1" :filePathName="'组织交底文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+              @input="setOrganizeDocument">
+            </FileUpload>
+            <div v-if="$route.query.taskName != '项目安排'" class="upload-list">
+              <el-link :href="`${baseUrl}${'/profile/upload' + form.organizeDocument}`" :underline="false"
+                target="_blank">
+                <span class="el-icon-document"> {{ getFileName(form.organizeDocument) }} </span>
+              </el-link>
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <!-- 人员选择对话框 -->
     <el-dialog width="320px" title="选择项目负责人" :visible.sync="peopleVisible" append-to-body>
       <el-form>
         <el-form-item label="部门：">
           <el-select v-model="peopleForm.deptId" @change="handleChangeDept">
-            <el-option v-for="item in peopleForm.deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId"
-              v-if="item.deptName != '四川中水成勘院测绘工程有限责任公司'">
+            <el-option v-for="item in peopleForm.deptList" :key="item.deptId" :label="item.deptName"
+              :value="item.deptId" v-if="item.deptName != '四川中水成勘院测绘工程有限责任公司'">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="人员：">
           <el-select v-model="peopleForm.userId">
-            <el-option v-for="item in peopleForm.userList" :key="item.userId" :label="item.nickName" :value="item.userId">
+            <el-option v-for="item in peopleForm.userList" :key="item.userId" :label="item.nickName"
+              :value="item.userId">
             </el-option>
           </el-select>
         </el-form-item>
@@ -70,8 +93,8 @@
       </el-form>
     </el-dialog>
     <div slot="footer" class="dialog-footer" style="text-align: center;">
-      <el-button type="primary" @click="confirmPlanForm" :disabled="disabled">确 定</el-button>
-      <el-button @click="cancel" :disabled="disabled">取 消</el-button>
+      <el-button type="primary" @click="confirmPlanForm" :disabled="disabled">提 交</el-button>
+      <!-- <el-button @click="cancel" :disabled="disabled">取 消</el-button> -->
     </div>
   </div>
 </template>
@@ -95,6 +118,7 @@ export default {
   },
   data() {
     return {
+      baseUrl: process.env.VUE_APP_BASE_API,
       form: {},
       rules: {},
       deptList: [],
@@ -124,6 +148,7 @@ export default {
     initForm() {
       getProject(this.taskForm.formId).then(res => {
         this.form = res.data;
+        console.log(this.form);
         if (this.form.undertakingDept != null && this.form.undertakingDept != "" && this.form.undertakingDept != undefined) {
           this.form.deptId = this.form.undertakingDeptName.split(',')
         }
@@ -137,9 +162,9 @@ export default {
         } else {
           this.$set(this.form, 'deptId', [])
         }
-        this.$store.commit('SET_PROJECTNUMBER',this.form.projectNumber)
-        this.$store.commit('SET_PROJECTNAME',this.form.projectName)
-        this.$store.commit('SET_PROJECT',this.form)
+        this.$store.commit('SET_PROJECTNUMBER', this.form.projectNumber)
+        this.$store.commit('SET_PROJECTNAME', this.form.projectName)
+        this.$store.commit('SET_PROJECT', this.form)
       })
     },
     getUserList() {
@@ -203,24 +228,48 @@ export default {
       updateProject(this.form)
       const params = { taskId: this.taskForm.taskId };
       // 获取下一个流程节点
-      getNextFlowNode(params).then(res => {
-        this.$set(this.taskForm.variables, "formId", this.taskForm.formId);
-        this.$set(this.taskForm.variables, "budgetInitiator", this.peopleForm.userId);
-        getUsersDeptLeaderByDept({ deptId: 105 }).then(res => {
-          let userId = res.data.userId;
-          this.$set(this.taskForm.variables, "approval", userId);
-          complete(this.taskForm).then(response => {
-            this.$modal.msgSuccess(response.msg);
-            this.$emit('goBack');
-          });
-        })
-      })
+      // getNextFlowNode(params).then(res => {
+      //   this.$set(this.taskForm.variables, "formId", this.taskForm.formId);
+      //   this.$set(this.taskForm.variables, "budgetInitiator", this.peopleForm.userId);
+      //   getUsersDeptLeaderByDept({ deptId: 105 }).then(res => {
+      //     let userId = res.data.userId;
+      //     this.$set(this.taskForm.variables, "approval", userId);
+      //     complete(this.taskForm).then(response => {
+      //       this.$modal.msgSuccess(response.msg);
+      //       this.$emit('goBack');
+      //     });
+      //   })
+      // })
     },
     cancel() {
       this.form = {}
     },
+    setOrganizeDocument(val) {
+      let arr = val.split('/upload')
+      this.form.organizeDocument = arr[1]
+      if (val == "") {
+        this.form.organizeDocument = ""
+      }
+    },
+    getFileName(name) {
+      if (name != null) {
+        let arr = name.split('/')
+        return arr[arr.length - 1];
+      }
+
+    },
+    handleFileDelete() {
+      console.log(this);
+      // this.$refs.orz.handleDelete(0);
+    },
   }
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.upload-list {
+  display: flex;
+  text-align: left;
+  justify-content: space-around;
+}
+</style>

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-10 14:45:57
+ * @LastEditTime: 2024-05-20 17:58:13
 -->
 <template>
   <div>
@@ -69,7 +69,8 @@
                   value-format="yyyy-MM-dd"></el-date-picker>
               </td>
               <td>
-                <el-input-number v-model="progress.percentage" :controls="false" style="width: 120px"></el-input-number>%
+                <el-input-number v-model="progress.percentage" :controls="false"
+                  style="width: 120px"></el-input-number>%
               </td>
               <td>
                 <el-input v-model="progress.situation" type="textarea"></el-input>
@@ -100,7 +101,7 @@
       </div>
       <div slot="footer" class="dialog-footer" style="text-align: center">
         <el-button @click="preserve()" :disabled="disabled" type="warning">保 存</el-button>
-        <el-button type="primary" @click="submitNextFlow()" :disabled="disabled">提交下一个流程</el-button>
+        <el-button type="primary" @click="submitNextFlow()" :disabled="disabled">项目结束</el-button>
       </div>
     </div>
   </div>
@@ -297,6 +298,13 @@ export default {
     submitNextFlow() {
       this.preserve();
       const params = { taskId: this.taskForm.taskId };
+      // this.$confirm('结束后流程不可再修改，请问是否确定结束？', '提示', {
+      //     confirmButtonText: '确定',
+      //     cancelButtonText: '取消',
+      //     type: 'warning'
+      //   }).then(() => {
+
+      //   }).catch(() => { });
       // 获取下一个流程节点
       getNextFlowNode(params).then(res => {
         getProject(this.taskForm.formId).then(res => {

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

@@ -1,20 +1,36 @@
 <!--
  * @Author: wrh
  * @Date: 2024-03-25 17:38:39
- * @LastEditors: wrh
- * @LastEditTime: 2024-05-17 18:10:49
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-05-20 14:39:09
 -->
 <template>
   <div>
-    <el-table v-loading="loading" :data="changeRecordList">
+    <el-table v-loading="loading" :data="displayData">
       <el-table-column label="序号" align="center" prop="id" />
       <el-table-column label="类型" align="center" prop="field" />
-      <el-table-column label="变更前" align="center" prop="before" />
-      <el-table-column label="变更后" align="center" prop="after" />
+      <el-table-column label="变更前" align="center" prop="before">
+        <template slot-scope="scope">
+          {{ formatRow(scope.row, 'before') }}
+        </template>
+      </el-table-column>
+      <el-table-column label="变更后" align="center" prop="after">
+        <template slot-scope="scope">
+          {{ formatRow(scope.row, 'after') }}
+        </template>
+      </el-table-column>
       <el-table-column label="变更日期" align="center" prop="date" />
     </el-table>
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      @pagination="getChangeRecordList" />
+    <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getChangeRecordList" /> -->
+    <div class="mt20" style="text-align:right">
+      <el-pagination @current-change="handleCurrentChange" @size-change="handleSizeChange" background
+        :current-page.sync="queryParams.pageNum" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
+        :total="total">
+      </el-pagination>
+    </div>
+
+
   </div>
 </template>
 
@@ -31,70 +47,102 @@ export default {
       total: 0,
       // 变更记录表格数据
       changeRecordList: [],
+      filteredData: [], // 搜索后的数据
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         userId: undefined
       },
+      currentPage: 1,
+      pageSize: 20,
+      searchText: ''
     };
   },
+  computed: {
+    displayData() {
+      // 根据当前页码和每页数量计算显示的数据
+      const startIndex = (this.currentPage - 1) * this.pageSize;
+      const endIndex = startIndex + this.pageSize;
+      return this.filteredData.slice(startIndex, endIndex);
+    },
+  },
   created() {
     this.getChangeRecordList();
   },
+  mounted() {
+    this.searchTextFun();
+  },
   methods: {
     /** 查询变更记录列表 */
     getChangeRecordList() {
       this.loading = true;
       this.queryParams.userId = Number(this.$route.query.userId);
       getUserChangeInfo(this.queryParams).then(response => {
-        for (let row of response.rows) {
-          if (row.field == '执业证书') {
-            row.before = this.formatDict(this.dict.type.sys_user_certificates, row.before);
-            row.after = this.formatDict(this.dict.type.sys_user_certificates, row.after);
-          }
-          else if (row.field == '项目经理级别') {
-            row.before = this.formatDict(this.dict.type.sys_user_pmlevel, row.before);
-            row.after = this.formatDict(this.dict.type.sys_user_pmlevel, row.after);
-          }
-          else if (row.field == '技术职称') {
-            row.before = this.formatDict(this.dict.type.sys_user_titles, row.before);
-            row.after = this.formatDict(this.dict.type.sys_user_titles, row.after);
-          }
-          else if (row.field == '工程师岗级') {
-            row.before = this.formatDict(this.dict.type.sys_user_engineerlevel, row.before);
-            row.after = this.formatDict(this.dict.type.sys_user_engineerlevel, row.after);
-          }
-          else if (row.field == '岗级') {
-            row.before = this.formatDict(this.dict.type.sys_user_postlevel, row.before);
-            row.after = this.formatDict(this.dict.type.sys_user_postlevel, row.after);
-          }
-          else if (row.field == '薪档') {
-            row.before = this.formatDict(this.dict.type.sys_user_salarylevel, row.before);
-            row.after = this.formatDict(this.dict.type.sys_user_salarylevel, row.after);
-          }
-          else if (row.field == '技工等级') {
-            row.before = this.formatDict(this.dict.type.sys_user_operatorlevel, row.before);
-            row.after = this.formatDict(this.dict.type.sys_user_operatorlevel, row.after);
-          }
-          else if (row.field == '政治面貌') {
-            row.before = this.formatDict(this.dict.type.sys_user_political, row.before);
-            row.after = this.formatDict(this.dict.type.sys_user_political, row.after);
-          }
-          else if (row.field == '学历') {
-            row.before = this.formatDict(this.dict.type.sys_user_degree, row.before);
-            row.after = this.formatDict(this.dict.type.sys_user_degree, row.after);
-          }
-          else if (row.field == '合同期满' || row.field == '合同签订') {
-            row.before = parseTime(row.before, '{y}-{m}-{d}');
-            row.after = parseTime(row.after, '{y}-{m}-{d}');
-          }
-          this.changeRecordList.push(row);
-        }
+        this.changeRecordList = response.rows;
+        this.filteredData = this.changeRecordList;
         this.total = response.total;
         this.loading = false;
       });
     },
-
+    // 改变每页显示的数量时触发
+    handleSizeChange(newSize) {
+      this.pageSize = newSize;
+      this.currentPage = 1; // 重置当前页码为第一页
+    },
+    // 改变当前页码时触发
+    handleCurrentChange(newPage) {
+      this.currentPage = newPage;
+    },
+    // 根据搜索文本过滤数据
+    searchTextFun() {
+      this.filteredData = this.changeRecordList.filter(item =>
+        item.field.includes(this.searchText)
+      );
+      this.currentPage = 1; // 重置当前页码为第一页
+    },
+    formatRow(row, key) {
+      if (row.field == '执业证书') {
+        row.before = row.before == null ? '' : this.selectDictLabels(this.dict.type.sys_user_certificates, row.before, ',');
+        row.after = row.after == null ? '' : this.selectDictLabels(this.dict.type.sys_user_certificates, row.after, ',');
+      }
+      else if (row.field == '项目经理级别') {
+        row.before = row.before == null ? '' : this.selectDictLabel(this.dict.type.sys_user_pmlevel, row.before);
+        row.after = row.after == null ? '' : this.selectDictLabel(this.dict.type.sys_user_pmlevel, row.after);
+      }
+      else if (row.field == '技术职称') {
+        row.before = row.before == null ? '' : this.selectDictLabel(this.dict.type.sys_user_titles, row.before);
+        row.after = row.after == null ? '' : this.selectDictLabel(this.dict.type.sys_user_titles, row.after);
+      }
+      else if (row.field == '工程师岗级') {
+        row.before = row.before == null ? '' : this.selectDictLabel(this.dict.type.sys_user_engineerlevel, row.before);
+        row.after = row.after == null ? '' : this.selectDictLabel(this.dict.type.sys_user_engineerlevel, row.after);
+      }
+      else if (row.field == '岗级') {
+        row.before = row.before == null ? '' : this.selectDictLabel(this.dict.type.sys_user_postlevel, row.before);
+        row.after = row.after == null ? '' : this.selectDictLabel(this.dict.type.sys_user_postlevel, row.after);
+      }
+      else if (row.field == '薪档') {
+        row.before = row.before == null ? '' : this.selectDictLabel(this.dict.type.sys_user_salarylevel, row.before);
+        row.after = row.after == null ? '' : this.selectDictLabel(this.dict.type.sys_user_salarylevel, row.after);
+      }
+      else if (row.field == '技工等级') {
+        row.before = row.before == null ? '' : this.selectDictLabel(this.dict.type.sys_user_operatorlevel, row.before);
+        row.after = row.after == null ? '' : this.selectDictLabel(this.dict.type.sys_user_operatorlevel, row.after);
+      }
+      else if (row.field == '政治面貌') {
+        row.before = row.before == null ? '' : this.selectDictLabel(this.dict.type.sys_user_political, row.before);
+        row.after = row.after == null ? '' : this.selectDictLabel(this.dict.type.sys_user_political, row.after);
+      }
+      else if (row.field == '学历') {
+        row.before = row.before == null ? '' : this.selectDictLabel(this.dict.type.sys_user_degree, row.before);
+        row.after = row.after == null ? '' : this.selectDictLabel(this.dict.type.sys_user_degree, row.after);
+      }
+      else if (row.field == '合同期满' || row.field == '合同签订') {
+        row.before = parseTime(row.before, '{y}-{m}-{d}');
+        row.after = parseTime(row.after, '{y}-{m}-{d}');
+      }
+      return row[key]
+    },
     formatDict(arr, val) {
       if (val != null && val != undefined && val != "") {
         let valArr = val.split(',');

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

@@ -75,15 +75,13 @@
         <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) }}
+              {{ selectDictLabel(dict.type.sys_user_postlevel,scope.row.postLevel) +  selectDictLabel(dict.type.sys_user_salarylevel,scope.row.salaryLevel)}}
           </template>
         </el-table-column>
         <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 : ""
-            }}
+            {{ selectDictLabel(dict.type.sys_user_titles,scope.row.titles) }}
           </template>
         </el-table-column>
         <el-table-column label="执业证书" align="center" key="certificates" prop="certificates" v-if="columns[7].visible"
@@ -166,7 +164,7 @@
                 </el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item label="年龄" prop="age">
+            <el-form-item label="年龄" prop="age" v-if="form.userId != undefined">
               {{ form.age + '岁' }}
             </el-form-item>
             <el-form-item label="手机号码" prop="phonenumber">
@@ -560,7 +558,6 @@ export default {
     },
     // 查看人员详情按钮
     handleView(row) {
-      this.formatLevel(row.postLevel, row.salaryLevel, this.dict.type.sys_user_postlevel, this.dict.type.sys_user_salarylevel);
       this.formatCrtificates(this.dict.type.sys_user_certificates, row.certificates)
       this.$router.push({
         path: '/staff/info',
@@ -568,8 +565,8 @@ export default {
           userId: row.userId,
           nickName: row.nickName,
           postIds: this.form.postIds,
-          certificates: this.certificates,
-          postSalary: this.postSalary,
+          // certificates: this.certificates,
+          // postSalary: this.postSalary,
         }
       })
     },
@@ -686,17 +683,6 @@ export default {
     submitFileForm() {
       this.$refs.upload.submit();
     },
-    // 格式化表格里的薪资岗级
-    formatLevel(postLevel, salaryLevel, postLevelList, salaryLevelList) {
-      if (postLevel && salaryLevel) {
-        let post = postLevelList[postLevel].label
-        let salary = salaryLevelList[salaryLevel].label
-        this.postSalary = post + salary
-        return post + salary
-      } else {
-        return ''
-      }
-    },
     formatCrtificates(arr, val) {
       if (val != null && val != undefined && val != "") {
         let valArr = val.split(',');

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

@@ -2,10 +2,10 @@
  * @Author: ysh
  * @Date: 2024-03-22 14:50:46
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-15 19:09:21
+ * @LastEditTime: 2024-05-20 15:17:11
 -->
 <template>
-  <div class="bg">
+  <div class="bg" v-loading="loading">
     <div class="header">
       <div class="back">
         <el-button type="primary" plain @click="goBack">返回</el-button>
@@ -21,16 +21,10 @@
             <img :src="avatar" class="user-avatar" />
           </div>
           <div class="user-name">{{ this.form.nickName }}</div>
-          <div class="user-sex">{{ getAgeByIdCard(this.form.idCard) + '岁' }} {{ this.form.sex == '0' ? ' 男' : ' 女' }}</div>
-        </div>
-        <div class="info-item">
-          <div class="item-label">
-            <svg-icon icon-class="car" class="info-icon"></svg-icon>
-            <div class="item-label">职称：</div>
+          <div class="user-sex">
+            {{ getAgeByIdCard(this.form.idCard) + '岁' }} {{ this.form.sex == '0' ? ' 男' : ' 女' }}
+            <el-tag :type="form.status == '在职' ? 'success' : 'warning'">{{ form.status }}</el-tag>
           </div>
-          <div>{{ (dict.type.sys_user_titles[this.form.titles]) ?
-          (dict.type.sys_user_titles[this.form.titles]).label
-          : "" }}</div>
         </div>
         <div class="info-item">
           <div class="item-label">
@@ -46,19 +40,15 @@
           </div>
           <div class="item-value">{{ form.phonenumber }}</div>
         </div>
-        <div class="info-item">
-          <div class="item-label">
-            <svg-icon icon-class="certificate" class="info-icon"></svg-icon>
-            执业证书：
-          </div>
-          <div class="item-value">{{ form.certificates }}</div>
-        </div>
         <div class="info-item">
           <div class="item-label">
             <svg-icon icon-class="postSalary" class="info-icon"></svg-icon>
             <div class="item-label">薪资岗级：</div>
           </div>
-          <div>{{ form.postSalary }}</div>
+          <div>
+            {{ selectDictLabel(dict.type.sys_user_postlevel, form.postLevel) +
+          selectDictLabel(dict.type.sys_user_salarylevel, form.salaryLevel) }}
+          </div>
         </div>
         <div class="info-item">
           <div class="item-label">
@@ -67,19 +57,26 @@
           </div>
           <div>{{ parseTime(form.entryDate, '{y}-{m}') }}</div>
         </div>
+        <div class="info-item" v-for="item in userInfo">
+          <div class="item-label">
+            <svg-icon :icon-class="item.icon" class="info-icon"></svg-icon>
+            <div class="item-label">{{ item.label }}</div>
+          </div>
+          <div>{{ item.value }}</div>
+        </div>
         <div class="info-item">
           <div class="item-label">
-            <svg-icon icon-class="rate" class="info-icon"></svg-icon>
-            <div class="item-label">状态：</div>
+            <svg-icon icon-class="homePlace" class="info-icon"></svg-icon>
+            <div class="item-label" style="min-width:70px;">家庭住址：</div>
           </div>
-          <div>{{ form.status }}</div>
+          <div>{{ form.homePlace }}</div>
         </div>
       </el-col>
       <el-col :span="17" class="stateInfo">
         <el-tabs v-model="activeName" @tab-click="handleClick">
-          <el-tab-pane label="负责项目" name="1">
+          <!-- <el-tab-pane label="负责项目" name="1">
             <projectInfo></projectInfo>
-          </el-tab-pane>
+          </el-tab-pane> -->
           <el-tab-pane label="变更记录" name="2">
             <changeRecord></changeRecord>
           </el-tab-pane>
@@ -92,21 +89,19 @@
 <script>
 import userAvatar from "@/views/system/user/profile/userAvatar.vue"
 import { getUser } from "@/api/system/user"
-import { mapGetters } from "vuex"
 import projectInfo from './projectInfo'
 import changeRecord from './changeRecord'
 export default {
   components: { userAvatar, projectInfo, changeRecord },
-  dicts: ['sys_normal_disable', 'sys_user_sex', 'sys_user_titles', 'sys_user_certificates', 'sys_user_pmlevel', 'sys_user_postlevel', 'sys_user_salarylevel'],
-  computed: {
-    ...mapGetters(["avatar"]),
-  },
+  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', 'sys_user_engineerlevel', 'sys_user_operatorlevel'],
   created() {
     if (this.$route.query)
       this.getUserInfo(this.$route.query.userId);
   },
   data() {
     return {
+      loading: true,
       form: {
         userId: undefined,
         nickName: '',
@@ -114,9 +109,11 @@ export default {
           deptName: ''
         }
       },
+      userInfo: [],
       postOptions: [],
       postData: '',
-      activeName: '1'
+      activeName: '2',
+      avatar: ''
     }
   },
   methods: {
@@ -124,8 +121,82 @@ export default {
       getUser(id).then(res => {
         this.postOptions = res.posts;
         if (res.data) {
+        this.avatar =  (res.data.avatar == "" || res.data.avatar == null) ? require("@/assets/images/user.png") : process.env.VUE_APP_BASE_API + res.data.avatar;
           this.form = res.data;
           this.formartForm(res);
+          this.userInfo = [
+            {
+              label: '技术职称：',
+              icon: 'titles',
+              value: this.form.titles != null ? this.selectDictLabels(this.dict.type.sys_user_titles, this.form.titles, ',') : ''
+            },
+            {
+              label: '执业证书：',
+              icon: 'certificate',
+              value: this.form.certificates != null ? this.selectDictLabels(this.dict.type.sys_user_certificates, this.form.certificates, ',') : ''
+            },
+            {
+              label: '工程师岗级：',
+              icon: 'engineer',
+              value: this.selectDictLabel(this.dict.type.sys_user_engineerlevel, this.form.engineerLevel)
+            },
+            {
+              label: '技工等级：',
+              icon: 'operator',
+              value: this.selectDictLabel(this.dict.type.sys_user_operatorlevel, this.form.operatorLevel)
+            },
+            {
+              label: '项目经理级别：',
+              icon: 'pmLevel',
+              value: this.selectDictLabel(this.dict.type.sys_user_pmlevel, this.form.pmLevel)
+            },
+            {
+              label: '身份证号码：',
+              icon: 'idCard',
+              value: this.form.idCard
+            },
+            {
+              label: '籍贯：',
+              icon: 'place',
+              value: this.form.nativePlace
+            },
+            {
+              label: '政治面貌：',
+              icon: 'politicalAffiliation',
+              value: this.selectDictLabels(this.dict.type.sys_user_political, this.form.politicalAffiliation, ',')
+            },
+            {
+              label: '民族：',
+              icon: 'flower',
+              value: this.form.ethnic
+            },
+            {
+              label: '毕业院校：',
+              icon: 'school',
+              value: this.form.graduateSchool
+            },
+            {
+              label: '专业：',
+              icon: 'major',
+              value: this.form.major
+            },
+            {
+              label: '学历：',
+              icon: 'degree',
+              value: this.selectDictLabel(this.dict.type.sys_user_degree, this.form.degree)
+            },
+            {
+              label: '合同签订：',
+              icon: 'contractSign',
+              value: this.parseTime(this.form.contractSign, '{y}-{m}-{d}')
+            },
+            {
+              label: '合同期满：',
+              icon: 'contractExpire',
+              value: this.parseTime(this.form.contractExpire, '{y}-{m}-{d}')
+            },
+          ]
+          this.loading =false;
         }
       })
     },
@@ -133,8 +204,6 @@ export default {
       if (this.$route.query) {
         this.form.userId = this.$route.query.userId
         this.form.nickName = this.$route.query.nickName
-        this.form.certificates = this.$route.query.certificates
-        this.form.postSalary = this.$route.query.postSalary
       }
       let postArr = [];
       for (let post of res.posts) {
@@ -194,7 +263,7 @@ export default {
 <style lang="scss" scoped>
 .bg {
   background-color: #F0F2F5;
-  height: 100vh;
+  height: 1000px;
 }
 
 .header {
@@ -219,16 +288,17 @@ export default {
 
 .userInfo {
   background-color: #fff;
-  height: 650px;
+  // height: 800px;
   margin-right: 40px;
+  padding: 5px;
 
   .avatar {
     text-align: center;
 
     // padding: 10px 0;
     .user-avatar {
-      width: 150px;
-      height: 150px;
+      width: 130px;
+      height: 130px;
       border-radius: 50%;
     }
 
@@ -260,9 +330,11 @@ export default {
     }
 
     .item-label {
-      max-width: 120px;
+      max-width: 150px;
       display: flex;
       align-items: center;
+      font-family: '微软雅黑';
+      font-weight: bold;
       // text-align: right;
       // display: inline-block;
     }
@@ -276,7 +348,7 @@ export default {
 
 .stateInfo {
   background-color: #fff;
-  height: 650px;
+  height: 800px;
   padding: 10px 30px 0;
 }
 </style>