From afcc8434acf1e24ccda14b1a0b5d4987ab31563a Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Tue, 30 Jun 2026 09:43:58 +0800
Subject: [PATCH] 修改

---
 src/views/safetyReview/expertManage/applyRecords/components/expertForm.vue |  184 +++++++++++++++++++++++++++++++--------------
 1 files changed, 127 insertions(+), 57 deletions(-)

diff --git a/src/views/safetyReview/expertManage/applyRecords/components/expertForm.vue b/src/views/safetyReview/expertManage/applyRecords/components/expertForm.vue
index e6105cc..7d5e197 100644
--- a/src/views/safetyReview/expertManage/applyRecords/components/expertForm.vue
+++ b/src/views/safetyReview/expertManage/applyRecords/components/expertForm.vue
@@ -35,7 +35,7 @@
                 <el-cascader
                     style="width: 100%"
                     clearable
-                    :disabled="state.disable"
+                    :disabled="state.findDept || disable"
                     v-model="state.form.deptId"
                     :options="state.deptList"
                     :props="{ expandTrigger: 'hover', value: 'deptId',label: 'deptName',emitPath: false}"></el-cascader>
@@ -103,7 +103,27 @@
                            :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='8'
                            v-model:file-list="state.evidenceList" list-type="picture-card" :before-upload="picSize"
                            :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles,'证明')"
-                           :before-remove="beforeRemove">
+                           :before-remove="(uploadFile, uploadFiles)=>beforeRemove(uploadFile, uploadFiles,'证明')">
+                  <el-icon>
+                    <Plus/>
+                  </el-icon>
+                  <template #tip>
+                    <div class="el-upload__tip">上传jpg/png图片尺寸小于5M,最多可上传8张</div>
+                  </template>
+                </el-upload>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="20">
+              <el-form-item label="学历证明" prop="academicCertificate">
+                <el-upload accept="image/*" multiple :action="state.uploadUrl" :headers="state.header" method="post"
+                           :disabled="state.disable"
+                           :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile,'学历')"
+                           :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='5'
+                           v-model:file-list="state.academicCertificateList" list-type="picture-card" :before-upload="picSize"
+                           :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles,'学历')"
+                           :before-remove="(uploadFile, uploadFiles)=>beforeRemove(uploadFile, uploadFiles,'学历')">
                   <el-icon>
                     <Plus/>
                   </el-icon>
@@ -122,7 +142,7 @@
                            :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='1'
                            v-model:file-list="state.fileList" list-type="picture-card" :before-upload="picSize"
                            :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles,'证件照')"
-                           :before-remove="beforeRemove">
+                           :before-remove="(uploadFile, uploadFiles)=>beforeRemove(uploadFile, uploadFiles,'证件照')">
                   <el-icon>
                     <Plus/>
                   </el-icon>
@@ -280,10 +300,10 @@
                            :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile,'简历')"
                            :on-exceed="showTip" :limit='8' v-model:file-list="state.resumeList" :before-upload="picSize"
                            :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles,'简历')"
-                           :before-remove="beforeRemove">
+                           :before-remove="(uploadFile, uploadFiles)=>beforeRemove(uploadFile, uploadFiles,'简历')">
                   <el-button type="primary">点击上传</el-button>
                   <template #tip>
-                    <div class="el-upload__tip">上传pdf格式文件尺寸小于5M,最多可上传5份</div>
+                    <div class="el-upload__tip">上传pdf格式文件尺寸小于5M,最多可上传8份</div>
                   </template>
                 </el-upload>
               </el-form-item>
@@ -294,16 +314,16 @@
               <el-form-item label="发明、著作、学术论文情况(何时、何地出版或发表)">
                 <el-upload accept="image/*" multiple :action="state.uploadUrl" :headers="state.header" method="post"
                            :disabled="state.disable"
-                           :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile,'著作')"
+                           :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile,'发明')"
                            :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='8'
                            v-model:file-list="state.inventionList" list-type="picture-card" :before-upload="picSize"
-                           :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles,'著作')"
-                           :before-remove="beforeRemove">
+                           :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles,'发明')"
+                           :before-remove="(uploadFile, uploadFiles)=>beforeRemove(uploadFile, uploadFiles,'发明')">
                   <el-icon>
                     <Plus/>
                   </el-icon>
                   <template #tip>
-                    <div class="el-upload__tip">上传jpg/png图片尺寸小于5M,最多可上传5张</div>
+                    <div class="el-upload__tip">上传jpg/png图片尺寸小于5M,最多可上传8张</div>
                   </template>
                 </el-upload>
               </el-form-item>
@@ -318,12 +338,12 @@
                            :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='8'
                            v-model:file-list="state.rewardList" list-type="picture-card" :before-upload="picSize"
                            :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles,'奖励')"
-                           :before-remove="beforeRemove">
+                           :before-remove="(uploadFile, uploadFiles)=>beforeRemove(uploadFile, uploadFiles,'奖励')">
                   <el-icon>
                     <Plus/>
                   </el-icon>
                   <template #tip>
-                    <div class="el-upload__tip">上传jpg/png图片尺寸小于5M,最多可上传5张</div>
+                    <div class="el-upload__tip">上传jpg/png图片尺寸小于5M,最多可上传8张</div>
                   </template>
                 </el-upload>
               </el-form-item>
@@ -338,12 +358,12 @@
                            :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='8'
                            v-model:file-list="state.achievementList" list-type="picture-card" :before-upload="picSize"
                            :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles,'研究')"
-                           :before-remove="beforeRemove">
+                           :before-remove="(uploadFile, uploadFiles)=>beforeRemove(uploadFile, uploadFiles,'研究')">
                   <el-icon>
                     <Plus/>
                   </el-icon>
                   <template #tip>
-                    <div class="el-upload__tip">上传jpg/png图片尺寸小于5M,最多可上传5张</div>
+                    <div class="el-upload__tip">上传jpg/png图片尺寸小于5M,最多可上传8张</div>
                   </template>
                 </el-upload>
               </el-form-item>
@@ -358,12 +378,12 @@
                            :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='8'
                            v-model:file-list="state.proAdviceList" list-type="picture-card" :before-upload="picSize"
                            :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles,'本人')"
-                           :before-remove="beforeRemove">
+                           :before-remove="(uploadFile, uploadFiles)=>beforeRemove(uploadFile, uploadFiles,'本人')">
                   <el-icon>
                     <Plus/>
                   </el-icon>
                   <template #tip>
-                    <div class="el-upload__tip">上传jpg/png图片尺寸小于5M,最多可上传5张</div>
+                    <div class="el-upload__tip">上传jpg/png图片尺寸小于5M,最多可上传8张<el-link href="/adviceTemplate.docx" type="primary" style="display: inline;margin-left: 10px;">下载模版</el-link></div>
                   </template>
                 </el-upload>
               </el-form-item>
@@ -378,12 +398,12 @@
                            :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='8'
                            v-model:file-list="state.adviceList" list-type="picture-card" :before-upload="picSize"
                            :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles,'单位')"
-                           :before-remove="beforeRemove">
+                           :before-remove="(uploadFile, uploadFiles)=>beforeRemove(uploadFile, uploadFiles,'单位')">
                   <el-icon>
                     <Plus/>
                   </el-icon>
                   <template #tip>
-                    <div class="el-upload__tip">上传jpg/png图片尺寸小于5M,最多可上传5张</div>
+                    <div class="el-upload__tip">上传jpg/png图片尺寸小于5M,最多可上传8张<el-link href="/unitTemplate.docx" type="primary" style="display: inline;margin-left: 10px;">下载模版</el-link></div>
                   </template>
                 </el-upload>
               </el-form-item>
@@ -484,7 +504,7 @@
 import {getToken} from "@/utils/auth"
 import {Base64} from "js-base64"
 import {listOutDept} from "@/api/system/dept";
-
+const baseUrl = import.meta.env.VITE_APP_BASE_API;
 const emit = defineEmits(["getList"])
 const dialogVisible = ref(false)
 const imgDialog = ref(false)
@@ -502,6 +522,14 @@
 let validateEvidence = (rule, value, callback) => {
   if (state.evidenceList.length == 0) {
     callback(new Error('请上传证明材料'));
+  } else {
+    callback();
+  }
+}
+
+let validateAcademicCertificate = (rule, value, callback) => {
+  if (state.academicCertificateList.length == 0) {
+    callback(new Error('请上传学历证明'));
   } else {
     callback();
   }
@@ -548,6 +576,7 @@
 
 const state = reactive({
   assessDialog: false,
+  findDept: true,
   form: {
     id: null,
     name: '',
@@ -578,6 +607,7 @@
     supportDirectionPrevention: [],
     supportDirectionEmergency: [],
     evidence: '',
+    academicCertificate: '',
     resumeKey: '',
     paperSituationKey: '',
     rewardKey: '',
@@ -623,6 +653,7 @@
   },
   fileList: [],
   evidenceList: [],
+  academicCertificateList: [],
   resumeList: [],
   inventionList: [],
   rewardList: [],
@@ -639,6 +670,7 @@
     phone: [{required: true, validator: validatePhone, trigger: 'blur'}],
     title: [{required: true, message: '请填写职称', trigger: 'blur'}],
     evidence: [{required: true, validator: validateEvidence, trigger: 'blur'}],
+    academicCertificate: [{required: true, validator: validateAcademicCertificate, trigger: 'blur'}],
     resumeKey: [{required: true, validator: validatePass, trigger: 'blur'}],
     recommendUnitOpinionKey: [{required: true, validator: validateOneOfTwo, trigger: 'blur'}],
     idCard: [{required: true, validator: verifyId, trigger: 'blur'}],
@@ -662,12 +694,21 @@
     state.form.bigClassify = null
     state.form.smallClassify = null
   }
+  const foundType = findNodeById(state.expertsType,value[1])
+  if(foundType.deptId){
+    state.form.deptId = foundType.deptId
+    state.findDept = true
+  }else{
+    ElMessage.warning('该专业未找到对应的业务处室,请手动选择')
+    state.form.deptId = null
+    state.findDept = false
+  }
 }
 
 const findNodeById = (data,value)=> {
   for (const node of data) {
     if (node.id === value) {
-      return node.classifyName;
+      return node;
     }
     if (node.children) {
       const foundNode = findNodeById(node.children, value);
@@ -717,7 +758,7 @@
             })
           }
           if (state.form.resumeKey !== '') {
-            state.resumeList = state.form.resumeKey.split(',').map(i => {
+            state.resumeList = state.form.resumeKey.split(',').filter(item => item.startsWith('http')).map(i => {
               return {
                 name: i,
                 url: i,
@@ -725,7 +766,15 @@
             })
           }
           if (state.form.evidence !== '') {
-            state.evidenceList = state.form.evidence.split(',').map(i => {
+            state.evidenceList = state.form.evidence.split(',').filter(item => item.startsWith('http')).map(i => {
+              return {
+                name: i,
+                url: i,
+              }
+            })
+          }
+          if (state.form.academicCertificate !== '') {
+            state.academicCertificateList = state.form.academicCertificate.split(',').filter(item => item.startsWith('http')).map(i => {
               return {
                 name: i,
                 url: i,
@@ -733,7 +782,7 @@
             })
           }
           if (state.form.paperSituationKey !== '') {
-            state.inventionList = state.form.paperSituationKey.split(',').map(i => {
+            state.inventionList = state.form.paperSituationKey.split(',').filter(item => item.startsWith('http')).map(i => {
               return {
                 name: i,
                 url: i,
@@ -741,7 +790,7 @@
             })
           }
           if (state.form.rewardKey !== '') {
-            state.rewardList = state.form.rewardKey.split(',').map(i => {
+            state.rewardList = state.form.rewardKey.split(',').filter(item => item.startsWith('http')).map(i => {
               return {
                 name: i,
                 url: i,
@@ -749,7 +798,7 @@
             })
           }
           if (state.form.achievementKey !== '') {
-            state.achievementList = state.form.achievementKey.split(',').map(i => {
+            state.achievementList = state.form.achievementKey.split(',').filter(item => item.startsWith('http')).map(i => {
               return {
                 name: i,
                 url: i,
@@ -757,7 +806,7 @@
             })
           }
           if (state.form.personalOpinionKey !== '') {
-            state.proAdviceList = state.form.personalOpinionKey.split(',').map(i => {
+            state.proAdviceList = state.form.personalOpinionKey.split(',').filter(item => item.startsWith('http')).map(i => {
               return {
                 name: i,
                 url: i,
@@ -765,7 +814,7 @@
             })
           }
           if (state.form.recommendUnitOpinionKey !== '') {
-            state.adviceList = state.form.recommendUnitOpinionKey.split(',').map(i => {
+            state.adviceList = state.form.recommendUnitOpinionKey.split(',').filter(item => item.startsWith('http')).map(i => {
               return {
                 name: i,
                 url: i,
@@ -906,43 +955,59 @@
   } else {
     ElMessage({
       type: 'warning',
-      message: '文件上传失败'
+      message: res.msg
     })
+    switch (type) {
+      case '著作': state.evidenceList = state.evidenceList.filter(i => i.response.code == 200); return;
+      case '学历': state.academicCertificateList = state.academicCertificateList.filter(i => i.response.code == 200) ; return;
+      case '证件照': state.fileList = state.fileList.filter(i => i.response.code == 200); return;
+      case '简历': state.resumeList = state.resumeList.filter(i => i.response.code == 200); return;
+      case '发明': state.inventionList = state.inventionList.filter(i => i.response.code == 200); return;
+      case '奖励': state.rewardList = state.rewardList.filter(i => i.response.code == 200); return;
+      case '研究': state.achievementList = state.achievementList.filter(i => i.response.code == 200); return;
+      case '本人': state.proAdviceList = state.proAdviceList.filter(i => i.response.code == 200); return;
+      case '单位': state.adviceList = state.adviceList.filter(i => i.response.code == 200); return;
+    }
+
   }
 }
 
-const handleRemove = (file, uploadFiles, type) => {
-  console.log(file, uploadFiles)
+const beforeRemove = (uploadFile, uploadFiles, type) => {
+  return ElMessageBox.confirm(
+    '该操作将永久删除此文件内容,是否继续?',
+    '提示',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }
+  ).then(
+    () => true,
+    () => false
+  )
+}
+
+const handleRemove = async(file, uploadFiles, type) => {
   if (file && file.status == 'success') {
-    ElMessageBox.confirm(
-        '该操作将永久删除此文件内容,是否继续?',
-        '提示',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+      let path = ''
+      if (type == '证件照') {
+        path = state.form.electronicPhoto
+      } else {
+        path = file.name
+      }
+      const res = await delPic({path: path})
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '文件已删除'
+        })
+        state.hasDeleteFile = true
+      } else {
+        ElMessage({
           type: 'warning',
+          message: res.msg
         })
-        .then(async () => {
-          let path = ''
-          if (type == '证件照') {
-            path = state.form.electronicPhoto
-          } else {
-            path = file.name
-          }
-          const res = await delPic({path: path})
-          if (res.code == 200) {
-            ElMessage({
-              type: 'success',
-              message: '文件已删除'
-            })
-            state.hasDeleteFile = true
-          } else {
-            ElMessage({
-              type: 'warning',
-              message: res.msg
-            })
-          }
-        })
+      }
   }
 }
 
@@ -953,11 +1018,12 @@
       let data = JSON.parse(JSON.stringify(state.form))
       data.bigClassify = data.profession[0]
       data.smallClassify = data.profession[1]
-      data.domain = findNodeById(state.expertsType,data.smallClassify)
+      data.domain = findNodeById(state.expertsType,data.smallClassify)?.classifyName
       data.supportDirectionSafety = Array.isArray(data.supportDirectionSafety) ? data.supportDirectionSafety.join(',') : ''
       data.supportDirectionPrevention = Array.isArray(data.supportDirectionPrevention) ? data.supportDirectionPrevention.join(',') : ''
       data.supportDirectionEmergency = Array.isArray(data.supportDirectionEmergency) ? data.supportDirectionEmergency.join(',') : ''
       data.evidence = state.evidenceList.map(i => i.name).join(',')
+      data.academicCertificate = state.academicCertificateList.map(i => i.name).join(',')
       data.resumeKey = state.resumeList.map(i => i.name).join(',')
       data.paperSituationKey = state.inventionList.map(i => i.name).join(',')
       data.rewardKey = state.rewardList.map(i => i.name).join(',')
@@ -972,6 +1038,7 @@
           ElMessage.success(res.msg)
           state.fileList = []
           state.evidenceList = []
+          state.academicCertificateList = []
           state.resumeList = []
           state.inventionList = []
           state.rewardList = []
@@ -990,6 +1057,7 @@
           ElMessage.success(res.msg)
           state.fileList = []
           state.evidenceList = []
+          state.academicCertificateList = []
           state.resumeList = []
           state.inventionList = []
           state.rewardList = []
@@ -1062,6 +1130,7 @@
       supportDirectionPrevention: [],
       supportDirectionEmergency: [],
       evidence: '',
+      academicCertificate: '',
       resumeKey: '',
       paperSituationKey: '',
       rewardKey: '',
@@ -1073,6 +1142,7 @@
     }
     state.fileList = []
     state.evidenceList = []
+    state.academicCertificateList = []
     state.resumeList = []
     state.inventionList = []
     state.rewardList = []

--
Gitblit v1.9.2