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/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/inspectionProject/InspectionProjectRight.vue | 4 +-
src/views/eam/modules/maintenanceCycle/MaintenanceCycleForm.vue | 10 ++++
src/views/eam/modules/dailyInspectionOrder/DailyInspectionStandardList.vue | 12 +++---
src/views/eam/modules/dailyInspectionStandard/JSelectDailylnspectionStandardModal.vue | 21 ++++++----
src/views/eam/modules/maintenanceProject/MaintenanceProjectRight.vue | 8 ++--
11 files changed, 89 insertions(+), 31 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/modules/dailyInspectionOrder/DailyInspectionStandardList.vue b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionStandardList.vue
index c013607..f87c9a1 100644
--- a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionStandardList.vue
+++ b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionStandardList.vue
@@ -22,10 +22,10 @@
:sm="8"
>
<a-form-item label="鏍囧噯缂栫爜">
- <j-input
+ <a-input
placeholder="璇疯緭鍏ユ爣鍑嗙紪鐮佹绱�"
v-model="queryParam.num"
- ></j-input>
+ ></a-input>
</a-form-item>
</a-col>
<a-col
@@ -33,10 +33,10 @@
:sm="8"
>
<a-form-item label="璁惧缂栧彿">
- <j-input
+ <a-input
placeholder="璇疯緭鍏ユ爣鍑嗙紪鍙锋绱�"
v-model="queryParam.equipmentNum"
- ></j-input>
+ ></a-input>
</a-form-item>
</a-col>
@@ -45,10 +45,10 @@
:sm="8"
>
<a-form-item label="璁惧鍚嶇О">
- <j-input
+ <a-input
placeholder="璇疯緭鍏ヨ澶囧悕绉版绱�"
v-model="queryParam.equipmentName"
- ></j-input>
+ ></a-input>
</a-form-item>
</a-col>
<a-col
diff --git a/src/views/eam/modules/dailyInspectionStandard/JSelectDailylnspectionStandardModal.vue b/src/views/eam/modules/dailyInspectionStandard/JSelectDailylnspectionStandardModal.vue
index f20be29..17597c8 100644
--- a/src/views/eam/modules/dailyInspectionStandard/JSelectDailylnspectionStandardModal.vue
+++ b/src/views/eam/modules/dailyInspectionStandard/JSelectDailylnspectionStandardModal.vue
@@ -21,10 +21,10 @@
:md='8'
:sm='6'
>
- <a-form-item label='鐐规椤圭洰鍚嶇О'>
- <a-input
- placeholder='璇疯緭鍏ョ偣妫�椤圭洰鍚嶇О'
- v-model='queryParam.num'
+ <a-form-item label='鐐规椤圭洰'>
+ <j-input
+ placeholder='璇疯緭鍏ョ偣妫�椤圭洰'
+ v-model='queryParam.name'
/>
</a-form-item>
</a-col>
@@ -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/inspectionProject/InspectionProjectRight.vue b/src/views/eam/modules/inspectionProject/InspectionProjectRight.vue
index 3eb4992..a4af459 100644
--- a/src/views/eam/modules/inspectionProject/InspectionProjectRight.vue
+++ b/src/views/eam/modules/inspectionProject/InspectionProjectRight.vue
@@ -56,7 +56,7 @@
icon="plus"
>鏂板</a-button>
<!-- :hidden="disabled" -->
- <a-upload
+ <!-- <a-upload
name="file"
:showUploadList="false"
:multiple="false"
@@ -73,7 +73,7 @@
type="primary"
icon="download"
@click="handleExportXls('鍘熷洜')"
- >瀵煎嚭</a-button>
+ >瀵煎嚭</a-button> -->
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-button style="margin-left: 8px">
鎵归噺鎿嶄綔
diff --git a/src/views/eam/modules/maintenanceCycle/MaintenanceCycleForm.vue b/src/views/eam/modules/maintenanceCycle/MaintenanceCycleForm.vue
index b50f3ca..86d05b5 100644
--- a/src/views/eam/modules/maintenanceCycle/MaintenanceCycleForm.vue
+++ b/src/views/eam/modules/maintenanceCycle/MaintenanceCycleForm.vue
@@ -207,13 +207,21 @@
:wrapperCol="wrapperCol"
prop="maintenanceType"
>
- <j-dict-select-tag
+ <!-- <j-dict-select-tag
allow-clear
:disabled="disableSubmit"
:placeholder="disableSubmit?'':'璇烽�変繚鍏荤被鍨�'"
:triggerChange="true"
dictCode="maintenance_type"
v-model="model.maintenanceType"
+
+ /> -->
+
+ <j-dict-select-tag
+ placeholder="璇烽�変繚鍏荤被鍨�"
+ :triggerChange="true"
+ dictCode="maintenance_type"
+ v-model="model.maintenanceType"
/>
</a-form-item>
</a-col>
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