Bläddra i källkod

fix: 修复通知公告不显示新发送的公告问题

qiny 1 år sedan
förälder
incheckning
423dc8aa29

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

@@ -159,6 +159,37 @@ export const formConfigList = [
     ]
   }
 ]
+// 追加的档案
+const additionalConfig = [
+  {
+    title: '工作经历',
+    children: [
+      {
+        name: '',
+        title: ''
+      }
+    ]
+  },
+  {
+    title: '学习经历',
+    children: [
+      {
+        name: '',
+        title: ''
+      }
+    ]
+  },
+  {
+    title: '职称证书',
+    children: [
+      {
+        name: '',
+        title: ''
+      }
+    ]
+  }
+]
+
 const getDictList = () => {
   const dictOptionsObj: any = {}
   // 性别

+ 3 - 1
client/src/views/OaSystem/mineCenter/rightChild/wdda.vue

@@ -4,7 +4,9 @@ import { getRecordsDetail } from '@/api/oa/staffRecords'
 import { useUserStore } from '@/store/modules/user'
 import { getConfigDict } from './index'
 import TechCertificate from '../../personnelManagement/ygdaPage/TechCertificate.vue'
-
+/**
+ * @description 我的档案
+ */
 const formConfigList = getConfigDict()
 
 const userId = useUserStore().getUser.id // 当前登录的编号

+ 3 - 2
client/src/views/OaSystem/officeCenter/noticeAndLearn/add.vue

@@ -55,11 +55,12 @@ const { fileUrls, downloadFile, uploadFile, deleteFile } = useFiles(request)
 defineOptions({
   name: 'NoticeAdd'
 })
-const route = useRoute()
+const route: any = useRoute()
+const routeName: string = route.name ?? ''
 const initFormData: any = {
   id: null,
   title: '',
-  type: route.name.startsWith('notice') ? 1 : 2,
+  type: routeName.startsWith('Notice') || routeName.startsWith('notice') ? 1 : 2,
   studyType: null,
   files: '',
   userId: '',

+ 33 - 0
client/src/views/OaSystem/personnelManagement/ygdaPage/WorkTable.vue

@@ -0,0 +1,33 @@
+<template>
+  <el-table
+    class="detail-table"
+    :header-cell-style="{
+      background: '#F2F4F8',
+      color: '#000000',
+      height: '46px'
+    }"
+    style="width: 100%; height: 100%"
+    :data="tableData"
+    height="150px"
+  >
+    <el-table-column prop="workLocation" label="工作单位" />
+    <el-table-column prop="post" label="职位" />
+    <el-table-column prop="startTime" label="开始时间" />
+    <el-table-column prop="endTime" label="结束时间" />
+    <el-table-column prop="resignReason" label="离职原因" />
+    <el-table-column prop="jyxy" label="是否有竞业限制/未尽法律事宜" />
+    <el-table-column prop="competitionDetail" label="具体条款" />
+  </el-table>
+</template>
+<script lang="ts" setup>
+/**
+ * @description 工作经历
+ */
+const tableData = []
+</script>
+<style scoped lang="scss">
+.detail-table {
+  width: 100%;
+  height: auto;
+}
+</style>

+ 10 - 4
client/src/views/OaSystem/personnelManagement/ygdaPage/staffDetail.vue

@@ -1,14 +1,20 @@
 <script setup lang="ts">
+/**
+ * @description 档案详情
+ */
+
 defineOptions({ name: 'StaffDetail' })
 
 import { useQuery, useMutation } from '@tanstack/vue-query'
 import { getRecordsDetail, editRecordsDetail, generateStaffNum } from '@/api/oa/staffRecords'
 import { getConfigDict } from './index'
 import { ElRow, FormInstance } from 'element-plus'
-import TechCertificate from './TechCertificate.vue'
+// import TechCertificate from './TechCertificate.vue'
 import avatarImg from '@/assets/imgs/avatar.jpg'
 import DeptSelect from '@/components/DeptSelect/index.vue'
 import { createImageViewer } from '@/components/ImageViewer'
+import WorkTable from './WorkTable.vue'
+
 const formConfigList = getConfigDict()
 
 const { query } = useRoute()
@@ -180,9 +186,9 @@ const isEdit = computed(() => {
         <div class="my-portrait-item">
           <div class="title">
             <i></i>
-            <span>技能证书</span>
+            <span>工作经历</span>
           </div>
-          <TechCertificate />
+          <WorkTable />
         </div>
         <el-row justify="end">
           <el-form-item v-if="isEdit">
@@ -234,7 +240,7 @@ const isEdit = computed(() => {
 
     .my-portrait-item {
       margin-bottom: 20px;
-
+      width: 100%;
       .title {
         display: flex;
         align-items: center;