From d988407a83fbaf46af822d8610360f865a42e9b9 Mon Sep 17 00:00:00 2001
From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com>
Date: 星期三, 03 十二月 2025 17:27:53 +0800
Subject: [PATCH] 修改新增
---
src/views/work/assetMng/toolsMonitorMeasure/annualVerificationPlan/components/editDialog.vue | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/src/views/work/assetMng/toolsMonitorMeasure/annualVerificationPlan/components/editDialog.vue b/src/views/work/assetMng/toolsMonitorMeasure/annualVerificationPlan/components/editDialog.vue
index fc7d3f5..7ed37bd 100644
--- a/src/views/work/assetMng/toolsMonitorMeasure/annualVerificationPlan/components/editDialog.vue
+++ b/src/views/work/assetMng/toolsMonitorMeasure/annualVerificationPlan/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 && state.title !== '上传'" label="企业:" prop="companyId">
+ <el-form-item v-if="state.isAdmin && state.title !== '上传'" 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"
@@ -74,6 +74,15 @@
:readonly="state.title =='查看'"
>
</el-input>
+ </template>
+ </el-table-column>
+ <el-table-column label="设备类型" prop="planType" align="center">
+ <template #default="scope">
+ <el-radio-group v-model="scope.row.planType" :disabled="state.title =='查看'">
+ <el-radio :label="1">软件</el-radio>
+ <el-radio :label="2">硬件</el-radio>
+ </el-radio-group>
+
</template>
</el-table-column>
<el-table-column label="规格型号" prop="model" align="center">
@@ -150,7 +159,7 @@
</el-input>
</template>
</el-table-column>
- <el-table-column label="使用人" prop="useUser" align="center">
+ <el-table-column label="使用单位" prop="useUser" align="center">
<template #default="scope">
<el-input
v-model.trim="scope.row.useUser"
@@ -163,7 +172,7 @@
</el-input>
</template>
</el-table-column>
- <el-table-column label="证书名称" prop="certificateName" align="center">
+ <el-table-column label="证书编号" prop="certificateName" align="center">
<template #default="scope">
<el-input
v-model.trim="scope.row.certificateName"
@@ -190,7 +199,7 @@
</template>
</el-table-column>
</el-table>
-<!-- <el-form-item label="证书名称:" prop="certificateName" v-if="state.title == '上传'">-->
+<!-- <el-form-item label="证书编号:" prop="certificateName" v-if="state.title == '上传'">-->
<!-- <el-input-->
<!-- v-model.trim="state.form.certificateName"-->
<!-- style="width: 100%;"-->
@@ -282,6 +291,7 @@
import {listUser} from "@/api/system/user";
import {getAnnualVerificationPlanDetail, saveAnnualVerificationPlan} from "@/api/assetManage/assetMng";
import {delPic} from "@/api/onlineEducation/banner";
+import {getEmployeeRecords} from "@/api/onlineEducation/user";
const emit = defineEmits(["getList"]);
const dialogVisible = ref(false)
@@ -352,6 +362,7 @@
await getUserList(companyId)
state.title = type === 'add' ? '新增' : type ==='edit' ? '编辑' : type ==='upload' ? '上传' : '查看'
state.form.companyId = companyId
+ state.form.year = new Date().getFullYear().toString()
if(state.title == '编辑'||state.title == '查看' ||state.title == '上传'){
await getInfo(value.id)
}
@@ -364,6 +375,7 @@
annualVerificationId: null,
deviceNumber: '',
deviceName: '',
+ planType: null,
model: '',
calibrationCycle: '',
nextCalibrationTime: '',
@@ -378,7 +390,6 @@
}
const handleDelete = (i) =>{
- console.log(i,state.fileList,'list')
state.form.annualVerificationDevices = state.form.annualVerificationDevices.filter((item,index) => index != i)
state.fileList = state.fileList.filter((item,index) => index != i)
}
@@ -429,6 +440,7 @@
annualVerificationId: item.annualVerificationId,
deviceNumber: item.deviceNumber,
deviceName: item.deviceName,
+ planType: item.planType,
model: item.model,
calibrationCycle: item.calibrationCycle,
nextCalibrationTime: item.nextCalibrationTime,
@@ -469,16 +481,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 ? res.data :[]
}else{
ElMessage.warning(res.message)
}
--
Gitblit v1.9.2