From af5d0dc7c9c6a6d2bac1580e176bc1af5141b393 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期二, 10 六月 2025 16:34:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/SelfMaintenanceAndInspectionList.vue | 12 +++--
src/views/eam/modules/dailyMaintenanceStandard/JSelectMaintenanceStandardModal.vue | 3 +
src/views/eam/modules/maintenancePlan/StandardSelect.vue | 25 +++++++++++-
src/views/eam/MaintenanceTypeList.vue | 4 +-
src/views/eam/EquipmentMaintenancePlanList.vue | 26 ++++++++++++-
src/views/eam/DailyMaintenanceOrderList.vue | 4 +-
src/views/eam/modules/dailyMaintenanceStandard3/JSelectMaintenanceStandardModal.vue | 3 +
src/views/eam/modules/dailyInspectionStandard/JSelectDailylnspectionStandardModal.vue | 13 ++++--
src/views/eam/modules/maintenanceProject/MaintenanceProjectRight.vue | 8 ++--
9 files changed, 75 insertions(+), 23 deletions(-)
diff --git a/src/views/eam/DailyMaintenanceOrderList.vue b/src/views/eam/DailyMaintenanceOrderList.vue
index a28acb3..ab13fae 100644
--- a/src/views/eam/DailyMaintenanceOrderList.vue
+++ b/src/views/eam/DailyMaintenanceOrderList.vue
@@ -61,7 +61,7 @@
/>
</a-form-item>
</a-col>
- <a-col :span="6">
+ <!-- <a-col :span="6">
<a-form-item label="绉讳氦鍗曠姸鎬�">
<j-dict-select-tag
dictCode="two_maintenance_devolution_status"
@@ -69,7 +69,7 @@
v-model="queryParam.confirmStatus"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
<a-col :span="7">
<a-form-item label="瀹屽伐鏃堕棿">
<a-range-picker
diff --git a/src/views/eam/EquipmentMaintenancePlanList.vue b/src/views/eam/EquipmentMaintenancePlanList.vue
index 456f04d..35e1071 100644
--- a/src/views/eam/EquipmentMaintenancePlanList.vue
+++ b/src/views/eam/EquipmentMaintenancePlanList.vue
@@ -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>
diff --git a/src/views/eam/MaintenanceTypeList.vue b/src/views/eam/MaintenanceTypeList.vue
index 8f85146..7b513a9 100644
--- a/src/views/eam/MaintenanceTypeList.vue
+++ b/src/views/eam/MaintenanceTypeList.vue
@@ -67,7 +67,7 @@
type="primary"
icon="plus"
>鏂板</a-button>
- <a-button
+ <!-- <a-button
type="primary"
icon="download"
@click="handleExportXls('mom_eam_maintenance_type')"
@@ -84,7 +84,7 @@
type="primary"
icon="import"
>瀵煎叆</a-button>
- </a-upload>
+ </a-upload> -->
<!-- 楂樼骇鏌ヨ鍖哄煙 -->
<!-- <j-super-query
:fieldList="superFieldList"
diff --git a/src/views/eam/SelfMaintenanceAndInspectionList.vue b/src/views/eam/SelfMaintenanceAndInspectionList.vue
index a47ab74..b6e41c6 100644
--- a/src/views/eam/SelfMaintenanceAndInspectionList.vue
+++ b/src/views/eam/SelfMaintenanceAndInspectionList.vue
@@ -33,8 +33,11 @@
<a-spin :spinning="loading">
<table id="dataTable" v-if="dataSource.list1&&dataSource.list1.length>0">
<thead>
- <tr style="height: 48px">
- <th colspan="42">鐢熶骇璁惧鑷富缁存姢鐐规琛�</th>
+ <tr style="height: 48px;position: relative">
+ <th colspan="42">
+ 鐢熶骇璁惧鑷富缁存姢鐐规琛�
+ <span style="position: absolute;right: 22.5%">{{dataSource.regulations}}</span>
+ </th>
</tr>
<tr style="height: 48px">
@@ -119,11 +122,10 @@
<tr>
<td colspan="11">鍛ㄤ繚鍏绘鏌ヤ汉纭锛堢淮淇汉鍛樼瀛楋級</td>
<td v-for="childItem in 4" colspan="6">
- {{dataSource.list5&&dataSource.list6[0]&&dataSource.list6[0].dataList&&dataSource.list6[0].dataList.find(item=>item.weekOfMonth===childItem)?dataSource.list6[0].dataList.find(item=>item.weekOfMonth===childItem).repairConfirmPerson:''}}
-
+ {{dataSource.list6&&dataSource.list6[0]&&dataSource.list6[0].dataList&&dataSource.list6[0].dataList.find(item=>item.weekOfMonth===childItem)?dataSource.list6[0].dataList.find(item=>item.weekOfMonth===childItem).repairConfirmPerson:''}}
</td>
<td colspan="7">
- {{dataSource.list5&&dataSource.list6[0]&&dataSource.list6[0].dataList&&dataSource.list6[0].dataList.find(item=>item.weekOfMonth===5)?dataSource.list6[0].dataList.find(item=>item.weekOfMonth===5).repairConfirmPerson:''}}
+ {{dataSource.list6&&dataSource.list6[0]&&dataSource.list6[0].dataList&&dataSource.list6[0].dataList.find(item=>item.weekOfMonth===5)?dataSource.list6[0].dataList.find(item=>item.weekOfMonth===5).repairConfirmPerson:''}}
</td>
</tr>
diff --git a/src/views/eam/modules/dailyInspectionStandard/JSelectDailylnspectionStandardModal.vue b/src/views/eam/modules/dailyInspectionStandard/JSelectDailylnspectionStandardModal.vue
index ac9e74a..17597c8 100644
--- a/src/views/eam/modules/dailyInspectionStandard/JSelectDailylnspectionStandardModal.vue
+++ b/src/views/eam/modules/dailyInspectionStandard/JSelectDailylnspectionStandardModal.vue
@@ -164,6 +164,7 @@
type: 'checkbox',
onChange: (selectedRowKeys, selectedRows) => {
this.selectedRowKeys = selectedRowKeys
+ this.onSelectChange(selectedRows)
},
onSelect: (record, selected, selectedRows) => {
if (selected) {
@@ -259,14 +260,18 @@
this.loadData()
},
handleSubmit() {
- this.$bus.$emit('selectionRows', this.selectionRowsNotClear)
+ // this.$bus.$emit('selectionRows', this.selectionRowsNotClear)
+ this.$bus.$emit('selectionRows', this.selectionRows)
this.searchReset(0)
this.close()
},
- onSelectionChange(selectedRowKeys, selectedRows) {
- this.selectedRowKeys = selectedRowKeys;
- this.selectedRows = selectedRows;
+ onSelectChange(selectionRows) {
+ this.selectionRows = selectionRows
},
+ // onSelectionChange(selectedRowKeys, selectedRows) {
+ // this.selectedRowKeys = selectedRowKeys;
+ // this.selectedRows = selectedRows;
+ // },
searchQuery() {
this.loadData(1)
diff --git a/src/views/eam/modules/dailyMaintenanceStandard/JSelectMaintenanceStandardModal.vue b/src/views/eam/modules/dailyMaintenanceStandard/JSelectMaintenanceStandardModal.vue
index 980a5d8..60bf3ab 100644
--- a/src/views/eam/modules/dailyMaintenanceStandard/JSelectMaintenanceStandardModal.vue
+++ b/src/views/eam/modules/dailyMaintenanceStandard/JSelectMaintenanceStandardModal.vue
@@ -266,7 +266,8 @@
this.loadData()
},
handleSubmit() {
- this.$bus.$emit('selectionRows', this.selectionRowsNotClear)
+ // this.$bus.$emit('selectionRows', this.selectionRowsNotClear)
+ this.$bus.$emit('selectionRows', this.selectionRows)
// this.searchReset(0)
this.close()
},
diff --git a/src/views/eam/modules/dailyMaintenanceStandard3/JSelectMaintenanceStandardModal.vue b/src/views/eam/modules/dailyMaintenanceStandard3/JSelectMaintenanceStandardModal.vue
index 980a5d8..60bf3ab 100644
--- a/src/views/eam/modules/dailyMaintenanceStandard3/JSelectMaintenanceStandardModal.vue
+++ b/src/views/eam/modules/dailyMaintenanceStandard3/JSelectMaintenanceStandardModal.vue
@@ -266,7 +266,8 @@
this.loadData()
},
handleSubmit() {
- this.$bus.$emit('selectionRows', this.selectionRowsNotClear)
+ // this.$bus.$emit('selectionRows', this.selectionRowsNotClear)
+ this.$bus.$emit('selectionRows', this.selectionRows)
// this.searchReset(0)
this.close()
},
diff --git a/src/views/eam/modules/maintenancePlan/StandardSelect.vue b/src/views/eam/modules/maintenancePlan/StandardSelect.vue
index f97147c..2838d36 100644
--- a/src/views/eam/modules/maintenancePlan/StandardSelect.vue
+++ b/src/views/eam/modules/maintenancePlan/StandardSelect.vue
@@ -361,8 +361,29 @@
},
changeDate(date, dateString) {
- this.queryParam.startTime = dateString[0].format('YYYY-MM-DD HH:mm:ss');
- this.queryParam.endTime = dateString[1].format('YYYY-MM-DD HH:mm:ss');
+ // this.queryParam.startTime = dateString[0].format('YYYY-MM-DD HH:mm:ss');
+ // this.queryParam.endTime = dateString[1].format('YYYY-MM-DD HH:mm:ss');
+ this.queryParam.startTime = this.formattedTime(dateString[0]);
+ this.queryParam.endTime = this.formattedTime(dateString[1]);
+ debugger
+ },
+ 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}`
},
onSelectChange(selectionRows) {
this.selectionRows = selectionRows;
diff --git a/src/views/eam/modules/maintenanceProject/MaintenanceProjectRight.vue b/src/views/eam/modules/maintenanceProject/MaintenanceProjectRight.vue
index 0f0be57..cd05cdb 100644
--- a/src/views/eam/modules/maintenanceProject/MaintenanceProjectRight.vue
+++ b/src/views/eam/modules/maintenanceProject/MaintenanceProjectRight.vue
@@ -10,7 +10,7 @@
@keyup.enter.native="searchQuery"
>
<a-row :gutter="24">
- <a-col
+ <!-- <a-col
:md="8"
:sm="8"
>
@@ -20,7 +20,7 @@
v-model="queryParam.num"
></j-input>
</a-form-item>
- </a-col>
+ </a-col> -->
<a-col
:md="8"
:sm="8"
@@ -56,11 +56,11 @@
icon="plus"
>鏂板</a-button>
<!-- :hidden="disabled" -->
- <a-button
+ <!-- <a-button
type="primary"
icon="download"
@click="handleExportXls('鍘熷洜')"
- >瀵煎嚭</a-button>
+ >瀵煎嚭</a-button> -->
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-button style="margin-left: 8px">
鎵归噺鎿嶄綔
--
Gitblit v1.9.3