From 79427dd90676020e6e0b204af731b7bf1a4ef462 Mon Sep 17 00:00:00 2001
From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com>
Date: 星期一, 17 十一月 2025 12:15:16 +0800
Subject: [PATCH] 修改新增
---
src/views/work/assetMng/workEnvironmentControl/6sInspectChecklist/components/editDialog.vue | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/src/views/work/assetMng/workEnvironmentControl/6sInspectChecklist/components/editDialog.vue b/src/views/work/assetMng/workEnvironmentControl/6sInspectChecklist/components/editDialog.vue
index e01fa83..b07ac2e 100644
--- a/src/views/work/assetMng/workEnvironmentControl/6sInspectChecklist/components/editDialog.vue
+++ b/src/views/work/assetMng/workEnvironmentControl/6sInspectChecklist/components/editDialog.vue
@@ -9,7 +9,7 @@
: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-form-item v-if="state.isAdmin" label="单位:" prop="companyId">
<el-select v-model="state.form.companyId" placeholder="请选择" :disabled="state.title =='查看'" clearable @change="getDeptList">
<el-option
v-for="item in state.companyList"
@@ -184,6 +184,7 @@
} from "@/api/innerReview/meetingReview";
import {getDepart} from "@/api/orgStructure/depart";
import {listUser} from "@/api/system/user";
+import {getEmployeeRecords} from "@/api/onlineEducation/user";
import {getMaintenanceServiceDetail, updateMaintenanceService} from "@/api/infrastructureMng/ledger";
import {getSixInspectionDetail, saveSixInspection} from "@/api/assetManage/assetMng";
@@ -348,6 +349,7 @@
await getUserList(companyId)
state.title = type === 'add' ? '新增' : type ==='edit' ? '编辑' : '查看'
state.form.companyId = companyId
+ state.form.year = new Date().getFullYear().toString()
if(state.title == '编辑'||state.title == '查看'){
await getInfo(value.id)
}
@@ -357,7 +359,7 @@
const onSubmit = async () => {
const valid = await superRef.value.validate();
if(valid){
- if(state.maintainList.find(item=>item.contentResult == null || item.concreteProblems == '' || item.responsibleDepartment == '')){
+ if(state.maintainList.find(item=>item.contentResult == null )){
ElMessage.warning('请完善检查表格内容')
return
}
@@ -454,16 +456,9 @@
const getUserList = async (companyId)=> {
- const res = await listUser({pageIndex: 1,pageSize: 999,companyId: companyId})
+ const res = await getEmployeeRecords({companyId: companyId})
if(res.code == 200){
- state.userList = res.data.list?res.data.list.map(item=>{
- const user = item.id
- const {id, ...data} = item
- return {
- ...data,
- userId: user
- }
- }):[]
+ state.userList = res.data.list?res.data.list:[]
}else{
ElMessage.warning(res.message)
}
--
Gitblit v1.9.2