Bladeren bron

fix: web端档案部分内容修改

qiny 11 maanden geleden
bovenliggende
commit
60471a0e30

+ 10 - 0
client/src/views/OaSystem/personnelManagement/components/FileUpload.vue

@@ -0,0 +1,10 @@
+<template>
+  <div></div>
+</template>
+<script lang="ts" setup>
+/**
+ * @description 附件上传
+ */
+// import { UploadImg, UploadImgs, UploadFile } from '@/components/UploadFile'
+</script>
+<style scoped lang="scss"></style>

+ 1 - 0
client/src/views/OaSystem/personnelManagement/dailyCenter/editorDetail.vue

@@ -38,6 +38,7 @@
       :initialData="formData.weeklyWorkloadList"
       :nowDate="writeData?.date"
     />
+
     <div class="footBox" v-if="isUpDate">
       <el-button type="primary" @click="sendReportHandle(false)">更新</el-button>
     </div>

+ 12 - 6
client/src/views/OaSystem/personnelManagement/ygdaPage/SchoolTable.vue

@@ -20,18 +20,19 @@
       }"
       :data="tableData"
     >
-      <el-table-column prop="major" label="专业">
-        <template #default="scope">
-          <el-input v-model="scope.row.major" v-if="scope.row.isEdit" />
-          <span v-else>{{ scope.row.major }}</span>
-        </template>
-      </el-table-column>
       <el-table-column prop="byxx" label="毕业学校">
         <template #default="scope">
           <el-input v-model="scope.row.byxx" v-if="scope.row.isEdit" />
           <span v-else>{{ scope.row.byxx }}</span>
         </template>
       </el-table-column>
+      <el-table-column prop="major" label="专业">
+        <template #default="scope">
+          <el-input v-model="scope.row.major" v-if="scope.row.isEdit" />
+          <span v-else>{{ scope.row.major }}</span>
+        </template>
+      </el-table-column>
+
       <el-table-column prop="bysj" label="毕业时间">
         <template #default="scope">
           <el-date-picker
@@ -225,6 +226,11 @@ const onEditItem = (index: number) => {
 // 删除
 const deleteRow = (index: number) => {
   tableData.value.splice(index, 1)
+  const changeData = cloneDeep(tableData.value).map((item: any) => {
+    delete item.isEdit
+    return item
+  })
+  $emit('onSave', changeData)
 }
 // 回填正确路径
 const imageUrl = (url) => {

+ 5 - 0
client/src/views/OaSystem/personnelManagement/ygdaPage/TechCertificate.vue

@@ -203,6 +203,11 @@ const onEditItem = (index: number) => {
 // 删除
 const deleteRow = (index: number) => {
   tableData.value.splice(index, 1)
+  const changeData = cloneDeep(tableData.value).map((item: any) => {
+    delete item.isEdit
+    return item
+  })
+  $emit('onSave', changeData)
 }
 // 回填正确路径
 const imageUrl = (url) => {

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

@@ -195,6 +195,11 @@ const onEditItem = (index: number) => {
 // 删除
 const deleteRow = (index: number) => {
   tableData.value.splice(index, 1)
+  const changeData = cloneDeep(tableData.value).map((item: any) => {
+    delete item.isEdit
+    return item
+  })
+  $emit('onSave', changeData)
 }
 </script>
 <style scoped lang="scss">

+ 12 - 7
client/src/views/OaSystem/personnelManagement/ygdaPage/familyTable.vue

@@ -20,19 +20,19 @@
       }"
       :data="tableData"
     >
-      <el-table-column prop="name" label="姓名">
+      <el-table-column prop="name" label="姓名" width="120">
         <template #default="scope">
           <el-input v-model="scope.row.name" v-if="scope.row.isEdit" />
           <span v-else>{{ scope.row.name }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="xb" label="性别">
+      <el-table-column prop="xb" label="性别" width="120">
         <template #default="scope">
           <el-select
             v-if="scope.row.isEdit"
             v-model="scope.row.xb"
             style="width: 100%"
-            placeholder="请选择学历水平"
+            placeholder="请选择"
           >
             <el-option
               v-for="opt in sexOptions"
@@ -56,19 +56,19 @@
           <span v-else>{{ scope.row.zz }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="lxdh" label="联系电话">
+      <el-table-column prop="lxdh" label="联系电话" width="180">
         <template #default="scope">
           <el-input v-model="scope.row.lxdh" v-if="scope.row.isEdit" />
           <span v-else>{{ scope.row.lxdh }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="gx" label="与本人关系">
+      <el-table-column prop="gx" label="与本人关系" width="140">
         <template #default="scope">
           <el-select
             v-if="scope.row.isEdit"
             v-model="scope.row.gx"
             style="width: 100%"
-            placeholder="请选择学历水平"
+            placeholder="请选择"
           >
             <el-option
               v-for="opt in relationOptions"
@@ -77,7 +77,7 @@
               :value="opt.value"
             />
           </el-select>
-          <span v-else>{{ degreeShowValue(scope.row.gx, sexOptions) }}</span>
+          <span v-else>{{ degreeShowValue(scope.row.gx, relationOptions) }}</span>
         </template>
       </el-table-column>
       <el-table-column fixed="right" label="操作" width="140" v-if="!readOnly">
@@ -208,6 +208,11 @@ const onEditItem = (index: number) => {
 // 删除
 const deleteRow = (index: number) => {
   tableData.value.splice(index, 1)
+  const changeData = cloneDeep(tableData.value).map((item: any) => {
+    delete item.isEdit
+    return item
+  })
+  $emit('onSave', changeData)
 }
 </script>
 <style scoped lang="scss">

+ 5 - 0
client/src/views/OaSystem/personnelManagement/ygdaPage/performanceTable.vue

@@ -170,6 +170,11 @@ const onEditItem = (index: number) => {
 // 删除
 const deleteRow = (index: number) => {
   tableData.value.splice(index, 1)
+  const changeData = cloneDeep(tableData.value).map((item: any) => {
+    delete item.isEdit
+    return item
+  })
+  $emit('onSave', changeData)
 }
 </script>
 <style scoped lang="scss">

+ 16 - 3
client/src/views/OaSystem/personnelManagement/ygdaPage/staffDetail.vue

@@ -228,18 +228,31 @@ const savePerformanceList = (data: any[]) => {
         </div>
 
         <div class="my-portrait-item">
-          <WorkTable :defaultData="formData['workList']" @onSave="saveWorkList" />
+          <WorkTable
+            :defaultData="formData['workList']"
+            @onSave="saveWorkList"
+            :onlyRead="type == 'view'"
+          />
         </div>
         <div class="my-portrait-item">
-          <FamilyTable :defaultData="formData['familyList']" @onSave="saveFamilyList" />
+          <FamilyTable
+            :defaultData="formData['familyList']"
+            @onSave="saveFamilyList"
+            :onlyRead="type == 'view'"
+          />
         </div>
         <div class="my-portrait-item">
-          <SchoolTable :defaultData="formData['schoolList']" @onSave="saveSchoolList" />
+          <SchoolTable
+            :defaultData="formData['schoolList']"
+            @onSave="saveSchoolList"
+            :onlyRead="type == 'view'"
+          />
         </div>
         <div class="my-portrait-item">
           <PerformanceTable
             :defaultData="formData['performanceList']"
             @onSave="savePerformanceList"
+            :onlyRead="type == 'view'"
           />
         </div>
         <el-row justify="end">