From e83829b8b2ef2ec3e684ee600e627eae482edbb1 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 25 三月 2025 15:41:06 +0800
Subject: [PATCH] art: 设备台账-列表 修改
---
src/views/eam/equipment/EamEquipmentList.vue | 178 ++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 127 insertions(+), 51 deletions(-)
diff --git a/src/views/eam/equipment/EamEquipmentList.vue b/src/views/eam/equipment/EamEquipmentList.vue
index 2c13c29..059f2ce 100644
--- a/src/views/eam/equipment/EamEquipmentList.vue
+++ b/src/views/eam/equipment/EamEquipmentList.vue
@@ -15,16 +15,43 @@
<a-input placeholder="璇疯緭鍏ヨ澶囧悕绉�" v-model="queryParam.equipmentName"></a-input>
</a-form-item>
</a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="鍏抽敭璁惧鏍囪瘑">
+ <j-dict-select-tag dict-code="yn" placeholder="璇烽�夋嫨鍏抽敭璁惧鏍囪瘑" v-model="queryParam.equipmentImportance"></j-dict-select-tag>
+ </a-form-item>
+ </a-col>
<template v-if="toggleSearchStatus">
-
<a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="璁惧鍨嬪彿">
- <a-input placeholder="璇疯緭鍏ヨ澶囧瀷鍙�" v-model="queryParam.equipmentModel"></a-input>
+ <a-form-item label="璧勪骇鐘舵��">
+ <j-dict-select-tag dict-code="asset_status" placeholder="璇烽�夋嫨璧勪骇鐘舵��" v-model="queryParam.assetStatus"></j-dict-select-tag>
</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.equipmentSpecification"></a-input>
+ <a-form-item label="鎶�鏈姸鎬�">
+ <j-dict-select-tag dict-code="technology_status" placeholder="璇烽�夋嫨鎶�鏈姸鎬�" v-model="queryParam.technologyStatus"></j-dict-select-tag>
+ </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.operationSystem"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="浣跨敤杞﹂棿">
+ <a-tree-select v-model="queryParam.orgId"
+ style="width: 100%"
+ :tree-data="treeData"
+ :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+ placeholder="璇烽�夋嫨浣跨敤杞﹂棿"
+ allow-clear
+ tree-default-expand-all
+ >
+ </a-tree-select>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="璁惧鍒嗙被">
+ <j-dict-select-tag dict-code="equipment_category" placeholder="璇烽�夋嫨璁惧鍒嗙被" v-model="queryParam.equipmentCategory"></j-dict-select-tag>
</a-form-item>
</a-col>
</template>
@@ -84,11 +111,21 @@
:scroll="{ x: 'max-content' }"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
-
<span slot="equipmentImportance" slot-scope="text">
- <lx-switch v-model="text" disabled checked-children='鏄�' un-checked-children='鍚�' />
+ <lx-switch v-model="text" disabled checked-children="鏄�" un-checked-children="鍚�" />
</span>
-
+ <span slot="mdcFlag" slot-scope="text">
+ <lx-switch v-model="text" disabled checked-children="鏄�" un-checked-children="鍚�" />
+ </span>
+ <span slot="processParametersFlag" slot-scope="text">
+ <lx-switch v-model="text" disabled checked-children="鏈�" un-checked-children="鏃�" />
+ </span>
+ <span slot="precisionParametersFlag" slot-scope="text">
+ <lx-switch v-model="text" disabled checked-children="鏈�" un-checked-children="鏃�" />
+ </span>
+ <span slot="specialEquipment" slot-scope="text">
+ <lx-switch v-model="text" disabled checked-children="鏄�" un-checked-children="鍚�" />
+ </span>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">缂栬緫</a>
@@ -96,6 +133,9 @@
<a-dropdown>
<a class="ant-dropdown-link">鏇村 <a-icon type="down" /></a>
<a-menu slot="overlay">
+ <a-menu-item>
+ <a href="javascript:;" @click="handleDetail(record)">璇︽儏</a>
+ </a-menu-item>
<a-menu-item>
<a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)">
<a>鍒犻櫎</a>
@@ -118,6 +158,7 @@
import '@/assets/less/TableExpand.less'
import EamEquipmentModal from './modules/EamEquipmentModal'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import { getAction } from '@api/manage'
export default {
name: 'EamEquipmentList',
@@ -138,7 +179,8 @@
align: 'center',
customRender: function(t, r, index) {
return parseInt(index) + 1
- }
+ },
+ fixed: 'left'
},
{
title: '璁惧缂栧彿',
@@ -146,7 +188,8 @@
width: 100,
dataIndex: 'equipmentCode',
ellipsis: true,
- fixed: 'left'
+ fixed: 'left',
+ sorter: true,
},
{
title: '璁惧鍚嶇О',
@@ -159,147 +202,164 @@
{
title: '鍏抽敭璁惧鏍囪瘑',
align: 'center',
- width : 100,
+ width: 120,
dataIndex: 'equipmentImportance',
scopedSlots: { customRender: 'equipmentImportance' }
},
{
+ title: '璧勪骇鐘舵��',
+ align: 'center',
+ width: 100,
+ dataIndex: 'assetStatus_dictText'
+ },
+ {
title: '鎶�鏈姸鎬�',
align: 'center',
- width : 100,
+ width: 100,
dataIndex: 'technologyStatus_dictText'
+ },
+ {
+ title: '缁翠慨鐘舵��',
+ align: 'center',
+ width: 100,
+ dataIndex: 'repairStatus_dictText'
+ },
+ {
+ title: '淇濆吇鐘舵��',
+ align: 'center',
+ width: 100,
+ dataIndex: 'maintenanceStatus_dictText'
},
{
title: '鎿嶄綔绯荤粺',
align: 'center',
- width : 100,
+ width: 100,
dataIndex: 'operationSystem'
},
{
- title: '浣跨敤閮ㄩ棬',
+ title: '浣跨敤杞﹂棿',
align: 'center',
- width : 100,
- dataIndex: 'orgId'
+ width: 100,
+ dataIndex: 'orgId_dictText'
},
{
title: '璁惧绠＄悊鍛�',
align: 'center',
- width : 100,
- dataIndex: 'equipmentManager'
+ width: 100,
+ dataIndex: 'equipmentManager_dictText'
},
{
title: '璁惧鍒嗙被',
align: 'center',
- width : 100,
+ width: 100,
dataIndex: 'equipmentCategory_dictText'
},
{
title: '璁惧鍨嬪彿',
align: 'center',
- width : 100,
+ width: 100,
dataIndex: 'equipmentModel'
},
{
title: '璁惧瑙勬牸',
align: 'center',
- width : 100,
+ width: 100,
dataIndex: 'equipmentSpecification'
},
{
title: '涓昏酱杩炴帴灏哄',
align: 'center',
- width : 100,
+ width: 120,
dataIndex: 'spindleConnectDimension'
},
{
title: '鎬诲姛鐜�',
align: 'center',
- width : 100,
+ width: 100,
dataIndex: 'equipmentPower'
},
{
title: '瀹夎浣嶇疆',
align: 'center',
- width : 100,
+ width: 100,
dataIndex: 'installationPosition'
},
- {
- title: '璧勪骇鐘舵��',
- align: 'center',
- width : 100,
- dataIndex: 'assetStatus_dictText'
- },
+
{
title: '绔嬮」鍗″彿',
align: 'center',
- width : 100,
+ width: 100,
dataIndex: 'cardNumber'
},
{
title: '鍑哄巶缂栧彿',
align: 'center',
- width : 100,
+ width: 100,
dataIndex: 'factoryNumber'
},
{
title: '鏈哄簥鍘傚',
align: 'center',
- width : 100,
+ width: 100,
dataIndex: 'manufacturingEnterprise'
},
{
title: '鏉ユ簮鍥藉',
align: 'center',
- width : 100,
+ width: 100,
dataIndex: 'originCountry'
},
{
title: '鍑哄巶鏃ユ湡',
align: 'center',
- width : 100,
+ width: 100,
dataIndex: 'leaveFactoryDate'
},
{
title: '楠屾敹鏃ユ湡',
align: 'center',
- width : 100,
+ width: 100,
dataIndex: 'acceptanceCheckDate'
},
{
title: '璐ㄤ繚寮�濮嬫棩鏈�',
align: 'center',
- width : 100,
+ width: 120,
dataIndex: 'warrantyStartDate'
},
{
title: '璐ㄤ繚缁撴潫鏃ユ湡',
align: 'center',
- width : 100,
+ width: 120,
dataIndex: 'warrantyEndDate'
},
{
title: '鏄惁瀹炴柦MDC',
align: 'center',
- width : 100,
- dataIndex: 'mdcFlag'
+ width: 120,
+ dataIndex: 'mdcFlag',
+ scopedSlots: { customRender: 'mdcFlag' }
},
{
- title: '鏄惁鏈夊伐鑹哄弬鏁�',
+ title: '鏈夋棤宸ヨ壓鍙傛暟',
align: 'center',
- width : 100,
- dataIndex: 'processParametersFlag'
+ width: 120,
+ dataIndex: 'processParametersFlag',
+ scopedSlots: { customRender: 'processParametersFlag' }
},
{
- title: '鏄惁鏈夌簿搴﹀弬鏁�',
+ title: '鏈夋棤绮惧害鍙傛暟',
align: 'center',
- width : 100,
- dataIndex: 'precisionParametersFlag'
+ width: 120,
+ dataIndex: 'precisionParametersFlag',
+ scopedSlots: { customRender: 'precisionParametersFlag' }
},
{
title: '鏄惁涓虹壒绉嶈澶�',
align: 'center',
- width : 100,
- dataIndex: 'specialEquipment'
+ width: 120,
+ dataIndex: 'specialEquipment',
+ scopedSlots: { customRender: 'specialEquipment' }
},
{
title: '閲嶉噺',
@@ -338,8 +398,10 @@
delete: '/eam/equipment/delete',
deleteBatch: '/eam/equipment/deleteBatch',
exportXlsUrl: 'eam/equipment/exportXls',
- importExcelUrl: 'eam/equipment/importExcel'
- }
+ importExcelUrl: 'eam/equipment/importExcel',
+ loadProductionOptions:'/mdc/mdcProduction/loadProductionTreeOptions'
+ },
+ treeData: [],
}
},
computed: {
@@ -347,7 +409,21 @@
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
}
},
- methods: {}
+ created() {
+ this.loadAllProductionTree();
+ },
+ methods: {
+ loadAllProductionTree() {
+ //鍔犺浇杞﹂棿閫夋嫨鏍�
+ getAction(this.url.loadProductionOptions).then(res => {
+ if (res.success) {
+ this.treeData = [...res.result]
+ }else {
+ that.$message.warning(res.message)
+ }
+ })
+ },
+ }
}
</script>
<style scoped>
--
Gitblit v1.9.3