From f13a2788d4640b46cacfe6f68f88d6d462dfa516 Mon Sep 17 00:00:00 2001
From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com>
Date: 星期三, 16 七月 2025 09:38:48 +0800
Subject: [PATCH] 修改新增
---
src/views/build/conpanyFunctionConsult/digitalFileDep/manageType/qualityManual/index.vue | 21 ++++++++++++++++++++-
src/views/build/conpanyFunctionConsult/orgStructure/departManage/index.vue | 2 +-
src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue | 5 +++--
src/views/menuPage.vue | 2 +-
public/qualityFile.docx | 0
src/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue | 6 +++---
6 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/public/qualityFile.docx b/public/qualityFile.docx
index 5e181b3..d2b504a 100644
--- a/public/qualityFile.docx
+++ b/public/qualityFile.docx
Binary files differ
diff --git a/src/views/build/conpanyFunctionConsult/digitalFileDep/manageType/qualityManual/index.vue b/src/views/build/conpanyFunctionConsult/digitalFileDep/manageType/qualityManual/index.vue
index 7c16b55..e71360a 100644
--- a/src/views/build/conpanyFunctionConsult/digitalFileDep/manageType/qualityManual/index.vue
+++ b/src/views/build/conpanyFunctionConsult/digitalFileDep/manageType/qualityManual/index.vue
@@ -80,7 +80,7 @@
getStandardDetail,
getStandardQuality
} from "@/api/standardSys/standardSys";
-import {getDepart, getDistribution, getSysClause} from "@/api/orgStructure/depart";
+import {getDepart, getDistribution, getFunctionalRemarkList, getSysClause} from "@/api/orgStructure/depart";
const userStore = useUserStore()
const { proxy } = getCurrentInstance();
@@ -249,6 +249,24 @@
}
}
+const getRemarksList = async (companyId)=> {
+ const res = await getFunctionalRemarkList({companyId: companyId})
+ if(res.code == 200){
+ const originRemark = res.data
+ for(let item of originRemark){
+ const foundObj = data.caluseList.find(i=>i.clauseNum == item.clauseNum)
+ if(foundObj){
+ foundObj.remark = item.remark
+ }
+ }
+ data.companyInfo.remarks = originRemark.map(i=>{
+ return `${i.clauseNum}：${i.remark}`
+ }).join('；')
+ }else{
+ ElMessage.warning(res.message)
+ }
+}
+
const transToTableData=(duties,deptList)=>{
// 步骤1：获取所有唯一的部门和条款编号
// const allDeptNames = [...new Set(duties.map(item => item.deptName))];
@@ -295,6 +313,7 @@
try {
await getDeptList(val)
await getInfo(val)
+ await getRemarksList(val.companyId)
// 2. 等待DOM更新完成
await nextTick();
diff --git a/src/views/build/conpanyFunctionConsult/orgStructure/departManage/index.vue b/src/views/build/conpanyFunctionConsult/orgStructure/departManage/index.vue
index 76cb20a..3d8929b 100644
--- a/src/views/build/conpanyFunctionConsult/orgStructure/departManage/index.vue
+++ b/src/views/build/conpanyFunctionConsult/orgStructure/departManage/index.vue
@@ -24,7 +24,7 @@
</div>
<!-- 表格数据 -->
<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="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">-->
diff --git a/src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue b/src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue
index 6b619b7..f536e19 100644
--- a/src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue
+++ b/src/views/build/conpanyFunctionConsult/orgStructure/dutyDistributeChart/index.vue
@@ -75,7 +75,7 @@
</el-input>
</el-form-item>
- <span v-else>{{ remarkForm.tableData[scope.$index].remark }}</span>
+ <span v-else>{{ remarkForm?.tableData?.[scope.$index]?.remark || '' }}</span>
</div>
</template>
</el-table-column>
@@ -238,7 +238,7 @@
return {
companyId: data.queryParams.companyId,
clauseNum: i.clauseNum,
- remark: i.remark
+ remark: i.remark.trim()
}
})
if(data.form.list.length == 0 && data.form.remarks.length == 0){
@@ -310,6 +310,7 @@
data.remarkForm = {
tableData: JSON.parse(JSON.stringify(data.caluseList))
}
+ console.log(data.remarkForm,5555555)
loading.value = false
}
diff --git a/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue b/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue
index b8fff89..12aff4f 100644
--- a/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue
@@ -62,7 +62,7 @@
<el-input v-model.trim="state.form.phone" :maxlength="11" :disabled="disabled" placeholder="请输入手机号"></el-input>
</el-form-item>
<el-form-item label="用户类型:" v-if="state.title !== '修改密码'" prop="userType">
- <el-radio-group v-model="state.form.userType" :disabled="disabled" @change="changeType" v-if="state.title == '新增'">
+ <el-radio-group v-model="state.form.userType" :disabled="disabled" @change="changeType" v-if="state.title == '新增' || state.title == '编辑'">
<el-radio :label="0" v-if="state.currentUserType == 0">系统管理员</el-radio>
<el-radio :label="6" v-if="state.currentUserType == 0 || state.currentUserType == 6 ">企业管理员</el-radio>
<el-radio :label="1" v-if="state.currentUserType == 0 || state.currentUserType == 6 || state.currentUserType ==1">企业用户</el-radio>
@@ -70,8 +70,8 @@
<el-radio :label="3">车间（岗位）级</el-radio>
<!-- <el-radio :label="4" v-if="state.currentUserType == 0">其他</el-radio>-->
</el-radio-group>
- <span v-else-if="state.title == '查看'">{{state.currentUserType === 0 ? '系统管理员' : state.currentUserType === 1 ? '企业用户' : state.currentUserType === 6 ? '企业管理员' : state.currentUserType === 2 ? '部门级' : state.currentUserType === 3 ? '车间级' :'其他'}}</span>
- <span v-else-if="state.title == '编辑'">{{state.form.userType === 0 ? '系统管理员' : state.form.userType === 1 ? '企业用户' : state.form.userType === 2 ? '部门级' : state.form.userType === 3 ? '车间级' :'其他'}}</span>
+ <span v-else>{{state.currentUserType === 0 ? '系统管理员' : state.currentUserType === 1 ? '企业用户' : state.currentUserType === 6 ? '企业管理员' : state.currentUserType === 2 ? '部门级' : state.currentUserType === 3 ? '车间级' :'其他'}}</span>
+<!-- <span v-else-if="state.title == '编辑'">{{state.form.userType === 0 ? '系统管理员' : state.form.userType === 1 ? '企业用户' : state.form.userType === 2 ? '部门级' : state.form.userType === 3 ? '车间级' :'其他'}}</span>-->
<!-- <el-radio-group v-model="state.form.userType" :disabled="disabled" @change="changeType" v-else-if="state.title == '编辑'">-->
<!-- <el-radio :label="0" v-if="state.currentUserType == 0">管理员</el-radio>-->
<!-- <el-radio :label="1" >企业级</el-radio>-->
diff --git a/src/views/menuPage.vue b/src/views/menuPage.vue
index dc5df07..567e44b 100644
--- a/src/views/menuPage.vue
+++ b/src/views/menuPage.vue
@@ -355,7 +355,7 @@
}
&:hover::before {
border-radius: 16px;
- background: linear-gradient(135deg, rgba(255,255,255,0.1) 0%, rgba(0,0,0,0.05) 100%);
+ background: linear-gradient(135deg, rgba(255,255,255,0.1) 0%, rgba(50,50,50,0.05) 100%);
}
}
--
Gitblit v1.9.2