From 09cdacb5994bc840723b4292fb863d947f5d58c8 Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期二, 27 五月 2025 17:38:53 +0800
Subject: [PATCH] 设备报废功能增加
---
src/views/flowable/workflow/FlowTodo.vue | 192 +++++++++++++++++++++++++----------------------
1 files changed, 103 insertions(+), 89 deletions(-)
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index 9d49b55..af6ba4b 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -4,15 +4,15 @@
Date: 2025-02-27
-->
<template>
- <a-card :bordered="false">
+ <a-card :bordered='false'>
<!-- 鏌ヨ鍖哄煙 -->
- <div class="table-page-search-wrapper">
- <a-form layout="inline" @keyup.enter.native="searchQuery">
- <a-row :gutter="24">
- <a-col :xl="4" :lg="6" :md="8" :sm="24">
- <a-form-item label="娴佺▼鍒嗙被">
- <j-dict-select-tag placeholder="璇烽�夋嫨娴佺▼鍒嗙被" v-model="queryParam.category"
- dictCode="flow_type"></j-dict-select-tag>
+ <div class='table-page-search-wrapper'>
+ <a-form layout='inline' @keyup.enter.native='searchQuery'>
+ <a-row :gutter='24'>
+ <a-col :lg='6' :md='8' :sm='24' :xl='4'>
+ <a-form-item label='娴佺▼鍒嗙被'>
+ <j-dict-select-tag v-model='queryParam.category' dictCode='flow_type'
+ placeholder='璇烽�夋嫨娴佺▼鍒嗙被'></j-dict-select-tag>
</a-form-item>
</a-col>
<!--<a-col :xl="4" :lg="6" :md="8" :sm="24">-->
@@ -20,35 +20,35 @@
<!--<a-input placeholder="璇疯緭鍏ユ祦绋嬪悕绉�" v-model="queryParam.flowName"></a-input>-->
<!--</a-form-item>-->
<!--</a-col>-->
- <a-col :xl="4" :lg="6" :md="8" :sm="24">
- <a-form-item label="褰撳墠鑺傜偣">
- <a-input placeholder="璇疯緭鍏ュ綋鍓嶈妭鐐圭簿纭煡璇�" v-model="queryParam.name"></a-input>
+ <a-col :lg='6' :md='8' :sm='24' :xl='4'>
+ <a-form-item label='褰撳墠鑺傜偣'>
+ <a-input v-model='queryParam.name' placeholder='璇疯緭鍏ュ綋鍓嶈妭鐐圭簿纭煡璇�'></a-input>
</a-form-item>
</a-col>
- <a-col :xl="4" :lg="6" :md="8" :sm="24">
- <a-form-item label="绠�瑕佹弿杩�">
- <a-input placeholder="璇疯緭鍏ョ畝瑕佹弿杩�" v-model="queryParam.title"></a-input>
+ <a-col :lg='6' :md='8' :sm='24' :xl='4'>
+ <a-form-item label='绠�瑕佹弿杩�'>
+ <a-input v-model='queryParam.title' placeholder='璇疯緭鍏ョ畝瑕佹弿杩�'></a-input>
</a-form-item>
</a-col>
- <template v-if="toggleSearchStatus">
- <a-col :xl="8" :lg="8" :md="12" :sm="24">
- <a-form-item label="浠诲姟鏃堕棿鑼冨洿">
- <j-date :show-time="false" date-format="YYYY-MM-DD HH:mm:ss" placeholder="璇烽�夋嫨寮�濮嬫椂闂�"
- class="query-group-cust"
- v-model="queryParam.startTime"></j-date>
- <span class="query-group-split-cust"></span>
- <j-date :show-time="false" date-format="YYYY-MM-DD HH:mm:ss" placeholder="璇烽�夋嫨缁撴潫鏃堕棿"
- class="query-group-cust"
- v-model="queryParam.endTime"></j-date>
+ <template v-if='toggleSearchStatus'>
+ <a-col :lg='8' :md='12' :sm='24' :xl='8'>
+ <a-form-item label='浠诲姟鏃堕棿鑼冨洿'>
+ <j-date v-model='queryParam.startTime' :show-time='false' class='query-group-cust'
+ date-format='YYYY-MM-DD HH:mm:ss'
+ placeholder='璇烽�夋嫨寮�濮嬫椂闂�'></j-date>
+ <span class='query-group-split-cust'></span>
+ <j-date v-model='queryParam.endTime' :show-time='false' class='query-group-cust'
+ date-format='YYYY-MM-DD HH:mm:ss'
+ placeholder='璇烽�夋嫨缁撴潫鏃堕棿'></j-date>
</a-form-item>
</a-col>
</template>
- <a-col :xl="4" :lg="6" :md="8" :sm="24">
- <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
- <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
- <a-button @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
- <a @click="handleToggleSearch" style="margin-left: 8px">
+ <a-col :lg='6' :md='8' :sm='24' :xl='4'>
+ <span class='table-page-search-submitButtons' style='float: left;overflow: hidden;'>
+ <a-button icon='search' type='primary' @click='searchQuery'>鏌ヨ</a-button>
+ <a-button icon='reload' style='margin-left: 8px' @click='searchReset'>閲嶇疆</a-button>
+ <a style='margin-left: 8px' @click='handleToggleSearch'>
{{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
</a>
@@ -60,85 +60,87 @@
<!-- 鏌ヨ鍖哄煙-END -->
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
- <div class="table-operator">
- <a-dropdown v-if="selectedRowKeys.length > 0 ">
- <a-menu slot="overlay">
- <a-menu-item key="1" @click="batchHandle">
- <a-icon type="delete" />
+ <div class='table-operator'>
+ <a-dropdown v-if='selectedRowKeys.length > 0 '>
+ <a-menu slot='overlay'>
+ <a-menu-item key='1' @click='batchHandle'>
+ <a-icon type='delete' />
鎵归噺澶勭悊
</a-menu-item>
</a-menu>
- <a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔
- <a-icon type="down" />
+ <a-button style='margin-left: 8px'> 鎵归噺鎿嶄綔
+ <a-icon type='down' />
</a-button>
</a-dropdown>
</div>
<!-- table鍖哄煙-begin -->
<div>
- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
- <i class="anticon anticon-info-circle ant-alert-icon"></i>宸查�夋嫨 <a style="font-weight: 600">{{
+ <div class='ant-alert ant-alert-info' style='margin-bottom: 16px;'>
+ <i class='anticon anticon-info-circle ant-alert-icon'></i>宸查�夋嫨 <a style='font-weight: 600'>{{
selectedRowKeys.length }}</a>椤�
- <a style="margin-left: 24px" @click="onClearSelected">娓呯┖</a>
+ <a style='margin-left: 24px' @click='onClearSelected'>娓呯┖</a>
</div>
<a-table
- ref="table"
+ ref='table'
+ :columns='columns'
+ :dataSource='dataSource'
+ :loading='loading'
+ :pagination='ipagination'
+ :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
+ :scroll='{x:getTableColumnsTotalWidth,y:465}'
bordered
- size="middle"
- rowKey="id"
- :scroll="{x:getTableColumnsTotalWidth,y:465}"
- :columns="columns"
- :dataSource="dataSource"
- :pagination="ipagination"
- :loading="loading"
- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
- @change="handleTableChange">
+ rowKey='id'
+ size='middle'
+ @change='handleTableChange'>
- <span slot="action" slot-scope="text, record">
- <a @click="handelDetail(record,text)">鎵ц/瀹℃壒</a>
+ <span slot='action' slot-scope='text, record'>
+ <a @click='handelDetail(record,text)'>鎵ц/瀹℃壒</a>
</span>
</a-table>
</div>
- <AssignFileStreamHandle ref="modalFormApproval" :selectShenpiData="selectShenpiData"
- @searchReset="searchReset"></AssignFileStreamHandle>
- <DispatchFileHandle ref="modalFormDispatchFileXq" :selectShenpiData="selectDispatchFileXqData"
- @searchReset="searchReset"></DispatchFileHandle>
- <DispatchFileBachHandleStyle ref="modalFormDispatchFileBatch" @searchReset="searchReset"
- @ok="modalFormOk"></DispatchFileBachHandleStyle>
+ <AssignFileStreamHandle ref='modalFormApproval' :selectShenpiData='selectShenpiData'
+ @searchReset='searchReset'></AssignFileStreamHandle>
+ <DispatchFileHandle ref='modalFormDispatchFileXq' :selectShenpiData='selectDispatchFileXqData'
+ @searchReset='searchReset'></DispatchFileHandle>
+ <DispatchFileBachHandleStyle ref='modalFormDispatchFileBatch' @ok='modalFormOk'
+ @searchReset='searchReset'></DispatchFileBachHandleStyle>
<!--鍗曚釜娴佺▼澶勭悊-->
- <InspectionOrderHandle ref="modalFormInspectionOrder" :selectShenpiData="selectInspectionOrderData"
- @searchReset="searchReset"></InspectionOrderHandle>
- <week-maintenance-approval-modal ref="weekMaintenanceApprovalModal" :selectShenpiData="selectWeekMaintenanceData"
- @searchReset="searchReset"></week-maintenance-approval-modal>
- <repair-order-approval-modal ref="repairOrderApprovalModal" @searchReset="searchReset"
- :selectShenpiData="selectRepairOrderData"></repair-order-approval-modal>
- <out-bound-order-handle ref="outBoundOrderHandle" :selectShenpiData="selectOutBoundOrderData"
- @searchReset="searchReset"></out-bound-order-handle>
- <stocktaking-bound-handle ref="stocktakingBoundHandle" :selectShenpiData="selectStocktakingBoundOrderData" @searchReset="searchReset"></stocktaking-bound-handle>
+ <InspectionOrderHandle ref='modalFormInspectionOrder' :selectShenpiData='selectInspectionOrderData'
+ @searchReset='searchReset'></InspectionOrderHandle>
+ <week-maintenance-approval-modal ref='weekMaintenanceApprovalModal' :selectShenpiData='selectWeekMaintenanceData'
+ @searchReset='searchReset'></week-maintenance-approval-modal>
+ <repair-order-approval-modal ref='repairOrderApprovalModal' :selectShenpiData='selectRepairOrderData'
+ @searchReset='searchReset'></repair-order-approval-modal>
+ <out-bound-order-handle ref='outBoundOrderHandle' :selectShenpiData='selectOutBoundOrderData'
+ @searchReset='searchReset'></out-bound-order-handle>
+ <stocktaking-bound-handle ref='stocktakingBoundHandle' :selectShenpiData='selectStocktakingBoundOrderData'
+ @searchReset='searchReset'></stocktaking-bound-handle>
- <loss-bound-handle ref="lossBoundHandle" :selectShenpiData="selectLossBoundOrderData"
- @searchReset="searchReset"></loss-bound-handle>
+ <loss-bound-handle ref='lossBoundHandle' :selectShenpiData='selectLossBoundOrderData'
+ @searchReset='searchReset'></loss-bound-handle>
<!--鎵归噺澶勭悊-->
- <inspection-order-batch-handle ref="inspectionOrderBatchHandleRef" @searchReset="searchReset"
- :taskList="selectionRows" />
+ <inspection-order-batch-handle ref='inspectionOrderBatchHandleRef' :taskList='selectionRows'
+ @searchReset='searchReset' />
- <week-maintenance-batch-approval-modal ref="weenMaintenanceBatchApprovalModalRef" @searchReset="searchReset"
- :taskList="selectionRows" />
- <equipment-lean-out-approval-modal ref="equipmentLeanOutApprovalModelRef" @searchReset="searchReset" />
+ <week-maintenance-batch-approval-modal ref='weenMaintenanceBatchApprovalModalRef' :taskList='selectionRows'
+ @searchReset='searchReset' />
+ <equipment-lean-out-approval-modal ref='equipmentLeanOutApprovalModelRef' @searchReset='searchReset' />
- <second-maintenance-approval-modal ref="secondMaintenanceApprovalModal"
- :selectShenpiData="selectSecondMaintenanceData"
- @searchReset="searchReset"></second-maintenance-approval-modal>
- <third-maintenance-approval-modal ref="thirdMaintenanceApprovalModal" :selectShenpiData="selectThirdMaintenanceData"
- @searchReset="searchReset"></third-maintenance-approval-modal>
- <equipment-seal-up-approval-modal ref="equipmentSealUpApprovalModelRef" @searchReset="searchReset" />
- <inbound-order-handle ref="inboundOrderApprovalModal" :selectInboundOrderData="selectInboundOrderData"
- @searchReset="searchReset"></inbound-order-handle>
- <equipment-transfer-approval-modal ref="equipmentTransferApprovalModelRef" @searchReset="searchReset" />
+ <second-maintenance-approval-modal ref='secondMaintenanceApprovalModal'
+ :selectShenpiData='selectSecondMaintenanceData'
+ @searchReset='searchReset'></second-maintenance-approval-modal>
+ <third-maintenance-approval-modal ref='thirdMaintenanceApprovalModal' :selectShenpiData='selectThirdMaintenanceData'
+ @searchReset='searchReset'></third-maintenance-approval-modal>
+ <equipment-seal-up-approval-modal ref='equipmentSealUpApprovalModelRef' @searchReset='searchReset' />
+ <inbound-order-handle ref='inboundOrderApprovalModal' :selectInboundOrderData='selectInboundOrderData'
+ @searchReset='searchReset'></inbound-order-handle>
+ <equipment-transfer-approval-modal ref='equipmentTransferApprovalModelRef' @searchReset='searchReset' />
+ <equipment-scrap-approval-modal ref='equipmentScrapApprovalModelRef' @searchReset='searchReset' />
</a-card>
</template>
@@ -160,10 +162,12 @@
import DispatchFileBachHandleStyle from '@views/flowable/workflow/dispatchFile/DispatchFileBachHandleStyle#Drawer.vue'
import OutBoundOrderHandle from '@views/flowable/workflow/outBoundOrder/OutBoundOrderHandle.vue'
import EquipmentLeanOutApprovalModal from '@views/flowable/workflow/leanOut/EquipmentLeanOutApprovalModal.vue'
-import SecondMaintenanceApprovalModal from '@views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue'
+import SecondMaintenanceApprovalModal
+ from '@views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue'
import ThirdMaintenanceApprovalModal from '@views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue'
import EquipmentSealUpApprovalModal from '@views/flowable/workflow/sealUp/EquipmentSealUpApprovalModal.vue'
import EquipmentTransferApprovalModal from '@views/flowable/workflow/transfer/EquipmentTransferApprovalModal.vue'
+import EquipmentScrapApprovalModal from '@views/flowable/workflow/scrap/EquipmentScrapApprovalModal.vue'
import stocktakingBoundHandle from '@views/flowable/workflow/stocktakingBound/stocktakingBoundHandle.vue'
import lossBoundHandle from '@views/flowable/workflow/lossBound/lossBoundHandle.vue'
import InboundOrderHandle from '@views/flowable/workflow/inboundOrder/InboundOrderHandle.vue'
@@ -189,7 +193,8 @@
OutBoundOrderHandle,
EquipmentSealUpApprovalModal,
InboundOrderHandle,
- EquipmentTransferApprovalModal
+ EquipmentTransferApprovalModal,
+ EquipmentScrapApprovalModal
},
data() {
return {
@@ -274,7 +279,7 @@
selectOutBoundOrderData: {},
selectLossBoundOrderData: {},
selectStocktakingBoundOrderData: {},
- selectInboundOrderData:{},
+ selectInboundOrderData: {},
//涓氬姟淇℃伅ID
dataId: undefined
}
@@ -372,6 +377,9 @@
break
case 'equipment_transfer':
this.handleEquipmentTransfer(item)
+ break
+ case 'equipment_scrap':
+ this.handleEquipmentScrap(item)
break
default:
alert('娌℃壘鍒拌娴佺▼')
@@ -511,10 +519,10 @@
},
handleToolInStorage(item) {
if (item && item.dataId) {
- this.selectInboundOrderData = Object.assign({}, item)
- this.$refs.inboundOrderApprovalModal.auditVisible = true
- this.$refs.inboundOrderApprovalModal.clearTableSource()
- this.$refs.inboundOrderApprovalModal.getAllApproveData(item)
+ this.selectInboundOrderData = Object.assign({}, item)
+ this.$refs.inboundOrderApprovalModal.auditVisible = true
+ this.$refs.inboundOrderApprovalModal.clearTableSource()
+ this.$refs.inboundOrderApprovalModal.getAllApproveData(item)
}
},
handleEquipmentTransfer(item) {
@@ -523,6 +531,12 @@
this.$refs.equipmentTransferApprovalModelRef.handleDetail(item)
this.$refs.equipmentTransferApprovalModelRef.disableSubmit = false
},
+ handleEquipmentScrap(item) {
+ this.$refs.equipmentScrapApprovalModelRef.visible = true
+ this.$refs.equipmentScrapApprovalModelRef.title = item.name
+ this.$refs.equipmentScrapApprovalModelRef.handleDetail(item)
+ this.$refs.equipmentScrapApprovalModelRef.disableSubmit = false
+ }
}
}
</script>
--
Gitblit v1.9.3