From 3db6d5c4d17ab9942a5c89a167c1f06ca485f355 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 16 七月 2025 21:21:14 +0800
Subject: [PATCH] 二保工单审批调整
---
src/views/flowable/workflow/FlowTodo.vue | 144 ++++++++++++++++++++++++++++--------------------
1 files changed, 84 insertions(+), 60 deletions(-)
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index 7d6937e..0929294 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -80,7 +80,7 @@
<a-table ref='table' :columns='columns' :dataSource='dataSource' :loading='loading' :pagination='ipagination'
:rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
- :scroll='{x:getTableColumnsTotalWidth,y:465}' bordered rowKey='id' size='middle'
+ :scroll="{x:'max-content',y:465}" bordered rowKey='id' size='middle'
@change='handleTableChange'>
<span slot='action' slot-scope='text, record'>
<a @click='handelDetail(record,text)'>鎵ц/瀹℃壒</a>
@@ -91,21 +91,40 @@
<maintenance-standard-approval-modal ref="maintenanceStandardApprovalModal" @modalFormOk="modalFormOk"
:selectShenpiData="selectedRowData"/>
- <inspection-order-handle ref="modalFormInspectionOrder" :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"/>
</a-card>
</template>
<script>
- import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getAction } from '@api/manage'
import MaintenanceStandardApprovalModal from './MaintenanceStandard/MaintenanceStandardApprovalModal'
import InspectionOrderHandle from './InspectionOrder/InspectionOrderHandle'
+ import TechnicalStatusEvaluationApprovalModal
+ from './TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal'
+ import SecondMaintenanceApprovalModal from './secondMaintenance/SecondMaintenanceApprovalModal'
+ import ThirdMaintenanceApprovalModal from './thirdMaintenance/ThirdMaintenanceApprovalModal'
export default {
name: 'NcDeviceCharactersList',
- mixins: [JeecgListMixin, mixinDevice],
- components: { InspectionOrderHandle, MaintenanceStandardApprovalModal },
+ mixins: [JeecgListMixin],
+ components: {
+ ThirdMaintenanceApprovalModal,
+ SecondMaintenanceApprovalModal,
+ TechnicalStatusEvaluationApprovalModal,
+ InspectionOrderHandle,
+ MaintenanceStandardApprovalModal
+ },
data() {
return {
description: '宸ヤ綔娴�-鎴戠殑寰呭姙',
@@ -186,9 +205,6 @@
computed: {
importExcelUrl: function() {
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
- },
- getTableColumnsTotalWidth() {
- return this.columns.reduce((total, item) => total + item.width, 0)
}
},
methods: {
@@ -202,9 +218,6 @@
case 'sbdjApproval':
this.handInspectionOrder(item)
break
- case 'WEEK_MAINTENANCE':
- this.handleWeekMaintenance(item)
- break
case 'eam_repair':
this.handleRepairOrder(item)
break
@@ -214,8 +227,8 @@
case 'third_maintenance':
this.handleThirdMaintenance(item)
break
- case 'toolOutStorageApproval':
- this.handleToolOutStorageApproval(item)
+ case 'TECHNICAL_STATUS_EVALUATION':
+ this.handleTechnicalStatusEvaluation(item)
break
case 'toolsStocktakingBound':
this.handleToolStocktakingApproval(item)
@@ -229,7 +242,7 @@
},
/**
- * 鐐瑰嚮淇濆吇瑙勮寖鍒嗙被娴佺▼璇︽儏鏃惰Е鍙�
+ * 鐐瑰嚮淇濆吇瑙勮寖鍒嗙被娴佺▼鎵ц瀹℃壒鏃惰Е鍙�
* @param record
*/
handleMaintenanceStandard(record) {
@@ -238,6 +251,63 @@
this.$refs.maintenanceStandardApprovalModal.title = '淇濆吇瑙勮寖'
this.$refs.maintenanceStandardApprovalModal.getAllApproveData(record)
this.$refs.maintenanceStandardApprovalModal.getBasicInformation(record)
+ },
+
+ /**
+ * 鐐瑰嚮鎶�鏈姸鎬侀壌瀹氭祦绋嬫墽琛屽鎵规椂瑙﹀彂
+ * @param record
+ */
+ handleTechnicalStatusEvaluation(record) {
+ this.selectedRowData = Object.assign({}, record)
+ this.$refs.technicalStatusApprovalModal.title = record.name
+ this.$refs.technicalStatusApprovalModal.handleDetail(record)
+ },
+
+ /**
+ * 鐐瑰嚮浜屼繚娴佺▼鎵ц瀹℃壒鏃惰Е鍙�
+ * @param record
+ */
+ handleSecondMaintenance(record) {
+ this.selectedRowData = Object.assign({}, record)
+ this.$refs.secondMaintenanceApprovalModal.visible = true
+ this.$refs.secondMaintenanceApprovalModal.title = record.name
+ this.$refs.secondMaintenanceApprovalModal.handleDetail(record)
+ },
+
+ /**
+ * 鐐瑰嚮鐐规宸ュ崟娴佺▼鎵ц瀹℃壒鏃惰Е鍙�
+ * @param record
+ */
+ handInspectionOrder(record) {
+ console.log('record----->', record)
+ 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)
+ },
+
+ /**
+ * 鐐瑰嚮涓変繚宸ュ崟娴佺▼鎵ц瀹℃壒鏃惰Е鍙�
+ * @param record
+ */
+ handleThirdMaintenance(record) {
+ this.selectedRowData = Object.assign({}, record)
+ this.$refs.thirdMaintenanceApprovalModal.visible = true
+ this.$refs.thirdMaintenanceApprovalModal.handleDetail(record)
+ this.$refs.thirdMaintenanceApprovalModal.title = record.name
+ },
+
+ /**
+ * 鐐瑰嚮璁惧缁翠慨鍒嗙被娴佺▼鎵ц瀹℃壒鏃惰Е鍙�
+ * @param record
+ */
+ handleRepairOrder(record) {
+ this.selectRepairOrderData = Object.assign({}, record)
+ this.$refs.repairOrderApprovalModal.visible = true
+ this.$refs.repairOrderApprovalModal.title = record.name
+ this.$refs.repairOrderApprovalModal.getAllApproveData(record)
+ this.$refs.repairOrderApprovalModal.getBasicInformation(record)
},
batchHandle() {
@@ -274,52 +344,6 @@
let parts = title.split('锛�') // 娉ㄦ剰鍐掑彿鏄叏瑙掑瓧绗︼紝浣跨敤瀵瑰簲鐨勫瓧杩涜鍒嗗壊
let result = parts[0]
return result
- },
-
- handInspectionOrder(record) {
- console.log('record----->', record)
- this.selectInspectionOrderData = Object.assign({}, record)
- this.$refs.modalFormInspectionOrder.visible = true
- this.$refs.modalFormInspectionOrder.title = record.name
- this.$refs.modalFormInspectionOrder.getAllApproveData(record)
- this.$refs.modalFormInspectionOrder.getBasicInformation(record)
- },
-
- handleWeekMaintenance(item) {
- if (item && item.dataId) {
- this.selectWeekMaintenanceData = Object.assign({}, item)
- this.$refs.weekMaintenanceApprovalModal.handleDetail(item)
- this.$refs.weekMaintenanceApprovalModal.title = item.name
- this.$refs.weekMaintenanceApprovalModal.disableSubmit = false
- }
- },
-
- /**
- * 鐐瑰嚮璁惧缁翠慨鍒嗙被娴佺▼璇︽儏鏃惰Е鍙�
- * @param record
- */
- handleRepairOrder(record) {
- this.selectRepairOrderData = Object.assign({}, record)
- this.$refs.repairOrderApprovalModal.visible = true
- this.$refs.repairOrderApprovalModal.title = record.name
- this.$refs.repairOrderApprovalModal.getAllApproveData(record)
- this.$refs.repairOrderApprovalModal.getBasicInformation(record)
- },
- handleSecondMaintenance(item) {
- if (item && item.dataId) {
- this.selectSecondMaintenanceData = Object.assign({}, item)
- this.$refs.secondMaintenanceApprovalModal.handleDetail(item)
- this.$refs.secondMaintenanceApprovalModal.title = item.name
- this.$refs.secondMaintenanceApprovalModal.disableSubmit = false
- }
- },
- handleThirdMaintenance(item) {
- if (item && item.dataId) {
- this.selectThirdMaintenanceData = Object.assign({}, item)
- this.$refs.thirdMaintenanceApprovalModal.handleDetail(item)
- this.$refs.thirdMaintenanceApprovalModal.title = item.name
- this.$refs.thirdMaintenanceApprovalModal.disableSubmit = false
- }
}
}
}
--
Gitblit v1.9.3