From 8c2a7060395aa428811af8b4195e2cef8ec93131 Mon Sep 17 00:00:00 2001
From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com>
Date: 星期四, 20 十一月 2025 09:30:13 +0800
Subject: [PATCH] 修改新增
---
src/views/build/conpanyFunctionConsult/standardSysTemp/programStanderdModule/index.vue | 17 ++++++++++++++++-
src/views/build/conpanyFunctionConsult/standardSysTemp/programStanderdModule/components/editDialog.vue | 18 +++++++++++++++++-
src/views/work/empResource/deptEmpAnalysis/index.vue | 2 +-
3 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/src/views/build/conpanyFunctionConsult/standardSysTemp/programStanderdModule/components/editDialog.vue b/src/views/build/conpanyFunctionConsult/standardSysTemp/programStanderdModule/components/editDialog.vue
index ab51c4c..7d685b8 100644
--- a/src/views/build/conpanyFunctionConsult/standardSysTemp/programStanderdModule/components/editDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/standardSysTemp/programStanderdModule/components/editDialog.vue
@@ -29,9 +29,19 @@
</el-option>
</el-select>
</el-form-item>
-
<el-form-item label="模板名称:" prop="templateName">
<el-input v-model.trim="state.form.templateName" :disabled="state.title =='查看'" placeholder="模板名称"></el-input>
+ </el-form-item>
+ <el-form-item label="行业类别:" prop="industryTypeId">
+ <el-select v-model="state.form.industryTypeId" filterable placeholder="请选择" clearable>
+ <el-option
+ v-for="item in state.typeList"
+ :key="item.id"
+ style="width: 100%"
+ :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
</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)" >
@@ -81,6 +91,8 @@
filePath: '',
format: '',
companyId: null,
+ industryTypeId: null,
+ industryTypeName: '',
deptId:null,
templateType: 10
},
@@ -89,6 +101,7 @@
templateName: [{ required: true, message: '请输入模板名称', trigger: 'blur' }],
filePath: [{ required: true, validator: checkFiles, trigger: 'blur' }],
deptId: [{ required: true, message: '请选择部门', trigger: 'blur' }],
+ industryTypeId: [{ required: true, message: '请选择行业类别', trigger: 'blur' }]
},
isAdmin: false,
companyList: [],
@@ -146,6 +159,7 @@
const onSubmit = async () => {
const valid = await superRef.value.validate();
if(valid){
+ state.form.industryTypeName = state.typeList.find(i=>i.id == state.form.industryTypeId)?.name || ''
if(state.title == '新增'){
const {id,...data} = state.form
const res = await saveStandardTemp(data)
@@ -227,6 +241,8 @@
filePath: '',
format: '',
companyId: null,
+ industryTypeId: null,
+ industryTypeName: '',
deptId:null,
templateType: 10
}
diff --git a/src/views/build/conpanyFunctionConsult/standardSysTemp/programStanderdModule/index.vue b/src/views/build/conpanyFunctionConsult/standardSysTemp/programStanderdModule/index.vue
index 24a0d40..3ec5395 100644
--- a/src/views/build/conpanyFunctionConsult/standardSysTemp/programStanderdModule/index.vue
+++ b/src/views/build/conpanyFunctionConsult/standardSysTemp/programStanderdModule/index.vue
@@ -31,6 +31,7 @@
<el-table-column label="序号" type="index" align="center" width="80"/>
<el-table-column label="模板名称" prop="templateName" header-align="center" align="left"/>
<el-table-column label="所属部门" prop="deptName" header-align="center" align="left"/>
+ <el-table-column label="行业类别" prop="industryTypeName" header-align="center" align="left"/>
<el-table-column label="模板文件" header-align="center" align="left">
<template #default="scope">
<el-link type="primary" @click="openFile(scope.row.filePath)">{{scope.row.templateName + '模板' + scope.row.format}}</el-link>
@@ -66,6 +67,7 @@
import useUserStore from "@/store/modules/user";
import {getStandardTemp,delStandardTemp} from "@/api/standardSys/standardSys";
import { renderAsync } from "docx-preview";
+import {getIndustryPage} from "@/api/system/industry";
const userStore = useUserStore()
const { proxy } = getCurrentInstance();
const loading = ref(false);
@@ -79,6 +81,7 @@
},
total: 0,
dataList: [],
+ typeList: [],
companyList: [],
isAdmin: false
});
@@ -94,6 +97,7 @@
data.queryParams.companyId = userStore.companyId
}
await getList()
+ await getTypeList()
})
onUnmounted(()=>{
@@ -165,12 +169,23 @@
}
}
+const getTypeList = async () => {
+ const res = await getIndustryPage({pageNum: 1,
+ pageSize: 999,
+ companyId: data.queryParams.companyId})
+ if(res.code == 200){
+ data.typeList = res.data.list
+ }else{
+ ElMessage.warning(res.message)
+ }
+}
+
const downloadFile = (path)=>{
window.open(import.meta.env.VITE_APP_BASE_API + '/' + path)
}
const openDialog = (type, value) => {
- dialogRef.value.openDialog(type, value, data.queryParams.companyId, data.isAdmin, data.companyList);
+ dialogRef.value.openDialog(type, value, data.queryParams.companyId, data.isAdmin, data.companyList, data.typeList);
}
/** 重置新增的表单以及其他数据 */
diff --git a/src/views/work/empResource/deptEmpAnalysis/index.vue b/src/views/work/empResource/deptEmpAnalysis/index.vue
index d127cfd..3c3fac1 100644
--- a/src/views/work/empResource/deptEmpAnalysis/index.vue
+++ b/src/views/work/empResource/deptEmpAnalysis/index.vue
@@ -38,7 +38,7 @@
其中
<span v-if="dataList.positional3>0">高级人称{{dataList.positional3}}人，</span>
<span v-if="dataList.positional2>0">中级人称{{dataList.positional2}}人，</span>
- <span v-if="dataList.positional1>0">初级人称{{dataList.positional1}}人，</span>。
+ <span v-if="dataList.positional1>0">初级人称{{dataList.positional1}}人</span>。
</span>
<br>
本科及以上学历{{dataList.qualification3 + dataList.qualification4 + dataList.qualification5}}人，占总人数的{{dataList.qualificationBKRatio}}%，
--
Gitblit v1.9.2