From 0af4ccb5dacacce56c5fddd0d70288fc377c56be Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 01 九月 2026 17:04:37 +0800
Subject: [PATCH] feat(inspection): 1.添加报告类型功能并优化检验流程 2.设备管理组件中的部门列表获取方法优化
---
src/views/CNAS/resourceDemand/device/component/management.vue | 26 +++++++++-----------------
1 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/management.vue b/src/views/CNAS/resourceDemand/device/component/management.vue
index 9224055..71bbc62 100644
--- a/src/views/CNAS/resourceDemand/device/component/management.vue
+++ b/src/views/CNAS/resourceDemand/device/component/management.vue
@@ -59,7 +59,7 @@
<el-form-item label="浠櫒鍚嶇О:" required prop="deviceName">
<el-input :disabled="isUp" v-model="formData.deviceName" size="small"></el-input>
</el-form-item>
- <el-form-item label="浠櫒鍚嶇ОEN:" required>
+ <el-form-item label="浠櫒鍚嶇ОEN:">
<el-input :disabled="isUp" v-model="formData.enDeviceName" size="small"></el-input>
</el-form-item>
<el-form-item label="瑙勬牸鍨嬪彿:" required>
@@ -216,7 +216,7 @@
<el-form-item label="浠櫒鍚嶇О:" required>
<el-input v-model="formData2.deviceName" size="small"></el-input>
</el-form-item>
- <el-form-item label="浠櫒鍚嶇ОEN:" required>
+ <el-form-item label="浠櫒鍚嶇ОEN:">
<el-input v-model="formData2.enDeviceName" size="small"></el-input>
</el-form-item>
<el-form-item label="瑙勬牸鍨嬪彿:" required>
@@ -391,7 +391,6 @@
import limsTable from "@/components/Table/lims-table.vue";
import dataAcquisitionConfig from './acquisitionConfig.vue'
import {
- obtainItemParameterList,
exportEquipmentDetails,
getInsProduction,
upDeviceParameter,
@@ -400,6 +399,7 @@
getDeviceParameter,
delDeviceParameter,
} from '@/api/cnas/resourceDemand/device.js'
+import { listDept } from '@/api/system/dept'
import { selectUserCondition } from "@/api/business/inspectionTask";
export default {
props: {
@@ -563,7 +563,7 @@
mounted() {
this.selectEnumByCategory()
this.selectDevicePrincipal()
- this.obtainItemParameterList()
+ this.obtainDepartmentList()
this.getInsProductIds()
// 鍒濆鍖�
this.clickSidebar(this.clickNodeVal)
@@ -573,13 +573,13 @@
handleNotification(cate) {
this.queryParams.largeCategory = cate
},
- obtainItemParameterList() {
- obtainItemParameterList().then(res => {
+ obtainDepartmentList() {
+ listDept({ status: '0' }).then(res => {
let data = []
res.data.forEach(a => {
data.push({
- label: a.laboratoryName,
- value: a.id
+ label: a.deptName,
+ value: a.deptId
})
})
this.subordinateDepartmentsList = data
@@ -781,10 +781,6 @@
this.$message.error('鏈緭鍏ヤ华鍣ㄥ悕绉�')
return
}
- if (!this.formData.enDeviceName) {
- this.$message.error('鏈緭鍏ヤ华鍣ㄥ悕绉癊N')
- return
- }
if (!this.formData.specificationModel) {
this.$message.error('鏈緭鍏ヨ鏍煎瀷鍙�')
return
@@ -815,7 +811,7 @@
delete this.formData.updateUser
const formData = this.HaveJson(this.formData)
formData.insProductIds = formData.insProductIds ? formData.insProductIds.join() : ''
- if (formData.authorizedPerson.length === 0) {
+ if (formData.authorizedPerson && formData.authorizedPerson.length === 0) {
formData.authorizedPerson = ''
} else {
formData.authorizedPerson = JSON.stringify(formData.authorizedPerson)
@@ -836,10 +832,6 @@
submitForm2() {
if (!this.formData2.deviceName) {
this.$message.error('鏈緭鍏ヤ华鍣ㄥ悕绉�')
- return
- }
- if (!this.formData2.enDeviceName) {
- this.$message.error('鏈緭鍏ヤ华鍣ㄥ悕绉癊N')
return
}
if (!this.formData2.specificationModel) {
--
Gitblit v1.9.3