From 2086dc154e65f80b441c7b428b06d4eab0491322 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 02 七月 2025 19:00:28 +0800
Subject: [PATCH] 调整设备台账灭火器和操作系统选择方式以及灭火器有效期和系统的限制条件
---
src/views/eam/equipment/modules/EamEquipmentModal.vue | 34 +++++++++++++---------------------
src/views/eam/equipment/EamEquipmentLedger.vue | 12 +++++++++---
2 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/src/views/eam/equipment/EamEquipmentLedger.vue b/src/views/eam/equipment/EamEquipmentLedger.vue
index 13250c3..502cadd 100644
--- a/src/views/eam/equipment/EamEquipmentLedger.vue
+++ b/src/views/eam/equipment/EamEquipmentLedger.vue
@@ -121,7 +121,12 @@
<!--鎿嶄綔绯荤粺-->
<template slot="operationSystem" slot-scope="text">
- <a-switch checked-children="鏄�" un-checked-children="鍚�" :checked="+text" disabled/>
+ <a-switch checked-children="鏄�" un-checked-children="鍚�" :checked="Boolean(+text)" disabled/>
+ </template>
+
+ <!--鎿嶄綔绯荤粺-->
+ <template slot="fireExtinguisher" slot-scope="text">
+ <a-switch checked-children="鏄�" un-checked-children="鍚�" :checked="Boolean(+text)" disabled/>
</template>
<!--璧勪骇鍒堕�犲晢-->
@@ -306,7 +311,8 @@
{
title: '鐏伀鍣�',
align: 'center',
- dataIndex: 'fireExtinguisher'
+ dataIndex: 'fireExtinguisher',
+ scopedSlots: { customRender: 'fireExtinguisher' }
},
{
title: '鐏伀鍣ㄦ湁鏁堟湡',
@@ -337,7 +343,7 @@
{
title: '閲嶉噺',
align: 'center',
- dataIndex: 'weightUnit'
+ dataIndex: 'equipmentWeight'
},
{
title: '閲嶉噺璁￠噺鍗曚綅',
diff --git a/src/views/eam/equipment/modules/EamEquipmentModal.vue b/src/views/eam/equipment/modules/EamEquipmentModal.vue
index 5bc74b5..0d8a601 100644
--- a/src/views/eam/equipment/modules/EamEquipmentModal.vue
+++ b/src/views/eam/equipment/modules/EamEquipmentModal.vue
@@ -52,23 +52,10 @@
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
- <a-form-model-item label="璐ㄤ繚寮�濮嬫棩鏈�">
- <a-date-picker v-model="model.warrantyStartDate" value-format="YYYY-MM-DD" style="width:100%"/>
- </a-form-model-item>
- </a-col>
- <a-col :span="customSpan">
- <a-form-model-item label="璐ㄤ繚缁撴潫鏃ユ湡">
- <a-date-picker v-model="model.warrantyEndDate" value-format="YYYY-MM-DD" style="width:100%"/>
- </a-form-model-item>
- </a-col>
- <a-col :span="customSpan">
<a-form-model-item label="ABC鏍囪瘑">
<j-dict-select-tag dict-code="abc_flag" placeholder="璇烽�夋嫨ABC鏍囪瘑" v-model="model.abcFlag"/>
</a-form-model-item>
</a-col>
- </a-row>
-
- <a-row>
<a-col :span="customSpan">
<a-form-model-item prop="repairDepartOrgCode" label="缁翠慨鐝粍">
<a-input placeholder="璇烽�夋嫨缁翠慨鐝粍" v-model="model.repairDepartOrgCode"/>
@@ -89,13 +76,13 @@
</a-col>
<a-col :span="customSpan">
<a-form-model-item label="鐏伀鍣�">
- <a-input placeholder="璇疯緭鍏ョ伃鐏櫒" v-model="model.fireExtinguisher"/>
+ <j-dict-select-tag dict-code="yn" type="radio" v-model="model.fireExtinguisher"/>
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
<a-form-model-item label="鐏伀鍣ㄦ湁鏁堟湡">
- <a-date-picker v-model="model.fireExtinguisherExpirationDate" value-format="YYYY-MM-DD"
- style="width:100%"/>
+ <a-input :disabled="!Boolean(+model.fireExtinguisher)"
+ v-model="model.fireExtinguisherExpirationDate" placeholder="璇疯緭鍏ョ伃鐏櫒鏈夋晥鏈�"/>
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
@@ -108,7 +95,7 @@
<a-row>
<a-col :span="customSpan">
<a-form-model-item label="绯荤粺">
- <a-input placeholder="璇疯緭鍏ョ郴缁�" v-model="model.system"/>
+ <a-input placeholder="璇疯緭鍏ョ郴缁�" :disabled="Boolean(+model.operationSystem)" v-model="model.system"/>
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
@@ -118,7 +105,8 @@
</a-col>
<a-col :span="customSpan">
<a-form-model-item label="鍧愭爣鏁伴噺">
- <a-input-number placeholder="璇疯緭鍏ュ潗鏍囨暟閲�" v-model="model.coordinateNum" :min="0" style="width: 100%"/>
+ <a-input-number placeholder="璇疯緭鍏ュ潗鏍囨暟閲�" v-model="model.coordinateNum" :min="0" :max="12"
+ style="width: 100%"/>
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
@@ -199,8 +187,9 @@
<a-row>
<a-col :span="customSpan">
- <a-form-model-item label="鎬诲姛鐜�">
- <a-input placeholder="璇疯緭鍏ユ�诲姛鐜�" v-model="model.equipmentPower"/>
+ <a-form-model-item label="鎬诲姛鐜�(KW)">
+ <a-input-number placeholder="璇疯緭鍏ユ�诲姛鐜�(KW)" v-model="model.equipmentPower" :min="0"
+ style="width: 100%"/>
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
@@ -361,7 +350,10 @@
add() {
this.editable = false
//鍒濆鍖栭粯璁ゅ��
- this.model = {}
+ this.model = {
+ operationSystem: 1,
+ fireExtinguisher: 0
+ }
this.visible = true
},
--
Gitblit v1.9.3