From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期四, 28 三月 2024 09:46:44 +0800 Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop --- src/views/eam/SpecialtyMaintenanceOrderList.vue | 65 +++++++++++++++++++++++++------- 1 files changed, 51 insertions(+), 14 deletions(-) diff --git a/src/views/eam/SpecialtyMaintenanceOrderList.vue b/src/views/eam/SpecialtyMaintenanceOrderList.vue index cb286e9..acafc95 100644 --- a/src/views/eam/SpecialtyMaintenanceOrderList.vue +++ b/src/views/eam/SpecialtyMaintenanceOrderList.vue @@ -1,7 +1,7 @@ <template> <a-card :bordered="false" - title="涓撲笟淇濆吇宸ュ崟" + title="棰勯槻鎬т繚鍏诲伐鍗�" > <!-- 鏌ヨ鍖哄煙 --> <div class="table-page-search-wrapper"> @@ -126,6 +126,7 @@ :loading="loading" class="j-table-force-nowrap" @change="handleTableChange" + :rowClassName="tableRowClass" > <!-- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" --> <span @@ -199,7 +200,7 @@ v-has="'specialtyMaintenanceOrder:assign'" >娲惧伐</a> <a - v-if="record.status == '2'&& record.assignMode == '3' && record.inspectionUserName != null " + v-if="record.status == '2'&& record.assignMode == '3' && record.maintenanceUserName != null " @click="handleAssignOrder(record)" v-has="'specialtyMaintenanceOrder:assign'" >鏀规淳</a> @@ -327,16 +328,7 @@ return parseInt(index) + 1; } }, - { - title: '鐘舵��', - align: "center", - dataIndex: 'statusName' - }, - { - title: '缁翠繚鏂瑰紡', - align: "center", - dataIndex: 'maintenanceMode' - }, + { title: '淇濆吇宸ュ崟鍙�', align: "center", @@ -344,7 +336,7 @@ scopedSlots: { customRender: 'num' } }, { - title: '瀵硅薄閮ㄩ棬', + title: '浣跨敤閮ㄩ棬', align: "center", dataIndex: 'departName', }, @@ -372,6 +364,16 @@ title: '璐d换鐝粍', align: "center", dataIndex: 'teamName', + }, + { + title: '鐘舵��', + align: "center", + dataIndex: 'statusName' + }, + { + title: '缁翠繚鏂瑰紡', + align: "center", + dataIndex: 'maintenanceMode' }, // { // title: '宸ユ椂瀹氶/姣忓皬鏃�', @@ -573,9 +575,44 @@ // //娓呯┖鍒楄〃閫変腑 // this.onClearSelected() // }, + + //棰勮棰滆壊 + tableRowClass(record, index) { + if ("1" == record.status || "2" == record.status) { + if (record.yellowWarningTime < record.currentDateTime && record.currentDateTime < record.redWarningTime) { + return 'yellow' + } else if (record.redWarningTime < record.currentDateTime && record.currentDateTime < record.planStartTime) { + return 'error' + } else if (record.planStartTime < record.currentDateTime) { + return 'frozenRowClass' + } + } + }, } } </script> -<style scoped> +<style > @import '~@assets/less/common.less'; +.frozenRowClass { + color: #c9c9c9; + font-weight: bold; +} +.success { + color: green; +} +.error { + color: red; + font-weight: bold; +} +.yellow { + color: yellow; + font-weight: bold; +} +.fontweight { + font-weight: bold; +} + +.ant-table-tbody .red { + background-color: red !important; +} </style> \ No newline at end of file -- Gitblit v1.9.3