From a7f16e7bfc7802777f7da404dcfe101483f38917 Mon Sep 17 00:00:00 2001
From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com>
Date: Mon, 09 Feb 2026 17:24:29 +0800
Subject: [PATCH] 条款修改
---
src/views/work/selfProblems/internalAudit/auditorManage/nameList/components/nameListDialog.vue | 2 +-
src/views/system/clauseManage/index.vue | 4 ++--
src/views/build/conpanyFunctionConsult/digitalFileDep/manageType/qualityManual/index.vue | 7 ++++---
src/views/build/conpanyFunctionConsult/orgStructure/departManage/index.vue | 1 +
src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue | 4 ++--
src/views/system/clauseManage/components/editDialog.vue | 20 ++++++++++++++++++--
src/views/work/selfProblems/internalAudit/innerReviewSheet/components/editDialog.vue | 7 ++++---
src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/departDialog.vue | 7 ++++---
8 files changed, 36 insertions(+), 16 deletions(-)
diff --git a/src/views/build/conpanyFunctionConsult/digitalFileDep/manageType/qualityManual/index.vue b/src/views/build/conpanyFunctionConsult/digitalFileDep/manageType/qualityManual/index.vue
index 099b08b..f3e6271 100644
--- a/src/views/build/conpanyFunctionConsult/digitalFileDep/manageType/qualityManual/index.vue
+++ b/src/views/build/conpanyFunctionConsult/digitalFileDep/manageType/qualityManual/index.vue
@@ -239,7 +239,6 @@
const userInfo = ref()
const formRef = ref()
onMounted(async () => {
- await getSysClauseList()
if (userStore.roles.includes('admin')) {
data.isAdmin = true
await getCompanyList()
@@ -247,6 +246,7 @@
data.isAdmin = false
data.queryParams.companyId = userStore.companyId
}
+ await getSysClauseList()
await getList()
})
@@ -285,7 +285,7 @@
}
const getSysClauseList = async () => {
- const res = await getSysClause()
+ const res = await getSysClause({companyId: data.queryParams.companyId})
if (res.code == 200) {
data.caluseList = res.data.map(i => {
return {
@@ -366,6 +366,7 @@
ElMessage.warning(res.message)
}
await getUserList(data.queryParams.companyId)
+ await getSysClauseList()
data.dialogVisible = true
} else {
ElMessage.warning('请先选择对应的企业')
@@ -381,7 +382,7 @@
const res = await getCompany(queryParams)
if (res.code == 200) {
data.companyList = res.data.list ? res.data.list : []
- // data.queryParams.companyId = data.companyList[0].id
+ data.queryParams.companyId = data.companyList[0].id
} else {
ElMessage.warning(res.message)
}
diff --git a/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/departDialog.vue b/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/departDialog.vue
index 0323bff..7164758 100644
--- a/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/departDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/departDialog.vue
@@ -180,7 +180,7 @@
}
await getUserList(companyId)
await getDepartList(companyId)
- await getSysClauseList()
+ await getSysClauseList(companyId)
state.title = type === 'add' ? '新增' : type ==='edit' ? '编辑' : '查看';
if(type === 'edit' || type === 'view') {
state.departList = state.departList.filter(i=>i.deptId !== value.deptId)
@@ -216,6 +216,7 @@
const getDeptList = async ()=>{
await getDepartList(state.form.companyId)
await getUserList(state.form.companyId)
+ await getSysClauseList(state.form.companyId)
}
const getDepartList = async (companyId)=> {
@@ -230,8 +231,8 @@
}
};
-const getSysClauseList = async ()=> {
- const res = await getSysClause()
+const getSysClauseList = async (companyId)=> {
+ const res = await getSysClause({companyId: companyId})
if(res.code == 200){
state.sysClauseList = res.data.map(i=>{
return {
diff --git a/src/views/build/conpanyFunctionConsult/orgStructure/departManage/index.vue b/src/views/build/conpanyFunctionConsult/orgStructure/departManage/index.vue
index 7164f35..aeaa49a 100644
--- a/src/views/build/conpanyFunctionConsult/orgStructure/departManage/index.vue
+++ b/src/views/build/conpanyFunctionConsult/orgStructure/departManage/index.vue
@@ -218,6 +218,7 @@
const res = await getCompany(queryParams)
if (res.code == 200) {
data.companyList = res.data.list?res.data.list:[]
+ data.queryParams.companyId = data.companyList[0].id
} else {
ElMessage.warning(res.message)
}
diff --git a/src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue b/src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue
index cef4f7d..4505faa 100644
--- a/src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue
+++ b/src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue
@@ -143,7 +143,6 @@
const { queryParams,isEdit, dataList,deptList, isAdmin, companyList, caluseList, form,originRemark, remarkList,dialogVisible,mergeValues,remarkForm,rules } = toRefs(data);
const noticeRef = ref();
onMounted(async ()=>{
- await getSysClauseList()
if(userStore.roles.includes('admin')){
data.isAdmin = true
await getCompanyList()
@@ -177,7 +176,7 @@
}
const getSysClauseList = async ()=> {
- const res = await getSysClause()
+ const res = await getSysClause({companyId: data.queryParams.companyId})
if(res.code == 200){
data.caluseList = res.data.map(i=>{
return {
@@ -304,6 +303,7 @@
}
}
await getRemarksList()
+ await getSysClauseList()
}else{
ElMessage.warning(res.message)
}
diff --git a/src/views/system/clauseManage/components/editDialog.vue b/src/views/system/clauseManage/components/editDialog.vue
index b514f35..ec76537 100644
--- a/src/views/system/clauseManage/components/editDialog.vue
+++ b/src/views/system/clauseManage/components/editDialog.vue
@@ -9,6 +9,16 @@
: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 filterable style="width: 100%" :disabled="state.title =='查看'">
+ <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="clauseNum">
<el-input v-model.trim="state.form.clauseNum" :disabled="state.title =='查看'" placeholder="条款编码"></el-input>
</el-form-item>
@@ -62,17 +72,23 @@
companyId: null,
points:''
},
+ isAdmin: false,
+ companyList: [],
formRules:{
clauseNum: [{ required: true, message: '请输入条款编码', trigger: 'blur' }],
name: [{ required: true, message: '请输入条款内容', trigger: 'blur' }],
- // points: [{ required: true, message: '请输入审核要点', trigger: 'blur' }],
+ companyId: [{ required: true, message: '请选择单位', trigger: 'blur' }],
}
})
onMounted(() => {
});
-const openDialog = async (type, value,companyId) => {
+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
showEditor.value = false
diff --git a/src/views/system/clauseManage/index.vue b/src/views/system/clauseManage/index.vue
index b0d5fd1..4aa326e 100644
--- a/src/views/system/clauseManage/index.vue
+++ b/src/views/system/clauseManage/index.vue
@@ -136,7 +136,7 @@
}
const openDialog = (type, value) => {
- dialogRef.value.openDialog(type, value, data.queryParams.companyId);
+ dialogRef.value.openDialog(type, value, data.queryParams.companyId,data.isAdmin, data.companyList);
}
/** 重置新增的表单以及其他数据 */
@@ -160,7 +160,7 @@
type: 'warning',
})
.then( async() => {
- const res = await delSysClause({id: val.id})
+ const res = await delSysClause({id: val.id,companyId: data.queryParams.companyId})
if(res.code == 200){
ElMessage.success('数据删除成功')
await getList()
diff --git a/src/views/work/selfProblems/internalAudit/auditorManage/nameList/components/nameListDialog.vue b/src/views/work/selfProblems/internalAudit/auditorManage/nameList/components/nameListDialog.vue
index f810c09..697018b 100644
--- a/src/views/work/selfProblems/internalAudit/auditorManage/nameList/components/nameListDialog.vue
+++ b/src/views/work/selfProblems/internalAudit/auditorManage/nameList/components/nameListDialog.vue
@@ -108,7 +108,7 @@
}
})
}
- await getPeopleList()
+ await getPeopleList()
dialogVisible.value = true
}
diff --git a/src/views/work/selfProblems/internalAudit/innerReviewSheet/components/editDialog.vue b/src/views/work/selfProblems/internalAudit/innerReviewSheet/components/editDialog.vue
index 30963e2..0b160f3 100644
--- a/src/views/work/selfProblems/internalAudit/innerReviewSheet/components/editDialog.vue
+++ b/src/views/work/selfProblems/internalAudit/innerReviewSheet/components/editDialog.vue
@@ -332,13 +332,13 @@
}
await getUserList()
await getDepartList(state.form.companyId)
- await getCatalogList()
+ await getCatalogList(state.form.companyId)
dialogVisible.value = true
}
-const getCatalogList = async() => {
+const getCatalogList = async(companyId) => {
state.menuOptions = [];
- const res = await getSysClause()
+ const res = await getSysClause({companyId: companyId})
if(res.code == 200){
state.menuOptions = res.data.map(i=>{
return {
@@ -437,6 +437,7 @@
state.form.personId = null
await getDepartList(state.form.companyId)
await getUserList()
+ await getCatalogList(state.form.companyId)
}
const getDepartList = async (companyId)=> {
--
Gitblit v1.9.2