Jelajahi Sumber

fix: 个人档案

qiny 11 bulan lalu
induk
melakukan
b5333bb15a

+ 1 - 1
client/src/views/OaSystem/mineCenter/rightChild/index.ts

@@ -205,7 +205,7 @@ const additionalConfig = [
 const getDictList = () => {
   const dictOptionsObj: any = {}
   // 性别
-  const sex = getDictOptions('system_user_sex')
+  const sex = getDictOptions('sex_type')
   // 状态
   const state = getDictOptions('staff_state_type')
   // 在岗职位

+ 1 - 2
client/src/views/OaSystem/personnelManagement/ygdaPage/SchoolTable.vue

@@ -19,7 +19,6 @@
         color: '#000000'
       }"
       :data="tableData"
-      v-else
     >
       <el-table-column prop="major" label="专业">
         <template #default="scope">
@@ -208,7 +207,7 @@ const deleteRow = (index: number) => {
 .add-tag {
   position: absolute;
   top: 2px;
-  left: 120px;
+  right: 0;
   cursor: pointer;
 }
 .detail-table {

+ 1 - 3
client/src/views/OaSystem/personnelManagement/ygdaPage/WorkTable.vue

@@ -19,7 +19,6 @@
         color: '#000000'
       }"
       :data="tableData"
-      v-else
     >
       <el-table-column prop="workLocation" label="工作单位">
         <template #default="scope">
@@ -102,7 +101,6 @@
 /**
  * @description 工作经历
  */
-
 import { cloneDeep } from 'lodash-es'
 
 interface ITable {
@@ -205,7 +203,7 @@ const deleteRow = (index: number) => {
 .add-tag {
   position: absolute;
   top: 2px;
-  left: 120px;
+  right: 0;
   cursor: pointer;
 }
 .detail-table {

+ 38 - 6
client/src/views/OaSystem/personnelManagement/ygdaPage/familyTable.vue

@@ -19,7 +19,6 @@
         color: '#000000'
       }"
       :data="tableData"
-      v-else
     >
       <el-table-column prop="name" label="姓名">
         <template #default="scope">
@@ -29,8 +28,20 @@
       </el-table-column>
       <el-table-column prop="xb" label="性别">
         <template #default="scope">
-          <el-input v-model="scope.row.xb" v-if="scope.row.isEdit" />
-          <span v-else>{{ scope.row.xb }}</span>
+          <el-select
+            v-if="scope.row.isEdit"
+            v-model="scope.row.xb"
+            style="width: 100%"
+            placeholder="请选择学历水平"
+          >
+            <el-option
+              v-for="opt in sexOptions"
+              :key="opt.value"
+              :label="opt.label"
+              :value="opt.value"
+            />
+          </el-select>
+          <span v-else>{{ degreeShowValue(scope.row.xb, sexOptions) }}</span>
         </template>
       </el-table-column>
       <el-table-column prop="gzdw" label="工作单位">
@@ -53,8 +64,20 @@
       </el-table-column>
       <el-table-column prop="gx" label="与本人关系">
         <template #default="scope">
-          <el-input v-model="scope.row.gx" v-if="scope.row.isEdit" />
-          <span v-else>{{ scope.row.gx }}</span>
+          <el-select
+            v-if="scope.row.isEdit"
+            v-model="scope.row.gx"
+            style="width: 100%"
+            placeholder="请选择学历水平"
+          >
+            <el-option
+              v-for="opt in relationOptions"
+              :key="opt.value"
+              :label="opt.label"
+              :value="opt.value"
+            />
+          </el-select>
+          <span v-else>{{ degreeShowValue(scope.row.gx, sexOptions) }}</span>
         </template>
       </el-table-column>
       <el-table-column fixed="right" label="操作" width="140">
@@ -88,6 +111,15 @@
  */
 
 import { cloneDeep } from 'lodash-es'
+import { getDictList } from './index'
+
+// 字典
+const formConfigList = getDictList()
+const sexOptions = formConfigList['sex']
+const relationOptions = formConfigList['jjlxrgx']
+const degreeShowValue = (value, options) => {
+  return options.find((item) => item.value == value)?.label ?? ''
+}
 
 interface ITable {
   id?: string
@@ -187,7 +219,7 @@ const deleteRow = (index: number) => {
 .add-tag {
   position: absolute;
   top: 2px;
-  left: 120px;
+  right: 0;
   cursor: pointer;
 }
 .detail-table {

+ 1 - 1
client/src/views/OaSystem/personnelManagement/ygdaPage/index.ts

@@ -3,7 +3,7 @@ import { cloneDeep } from 'lodash-es'
 export const getDictList = () => {
   const dictOptionsObj: any = {}
   // 性别
-  const sex = getDictOptions('system_user_sex')
+  const sex = getDictOptions('sex_type')
   // 状态
   const state = getDictOptions('staff_state_type')
   // 在岗职位

+ 1 - 2
client/src/views/OaSystem/personnelManagement/ygdaPage/performanceTable.vue

@@ -19,7 +19,6 @@
         color: '#000000'
       }"
       :data="tableData"
-      v-else
     >
       <el-table-column prop="year" label="年份" width="300">
         <template #default="scope">
@@ -182,7 +181,7 @@ const deleteRow = (index: number) => {
 .add-tag {
   position: absolute;
   top: 2px;
-  left: 120px;
+  right: 0;
   cursor: pointer;
 }
 .detail-table {