From 5df79be2b15c0c22e4c25f94b02464ad70d793c3 Mon Sep 17 00:00:00 2001
From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com>
Date: 星期三, 16 七月 2025 14:52:28 +0800
Subject: [PATCH] 修改新增
---
src/views/build/conpanyFunctionConsult/staffManage/staffRegister/index.vue | 2 +-
src/views/build/conpanyFunctionConsult/standardSysTemp/sysStandardModule/components/editDialog.vue | 4 ++--
src/views/build/conpanyFunctionConsult/standardSysTemp/sysStandardModule/index.vue | 29 ++++++++++++++++-------------
src/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue | 1 +
4 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue b/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue
index 12aff4f..055431f 100644
--- a/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue
@@ -31,6 +31,7 @@
<el-radio-group v-model="state.form.personType" :disabled="disabled">
<el-radio :label="1">技术</el-radio>
<el-radio :label="2">管理</el-radio>
+ <el-radio :label="3">行政</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="身份证号:" prop="idCard" v-if="state.title !== '修改密码'">
diff --git a/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/index.vue b/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/index.vue
index 4c3c7d3..f27261f 100644
--- a/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/index.vue
+++ b/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/index.vue
@@ -68,7 +68,7 @@
<el-table-column label="职称" prop="positional" align="center"/>
<el-table-column label="人员类别" prop="personType" align="center">
<template #default="scope">
- {{ scope.row.personType == 1?'技术':'管理' }}
+ {{ scope.row.personType == 1?'技术':scope.row.personType == 2?'管理':'行政' }}
</template>
</el-table-column>
<el-table-column label="身份证号" prop="idCard" align="center" />
diff --git a/src/views/build/conpanyFunctionConsult/standardSysTemp/sysStandardModule/components/editDialog.vue b/src/views/build/conpanyFunctionConsult/standardSysTemp/sysStandardModule/components/editDialog.vue
index 6e61682..1bb01f8 100644
--- a/src/views/build/conpanyFunctionConsult/standardSysTemp/sysStandardModule/components/editDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/standardSysTemp/sysStandardModule/components/editDialog.vue
@@ -23,10 +23,10 @@
<el-input v-model.trim="state.form.templateName" :disabled="state.title =='查看'" placeholder="模板名称"></el-input>
</el-form-item>
<el-form-item label="模板文件:" prop="filePath">
- <el-upload accept=".doc,.docx" :action="state.uploadUrl" :headers="state.header" method="post" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile)" :on-exceed="showTip" :limit='state.fileLimit' v-model:file-list="state.fileList" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles)" >
+ <el-upload accept=".doc,.docx,.pdf" :action="state.uploadUrl" :headers="state.header" method="post" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile)" :on-exceed="showTip" :limit='state.fileLimit' v-model:file-list="state.fileList" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles)" >
<el-button type="primary">点击上传</el-button>
<template #tip>
- <div class="el-upload__tip">支持上传.doc、.docx格式文档，尺寸小于5M，最多可上传1份</div>
+ <div class="el-upload__tip">支持上传.doc、.docx、.pdf格式文档，尺寸小于5M，最多可上传1份</div>
</template>
</el-upload>
</el-form-item>
diff --git a/src/views/build/conpanyFunctionConsult/standardSysTemp/sysStandardModule/index.vue b/src/views/build/conpanyFunctionConsult/standardSysTemp/sysStandardModule/index.vue
index 0932de7..ebee8de 100644
--- a/src/views/build/conpanyFunctionConsult/standardSysTemp/sysStandardModule/index.vue
+++ b/src/views/build/conpanyFunctionConsult/standardSysTemp/sysStandardModule/index.vue
@@ -109,14 +109,16 @@
console.log('取消预览')
});
return
- }
- try {
- // 1. 获取文件
- const response = await fetch(import.meta.env.VITE_APP_BASE_API + '/' + path);
- const arrayBuffer = await response.arrayBuffer();
- // 2. 创建新窗口
- const win = window.open('', '_blank');
- win.document.write(`
+ }else if(ext === 'pdf'){
+ window.open(`${import.meta.env.VITE_APP_BASE_API}/${path}`, '_blank');
+ }else{
+ try {
+ // 1. 获取文件
+ const response = await fetch(import.meta.env.VITE_APP_BASE_API + '/' + path);
+ const arrayBuffer = await response.arrayBuffer();
+ // 2. 创建新窗口
+ const win = window.open('', '_blank');
+ win.document.write(`
<!DOCTYPE html>
<html>
<head>
@@ -131,12 +133,13 @@
</body>
</html>
`);
- // 3. 渲染 DOCX
- await renderAsync(arrayBuffer, win.document.getElementById('container'));
+ // 3. 渲染 DOCX
+ await renderAsync(arrayBuffer, win.document.getElementById('container'));
- } catch (error) {
- console.error('预览失败:', error);
- alert(`预览失败: ${error.message}`);
+ } catch (error) {
+ console.error('预览失败:', error);
+ alert(`预览失败: ${error.message}`);
+ }
}
}
--
Gitblit v1.9.2