From 59a4f02701ef3b232b9f1d54ba0b29a1e8764704 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期三, 03 十二月 2025 14:54:53 +0800
Subject: [PATCH] 修改
---
src/views/work/assetMng/toolsMonitorMeasure/annualVerificationPlan/components/editDialog.vue | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/views/work/assetMng/toolsMonitorMeasure/annualVerificationPlan/components/editDialog.vue b/src/views/work/assetMng/toolsMonitorMeasure/annualVerificationPlan/components/editDialog.vue
index 3b8a12a..7ed37bd 100644
--- a/src/views/work/assetMng/toolsMonitorMeasure/annualVerificationPlan/components/editDialog.vue
+++ b/src/views/work/assetMng/toolsMonitorMeasure/annualVerificationPlan/components/editDialog.vue
@@ -76,6 +76,15 @@
</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">
<template #default="scope">
<el-input
@@ -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)
@@ -365,6 +375,7 @@
annualVerificationId: null,
deviceNumber: '',
deviceName: '',
+ planType: null,
model: '',
calibrationCycle: '',
nextCalibrationTime: '',
@@ -379,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)
}
@@ -430,6 +440,7 @@
annualVerificationId: item.annualVerificationId,
deviceNumber: item.deviceNumber,
deviceName: item.deviceName,
+ planType: item.planType,
model: item.model,
calibrationCycle: item.calibrationCycle,
nextCalibrationTime: item.nextCalibrationTime,
@@ -470,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