From dc0308d8f66c34cdf90f926af1455f865285b0e5 Mon Sep 17 00:00:00 2001
From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com>
Date: 星期四, 27 十一月 2025 09:00:29 +0800
Subject: [PATCH] 修改新增
---
src/views/work/qualityInfo/infrastructureMng/ledger/components/editDialog.vue | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/src/views/work/qualityInfo/infrastructureMng/ledger/components/editDialog.vue b/src/views/work/qualityInfo/infrastructureMng/ledger/components/editDialog.vue
index 720804b..84ab1d5 100644
--- a/src/views/work/qualityInfo/infrastructureMng/ledger/components/editDialog.vue
+++ b/src/views/work/qualityInfo/infrastructureMng/ledger/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="请选择" clearable @change="getDeptList" :disabled="state.title =='查看'">
<el-option
v-for="item in state.companyList"
@@ -19,7 +19,10 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="名称型号:" prop="model">
+ <el-form-item label="名称:" prop="name">
+ <el-input v-model.trim="state.form.name"></el-input>
+ </el-form-item>
+ <el-form-item label="型号:" prop="model">
<el-input v-model.trim="state.form.model"></el-input>
</el-form-item>
<el-form-item label="部门:" prop="deptId">
@@ -43,16 +46,19 @@
<el-select clearable v-model="state.form.personResponsible" :disabled="state.title =='查看'" filterable placeholder="责任人/使用人" style="width: 100%">
<el-option
v-for="item in state.userList"
- :key="item.id"
+ :key="item.userId"
:label="item.name"
- :value="item.id"
+ :value="item.userId"
/>
</el-select>
</el-form-item>
<el-form-item label="设备类型:" prop="deviceType">
<el-select v-model="state.form.deviceType" :disabled="state.title =='查看'" placeholder="请选择" clearable>
- <el-option key="1" label="生产设备" :value="1"></el-option>
+ <el-option key="1" label="计算机设备" :value="1"></el-option>
<el-option key="2" label="办公自动化设备" :value="2"></el-option>
+ <el-option key="3" label="外部设备" :value="3"></el-option>
+ <el-option key="3" label="生产设备" :value="5"></el-option>
+ <el-option key="4" label="其他" :value="4"></el-option>
</el-select>
</el-form-item>
<el-form-item label="编号:" prop="number">
@@ -67,7 +73,8 @@
<el-form-item label="状态:" prop="status">
<el-select v-model="state.form.status" :disabled="state.title =='查看'" placeholder="请选择" clearable>
<el-option key="1" label="完好" :value="1"></el-option>
- <el-option key="2" label="损坏" :value="2"></el-option>
+ <el-option key="2" label="需整改" :value="2"></el-option>
+ <el-option key="3" label="报废" :value="3"></el-option>
</el-select>
</el-form-item>
<el-form-item label="用途:" prop="purpose">
@@ -103,6 +110,7 @@
} from "@/api/innerReview/meetingReview";
import {getDepart} from "@/api/orgStructure/depart";
import {listUser} from "@/api/system/user";
+import {getEmployeeRecords} from "@/api/onlineEducation/user";
import {addStandingBook, updateStandingBook} from "@/api/infrastructureMng/ledger";
const emit = defineEmits(["getList"]);
@@ -113,6 +121,7 @@
title: '',
form: {
id: null,
+ name: '',
model: '',
deptId: null,
personResponsible: null,
@@ -130,7 +139,8 @@
formRules:{
companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }],
deptId: [{ required: true, message: '请选择受部门', trigger: 'blur' }],
- model: [{ required: true, message: '请填写名称型号', trigger: 'blur' }],
+ name: [{ required: true, message: '请填写名称', trigger: 'blur' }],
+ model: [{ required: true, message: '请填写型号', trigger: 'blur' }],
personResponsible: [{ required: true, message: '请选择责任人/使用人', trigger: 'blur' }],
deviceType: [{ required: true, message: '请选择设备类型', trigger: 'blur' }],
number: [{ required: true, message: '请填写编号', trigger: 'blur' }]
@@ -212,9 +222,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:[]
+ state.userList = res.data ? res.data :[]
}else{
ElMessage.warning(res.message)
}
@@ -223,6 +233,7 @@
const handleClose = () => {
state.form = {
id: null,
+ name: '',
model: '',
deptId: null,
personResponsible: null,
--
Gitblit v1.9.2