From 13c0b3f07e75d63ffb518ee8f3af81b3e8a1caa3 Mon Sep 17 00:00:00 2001
From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com>
Date: 星期四, 10 七月 2025 09:28:43 +0800
Subject: [PATCH] 修改新增
---
src/views/build/conpanyFunctionConsult/digitalFileDep/manageType/qualityManual/components/editDialog.vue | 79 +-----
src/views/build/conpanyFunctionConsult/digitalFileDep/manageType/qualityManual/index.vue | 198 +++++------------
src/views/build/conpanyFunctionConsult/orgStructure/departManage/index.vue | 98 +++-----
src/views/build/conpanyFunctionConsult/digitalFileDep/manageType/qualityManual/components/exportDoc.js | 2
src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/dutyDialog.vue | 69 -----
src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue | 96 ++------
public/qualityFile.docx | 0
src/api/orgStructure/depart.js | 8
src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/departDialog.vue | 91 +++++--
src/components/Tinymce/Tinymce.vue | 6
10 files changed, 223 insertions(+), 424 deletions(-)
diff --git a/public/qualityFile.docx b/public/qualityFile.docx
index 0052086..89a6e24 100644
--- a/public/qualityFile.docx
+++ b/public/qualityFile.docx
Binary files differ
diff --git a/src/api/orgStructure/depart.js b/src/api/orgStructure/depart.js
index 9265347..cc57c8c 100644
--- a/src/api/orgStructure/depart.js
+++ b/src/api/orgStructure/depart.js
@@ -9,6 +9,14 @@
})
}
+export function getDeptTreeList(params) {
+ return request({
+ url: '/system/dept/treeList',
+ method: 'get',
+ params: params
+ })
+}
+
export function getDepartByPage(params) {
return request({
url: '/system/dept/pageList',
diff --git a/src/components/Tinymce/Tinymce.vue b/src/components/Tinymce/Tinymce.vue
index d61231a..7178c82 100644
--- a/src/components/Tinymce/Tinymce.vue
+++ b/src/components/Tinymce/Tinymce.vue
@@ -12,7 +12,7 @@
import tinymce from "tinymce/tinymce";
import Editor from "@tinymce/tinymce-vue";
import { upload } from "@/api/backManage/notice";
-import 'tinymce-paragraphspacing'
+// import 'tinymce-paragraphspacing'
import "tinymce/themes/silver";
import "tinymce/themes/silver/theme";
import "tinymce/icons/default/icons";
@@ -51,7 +51,7 @@
},
toolbar: {
type: [String, Array],
- default: " styleselect fontsizeselect paragraphspacing | upfile image bold italic | fontselect |alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | undo redo | lists insertfile table | removeformat fullscreen "
+ default: " fontsizeselect | undo redo "
}
},
data() {
@@ -65,7 +65,7 @@
content_css: '/tinymce/skins/content/default/content.css',
height: this.height? this.height : 500, // 编辑器高度
branding: false, // 是否禁用“Powered by TinyMCE”
- menubar: true, // 顶部菜单栏显示
+ menubar: false, // 顶部菜单栏显示
plugins: this.plugins,
toolbar: this.toolbar,
relative_urls: false,
diff --git a/src/views/build/conpanyFunctionConsult/digitalFileDep/manageType/qualityManual/components/editDialog.vue b/src/views/build/conpanyFunctionConsult/digitalFileDep/manageType/qualityManual/components/editDialog.vue
index 5e1028b..63791c0 100644
--- a/src/views/build/conpanyFunctionConsult/digitalFileDep/manageType/qualityManual/components/editDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/digitalFileDep/manageType/qualityManual/components/editDialog.vue
@@ -9,20 +9,10 @@
:close-on-click-modal="false"
>
<el-form :model="state.form" size="default" ref="superRef" :rules="state.formRules" label-width="150px" >
- <el-form-item v-if="state.isAdmin" label="企业：" prop="companyId">
- <el-select v-model="state.form.companyId" placeholder="请选择" clearable>
- <el-option
- v-for="item in state.companyList"
- :key="item.id"
- :label="item.name"
- :value="item.id">
- </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="filePath">
+<!-- <el-form-item label="手册名称:" prop="qualityName">-->
+<!-- <el-input v-model.trim="state.form.qualityName" :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-button type="primary">点击上传</el-button>
<template #tip>
@@ -49,6 +39,7 @@
import {addIndustryTemp, updateIndustryTemp, updateInfoPlatforms} from "@/api/staffManage/staff";
import {getToken} from "@/utils/auth";
import {delPic} from "@/api/onlineEducation/banner";
+import {addStandardQuality} from "@/api/standardSys/standardSys";
const emit = defineEmits(["getList"]);
const dialogVisible = ref(false)
@@ -64,17 +55,16 @@
title: '',
form: {
id: null,
- templateName: '',
+ qualityName: '质量手册',
filePath: '',
format: '',
companyId: null
},
formRules:{
companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }],
- templateName: [{ required: true, message: '请输入模板名称', trigger: 'blur' }],
+ qualityName: [{ required: true, message: '请输入模板名称', trigger: 'blur' }],
filePath: [{ required: true, validator: checkFiles, trigger: 'blur' }]
},
- isAdmin: false,
companyList: [],
uploadUrl: import.meta.env.VITE_APP_BASE_API + '/system/common/uploadFile',
header: {
@@ -87,27 +77,10 @@
});
-const openDialog = async (type, value,companyId, isAdmin, companyList) => {
- state.isAdmin = isAdmin
- if(isAdmin){
- state.companyList = companyList
- }
- state.title = type === 'add' ? '新增' : type ==='edit' ? '编辑' : '查看'
- state.form.companyId = companyId
- if(state.title == '编辑'||state.title == '查看'){
- Object.keys(state.form).forEach(key => {
- if (key in value) {
- state.form[key] = value[key]
- }
- })
- if(value.filePath) {
- const obj = {
- url: value.filePath,
- name: '模板文件'
- }
- state.fileList = [obj]
- }
- }
+const openDialog = async (type, value) => {
+ state.title = '上传'
+ state.form.id = value.id
+ state.form.companyId = value.companyId
dialogVisible.value = true
}
@@ -115,27 +88,14 @@
const onSubmit = async () => {
const valid = await superRef.value.validate();
if(valid){
- if(state.title == '新增'){
- const {id,...data} = state.form
- const res = await addIndustryTemp(data)
- if(res.code == 200){
- ElMessage.success(res.message)
- emit('getList')
- handleClose()
- dialogVisible.value = false;
- }else{
- ElMessage.warning(res.message)
- }
+ const res = await addStandardQuality(state.form)
+ if(res.code == 200){
+ ElMessage.success(res.message)
+ emit('getList')
+ handleClose()
+ dialogVisible.value = false;
}else{
- const res = await updateIndustryTemp(state.form)
- if(res.code == 200){
- ElMessage.success(res.message)
- emit('getList')
- handleClose()
- dialogVisible.value = false;
- }else{
- ElMessage.warning(res.message)
- }
+ ElMessage.warning(res.message)
}
}
}
@@ -192,8 +152,7 @@
const handleClose = () => {
state.form = {
id: null,
- templateName: '',
- industryType: '',
+ qualityName: '质量手册',
filePath: '',
format: '',
companyId: null
diff --git a/src/views/build/conpanyFunctionConsult/digitalFileDep/manageType/qualityManual/components/exportDoc.js b/src/views/build/conpanyFunctionConsult/digitalFileDep/manageType/qualityManual/components/exportDoc.js
index cbe4516..cf4023c 100644
--- a/src/views/build/conpanyFunctionConsult/digitalFileDep/manageType/qualityManual/components/exportDoc.js
+++ b/src/views/build/conpanyFunctionConsult/digitalFileDep/manageType/qualityManual/components/exportDoc.js
@@ -62,7 +62,7 @@
});
});
- return result.join('\n\n'); // 用两个换行符分隔段落
+ return result.join('\n'); // 用两个换行符分隔段落
}
function convertTreeToHtml(data) {
diff --git a/src/views/build/conpanyFunctionConsult/digitalFileDep/manageType/qualityManual/index.vue b/src/views/build/conpanyFunctionConsult/digitalFileDep/manageType/qualityManual/index.vue
index 65e16a1..745679e 100644
--- a/src/views/build/conpanyFunctionConsult/digitalFileDep/manageType/qualityManual/index.vue
+++ b/src/views/build/conpanyFunctionConsult/digitalFileDep/manageType/qualityManual/index.vue
@@ -37,7 +37,8 @@
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
-<!-- <el-button link type="primary" @click="openDialog('edit',scope.row)">编辑</el-button>-->
+ <el-button link type="primary" @click="initFile(scope.row)">下载</el-button>
+ <el-button link type="primary" @click="openDialog('add',scope.row)">上传</el-button>
<el-button link type="danger" @click="handleDelete(scope.row)">删除</el-button>
</template>
</el-table-column>
@@ -60,6 +61,7 @@
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
+ <edit-dialog ref="dialogRef" @getList=getList></edit-dialog>
</div>
</template>
@@ -68,7 +70,7 @@
import {ElMessage, ElMessageBox} from "element-plus";
import {delCompany, getCompany} from "@/api/onlineEducation/company";
import {generateWordDocument} from './components/exportDoc.js'
-// import OrgTree from 'vue-org-tree'
+import editDialog from './components/editDialog.vue'
import html2canvas from 'html2canvas'
import { saveAs } from 'file-saver'
import useUserStore from "@/store/modules/user";
@@ -78,7 +80,7 @@
getStandardDetail,
getStandardQuality
} from "@/api/standardSys/standardSys";
-import {getDepart, getDistribution} from "@/api/orgStructure/depart";
+import {getDepart, getDistribution, getSysClause} from "@/api/orgStructure/depart";
const userStore = useUserStore()
const { proxy } = getCurrentInstance();
@@ -94,14 +96,8 @@
dataList: [],
deptList: {
id: 0,
- deptName: "总经理",
- children:[
- {
- id: '0-1',
- deptName: "管理者代表",
- children: []
- }
- ]
+ deptName: "",
+ children:[]
},
treeProps: {
label: 'deptName'
@@ -115,87 +111,15 @@
},
companyList: [],
isAdmin: false,
- companyInfo: {
- summaries: '',
- policies: '',
- deptList: [],
- duties: [],
- temps: []
- },
- caluseList: [
- {clauseNum: '4', content: '组织环境'},
- {clauseNum: '4.1', content: '理解组织及其环境',manage: true,represent: false},
- {clauseNum: '4.2', content: '理解相关方的需求和期望',manage: true,represent: false},
- {clauseNum: '4.3', content: '确定质量管理体系的范围',manage: false,represent: true},
- {clauseNum: '4.4', content: '质量管理体系及其过程',manage: false,represent: true},
- {clauseNum: '5', content: '领导作用'},
- {clauseNum: '5.1', content: '领导作用和承诺',manage: true,represent: false},
- {clauseNum: '5.2', content: '质量方针',manage: true,represent: false},
- {clauseNum: '5.3', content: '组织的岗位、职责和权限',manage: true,represent: false},
- {clauseNum: '6', content: ''},
- {clauseNum: '6.1', content: '应对风险和机遇的措施',manage: true,represent: false},
- {clauseNum: '6.2', content: '质量目标及其实现的策划',manage: false,represent: true},
- {clauseNum: '6.3', content: '变更的策划',manage: false,represent: true},
- {clauseNum: '7', content: '支持'},
- {clauseNum: '7.1', content: '资源',manage: true,represent: false},
- {clauseNum: '7.1.1', content: '总则',manage: true,represent: false},
- {clauseNum: '7.1.2', content: '人员',manage: true,represent: false},
- {clauseNum: '7.1.3', content: '基础设施',manage: false,represent: true},
- {clauseNum: '7.1.4', content: '过程运行环境',manage: false,represent: true},
- {clauseNum: '7.1.5', content: '监视和测量资源',manage: false,represent: true},
- {clauseNum: '7.1.6', content: '组织的知识',manage: false,represent: true},
- {clauseNum: '7.2', content: '能力'},
- {clauseNum: '7.3', content: '意识'},
- {clauseNum: '7.4', content: '沟通'},
- {clauseNum: '7.5', content: '成文信息'},
- {clauseNum: '7.6', content: '质量信息'},
- {clauseNum: '8', content: '运行'},
- {clauseNum: '8.1', content: '运行策划和控制'},
- {clauseNum: '8.2', content: '产品和服务的要求'},
- {clauseNum: '8.2.1', content: '顾客沟通'},
- {clauseNum: '8.2.2', content: '与产品和服务有关的要求的确定'},
- {clauseNum: '8.2.3', content: '与产品和服务有关的要求的评审'},
- {clauseNum: '8.2.4', content: '产品和服务要求的更改'},
- {clauseNum: '8.3', content: '产品和服务的设计和开发'},
- {clauseNum: '8.3.1', content: '总则'},
- {clauseNum: '8.3.2', content: '设计和开发策划'},
- {clauseNum: '8.3.3', content: '设计和开发输入'},
- {clauseNum: '8.3.4', content: '设计和开发控制'},
- {clauseNum: '8.3.5', content: '设计和开发输出'},
- {clauseNum: '8.3.6', content: '设计和开发更改'},
- {clauseNum: '8.3.7', content: '新产品试制'},
- {clauseNum: '8.3.8', content: '设计和开发的试验控制'},
- {clauseNum: '8.4', content: '外部提供过程、产品和服务的控制'},
- {clauseNum: '8.4.1', content: '总则'},
- {clauseNum: '8.4.2', content: '控制类型和程度'},
- {clauseNum: '8.4.3', content: '提供给外部供方的信息'},
- {clauseNum: '8.5', content: '生产和服务提供'},
- {clauseNum: '8.5.1', content: '生产和服务提供的控制'},
- {clauseNum: '8.5.2', content: '标识和可追溯性'},
- {clauseNum: '8.5.3', content: '顾客或外部供方的财产'},
- {clauseNum: '8.5.4', content: '防护'},
- {clauseNum: '8.5.5', content: '交付后的活动'},
- {clauseNum: '8.5.6', content: '更改控制'},
- {clauseNum: '8.5.7', content: '关键过程'},
- {clauseNum: '8.6', content: '产品和服务的放行'},
- {clauseNum: '8.7', content: '不合格输出的控制'},
- {clauseNum: '9', content: '绩效评价'},
- {clauseNum: '9.1', content: '监视、测量、分析和评价'},
- {clauseNum: '9.1.1', content: '总则'},
- {clauseNum: '9.1.2', content: '顾客满意'},
- {clauseNum: '9.1.3', content: '分析和评价'},
- {clauseNum: '9.2', content: '内部审核'},
- {clauseNum: '9.3', content: '管理评审'},
- {clauseNum: '10', content: '持续改进'},
- {clauseNum: '10.1', content: '总则'},
- {clauseNum: '10.2', content: '不合格和纠正措施'},
- {clauseNum: '10.3', content: '持续改进'}
- ]
+ companyInfo: {},
+ caluseList: [],
+ originDeptList: []
});
const { queryParams, total, dataList,deptList,treeProps,tools,labelStyle,companyList, isAdmin, companyInfo, caluseList } = toRefs(data);
const userInfo = ref()
onMounted(async ()=>{
+ await getSysClauseList()
if(userStore.roles.includes('admin')){
data.isAdmin = true
await getCompanyList()
@@ -210,6 +134,19 @@
})
+const getSysClauseList = async ()=> {
+ const res = await getSysClause()
+ if(res.code == 200){
+ data.caluseList = res.data.map(i=>{
+ return {
+ clauseNum: i.clauseNum,
+ content: i.name
+ }
+ })
+ }else{
+ ElMessage.warning(res.message)
+ }
+}
const getList = async () => {
loading.value = true
@@ -224,7 +161,7 @@
}
const getDeptData = async (val) => {
- await getDeptList(val.companyId)
+ await getDeptList(val)
const res = await getDistribution({companyId: val.companyId})
if(res.code == 200){
for(let item of data.caluseList){
@@ -243,10 +180,12 @@
ElMessage.warning(res.message)
}
}
-const getDeptList = async (id) => {
- const res = await getDepart({pageNum: 1, pageSize: 999, responsType: 1, companyId: id})
+const getDeptList = async (val) => {
+ const res = await getDepart({responsType: 1, companyId: val.companyId})
if(res.code == 200){
- data.deptList.children[0].children = res.data
+ data.originDeptList = res.data
+ data.deptList.deptName = val.companyName
+ data.deptList.children = proxy.handleTree(res.data, "deptId")
}else{
ElMessage.warning(res.message)
}
@@ -286,21 +225,15 @@
}
const getInfo = async (val) => {
- loading.value = true;
const res = await getStandardDetail({companyId: val.companyId});
if(res.code === 200){
if(!res.data || (res.data.companyIndustryTemplates.length == 0 && res.data.companyQualityPolicies.length == 0 && res.data.companySummaries.length == 0 && res.data.sysFunctionalDistributions
.length == 0 && res.data.treeSelects.length == 0)){
- loading.value = false;
return Promise.reject(new Error('该企业暂无质量数据'));
}
data.companyInfo.summaries = res.data.companySummaries ? res.data.companySummaries[0]?.companySummary : []
data.companyInfo.policies = res.data.companyQualityPolicies ? res.data.companyQualityPolicies[0]?.policy : []
- data.companyInfo.deptList = res.data.treeSelects ? res.data.treeSelects : []
- // data.companyInfo.clauses = data.caluseList
- // data.companyInfo.duties = res.data.sysFunctionalDistributions
-
- const duties = transToTableData(res.data.sysFunctionalDistributions)
+ const duties = transToTableData(res.data.sysFunctionalDistributions,data.originDeptList)
data.companyInfo.allDeptNames = duties.allDeptNames
data.companyInfo.clauses = duties.clauses
data.companyInfo.temps = res.data.companyIndustryTemplates?.map((item,index)=>{
@@ -309,45 +242,37 @@
templateName: item.templateName
}
}) || []
- // const imageBase64 = await exportTableToImage()
- // data.companyInfo.tableImage = {
- // data: imageBase64.split(",")[1], // 去掉 data:image/png;base64, 前缀
- // type: "png",
- // }
}else{
ElMessage.warning(res.message)
}
- loading.value = false;
}
-const transToTableData=(duties)=>{
+const transToTableData=(duties,deptList)=>{
// 步骤1：获取所有唯一的部门和条款编号
- const allDeptNames = [...new Set(duties.map(item => item.deptName))];
+ // const allDeptNames = [...new Set(duties.map(item => item.deptName))];
+ const allDeptNames = deptList ? deptList.map(item => item.deptName) : [...new Set(duties.map(item => item.deptName))]
const allClauseNums = [...new Set([
...data.caluseList.map(c => c.clauseNum),
...duties.map(d => d.clauseNum)
])];
// 步骤2：为每个条款生成完整的部门数据（缺失数据默认 chooseLab: 0）
+ const mergeValues = ['4','5','6','7','7.1','8','8.2','8.3','8.4','8.5','9','9.1','10']
const processedClauses = allClauseNums.map(clauseNum => {
const clauseContent = data.caluseList.find(c => c.clauseNum === clauseNum)?.content || "";
-
// 为当前条款生成所有部门的数据（确保每个部门都有值）
const deptValues = allDeptNames.map(deptName => {
const matchedDept = duties.find(
item => item.clauseNum === clauseNum && item.deptName === deptName
);
- return matchedDept ? (matchedDept.chooseLab==1?'●':'○' ): '○';
-
+ return matchedDept ? (matchedDept.chooseLab==1?'●':'○' ): '○'
});
-
return {
clauseNum,
content: clauseContent,
- deptValues // 数组形式，例如 [0, 1, 0, 0]
- };
- });
-
+ deptValues: !mergeValues.includes(clauseNum)? deptValues : deptValues.map(i=> '')
+ }
+ })
// 最终数据结构
return {
clauses: processedClauses,
@@ -356,25 +281,32 @@
}
const initFile = async (val) => {
- try {
- await getInfo(val)
- await getDeptData(val)
- // 2. 等待DOM更新完成
- await nextTick();
+ data.companyInfo = {}
+ loading.value = true
+ if(val.filePath !== ''){
+ window.open(import.meta.env.VITE_APP_BASE_API + '/' + val.filePath)
+ }else{
+ try {
+ await getDeptList(val)
+ await getInfo(val)
+ // 2. 等待DOM更新完成
+ await nextTick();
- // 3. 捕获组织结构图图片
- const orgChartImage = await captureElementToImage('org-tree-container');
- data.companyInfo.orgChart = orgChartImage
- const templatePath = '/qualityFile.docx'
- await generateWordDocument(
- templatePath,
- data.companyInfo,
- val.companyName+'质量手册.docx'
- );
- ElMessage.success('手册导出成功！')
- } catch (error) {
- console.error('操作失败:', error);
- ElMessage.warning(error.message || '操作失败');
+ // 3. 捕获组织结构图图片
+ const orgChartImage = await captureElementToImage('org-tree-container');
+ data.companyInfo.orgChart = orgChartImage
+ data.companyInfo.companyName = val.companyName
+ const templatePath = '/qualityFile.docx'
+ await generateWordDocument(
+ templatePath,
+ data.companyInfo,
+ val.companyName+'质量手册.docx'
+ );
+ loading.value = false
+ } catch (error) {
+ console.error('操作失败:', error);
+ ElMessage.warning(error.message || '操作失败');
+ }
}
}
@@ -392,7 +324,7 @@
}
const openDialog = (type, value) => {
- dialogRef.value.openDialog(type, value, data.queryParams.companyId, data.isAdmin, data.companyList);
+ dialogRef.value.openDialog(type, value);
}
/** 重置新增的表单以及其他数据 */
diff --git a/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/departDialog.vue b/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/departDialog.vue
index 7a53bdf..e6be06a 100644
--- a/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/departDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/departDialog.vue
@@ -9,16 +9,41 @@
:close-on-click-modal="false"
>
<el-form :model="state.form" size="default" ref="superRef" :rules="state.formRules" label-width="150px">
+ <el-form-item label="企业：" prop="companyId" v-if="state.isAdmin">
+ <el-select v-model="state.form.companyId" placeholder="请选择" clearable @change="getDeptList()">
+ <el-option
+ v-for="item in state.companyList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
<el-row>
- <el-col :span="12" v-if="state.isAdmin" >
- <el-form-item label="企业：" prop="companyId">
- <el-select v-model="state.form.companyId" placeholder="请选择" clearable @change="getDeptList()">
+ <el-col :span="12" v-if="state.title == '新增'">
+ <el-form-item label="上级部门" prop="parentId">
+<!-- <el-tree-select-->
+<!-- v-model="state.form.parentId"-->
+<!-- :data="state.departList"-->
+<!-- :props="{ value: 'deptId', label: 'deptName', children: 'children' }"-->
+<!-- value-key="deptId"-->
+<!-- placeholder="选择上级部门"-->
+<!-- check-strictly-->
+<!-- />-->
+ <el-select
+ clearable
+ v-model="state.form.parentId"
+ :disabled="state.title =='查看'"
+ filterable
+ placeholder="选择上级部门"
+ style="width: 100%"
+ >
<el-option
- v-for="item in state.companyList"
- :key="item.id"
- :label="item.name"
- :value="item.id">
- </el-option>
+ v-for="item in state.departList"
+ :key="item.deptId"
+ :label="item.deptName"
+ :value="item.deptId"
+ />
</el-select>
</el-form-item>
</el-col>
@@ -36,29 +61,29 @@
<el-option
v-for="item in state.userList"
:key="item.id"
- :label="item.username"
+ :label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
- <el-form-item label="主要负责部门:" prop="childDeptIds">
- <el-select
- clearable
- v-model="state.form.childDeptIds"
- :disabled="state.title =='查看'"
- filterable
- multiple
- placeholder="主要负责部门"
- style="width: 100%"
- >
- <el-option
- v-for="item in state.departList"
- :key="item.deptId"
- :label="item.deptName"
- :value="item.deptId"
- />
- </el-select>
- </el-form-item>
+<!-- <el-form-item label="主要负责部门:" prop="childDeptIds">-->
+<!-- <el-select-->
+<!-- clearable-->
+<!-- v-model="state.form.childDeptIds"-->
+<!-- :disabled="state.title =='查看'"-->
+<!-- filterable-->
+<!-- multiple-->
+<!-- placeholder="主要负责部门"-->
+<!-- style="width: 100%"-->
+<!-- >-->
+<!-- <el-option-->
+<!-- v-for="item in state.departList"-->
+<!-- :key="item.deptId"-->
+<!-- :label="item.deptName"-->
+<!-- :value="item.deptId"-->
+<!-- />-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
<el-form-item label="部门涉及条款:" prop="caluseVO1List">
<el-select
clearable
@@ -158,7 +183,12 @@
state.form.childDeptIds = value.sysDeptManageVoList?.map(i=>i.subDeptId)
state.form.responsType = Number(value.responsType)
}else{
- state.form.companyId = companyId
+ if(value.deptId && value.companyId){
+ state.form.parentId = value.deptId
+ state.form.companyId = value.companyId
+ }else{
+ state.form.companyId = companyId
+ }
}
dialogVisible.value = true
}
@@ -178,8 +208,6 @@
const getDepartList = async (companyId)=> {
const params = {
- pageNum: 1,
- pageSize: 999,
companyId: companyId
}
const res = await getDepart(params)
@@ -216,6 +244,9 @@
}
})
state.form.delCaluseIds = state.oldClauseList.filter(oldItem => !state.form.caluseVO1List.some(newItem => newItem.id === oldItem.id)).map(item => item.id)
+ if(!state.form.parentId){
+ state.form.parentId = 0
+ }
const res = await saveDepart(state.form)
if(res.code == 200){
ElMessage.success(res.message)
diff --git a/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/dutyDialog.vue b/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/dutyDialog.vue
index b78fe03..c97c48e 100644
--- a/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/dutyDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/dutyDialog.vue
@@ -70,13 +70,9 @@
v-model.trim="scope.row.clauseNum"
size="large"
type="textarea"
- v-if="scope.$index>4 && scope.$index<state.form.sysDeptResponsibilityList.length-2"
style="width: 100%;"
>
</el-input>
- <span v-else>
- {{scope.row.clauseNum}}
- </span>
</template>
</el-table-column>
<el-table-column label="内容" prop="content" align="center">
@@ -85,13 +81,9 @@
v-model.trim="scope.row.content"
size="large"
type="textarea"
- v-if="scope.$index>4 && scope.$index<state.form.sysDeptResponsibilityList.length-2"
style="width: 100%;"
>
</el-input>
- <span v-else>
- {{scope.row.content}}
- </span>
</template>
</el-table-column>
<el-table-column label="条款负责人" prop="leader" align="center">
@@ -166,7 +158,7 @@
<el-table-column label="操作" align="center" width="70">
<template #default="scope">
<!-- <el-button link type="primary" @click="openEdit('edit',scope.row)">编辑</el-button>-->
- <el-button link type="danger" v-if="scope.$index>4 && scope.$index<state.form.sysDeptResponsibilityList.length-2" @click="handleDelete(scope.$index)">删除</el-button>
+ <el-button link type="danger" @click="handleDelete(scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -206,17 +198,6 @@
// internalAuditors: [{ required: true, message: '请选择内审员', trigger: 'blur' }],
responsibilities: [{ required: true, message: '请输入部门职责', trigger: 'blur' }]
},
- firstFive: [
- {clauseNum: '5.3',content: '组织的岗位、职责和权限'},
- {clauseNum: '4.1',content: '理解组织及其环境'},
- {clauseNum: '4.2',content: '理解相关方的需求和期望'},
- {clauseNum: '6.1',content: '应对风险和机遇的措施'},
- {clauseNum: '6.2',content: '质量目标及其实现的策划'}
- ],
- lastTwo: [
- {clauseNum: '9.1',content: '监视、测量、分析和评价'},
- {clauseNum: '10',content: '改进'}
- ],
userList: []
})
@@ -239,13 +220,8 @@
state.form[key] = res.data[key];
}
})
- if(res.data.sysDeptResponsibilitys && Array.isArray(res.data.sysDeptResponsibilitys) && res.data.sysDeptResponsibilitys.find(i=>i.clauseNum == '5.3')){
- state.form.sysDeptResponsibilityList = sortResponsibilities(res.data.sysDeptResponsibilitys)
- state.oldResponsibilityList = sortResponsibilities(res.data.sysDeptResponsibilitys)
- }else{
- state.form.sysDeptResponsibilityList = [...state.firstFive,...res.data.sysDeptResponsibilitys,...state.lastTwo]
- state.oldResponsibilityList = [...state.firstFive,...res.data.sysDeptResponsibilitys,...state.lastTwo]
- }
+ state.form.sysDeptResponsibilityList = res.data.sysDeptResponsibilitys
+ state.oldResponsibilityList = res.data.sysDeptResponsibilitys
state.form.personNum = state.form.personNum==0?null:state.form.personNum
state.form.internalAuditors = state.form.internalAuditors==0?null:state.form.internalAuditors
}else{
@@ -254,43 +230,6 @@
} else {
ElMessage.warning(res.message)
}
-}
-
-const sortResponsibilities = (list) => {
- // 提取firstFive和lastTwo的clauseNum作为排序依据
- const firstFiveClauses = state.firstFive.map(item => item.clauseNum)
- const lastTwoClauses = state.lastTwo.map(item => item.clauseNum)
-
- // 分类处理
- const matchedFirstFive = []
- const matchedLastTwo = []
- const otherItems = []
-
- // 先匹配firstFive
- firstFiveClauses.forEach(clauseNum => {
- const foundItem = list.find(item => item.clauseNum === clauseNum)
- if (foundItem) {
- matchedFirstFive.push(foundItem)
- }
- });
-
- // 然后匹配lastTwo
- lastTwoClauses.forEach(clauseNum => {
- const foundItem = list.find(item => item.clauseNum === clauseNum)
- if (foundItem && !matchedFirstFive.includes(foundItem)) {
- matchedLastTwo.push(foundItem)
- }
- });
-
- // 剩下的其他项
- list.forEach(item => {
- if (!matchedFirstFive.includes(item) && !matchedLastTwo.includes(item)) {
- otherItems.push(item)
- }
- });
-
- // 合并结果数组
- return [...matchedFirstFive, ...otherItems, ...matchedLastTwo]
}
const getUserList = async ()=> {
@@ -312,7 +251,7 @@
technicalDocuments: '',
existingRecords: ''
}
- state.form.sysDeptResponsibilityList.splice(-2, 0, obj);
+ state.form.sysDeptResponsibilityList.push(obj);
}
const handleDelete = (i) =>{
diff --git a/src/views/build/conpanyFunctionConsult/orgStructure/departManage/index.vue b/src/views/build/conpanyFunctionConsult/orgStructure/departManage/index.vue
index 6117899..76cb20a 100644
--- a/src/views/build/conpanyFunctionConsult/orgStructure/departManage/index.vue
+++ b/src/views/build/conpanyFunctionConsult/orgStructure/departManage/index.vue
@@ -23,43 +23,44 @@
</el-form>
</div>
<!-- 表格数据 -->
- <el-table v-loading="loading" :data="dataList" border>
- <el-table-column label="序号" type="index" align="center" width="80" />
- <el-table-column label="部门名称" prop="deptName" align="center" />
- <el-table-column label="负责人" prop="leaderName" align="center" />
- <el-table-column label="主要负责部门" prop="parentName" align="center">
- <template #default="scope">
- <span>
- {{scope.row.sysDeptManageVoList?.map(i=>i.subDeptName).join('、')}}
- </span>
- </template>
- </el-table-column>
- <el-table-column label="部门涉及条款" prop="userTypeName" align="center" width="150">
+ <el-table v-loading="loading" :data="dataList" border row-key="deptId" :default-expand-all="true" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
+ <el-table-column label="部门名称" prop="deptName" align="center" width="220"/>
+ <el-table-column label="排序" prop="orderNum" align="center" width="60"/>
+ <el-table-column label="负责人" prop="leaderName" align="center" width="80"/>
+<!-- <el-table-column label="主要负责部门" prop="parentName" align="center">-->
+<!-- <template #default="scope">-->
+<!-- <span>-->
+<!-- {{scope.row.sysDeptManageVoList?.map(i=>i.subDeptName).join('、')}}-->
+<!-- </span>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
+ <el-table-column label="部门涉及条款" prop="userTypeName" align="center">
<template #default="scope">
{{sortVersionNumbers(scope.row.caluseVO1List?.map(i=>i.clauseNum)).join('、')}}
</template>
</el-table-column>
- <el-table-column label="部门职责表" prop="userTypeName" align="center" width="150">
+ <el-table-column label="部门职责表" prop="userTypeName" align="center" width="140">
<template #default="scope">
<el-button link type="primary" @click="openDutyDialog(scope.row)">编辑</el-button>
<el-button link type="danger" @click="download(scope.row)">导出</el-button>
</template>
</el-table-column>
- <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
+ <el-table-column label="操作" align="center" width="160">
<template #default="scope">
<el-button link type="primary" @click="openDialog('edit',scope.row)">编辑</el-button>
+ <el-button link type="primary" @click="openDialog('add',scope.row)">新增</el-button>
<el-button link type="danger" @click="handleDelete(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
- <pagination
- v-show="total > 0"
- :total="total"
- v-model:page="queryParams.pageNum"
- v-model:limit="queryParams.pageSize"
- @pagination="getList"
- />
+<!-- <pagination-->
+<!-- v-show="total > 0"-->
+<!-- :total="total"-->
+<!-- v-model:page="queryParams.pageNum"-->
+<!-- v-model:limit="queryParams.pageSize"-->
+<!-- @pagination="getList"-->
+<!-- />-->
<depart-dialog ref="dialogRef" @getList=getList></depart-dialog>
<duty-dialog ref="dutyDialogRef" @getList=getList></duty-dialog>
</div>
@@ -87,25 +88,12 @@
const dutyDialogRef = ref()
const data = reactive({
queryParams: {
- pageNum: 1,
- pageSize: 10,
companyId: null
},
total: 0,
dataList: [],
companyList: [],
- isAdmin: false,
- firstFive: [
- {clauseNum: '5.3',content: '组织的岗位、职责和权限'},
- {clauseNum: '4.1',content: '理解组织及其环境'},
- {clauseNum: '4.2',content: '理解相关方的需求和期望'},
- {clauseNum: '6.1',content: '应对风险和机遇的措施'},
- {clauseNum: '6.2',content: '质量目标及其实现的策划'}
- ],
- lastTwo: [
- {clauseNum: '9.1',content: '监视、测量、分析和评价'},
- {clauseNum: '10',content: '改进'}
- ]
+ isAdmin: false
});
const { queryParams, total, dataList, companyList, isAdmin } = toRefs(data);
const userInfo = ref()
@@ -126,10 +114,11 @@
const getList = async () => {
loading.value = true
- const res = await getDepartByPage(data.queryParams)
+ const res = await getDepart(data.queryParams)
if(res.code == 200){
- data.dataList = res.data.list || []
- data.total = res.data.total
+ data.dataList = proxy.handleTree(res.data, "deptId")
+ console.log(data.dataList,'list')
+ // data.total = res.data.total
}else{
ElMessage.warning(res.message)
}
@@ -227,29 +216,16 @@
if (res.code == 200) {
if(res.data){
tableData = res.data
- if(res.data.sysDeptResponsibilitys && Array.isArray(res.data.sysDeptResponsibilitys) && res.data.sysDeptResponsibilitys.find(i=>i.clauseNum == '5.3')){
- tableData.tableData = sortResponsibilities(res.data.sysDeptResponsibilitys.map(i=>{
- return {
- ...i,
- leader: i.leader || '',
- evidenceMaterials: i.evidenceMaterials || '',
- managementDocuments: i.managementDocuments || '',
- technicalDocuments: i.technicalDocuments || '',
- existingRecords: i.existingRecords || '',
- }
- }))
- }else{
- tableData.tableData = [...data.firstFive,...res.data.sysDeptResponsibilitys,...data.lastTwo].map(i=>{
- return {
- ...i,
- leader: i.leader || '',
- evidenceMaterials: i.evidenceMaterials || '',
- managementDocuments: i.managementDocuments || '',
- technicalDocuments: i.technicalDocuments || '',
- existingRecords: i.existingRecords || '',
- }
- })
- }
+ tableData.tableData = res.data.sysDeptResponsibilitys.map(i=>{
+ return {
+ ...i,
+ leader: i.leader || '',
+ evidenceMaterials: i.evidenceMaterials || '',
+ managementDocuments: i.managementDocuments || '',
+ technicalDocuments: i.technicalDocuments || '',
+ existingRecords: i.existingRecords || '',
+ }
+ })
return tableData
}else{
ElMessage.warning('暂无部门信息')
diff --git a/src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue b/src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue
index 601744b..7d2d239 100644
--- a/src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue
+++ b/src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue
@@ -62,7 +62,14 @@
import {ElMessage, ElMessageBox} from "element-plus";
import {delUser, getUser} from "@/api/onlineEducation/user";
import useUserStore from "@/store/modules/user";
-import {getCompany, getDepart, getDistribution, initDistribution, saveDistribution} from "@/api/orgStructure/depart";
+import {
+ getCompany,
+ getDepart,
+ getDistribution,
+ getSysClause,
+ initDistribution,
+ saveDistribution
+} from "@/api/orgStructure/depart";
const userStore = useUserStore()
const { proxy } = getCurrentInstance();
const loading = ref(false);
@@ -76,75 +83,7 @@
isEdit: false,
dataList: [],
deptList: [],
- caluseList: [
- {clauseNum: '4', content: '组织环境'},
- {clauseNum: '4.1', content: '理解组织及其环境',manage: true,represent: false},
- {clauseNum: '4.2', content: '理解相关方的需求和期望',manage: true,represent: false},
- {clauseNum: '4.3', content: '确定质量管理体系的范围',manage: false,represent: true},
- {clauseNum: '4.4', content: '质量管理体系及其过程',manage: false,represent: true},
- {clauseNum: '5', content: '领导作用'},
- {clauseNum: '5.1', content: '领导作用和承诺',manage: true,represent: false},
- {clauseNum: '5.2', content: '质量方针',manage: true,represent: false},
- {clauseNum: '5.3', content: '组织的岗位、职责和权限',manage: true,represent: false},
- {clauseNum: '6', content: ''},
- {clauseNum: '6.1', content: '应对风险和机遇的措施',manage: true,represent: false},
- {clauseNum: '6.2', content: '质量目标及其实现的策划',manage: false,represent: true},
- {clauseNum: '6.3', content: '变更的策划',manage: false,represent: true},
- {clauseNum: '7', content: '支持'},
- {clauseNum: '7.1', content: '资源',manage: true,represent: false},
- {clauseNum: '7.1.1', content: '总则',manage: true,represent: false},
- {clauseNum: '7.1.2', content: '人员',manage: true,represent: false},
- {clauseNum: '7.1.3', content: '基础设施',manage: false,represent: true},
- {clauseNum: '7.1.4', content: '过程运行环境',manage: false,represent: true},
- {clauseNum: '7.1.5', content: '监视和测量资源',manage: false,represent: true},
- {clauseNum: '7.1.6', content: '组织的知识',manage: false,represent: true},
- {clauseNum: '7.2', content: '能力'},
- {clauseNum: '7.3', content: '意识'},
- {clauseNum: '7.4', content: '沟通'},
- {clauseNum: '7.5', content: '成文信息'},
- {clauseNum: '7.6', content: '质量信息'},
- {clauseNum: '8', content: '运行'},
- {clauseNum: '8.1', content: '运行策划和控制'},
- {clauseNum: '8.2', content: '产品和服务的要求'},
- {clauseNum: '8.2.1', content: '顾客沟通'},
- {clauseNum: '8.2.2', content: '与产品和服务有关的要求的确定'},
- {clauseNum: '8.2.3', content: '与产品和服务有关的要求的评审'},
- {clauseNum: '8.2.4', content: '产品和服务要求的更改'},
- {clauseNum: '8.3', content: '产品和服务的设计和开发'},
- {clauseNum: '8.3.1', content: '总则'},
- {clauseNum: '8.3.2', content: '设计和开发策划'},
- {clauseNum: '8.3.3', content: '设计和开发输入'},
- {clauseNum: '8.3.4', content: '设计和开发控制'},
- {clauseNum: '8.3.5', content: '设计和开发输出'},
- {clauseNum: '8.3.6', content: '设计和开发更改'},
- {clauseNum: '8.3.7', content: '新产品试制'},
- {clauseNum: '8.3.8', content: '设计和开发的试验控制'},
- {clauseNum: '8.4', content: '外部提供过程、产品和服务的控制'},
- {clauseNum: '8.4.1', content: '总则'},
- {clauseNum: '8.4.2', content: '控制类型和程度'},
- {clauseNum: '8.4.3', content: '提供给外部供方的信息'},
- {clauseNum: '8.5', content: '生产和服务提供'},
- {clauseNum: '8.5.1', content: '生产和服务提供的控制'},
- {clauseNum: '8.5.2', content: '标识和可追溯性'},
- {clauseNum: '8.5.3', content: '顾客或外部供方的财产'},
- {clauseNum: '8.5.4', content: '防护'},
- {clauseNum: '8.5.5', content: '交付后的活动'},
- {clauseNum: '8.5.6', content: '更改控制'},
- {clauseNum: '8.5.7', content: '关键过程'},
- {clauseNum: '8.6', content: '产品和服务的放行'},
- {clauseNum: '8.7', content: '不合格输出的控制'},
- {clauseNum: '9', content: '绩效评价'},
- {clauseNum: '9.1', content: '监视、测量、分析和评价'},
- {clauseNum: '9.1.1', content: '总则'},
- {clauseNum: '9.1.2', content: '顾客满意'},
- {clauseNum: '9.1.3', content: '分析和评价'},
- {clauseNum: '9.2', content: '内部审核'},
- {clauseNum: '9.3', content: '管理评审'},
- {clauseNum: '10', content: '持续改进'},
- {clauseNum: '10.1', content: '总则'},
- {clauseNum: '10.2', content: '不合格和纠正措施'},
- {clauseNum: '10.3', content: '持续改进'}
- ],
+ caluseList: [],
form: {
companyId: null,
list: []
@@ -154,6 +93,7 @@
const { queryParams,isEdit, dataList,deptList, isAdmin, companyList, caluseList, form } = toRefs(data);
onMounted(async ()=>{
+ await getSysClauseList()
if(userStore.roles.includes('admin')){
data.isAdmin = true
await getCompanyList()
@@ -168,6 +108,20 @@
onUnmounted(()=>{
})
+
+const getSysClauseList = async ()=> {
+ const res = await getSysClause()
+ if(res.code == 200){
+ data.caluseList = res.data.map(i=>{
+ return {
+ clauseNum: i.clauseNum,
+ content: i.name
+ }
+ })
+ }else{
+ ElMessage.warning(res.message)
+ }
+}
const changeStatus = (val)=>{
const excludeFields = ['clauseNum', 'content', 'manage', 'represent']
@@ -256,7 +210,7 @@
const getDeptList = async () => {
loading.value = true
- const res = await getDepart({pageNum: 1, pageSize: 999,responsType: 1, companyId: data.queryParams.companyId})
+ const res = await getDepart({responsType: 1, companyId: data.queryParams.companyId})
if(res.code == 200){
data.deptList = res.data
}else{
--
Gitblit v1.9.2