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/RepairOrderFinishedReport.vue | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/views/eam/RepairOrderFinishedReport.vue b/src/views/eam/RepairOrderFinishedReport.vue
index a7eef6d..c6ca35a 100644
--- a/src/views/eam/RepairOrderFinishedReport.vue
+++ b/src/views/eam/RepairOrderFinishedReport.vue
@@ -101,13 +101,13 @@
<a-menu-item
key="2"
@click="handleAddPre(false)"
- ><a-icon type="copy" />鍙傜収淇濅慨鏁呴殰鍗�</a-menu-item>
+ ><a-icon type="copy" />鍙傜収鏁呴殰鎶ヤ慨鍗�</a-menu-item>
</a-menu>
<a-button
type="primary"
icon="plus"
>鏂板</a-button>
- </a-dropdown>
+ </a-dropdown>
<a-button
type="primary"
icon="plus"
@@ -365,6 +365,7 @@
ref='approvalModalForm'
@ok='approvalModalFormOk'
@cancel='approvalModalFormOk'
+ @loadData = "loadData"
></approvel-modal>
</a-card>
</template>
@@ -373,9 +374,9 @@
import { getAction } from '@/api/manage'
import '@/assets/less/TableExpand.less'
import { putAction } from '../../api/manage'
-import RepairOrderModal from './modules/repairorderfinished/RepairOrderFinishedReportModel.vue'
+import RepairOrderModal from './modules/repairorderfinished/RepairOrderFinishedReportModel'
import RepairOrderActualMaterialList from './repairOrderFinishedReport/RepairOrderActualMaterialReport.vue'
-import RepairOrderActualWorkHoursList from './repairOrderFinishedReport/RepairOrderActualHoursReport.vue'
+import RepairOrderActualWorkHoursList from './repairOrderFinishedReport/RepairOrderActualHoursReport'
import RepairOrderFaultAnalysisList from './repairOrderFinishedReport/RepairOrderFaultAnalysisReport.vue'
import RepairOrderDetailList from './repairOrderFinishedReport/RepairOrderDetailReport.vue'
import FaultDescriptionList from './FaultDescriptionList'
@@ -512,7 +513,7 @@
},
{
/*鏂板瀛楁闇�瑕佷慨鏀�*/
- title: '濮斿鍗曚綅',
+ title: '澶栧鍗曚綅',
align: "center",
dataIndex: 'outsourcingUnitName'
},
--
Gitblit v1.9.3