From c46213fa824995bb2155c11ea332824d23232d9c Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期二, 10 六月 2025 16:25:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/EquipmentMaintenancePlanList.vue | 60 +++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 41 insertions(+), 19 deletions(-)
diff --git a/src/views/eam/EquipmentMaintenancePlanList.vue b/src/views/eam/EquipmentMaintenancePlanList.vue
index 0b94b4a..35e1071 100644
--- a/src/views/eam/EquipmentMaintenancePlanList.vue
+++ b/src/views/eam/EquipmentMaintenancePlanList.vue
@@ -1,6 +1,6 @@
<template>
<a-card
- title="淇濆吇璁″垝"
+ title=""
:bordered="false"
>
<!-- 鏌ヨ鍖哄煙 -->
@@ -23,12 +23,13 @@
></j-input>
</a-form-item>
</a-col>
- <!-- 鎸夊垱寤烘椂闂磋寖鍥存绱� -->
+ <!-- 鎸夊垱寤烘椂闂磋寖鍥存绱� -->
<a-col
:xl="6"
:lg="7"
:md="8"
- :sm="24">
+ :sm="24"
+ >
<a-form-item label="鍒涘缓鏃堕棿">
<a-range-picker
v-model="ranges"
@@ -54,7 +55,6 @@
/>
</a-form-item>
</a-col>
-
<a-col
:xl="6"
@@ -172,75 +172,75 @@
>
<a
@click="handleEdit(record)"
- v-if="record.status==='created'||record.status==='rejected'"
+ v-show="record.status==='created'||record.status==='rejected'"
v-has="'MaintenancePlan:add&edit&submit'"
>缂栬緫</a>
<a-divider
type="vertical"
- v-if="record.status==='created'||record.status==='rejected'"
+ v-show="record.status==='created'||record.status==='rejected'"
/>
<a-popconfirm
title="纭畾鍒犻櫎鍚�?"
@confirm="() => handleDelete(record.id)"
- v-if="record.status==='created'||record.status==='rejected'"
+ v-show="record.status==='created'||record.status==='rejected'"
v-has="'MaintenancePlan:add&edit&submit'"
>
<a>鍒犻櫎</a>
</a-popconfirm>
<a-divider
type="vertical"
- v-if="record.status==='created'||record.status==='rejected'"
+ v-show="record.status==='created'||record.status==='rejected'"
v-has="'MaintenancePlan:add&edit&submit'"
/>
<a-popconfirm
title="鎻愪氦鍚庝笉鍙挙鍥烇紝纭畾鎻愪氦鍚�?"
@confirm="() => handleSubmit(record)"
- v-if="record.status==='created'||record.status==='rejected'"
+ v-show="record.status==='created'||record.status==='rejected'"
v-has="'MaintenancePlan:add&edit&submit'"
>
<a>鎻愪氦</a>
</a-popconfirm>
<a-divider
type="vertical"
- v-if="record.status==='created'||record.status==='rejected'"
+ v-show="record.status==='created'||record.status==='rejected'"
v-has="'MaintenancePlan:add&edit&submit'"
/>
<a-popconfirm
title="閫氳繃鍚庝笉鍙挙閿�锛岀‘瀹氶�氳繃鍚�?"
@confirm="() => handleAudit(record)"
- v-if="record.status==='submitted'"
+ v-show="record.status==='submitted'"
v-has="'MaintenancePlan:audit&reject'"
>
<a>閫氳繃</a>
</a-popconfirm>
<a-divider
type="vertical"
- v-if="record.status==='submitted'"
+ v-show="record.status==='submitted'"
v-has="'MaintenancePlan:audit&reject'"
/>
<a-popconfirm
title="纭畾椹冲洖鍚�?"
@confirm="() => handleReject(record)"
- v-if="record.status==='submitted'"
+ v-show="record.status==='submitted'"
v-has="'MaintenancePlan:audit&reject'"
>
<a>椹冲洖</a>
</a-popconfirm>
<a-divider
type="vertical"
- v-if="record.status==='submitted'"
+ v-show="record.status==='submitted'"
v-has="'MaintenancePlan:audit&reject'"
/>
<a-popconfirm
title="涓嬪彂鍚庝笉鍙挙閿�锛岀‘瀹氫笅鍙戝悧?"
@confirm="() => handleDistrbute(record)"
- v-if="record.status==='passed'"
+ v-show="record.status==='passed'"
v-has="'MaintenancePlan:distribute'"
>
<a>涓嬪彂</a>
</a-popconfirm>
<span
- v-if="record.status==='distributed'"
+ v-show="record.status==='distributed'"
style="font-size: 12px;font-style: italic;"
>宸茬敓鎴愬伐鍗�</span>
</span>
@@ -286,7 +286,7 @@
data() {
return {
description: '淇濆吇璁″垝绠＄悊椤甸潰',
- ranges:[],
+ ranges: [],
// 琛ㄥご
columns: [
{
@@ -499,11 +499,33 @@
this.queryParam.endTime = ''
} else {
//鍚庣鎶ヨ繖涓敊rejected value ["2024-03-14T06:26:38.692Z"]
- this.queryParam.beginTime = this.ranges[0].format('YYYY-MM-DD')
- this.queryParam.endTime = this.ranges[1].format('YYYY-MM-DD')
+ // var beginTime = this.formattedTime(this.ranges[0])
+ // this.queryParam.beginTime = this.ranges[0].format('YYYY-MM-DD')
+ // this.queryParam.endTime = this.ranges[1].format('YYYY-MM-DD')
+ this.queryParam.beginTime = this.formattedTime(this.ranges[0])
+ this.queryParam.endTime = this.formattedTime(this.ranges[1])
}
},
+ formattedTime(originalTime) {
+
+ // 鍒涘缓 Date 瀵硅薄
+ const date = new Date(originalTime)
+
+ // 妫�鏌� Date 瀵硅薄鏄惁鏈夋晥
+ if (isNaN(date.getTime())) return '鏃犳晥鏃堕棿'
+
+ // 鑾峰彇骞淬�佹湀銆佹棩銆佹椂銆佸垎
+ const year = date.getFullYear()
+ const month = String(date.getMonth() + 1).padStart(2, '0')
+ const day = String(date.getDate()).padStart(2, '0')
+ const hours = String(date.getHours()).padStart(2, '0')
+ const minutes = String(date.getMinutes()).padStart(2, '0')
+ const seconds = String(date.getSeconds()).padStart(2, '0')
+ // 鎷兼帴鎴愭寚瀹氭牸寮�
+ return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
+ },
+
}
}
</script>
--
Gitblit v1.9.3