From 336dcb70c156c947530eab0f0a96ee17de477929 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期五, 12 七月 2024 18:04:33 +0800
Subject: [PATCH] 设备管理修改
---
src/views/eam/EquipmentListOfFilesCarousel.vue | 75 ++++++++++++++++++++++++++++++-------
1 files changed, 60 insertions(+), 15 deletions(-)
diff --git a/src/views/eam/EquipmentListOfFilesCarousel.vue b/src/views/eam/EquipmentListOfFilesCarousel.vue
index 8cb434e..409f7c6 100644
--- a/src/views/eam/EquipmentListOfFilesCarousel.vue
+++ b/src/views/eam/EquipmentListOfFilesCarousel.vue
@@ -97,12 +97,17 @@
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
- <a-tree-select
+ <!-- <a-tree-select
style="width: 100%"
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
:tree-data="treeData"
placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
tree-default-expand-all
+ v-model="queryParam.manageId"
+ /> -->
+ <j-dict-select-tag
+ dictCode="sys_depart,depart_name,id"
+ placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
v-model="queryParam.manageId"
/>
</a-form-item>
@@ -113,12 +118,17 @@
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
- <a-tree-select
+ <!-- <a-tree-select
style="width: 100%"
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
:tree-data="treeData"
placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
tree-default-expand-all
+ v-model="queryParam.useId"
+ /> -->
+ <j-dict-select-tag
+ dictCode="sys_depart,depart_name,id"
+ placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
v-model="queryParam.useId"
/>
</a-form-item>
@@ -329,13 +339,14 @@
:customRow="clickThenSelect"
@change="handleTableChange"
>
- <template
+ <template
slot="technologyStatus"
slot-scope="text,record"
- >
+ >
<a
href="javascript:eam/EquipmentCalibrationOrder;"
- @click="handleTechnologyStatus(record)">{{record.technologyStatus_dictText}}</a>
+ @click="handleTechnologyStatus(record)"
+ >{{record.technologyStatus_dictText}}</a>
</template>
<template
slot="htmlSlot"
@@ -465,6 +476,26 @@
class="error"
>鍚�</span>
</span>
+
+ <span
+ slot="name"
+ slot-scope="text"
+ >
+ <j-ellipsis
+ :value="text"
+ :length="8"
+ />
+ </span>
+
+ <template
+ slot="num"
+ slot-scope="text,record"
+ >
+ <a
+ href="javascript:;"
+ @click="handleDetail(record)"
+ >{{record.num}}</a>
+ </template>
<span
slot="action"
@@ -645,6 +676,7 @@
import DailyMaintenanceList from './modules/equipmentNew/DailyMaintenanceList.vue'
import SecondMaintenanceList from './modules/equipmentNew/SecondMaintenanceList.vue'
import ThirdMaintenanceList from './modules/equipmentNew/ThirdMaintenanceList.vue'
+import JEllipsis from '@/components/jeecg/JEllipsis'
export default {
name: "EquipmentList",
mixins: [JeecgListMixin, mixinDevice],
@@ -668,6 +700,7 @@
DailyMaintenanceList,
SecondMaintenanceList,
ThirdMaintenanceList,
+ JEllipsis
},
data() {
return {
@@ -696,14 +729,21 @@
dataIndex: 'isLineEquip_dictText',
},
{
+ title: '鍏抽敭璁惧鏍囪瘑',
+ align: "center",
+ dataIndex: 'specificEquipment_dictText',
+ },
+ {
title: '缁熶竴缂栫爜',
align: "center",
dataIndex: 'num',
+ scopedSlots: { customRender: 'num' },
},
{
title: '璁惧鍚嶇О',
align: "center",
dataIndex: 'name',
+ scopedSlots: { customRender: 'name' },
},
{
title: '鍨嬪彿',
@@ -720,16 +760,16 @@
align: "center",
dataIndex: 'gpo',
},
- {
- title: '浣跨敤閮ㄩ棬',
- align: "center",
- dataIndex: 'useId_dictText',
- },
- {
- title: '缁存姢閮ㄩ棬',
- align: "center",
- dataIndex: 'manageId_dictText',
- },
+ // {
+ // title: '浣跨敤閮ㄩ棬',
+ // align: "center",
+ // dataIndex: 'useId_dictText',
+ // },
+ // {
+ // title: '缁存姢閮ㄩ棬',
+ // align: "center",
+ // dataIndex: 'manageId_dictText',
+ // },
{
title: '缁翠慨鐝粍',
align: "center",
@@ -757,6 +797,11 @@
dataIndex: 'technologyStatusVerificationType_dictText',
},
{
+ title: '涓嬫鎶�鏈姸鎬侀壌瀹氭椂闂�',
+ align: "center",
+ dataIndex: 'nextTechnologyStatusQualificationTime',
+ },
+ {
title: '鐢熶骇绾跨紪鍙�',
align: "center",
dataIndex: 'lineId_dictText',
--
Gitblit v1.9.3