From 3a8223b71d18205d40b894fd0b4c0fa1ca773e86 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 13 十一月 2023 10:44:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdc-test' into mdc-test
---
src/views/eam/modules/repairorder/repairOrderExcuteDrawer.vue | 36 ++++++++++++++++++++++--------------
1 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/src/views/eam/modules/repairorder/repairOrderExcuteDrawer.vue b/src/views/eam/modules/repairorder/repairOrderExcuteDrawer.vue
index 9a89f7c..783a5d1 100644
--- a/src/views/eam/modules/repairorder/repairOrderExcuteDrawer.vue
+++ b/src/views/eam/modules/repairorder/repairOrderExcuteDrawer.vue
@@ -228,20 +228,20 @@
type="card"
defaultActiveKey="1"
>
- <a-tab-pane
- tab='瀹為檯鐢ㄦ枡'
+ <a-tab-pane
+ tab='鏁呴殰鍒嗘瀽'
key="1"
class="hightColor"
>
- <!-- <actual-material-edit-table
+ <!-- <fault-analysis-edit-table
:repairOrderId="repairOrder.id"
:repairOrderStatus="repairOrder.status"
- ></actual-material-edit-table> -->
- <RepairOrderActualMaterialList :mainId="repairOrder" />
+ ></fault-analysis-edit-table> -->
+ <RepairOrderFaultAnalysisList :repairOrderId="repairOrderId" :repairOrder="repairOrder"/>
</a-tab-pane>
<a-tab-pane
tab='瀹為檯宸ユ椂'
- key="2"
+ key="3"
class="hightColor"
>
<RepairOrderActualWorkHoursList
@@ -251,15 +251,15 @@
/>
</a-tab-pane>
<a-tab-pane
- tab='鏁呴殰鍒嗘瀽'
- key="3"
+ tab='瀹為檯鐢ㄦ枡'
+ key="2"
class="hightColor"
>
- <!-- <fault-analysis-edit-table
+ <!-- <actual-material-edit-table
:repairOrderId="repairOrder.id"
:repairOrderStatus="repairOrder.status"
- ></fault-analysis-edit-table> -->
- <RepairOrderFaultAnalysisList :mainId="repairOrder" />
+ ></actual-material-edit-table> -->
+ <RepairOrderActualMaterialList :mainId="repairOrder" />
</a-tab-pane>
</a-tabs>
</a-card>
@@ -284,9 +284,9 @@
import Tooltip from 'ant-design-vue/es/tooltip'
import ActualMaterialEditTable from './moudles/ActualMaterialEditTable.vue'
import ActualWorkHoursEditTable from './moudles/ActualWorkHoursEditTable.vue'
-import FaultAnalysisEditTable from './moudles/FaultAnalysisEditTable.vue'
-import RepairOrderActualMaterialList from './moudles/RepairOrderActualMaterialReport.vue'
-import RepairOrderActualWorkHoursList from './moudles/RepairOrderActualHoursReport.vue'
+import FaultAnalysisEditTable from './moudles/FaultAnalysisEditTable'
+import RepairOrderActualMaterialList from './moudles/RepairOrderActualMaterialReport'
+import RepairOrderActualWorkHoursList from './moudles/RepairOrderActualHoursReport'
import RepairOrderFaultAnalysisList from './moudles/RepairOrderFaultAnalysisReport.vue'
export default {
name: 'RepairOrderExcuteDrawer',
@@ -305,6 +305,14 @@
type: Object,
required: false,
default: {}
+ },
+ repairOrderId: {
+ type: String,
+ default:'',
+ },
+ status:{
+ type: String,
+ default:'',
}
},
data() {
--
Gitblit v1.9.3