From 116daf6993c353182c92cb9f98771567c6ef17ba Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Wed, 26 Nov 2025 13:24:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E7=94=A8=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../certificateExam/index.vue                 | 19 +++---
 .../certificateRequest/index.vue              | 64 ++++++++++---------
 2 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/src/views/certificate/certificateReturnManage/certificateExam/index.vue b/src/views/certificate/certificateReturnManage/certificateExam/index.vue
index a85d4a9..ac67a5b 100644
--- a/src/views/certificate/certificateReturnManage/certificateExam/index.vue
+++ b/src/views/certificate/certificateReturnManage/certificateExam/index.vue
@@ -61,19 +61,20 @@
             <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="申请人" align="center" prop="name" :show-overflow-tooltip="true" width="120"/>
-        <el-table-column label="联系方式" align="center" prop="phone" :show-overflow-tooltip="true" width="180"/> 
-        <el-table-column label="身份证号" align="center" prop="idNumber" :show-overflow-tooltip="true" width="180"/> 
+        <el-table-column label="申请人" align="center" prop="name" :show-overflow-tooltip="true" width="120"/> 
+        <el-table-column label="岗位" align="center" prop="postName" :show-overflow-tooltip="true" width="180"/>
+        <el-table-column label="联系方式" align="center" prop="phone" :show-overflow-tooltip="true" width="150"/>
+        <!-- <el-table-column label="身份证号" align="center" prop="idNumber" :show-overflow-tooltip="true" width="180"/> -->
         <el-table-column label="证件类型" align="center" prop="certificateTypeName" :show-overflow-tooltip="true"/>
-        <el-table-column label="证件编号" align="center" prop="certificateNo" :show-overflow-tooltip="true" width="180"></el-table-column>
-        <el-table-column label="领用原因"   align="center" prop="requestReason" :show-overflow-tooltip="true">
+        <!-- <el-table-column label="证件编号" align="center" prop="certificateNo" :show-overflow-tooltip="true" width="180"></el-table-column> -->
+        <el-table-column label="领用原因" align="center" prop="applyReason" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            <dict-tag :options="dict.type.issue_type" :value="scope.row.requestReason"/>
+            <dict-tag :options="dict.type.issue_type" :value="scope.row.applyReason"/>
           </template>
         </el-table-column>
-        <el-table-column label="详细说明" align="center" width="120" prop="remark" :show-overflow-tooltip="true"/> 
-        <el-table-column label="计划出国时间" align="center" prop="" :show-overflow-tooltip="true"/>
-        <el-table-column label="计划返回时间" align="center" prop="" :show-overflow-tooltip="true"/>
+        <el-table-column label="详细说明" align="center" width="120" prop="applyDetail" :show-overflow-tooltip="true"/>
+        <el-table-column label="计划出国时间" align="center" prop="startTime" :show-overflow-tooltip="true"/>
+        <el-table-column label="计划返回时间" align="center" prop="endTime" :show-overflow-tooltip="true"/>
         <el-table-column label="附件" align="center" prop="" :show-overflow-tooltip="true"/>
         <el-table-column label="申请状态" align="center" prop="" :show-overflow-tooltip="true">
           <!-- <template slot-scope="scope"> 
diff --git a/src/views/certificate/certificateReturnManage/certificateRequest/index.vue b/src/views/certificate/certificateReturnManage/certificateRequest/index.vue
index 45eaa13..5ed0812 100644
--- a/src/views/certificate/certificateReturnManage/certificateRequest/index.vue
+++ b/src/views/certificate/certificateReturnManage/certificateRequest/index.vue
@@ -62,7 +62,7 @@
           </template>
         </el-table-column>
         <el-table-column label="申请人" align="center" prop="name" :show-overflow-tooltip="true" width="120"/> 
-        <el-table-column label="岗位" align="center" prop="idNumber" :show-overflow-tooltip="true" width="180"/>
+        <el-table-column label="岗位" align="center" prop="postName" :show-overflow-tooltip="true" width="180"/>
         <el-table-column label="联系方式" align="center" prop="phone" :show-overflow-tooltip="true" width="150"/>
         <!-- <el-table-column label="身份证号" align="center" prop="idNumber" :show-overflow-tooltip="true" width="180"/> -->
         <el-table-column label="证件类型" align="center" prop="certificateTypeName" :show-overflow-tooltip="true"/>
@@ -73,8 +73,8 @@
           </template>
         </el-table-column>
         <el-table-column label="详细说明" align="center" width="120" prop="applyDetail" :show-overflow-tooltip="true"/>
-        <el-table-column label="计划出国时间" align="center" prop="" :show-overflow-tooltip="true"/>
-        <el-table-column label="计划返回时间" align="center" prop="" :show-overflow-tooltip="true"/>
+        <el-table-column label="计划出国时间" align="center" prop="startTime" :show-overflow-tooltip="true"/>
+        <el-table-column label="计划返回时间" align="center" prop="endTime" :show-overflow-tooltip="true"/>
         <el-table-column label="附件" align="center" prop="" :show-overflow-tooltip="true"/>
         <el-table-column label="申请状态" align="center" prop="" :show-overflow-tooltip="true">
           <!-- <template slot-scope="scope"> 
@@ -210,7 +210,9 @@
                 :action="upload.url"
                 :disabled="upload.isUploading"
                 :on-progress="handleFileUploadProgress"
+                :file-list="fileList" 
                 :on-success="handleFileSuccess"
+                :on-change="handleChange"
                 :auto-upload="true"
                 drag
               >
@@ -348,6 +350,9 @@
                 },
                 // 表单校验
                 baseFormRules: {
+                    name: [
+                        { required: true, message: "申请人不能为空", trigger: "change" }
+                    ],
                     userId: [
                         { required: true, message: "申请人不能为空", trigger: "change" }
                     ],
@@ -380,7 +385,9 @@
                    headers: { Authorization: 'Bearer ' + getToken() },
                    // 上传的地址
                    url: process.env.VUE_APP_BASE_API + '/file/upload?type=face',
-                }
+                },
+                fileList:[],
+                fileUrls:[]
             };
         },
         mounted(){
@@ -467,23 +474,23 @@
                 this.baseForm.applyState = type;
 
                 //fileUrls 附件 数组
-
+                console.log(this.fileUrls)
                 console.log("this.baseForm",this.baseForm);
                 this.$refs["baseForm"].validate(valid => {
                 if (valid) {
-                    // if (this.baseForm.createTime != undefined) {
-                    //     editCertificateApplyApi(this.baseForm).then(response => {
-                    //         this.$modal.msgSuccess("修改成功");
-                    //         this.open = false;
-                    //         this.getList();
-                    //     });
-                    // } else {
-                    //     addCertificateApplyApi(this.baseForm).then(response => {
-                    //         this.$modal.msgSuccess("新增成功");
-                    //         this.open = false;
-                    //         this.getList();
-                    //     });
-                    // }
+                    if (this.baseForm.createTime != undefined) {
+                        // editCertificateApplyApi(this.baseForm).then(response => {
+                        //     this.$modal.msgSuccess("修改成功");
+                        //     this.open = false;
+                        //     this.getList();
+                        // });
+                    } else {
+                        // addCertificateApplyApi(this.baseForm).then(response => {
+                        //     this.$modal.msgSuccess("新增成功");
+                        //     this.open = false;
+                        //     this.getList();
+                        // });
+                    }
                 }
                 });
             },
@@ -544,29 +551,24 @@
                   });
                 }).catch(() => {});
             },
-           
-            /** 导出按钮操作 */
-            handleExport() {
-              this.download('certificate/certificate_manage/certificateInfo/export', {
-                ...this.queryParams
-              }, `证件信息_${new Date().getTime()}.xlsx`);
-            },
             // 文件上传中处理
             handleFileUploadProgress(event, file, fileList) {
                 this.upload.isUploading = true
             },
             // 文件上传成功处理
             handleFileSuccess(response, file, fileList) {
-                console.log(response)
-                this.upload.isUploading = false
-                this.$refs.upload.clearFiles()
+                this.upload.isUploading = false;
                 if(response.code==200){
-                    this.$modal.msgSuccess(response.msg);
-                    this.getList();
+                  this.$modal.msgSuccess(response.msg); 
                 }else{
-                    this.$modal.msgError(response.msg);
+                  this.$modal.msgError(response.msg);
                 }
             },
+            handleChange(file, fileList) {
+              console.log(fileList)
+              // this.fileUrls = fileList.map(item => item.response.data.url)
+              
+            },
             /** 批量删除 */
             handleBatchDel(){