From 9be2e2f91332ed341406acf9739d8912dddbf6fe Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期二, 22 七月 2025 20:43:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/flowable/workflow/FlowTodo.vue | 103 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 83 insertions(+), 20 deletions(-)
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index e42673d..9215f12 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -78,20 +78,43 @@
</a-table>
</div>
+ <!--淇濆吇瑙勮寖-->
<maintenance-standard-approval-modal ref="maintenanceStandardApprovalModal" @modalFormOk="modalFormOk"
:selectShenpiData="selectedRowData"/>
+ <!--鐐规-->
<inspection-order-handle ref="inspectionOrderHandle" :selectShenpiData="selectedRowData"
@modalFormOk="modalFormOk"/>
+ <!--鎶�鏈壌瀹氬伐鍗�-->
<technical-status-evaluation-approval-modal ref="technicalStatusApprovalModal" :selectShenpiData="selectedRowData"
@modalFormOk="modalFormOk"/>
+ <!--浜屼繚宸ュ崟-->
<second-maintenance-approval-modal ref="secondMaintenanceApprovalModal" :selectShenpiData="selectedRowData"
@modalFormOk="modalFormOk"/>
+ <!--涓変繚宸ュ崟-->
<third-maintenance-approval-modal ref="thirdMaintenanceApprovalModal" :selectShenpiData="selectedRowData"
@modalFormOk="modalFormOk"/>
+
+ <!--鎶�鏈壌瀹氬伐鍗曞彉鏇�-->
+ <technical-status-evaluation-order-change-approval-modal ref="evaluationOrderChangeApprovalModal"
+ :selectShenpiData="selectedRowData"
+ @modalFormOk="modalFormOk"/>
+
+ <!--缁翠慨宸ュ崟-->
+ <repair-order-approval-modal ref="repairOrderApprovalModal" :selectShenpiData="selectedRowData"
+ @modalFormOk="modalFormOk"/>
+
+ <!--鎶�鏈姸鎬佸彉鏇�-->
+ <technical-status-change-approval-modal ref="technicalStatusChangeApprovalModal" :selectShenpiData="selectedRowData"
+ @modalFormOk="modalFormOk"/>
+
+ <!--鎶�鏈姸鎬侀壌瀹氱敵璇�-->
+ <technical-status-evaluation-application-approval-modal ref="technicalStatusEvaluationApplicationApprovalModal"
+ :selectShenpiData="selectedRowData"
+ @modalFormOk="modalFormOk"/>
</a-card>
</template>
@@ -104,11 +127,21 @@
from './TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal'
import SecondMaintenanceApprovalModal from './secondMaintenance/SecondMaintenanceApprovalModal'
import ThirdMaintenanceApprovalModal from './thirdMaintenance/ThirdMaintenanceApprovalModal'
+ import TechnicalStatusEvaluationOrderChangeApprovalModal
+ from './TechnicalStatusEvaluation/TechnicalStatusEvaluationOrderChangeApprovalModal'
+ import RepairOrderApprovalModal from './repairOrder/RepairOrderApprovalModal'
+ import TechnicalStatusChangeApprovalModal from './TechnicalStatus/TechnicalStatusChangeApprovalModal'
+ import TechnicalStatusEvaluationApplicationApprovalModal
+ from './TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal'
export default {
name: 'FlowTodo',
mixins: [JeecgListMixin],
components: {
+ TechnicalStatusEvaluationApplicationApprovalModal,
+ TechnicalStatusChangeApprovalModal,
+ RepairOrderApprovalModal,
+ TechnicalStatusEvaluationOrderChangeApprovalModal,
ThirdMaintenanceApprovalModal,
SecondMaintenanceApprovalModal,
TechnicalStatusEvaluationApprovalModal,
@@ -192,33 +225,36 @@
}
},
methods: {
- handelDetail(item, index) {
- let processType = this.splitProcessType(item.category)
+ handelDetail(record) {
+ let processType = this.splitProcessType(record.category)
console.log('processType', processType)
switch (processType) {
case 'maintenance_standard':
- this.handleMaintenanceStandard(item)
+ this.handleMaintenanceStandard(record)
break
case 'sbdjApproval':
- this.handInspectionOrder(item)
- break
- case 'eam_repair':
- this.handleRepairOrder(item)
+ this.handInspectionOrder(record)
break
case 'second_maintenance':
- this.handleSecondMaintenance(item)
+ this.handleSecondMaintenance(record)
break
case 'third_maintenance':
- this.handleThirdMaintenance(item)
+ this.handleThirdMaintenance(record)
break
case 'TECHNICAL_STATUS_EVALUATION':
- this.handleTechnicalStatusEvaluation(item)
+ this.handleTechnicalStatusEvaluation(record)
break
- case 'toolsStocktakingBound':
- this.handleToolStocktakingApproval(item)
+ case 'EVALUATION_ORDER_CHANGE_PROCESS':
+ this.handleEvaluationOrderChange(record)
break
- case 'toolsLossApproval':
- this.handleToolLossApproval(item)
+ case 'eam_repair_order':
+ this.handleRepairOrder(record)
+ break
+ case 'TECHNICAL_STATUS_CHANGE_PROCESS':
+ this.handleTechnicalStatusChange(record)
+ break
+ case 'TECHNICAL_STATUS_EVALUATION_APPLY_PROCESS':
+ this.handleTechnicalStatusEvaluationApply(record)
break
default:
alert('娌℃壘鍒拌娴佺▼')
@@ -248,6 +284,13 @@
this.$refs.technicalStatusApprovalModal.handleDetail(record)
},
+ handleEvaluationOrderChange(record) {
+ this.selectedRowData = Object.assign({}, record)
+ this.$refs.evaluationOrderChangeApprovalModal.visible = true
+ this.$refs.evaluationOrderChangeApprovalModal.title = record.name
+ this.$refs.evaluationOrderChangeApprovalModal.handleApprove(record)
+ },
+
/**
* 鐐瑰嚮浜屼繚娴佺▼鎵ц瀹℃壒鏃惰Е鍙�
* @param record
@@ -267,8 +310,7 @@
this.selectedRowData = Object.assign({}, record)
this.$refs.inspectionOrderHandle.visible = true
this.$refs.inspectionOrderHandle.title = record.name
- this.$refs.inspectionOrderHandle.getAllApproveData(record)
- this.$refs.inspectionOrderHandle.getBasicInformation(record)
+ this.$refs.inspectionOrderHandle.handleApprove(record)
},
/**
@@ -278,8 +320,8 @@
handleThirdMaintenance(record) {
this.selectedRowData = Object.assign({}, record)
this.$refs.thirdMaintenanceApprovalModal.visible = true
- this.$refs.thirdMaintenanceApprovalModal.handleDetail(record)
this.$refs.thirdMaintenanceApprovalModal.title = record.name
+ this.$refs.thirdMaintenanceApprovalModal.handleDetail(record)
},
/**
@@ -287,11 +329,32 @@
* @param record
*/
handleRepairOrder(record) {
- this.selectRepairOrderData = Object.assign({}, record)
+ this.selectedRowData = Object.assign({}, record)
this.$refs.repairOrderApprovalModal.visible = true
this.$refs.repairOrderApprovalModal.title = record.name
- this.$refs.repairOrderApprovalModal.getAllApproveData(record)
- this.$refs.repairOrderApprovalModal.getBasicInformation(record)
+ this.$refs.repairOrderApprovalModal.handleDetail(record)
+ },
+
+ /**
+ * 鐐瑰嚮鎶�鏈姸鎬佸彉鏇村垎绫绘祦绋嬪鎵规椂瑙﹀彂
+ * @param record
+ */
+ handleTechnicalStatusChange(record) {
+ this.selectedRowData = Object.assign({}, record)
+ this.$refs.technicalStatusChangeApprovalModal.visible = true
+ this.$refs.technicalStatusChangeApprovalModal.title = record.name
+ this.$refs.technicalStatusChangeApprovalModal.handleApprove(record)
+ },
+
+ /**
+ * 鐐瑰嚮鎶�鏈姸鎬侀壌瀹氱敵璇峰垎绫绘祦绋嬪鎵规椂瑙﹀彂
+ * @param record
+ */
+ handleTechnicalStatusEvaluationApply(record) {
+ this.selectedRowData = Object.assign({}, record)
+ this.$refs.technicalStatusEvaluationApplicationApprovalModal.visible = true
+ this.$refs.technicalStatusEvaluationApplicationApprovalModal.title = record.name
+ this.$refs.technicalStatusEvaluationApplicationApprovalModal.handleApprove(record)
},
batchHandle() {
--
Gitblit v1.9.3