From b1b6d5435e244018433b3b1223eee2365cf6fc85 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 11 三月 2025 11:35:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/CNAS/resourceDemand/device/component/management.vue | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/management.vue b/src/views/CNAS/resourceDemand/device/component/management.vue
index 739ac7f..6e95077 100644
--- a/src/views/CNAS/resourceDemand/device/component/management.vue
+++ b/src/views/CNAS/resourceDemand/device/component/management.vue
@@ -170,7 +170,7 @@
style="border: 1px solid #DCDFE6;border-radius:4px;height:32px;lineHeight:32px;display:flex;justify-content: space-around;font-size: 13px;">
<div v-show="formData.imageName" class="picName">{{ formData.imageName }}</div>
<el-upload :disabled="isUp" :action="action" :on-success="handleSuccessUpImg2"
- :show-file-list="false" accept='image/jpg,image/jpeg,image/png' :headers="headers"
+ :show-file-list="false" accept='image/jpg,image/jpeg,image/png' :headers="uploadHeader"
:on-change="beforeUpload" :on-error="onError" ref='upload'>
<el-button type="text" style="height:30px;padding-top:8px">涓婁紶</el-button>
</el-upload>
@@ -268,7 +268,7 @@
<el-col :span="7">
<el-form :label-position="labelPosition" :model="formData2" label-width="120px" ref="ruleForm">
<!-- 瀹為獙瀹ゅ垪琛� -->
- <el-form-item label="鎵�灞為儴闂�:">
+ <el-form-item label="鎵�灞為儴闂�:" required>
<el-select v-model="formData2.subordinateDepartmentsId" placeholder="璇烽�夋嫨" size="small"
style="width:100%">
<el-option v-for="item in subordinateDepartmentsList" :key="item.value"
@@ -308,7 +308,7 @@
style="border: 1px solid #DCDFE6;border-radius:4px;height:32px;line-height:32px;display:flex;justify-content: space-around;font-size: 13px;">
<div v-show="formData2.imageName" class="picName">{{ formData2.imageName }}</div>
<el-upload :action="action" :on-success="handleSuccessUpImg2" :show-file-list="false"
- accept='image/jpg,image/jpeg,image/png' :headers="headers" :on-change="beforeUpload"
+ accept='image/jpg,image/jpeg,image/png' :headers="uploadHeader" :on-change="beforeUpload"
:on-error="onError" ref='upload'>
<el-button type="text" style="height:30px;padding-top:8px">涓婁紶</el-button>
</el-upload>
@@ -421,11 +421,9 @@
labelPosition: 'right',
dialogVisible: false,
dialogVisible2: false,
- addPower: false,
showData: false, // 鏁伴噰閰嶇疆椤甸潰
tableList: [],
addDia: true,
- addPower: true,
//璁惧绫诲瀷鍒楄〃
equipmentList: [],
// 璐熻矗浜哄垪琛�
@@ -445,7 +443,7 @@
queryParams: {},
tableData: [],
column: [
- { label: "璁惧鍚嶇О", prop: "deviceName", dataType: 'link', linkMethod: 'selectAllByOne' },
+ { label: "璁惧鍚嶇О", prop: "deviceName", dataType: 'link', linkMethod: 'selectAllByOne', width: 120 },
{ label: "璁惧鍚嶇ОEN", prop: "enDeviceName" },
{
label: "瑙勬牸鍨嬪彿",
@@ -469,10 +467,18 @@
{
label: "璁惧鍒嗙被", prop: "largeCategory", dataType: "tag",
formatData: (params) => {
- return this.equipmentList.find(m => m.value == params).label
+ if (this.equipmentList.find(m => m.value == params)) {
+ return this.equipmentList.find(m => m.value == params).label
+ } else {
+ return null
+ }
},
formatType: (params) => {
- return this.equipmentList.find(m => m.value == params).type
+ if (this.equipmentList.find(m => m.value == params)) {
+ return this.equipmentList.find(m => m.value == params).type
+ } else {
+ return null
+ }
}
},
{ label: "鍗曚环", prop: "unitPrice" },
@@ -821,6 +827,10 @@
this.$message.error('杈撳叆鏍″噯鍛ㄦ湡锛堟湀锛�')
return
}
+ if (!this.formData2.subordinateDepartmentsId) {
+ this.$message.error('璇烽�夋嫨鎵�灞為儴闂�')
+ return
+ }
const formData = this.HaveJson(this.formData2)
formData.insProductIds = formData.insProductIds ? formData.insProductIds.join() : ''
if (formData.authorizedPerson.length === 0) {
--
Gitblit v1.9.3