From e04a867a23568c9ed5d33c53f8300eee69b1ff7f Mon Sep 17 00:00:00 2001
From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com>
Date: 星期二, 08 七月 2025 16:51:13 +0800
Subject: [PATCH] 修改新增
---
src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue | 102 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 80 insertions(+), 22 deletions(-)
diff --git a/src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue b/src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue
index 903fff4..601744b 100644
--- a/src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue
+++ b/src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue
@@ -11,7 +11,7 @@
<!-- >新增</el-button>-->
<!-- </el-form-item>-->
<el-form-item v-if="isAdmin" label="企业：" >
- <el-select v-model="data.queryParams.companyId" placeholder="请选择" clearable>
+ <el-select v-model="data.queryParams.companyId" placeholder="请选择" clearable @change="getList">
<el-option
v-for="item in companyList"
:key="item.id"
@@ -38,16 +38,16 @@
<el-table v-loading="loading" :data="caluseList" class="caluseTable" :border="true" :span-method="arraySpanMethod">
<el-table-column label="条款号" prop="clauseNum" align="center"/>
<el-table-column label="条款内容/要素" prop="content" align="left"/>
- <el-table-column label="总经理" prop="manage" align="center">
- <template #default="scope">
- <el-checkbox v-model="scope.row.manage" disabled size="large" />
- </template>
- </el-table-column>
- <el-table-column label="管理者代表" prop="represent" align="center">
- <template #default="scope">
- <el-checkbox v-model="scope.row.represent" disabled size="large" />
- </template>
- </el-table-column>
+<!-- <el-table-column label="总经理" prop="manage" align="center">-->
+<!-- <template #default="scope">-->
+<!-- <el-checkbox v-model="scope.row.manage" disabled size="large" />-->
+<!-- </template>-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="管理者代表" prop="represent" align="center">-->
+<!-- <template #default="scope">-->
+<!-- <el-checkbox v-model="scope.row.represent" disabled size="large" />-->
+<!-- </template>-->
+<!-- </el-table-column>-->
<el-table-column v-for="column in deptList" :key="column.deptId" :prop="column.deptId" :label="column.deptName" align="center">
<template #default="scope">
<el-checkbox v-model="scope.row[column.deptId]" :disabled="!isEdit" size="large" @change="changeStatus(scope.row)"/>
@@ -84,8 +84,8 @@
{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: '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},
@@ -97,7 +97,53 @@
{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.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: '持续改进'}
],
form: {
companyId: null,
@@ -116,7 +162,6 @@
data.queryParams.companyId = userStore.companyId
data.form.companyId = userStore.companyId
}
- await getDeptList()
await getList()
})
@@ -148,7 +193,13 @@
}
const confirmEdit = async ()=>{
+ if(data.form.list.length == 0){
+ data.isEdit = !data.isEdit
+ await getList()
+ return
+ }
loading.value = true
+ data.form.companyId = data.queryParams.companyId
const res = await saveDistribution(data.form)
if(res.code == 200){
ElMessage.success(res.message)
@@ -156,6 +207,7 @@
ElMessage.warning(res.message)
}
loading.value = false
+ await getList()
data.isEdit = !data.isEdit
}
@@ -165,20 +217,25 @@
rowIndex,
columnIndex,
}) => {
- if (rowIndex === 0 || rowIndex === 5 ||rowIndex === 9 ||rowIndex === 13) {
+ const mergeValues = ['4','5','6','7','7.1','8','8.2','8.3','8.4','8.5','9','9.1','10']
+ if (mergeValues.includes(row.clauseNum)) {
if (columnIndex === 0) {
return [1, 1]
} else if(columnIndex === 1){
- return [1,8]
+ return [1,900]
}
}
}
const getList = async () => {
loading.value = true
+ await getDeptList()
const res = await getDistribution(data.queryParams)
if(res.code == 200){
data.dataList = res.data
+ if(!data.dataList || data.dataList.length == 0){
+ ElMessage.warning('该企业暂无部门信息')
+ }
for(let item of data.caluseList){
const sameNum = data.dataList.filter(i=>i.clauseNum == item.clauseNum).map(j=> {
return {
@@ -199,7 +256,7 @@
const getDeptList = async () => {
loading.value = true
- const res = await getDepart({pageNum: 1, pageSize: 999, companyId: data.queryParams.companyId})
+ const res = await getDepart({pageNum: 1, pageSize: 999,responsType: 1, companyId: data.queryParams.companyId})
if(res.code == 200){
data.deptList = res.data
}else{
@@ -248,13 +305,14 @@
}
/** 重置新增的表单以及其他数据 */
-function reset() {
+const reset= async()=> {
data.queryParams = {
pageNum: 1,
pageSize: 10,
companyId: null
}
- getList()
+ await getCompanyList()
+ await getList()
}
const handleDelete = (val) => {
ElMessageBox.confirm(
@@ -280,7 +338,7 @@
<style lang="scss">
.caluseTable{
.el-table__cell{
- padding: 4px 0 !important;
+ padding: 0 !important;
.is-disabled{
.el-checkbox__label{
color: #606266 !important
@@ -306,7 +364,7 @@
}
}
.cell{
- padding: 0 6px !important;
+ padding: 0 4px !important;
}
}
</style>
\ No newline at end of file
--
Gitblit v1.9.2