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 | 200 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 144 insertions(+), 56 deletions(-)
diff --git a/src/views/eam/modules/repairorder/repairOrderExcuteDrawer.vue b/src/views/eam/modules/repairorder/repairOrderExcuteDrawer.vue
index 6dbccfe..783a5d1 100644
--- a/src/views/eam/modules/repairorder/repairOrderExcuteDrawer.vue
+++ b/src/views/eam/modules/repairorder/repairOrderExcuteDrawer.vue
@@ -170,7 +170,10 @@
</a-form-item>
</a-col>
</a-row>
- <a-row :gutter="24">
+ <a-row
+ hidden
+ :gutter="24"
+ >
<a-col :span="6">
<a-form-item
:labelCol="labelCol"
@@ -225,38 +228,38 @@
type="card"
defaultActiveKey="1"
>
- <a-tab-pane
- tab='瀹為檯鐢ㄦ枡'
- key="1"
- class="hightColor"
- >
- <!-- <actual-material-edit-table
- :repairOrderId="repairOrder.id"
- :repairOrderStatus="repairOrder.status"
- ></actual-material-edit-table> -->
- <RepairOrderActualMaterialList :mainId="repairOrder"/>
- </a-tab-pane>
- <a-tab-pane
- tab='瀹為檯宸ユ椂'
- key="2"
- class="hightColor"
- >
- <!-- <actual-work-hours-edit-table
- :repairOrderId="repairOrder.id"
- :repairOrderStatus="repairOrder.status"
- ></actual-work-hours-edit-table> -->
- <RepairOrderActualWorkHoursList :mainId="repairOrder"/>
- </a-tab-pane>
- <a-tab-pane
+ <a-tab-pane
tab='鏁呴殰鍒嗘瀽'
- key="3"
+ key="1"
class="hightColor"
>
<!-- <fault-analysis-edit-table
:repairOrderId="repairOrder.id"
:repairOrderStatus="repairOrder.status"
></fault-analysis-edit-table> -->
- <RepairOrderFaultAnalysisList :mainId="repairOrder"/>
+ <RepairOrderFaultAnalysisList :repairOrderId="repairOrderId" :repairOrder="repairOrder"/>
+ </a-tab-pane>
+ <a-tab-pane
+ tab='瀹為檯宸ユ椂'
+ key="3"
+ class="hightColor"
+ >
+ <RepairOrderActualWorkHoursList
+ :repairOrderId="repairOrder.id"
+ :repairOrderStatus="repairOrder.status"
+ :teamId="repairOrder.teamId"
+ />
+ </a-tab-pane>
+ <a-tab-pane
+ tab='瀹為檯鐢ㄦ枡'
+ key="2"
+ class="hightColor"
+ >
+ <!-- <actual-material-edit-table
+ :repairOrderId="repairOrder.id"
+ :repairOrderStatus="repairOrder.status"
+ ></actual-material-edit-table> -->
+ <RepairOrderActualMaterialList :mainId="repairOrder" />
</a-tab-pane>
</a-tabs>
</a-card>
@@ -281,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',
@@ -302,6 +305,14 @@
type: Object,
required: false,
default: {}
+ },
+ repairOrderId: {
+ type: String,
+ default:'',
+ },
+ status:{
+ type: String,
+ default:'',
}
},
data() {
@@ -332,7 +343,7 @@
mounted() {
this.$bus.$on('closeDrawer', (data) => {
- this.visible = false;
+ this.handleCancel()
})
},
@@ -357,40 +368,117 @@
this.visible = false;
//this.repairOrder.id = "-1"
},
- handleStart(record) {
- putAction(this.url.orderStart, this.repairOrder).then(res => {
- if (res.result) {
- this.$message.success('寮�宸ユ垚鍔�');
- this.repairOrder.status = '3'
- this.$emit('loadData');
- } else {
- this.$message.error('寮�宸ュ嚭鐜板紓甯�')
- }
+ // handleStart(record) {
+ // putAction(this.url.orderStart, this.repairOrder).then(res => {
+ // if (res.result) {
+ // this.$message.success('寮�宸ユ垚鍔�');
+ // this.repairOrder.status = '3'
+ // this.$emit('loadData');
+ // } else {
+ // this.$message.error('寮�宸ュ嚭鐜板紓甯�')
+ // }
+ // })
+ // },
+ //寮�宸�
+ handleStart() {
+ const that = this;
+ that.confirmLoading = true;
+ this.$confirm({
+ title: '缁翠慨宸ュ崟寮�宸�',
+ content: '鎻愮ず锛氬紑宸ュ悗鏃犳硶鎾ゅ洖锛岃璋ㄦ厧鎿嶄綔锛�',
+ okText: '纭',
+ cancelText: '鍙栨秷',
+ onOk() {
+ putAction(that.url.orderStart, that.repairOrder).then(res => {
+ if (res.result) {
+ that.$message.success('寮�宸ユ垚鍔�');
+ that.repairOrder.status = '3'
+ that.$emit('loadData');
+ } else {
+ that.$message.error('寮�宸ュ嚭鐜板紓甯�')
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ // that.close();
+ })
+ },
})
},
+
+ // handleReport() {
+ // putAction(this.url.orderReport, this.repairOrder).then(res => {
+ // if (res.result) {
+ // this.$message.success('鎶ュ伐鎴愬姛');
+ // this.repairOrder.status = '4'
+ // this.$emit('loadData');
+ // } else {
+ // this.$message.error('鎶ュ伐鍑虹幇寮傚父')
+ // }
+ // })
+ // },
+
+ //鎶ュ伐
handleReport() {
- putAction(this.url.orderReport, this.repairOrder).then(res => {
- if (res.result) {
- this.$message.success('鎶ュ伐鎴愬姛');
- this.repairOrder.status = '4'
- this.$emit('loadData');
- } else {
- this.$message.error('鎶ュ伐鍑虹幇寮傚父')
- }
+ const that = this;
+ that.confirmLoading = true;
+ this.$confirm({
+ title: '缁翠慨宸ュ崟鎶ュ伐',
+ content: '鎻愮ず锛氭姤宸ュ悗缁翠慨瀹屽伐锛岃璋ㄦ厧鎿嶄綔锛�',
+ okText: '纭',
+ cancelText: '鍙栨秷',
+ onOk() {
+ putAction(that.url.orderReport, that.repairOrder).then(res => {
+ if (res.result) {
+ that.$message.success('鎶ュ伐鎴愬姛');
+ that.repairOrder.status = '4'
+ that.$emit('loadData');
+ } else {
+ that.$message.error('鎶ュ伐鍑虹幇寮傚父')
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ //
+ })
+ },
})
},
+ // handleRevoke() {
+ // putAction(this.url.orderRevoke, this.repairOrder).then(res => {
+ // if (res.result) {
+ // this.$message.success('鎾ら攢鎴愬姛');
+ // this.repairOrder.status = '3'
+ // this.$emit('loadData');
+ // } else {
+ // this.$message.error('鎾ら攢鍑虹幇寮傚父')
+ // }
+ // })
+ // },
+
+ //鎾ら攢
handleRevoke() {
- putAction(this.url.orderRevoke, this.repairOrder).then(res => {
- if (res.result) {
- this.$message.success('鎾ら攢鎴愬姛');
- this.repairOrder.status = '3'
- this.$emit('loadData');
- } else {
- this.$message.error('鎾ら攢鍑虹幇寮傚父')
- }
+ const that = this;
+ that.confirmLoading = true;
+ this.$confirm({
+ title: '瀹屽伐鎾ら攢',
+ content: '鎻愮ず锛氬畬宸ユ挙閿�鍚庡彲缁х画鎶ュ伐鎿嶄綔锛�',
+ okText: '纭',
+ cancelText: '鍙栨秷',
+ onOk() {
+ putAction(that.url.orderRevoke, that.repairOrder).then(res => {
+ if (res.result) {
+ that.$message.success('鎾ら攢鎴愬姛');
+ that.repairOrder.status = '3'
+ that.$emit('loadData');
+ } else {
+ that.$message.error('鎾ら攢鍑虹幇寮傚父')
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ // that.close();
+ })
+ },
})
},
-
},
}
--
Gitblit v1.9.3