From 6670fda2939518181d60c6254f2bcb37917f0e2f Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期二, 10 六月 2025 14:42:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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 | 8 ++++----
4 files changed, 21 insertions(+), 13 deletions(-)
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..ac9e74a 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>
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>
--
Gitblit v1.9.3