From b8e56a7c55cebb5f40867d2893189963fcdbe20f Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 03 七月 2025 15:34:49 +0800
Subject: [PATCH] 1、删除用户管理冗余字段 2、区分MDC和设备管理部门及设备分配
---
src/views/eam/equipment/EamEquipmentLedger.vue | 37 +++++++++++--------------------------
1 files changed, 11 insertions(+), 26 deletions(-)
diff --git a/src/views/eam/equipment/EamEquipmentLedger.vue b/src/views/eam/equipment/EamEquipmentLedger.vue
index 44f998d..502cadd 100644
--- a/src/views/eam/equipment/EamEquipmentLedger.vue
+++ b/src/views/eam/equipment/EamEquipmentLedger.vue
@@ -11,13 +11,13 @@
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="璁惧缂栧彿">
- <a-input placeholder="璇疯緭鍏ヨ澶囩紪鍙�" v-model="queryParam.equipmentCode"></a-input>
+ <a-form-item label="缁熶竴缂栫爜">
+ <a-input placeholder="璇疯緭鍏ョ粺涓�缂栫爜妯$硦鏌ヨ" v-model="queryParam.equipmentCode"></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="璁惧鍚嶇О">
- <a-input placeholder="璇疯緭鍏ヨ澶囧悕绉�" v-model="queryParam.equipmentName"></a-input>
+ <a-input placeholder="璇疯緭鍏ヨ澶囧悕绉版ā绯婃煡璇�" v-model="queryParam.equipmentName"></a-input>
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
@@ -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>
<!--璧勪骇鍒堕�犲晢-->
@@ -244,7 +249,6 @@
{
title: '缁熶竴缂栫爜',
align: 'center',
- width: 100,
dataIndex: 'equipmentCode',
scopedSlots: { customRender: 'equipmentCode' },
ellipsis: true,
@@ -267,56 +271,48 @@
{
title: '鎵�灞炲垎绫�',
align: 'center',
- width: 100,
dataIndex: 'equipmentCategory_dictText'
},
{
title: '淇濆吇鐘舵��',
align: 'center',
- width: 100,
dataIndex: 'maintenanceStatus_dictText'
},
{
title: '缁翠慨鐘舵��',
align: 'center',
- width: 100,
dataIndex: 'repairStatus_dictText'
},
{
title: '鎶�鏈姸鎬�',
align: 'center',
- width: 100,
dataIndex: 'technologyStatus_dictText'
},
{
title: 'ABC鏍囪瘑',
align: 'center',
- width: 100,
dataIndex: 'abcFlag'
},
{
title: '缁翠慨鐝粍',
align: 'center',
- width: 100,
dataIndex: 'repairDepartOrgCode'
},
{
title: '瀹夊叏閰嶇疆',
align: 'center',
- width: 100,
dataIndex: 'securityConfiguration'
},
{
title: '鍐峰嵈绯荤粺',
align: 'center',
- width: 100,
dataIndex: 'coolSystem'
},
{
title: '鐏伀鍣�',
align: 'center',
- width: 100,
- dataIndex: 'fireExtinguisher'
+ dataIndex: 'fireExtinguisher',
+ scopedSlots: { customRender: 'fireExtinguisher' }
},
{
title: '鐏伀鍣ㄦ湁鏁堟湡',
@@ -332,37 +328,31 @@
{
title: '绯荤粺',
align: 'center',
- width: 100,
dataIndex: 'system'
},
{
title: '璁惧绔彛',
align: 'center',
- width: 100,
dataIndex: 'equipmentPort'
},
{
title: '鍧愭爣鏁伴噺',
align: 'center',
- width: 100,
dataIndex: 'coordinateNum'
},
{
title: '閲嶉噺',
align: 'center',
- width: 100,
dataIndex: 'equipmentWeight'
},
{
title: '閲嶉噺璁¢噺鍗曚綅',
align: 'center',
- width: 150,
dataIndex: 'weightUnit'
},
{
title: '鍔熻兘浣嶇疆',
align: 'center',
- width: 100,
dataIndex: 'functionalLocation'
},
{
@@ -374,13 +364,11 @@
{
title: '鍑哄巶鏃ユ湡',
align: 'center',
- width: 100,
dataIndex: 'leaveFactoryDate'
},
{
title: '绔嬮」鍗″彿',
align: 'center',
- width: 100,
dataIndex: 'cardNumber'
},
{
@@ -391,7 +379,6 @@
{
title: '楠屾敹鏃ユ湡',
align: 'center',
- width: 100,
dataIndex: 'acceptanceCheckDate'
},
{
@@ -414,13 +401,11 @@
{
title: '鍨嬪彿',
align: 'center',
- width: 100,
dataIndex: 'equipmentModel'
},
{
title: '璁惧瑙勬牸',
align: 'center',
- width: 100,
dataIndex: 'equipmentSpecification'
},
{
--
Gitblit v1.9.3