From ebf2058274599ff00ef0654fc5046d627e17002a Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期四, 22 五月 2025 17:49:54 +0800
Subject: [PATCH] 工具管理-工具出库申请流程我的已办页面
---
src/views/flowable/workflow/FlowTodo.vue | 220 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 180 insertions(+), 40 deletions(-)
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index 8f8957a..c895811 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -15,11 +15,11 @@
dictCode="flow_type"></j-dict-select-tag>
</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.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.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>
@@ -33,10 +33,12 @@
<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"
+ <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"
+ <j-date :show-time="false" date-format="YYYY-MM-DD HH:mm:ss" placeholder="璇烽�夋嫨缁撴潫鏃堕棿"
+ class="query-group-cust"
v-model="queryParam.endTime"></j-date>
</a-form-item>
</a-col>
@@ -99,13 +101,31 @@
</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>
+ <!--鍗曚釜娴佺▼澶勭悊-->
<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>
+
+ <!--鎵归噺澶勭悊-->
+ <inspection-order-batch-handle ref="inspectionOrderBatchHandleRef" @searchReset="searchReset"
+ :taskList="selectionRows"/>
+
+ <week-maintenance-batch-approval-modal ref="weenMaintenanceBatchApprovalModalRef" @searchReset="searchReset"
+ :taskList="selectionRows"/>
+ <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>
</a-card>
</template>
@@ -120,15 +140,33 @@
import InspectionOrderHandle from '@views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue'
import { getAction } from '@api/manage'
+ import InspectionOrderBatchHandle from './InspectionOrder/InspectionOrderBatchHandle'
+ import WeekMaintenanceBatchApprovalModal from './weekMaintenance/WeekMaintenanceBatchApprovalModal'
+ import AssignFileStreamHandle from '@views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue'
+ import DispatchFileHandle from '@views/flowable/workflow/dispatchFile/DispatchFileHandle.vue'
+ 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 ThirdMaintenanceApprovalModal from '@views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue'
export default {
name: 'NcDeviceCharactersList',
mixins: [JeecgListMixin, mixinDevice],
components: {
+ AssignFileStreamHandle,
+ DispatchFileHandle,
+ DispatchFileBachHandleStyle,
+ WeekMaintenanceBatchApprovalModal,
+ InspectionOrderBatchHandle,
JDictSelectTag,
WeekMaintenanceApprovalModal,
RepairOrderApprovalModal,
- InspectionOrderHandle
+ InspectionOrderHandle,
+ EquipmentLeanOutApprovalModal,
+ SecondMaintenanceApprovalModal,
+ ThirdMaintenanceApprovalModal,
+ OutBoundOrderHandle
},
data() {
return {
@@ -148,7 +186,7 @@
{
title: '娴佺▼鍒嗙被',
align: 'center',
- dataIndex: 'category_dictText',
+ dataIndex: 'category_dictText'
},
{
title: '娴佺▼鍚嶇О',
@@ -159,7 +197,7 @@
{
title: '娴佺▼涓氬姟绠�瑕佹弿杩�',
align: 'center',
- dataIndex: 'title',
+ dataIndex: 'description',
width: 350,
ellipsis: true
@@ -202,10 +240,15 @@
isSameNode: '/assign/flow/isSameNode'
},
dictOptions: {},
+ selectShenpiData: {},
+ selectDispatchFileXqData:{},
selectInspectionOrderData: {},
selectWeekMaintenanceData: {},
+ selectSecondMaintenanceData: {},
+ selectThirdMaintenanceData: {},
selectBachData: {},
selectRepairOrderData: {},
+ selectOutBoundOrderData: {},
//涓氬姟淇℃伅ID
dataId: undefined
}
@@ -221,6 +264,40 @@
}
},
methods: {
+ loadData(arg) {
+ if (!this.url.list) {
+ this.$message.error('璇疯缃畊rl.list灞炴��!')
+ return
+ }
+ //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
+ if (arg === 1) {
+ this.ipagination.current = 1
+ }
+ var params = this.getQueryParams()//鏌ヨ鏉′欢
+ if (!params) {
+ return false
+ }
+ this.loading = true
+ getAction(this.url.list, params).then((res) => {
+ if (res.success) {
+ // console.log(res)
+ //update-begin---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
+ this.dataSource = res.result.records || res.result
+ if (res.result.total) {
+ this.ipagination.total = res.result.total
+ } else {
+ this.ipagination.total = 0
+ }
+ if (this.selectedRowKeys.length > 0) this.selectedRowKeys = this.selectionRows = []
+ //update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
+ } else {
+ this.$message.warning(res.message)
+ }
+ }).finally(() => {
+ this.loading = false
+ })
+ },
+
handelDetail(item, index) {
console.log('鐐瑰嚮浜嗚鎯�')
console.log('item----->', item)
@@ -228,6 +305,12 @@
let processType = this.splitAprocessType(item.category)
console.log('processType--->', processType)
switch (processType) {
+ case 'drApproval':
+ this.handDrDetial(item)
+ break
+ case 'ggApproval':
+ this.handDispatchFileDetial(item)
+ break
case 'sbdjApproval':
this.handInspectionOrder(item)
break
@@ -237,14 +320,70 @@
case 'eam_repair':
this.handleRepairOrder(item)
break
+ case 'equipment_lean_out':
+ this.handleEquipmentLeanOut(item)
+ break
+ case 'second_maintenance':
+ this.handleSecondMaintenance(item)
+ break
+ case 'third_maintenance':
+ this.handleThirdMaintenance(item)
+ break
+ case 'toolOutStorageApproval':
+ this.handleToolOutStorageApproval(item)
+ break
default:
alert('娌℃壘鍒拌娴佺▼')
}
},
+
+ batchHandle() {
+ const categorySet = new Set(this.selectionRows.map(item => item.category))
+ const nameSet = new Set(this.selectionRows.map(item => item.name))
+ if (categorySet.size !== 1 || nameSet.size !== 1) {
+ this.$notification.info({
+ message: '娑堟伅',
+ description: '璇烽�夋嫨鍚屼竴娴佺▼鍒嗙被涓嬬殑鍚屼竴褰撳墠鑺傜偣'
+ })
+ return
+ }
+
+ if (categorySet.has('eam_repair')) {
+ this.$notification.info({
+ message: '娑堟伅',
+ description: '璁惧缁翠慨娴佺▼鏃犳硶鎵归噺澶勭悊'
+ })
+ return
+ }
+
+ if (categorySet.has('sbdjApproval')) {
+ this.$refs.inspectionOrderBatchHandleRef.visible = true
+ this.$refs.inspectionOrderBatchHandleRef.title = this.selectionRows[0].name
+ this.$refs.inspectionOrderBatchHandleRef.getAllApproveData(this.selectionRows[0])
+ this.$refs.inspectionOrderBatchHandleRef.getBasicInformation(this.selectionRows[0])
+ } else if (categorySet.has('WEEK_MAINTENANCE')) {
+ this.$refs.weenMaintenanceBatchApprovalModalRef.handleDetail(this.selectionRows[0])
+ this.$refs.weenMaintenanceBatchApprovalModalRef.title = this.selectionRows[0].name
+ }
+ },
+
splitAprocessType(title) {
let parts = title.split('锛�') // 娉ㄦ剰鍐掑彿鏄叏瑙掑瓧绗︼紝浣跨敤瀵瑰簲鐨勫瓧杩涜鍒嗗壊
let result = parts[0]
return result
+ },
+
+ handDrDetial(item) {
+ this.selectShenpiData = item
+ this.$refs.modalFormApproval.clearTableSource()
+ this.$refs.modalFormApproval.getAllApproveData(item)
+ },
+
+ handDispatchFileDetial(item){
+ console.log('item----->', item)
+ this.selectDispatchFileXqData = item
+ this.$refs.modalFormDispatchFileXq.clearTableSource()
+ this.$refs.modalFormDispatchFileXq.getAllApproveData(item)
},
handInspectionOrder(record) {
@@ -256,35 +395,6 @@
this.$refs.modalFormInspectionOrder.getBasicInformation(record)
},
- batchHandle() {
- if (this.selectedRowKeys.length <= 0) {
- this.$notification.warning({
- message: '娑堟伅',
- description: '璇烽�夋嫨涓�鏉¤褰�'
- })
- return
- } else {
- let ids = ''
- for (var a = 0; a < this.selectedRowKeys.length; a++) {
- ids += this.selectedRowKeys[a] + ','
- }
- getAction(this.url.isSameNode + '?taskIds=' + ids).then((res) => {
- if (res.success) {
- let taskDefKey = res.result
- this.selectBachData.taskIds = ids
- this.selectBachData.taskDefKey = taskDefKey
- this.$refs.modalFormDispatchFileBatch.title = '鎵归噺澶勭悊'
- this.$refs.modalFormDispatchFileBatch.edit(this.selectBachData)
- this.$refs.modalFormDispatchFileBatch.disableSubmit = false
- } else {
- this.$notification.warning({
- message: '娑堟伅',
- description: res.message
- })
- }
- })
- }
- },
handleWeekMaintenance(item) {
if (item && item.dataId) {
@@ -305,6 +415,36 @@
this.$refs.repairOrderApprovalModal.title = record.name
this.$refs.repairOrderApprovalModal.getAllApproveData(record)
this.$refs.repairOrderApprovalModal.getBasicInformation(record)
+ },
+ handleEquipmentLeanOut(item) {
+ this.$refs.equipmentLeanOutApprovalModelRef.visible = true
+ this.$refs.equipmentLeanOutApprovalModelRef.title = item.name
+ this.$refs.equipmentLeanOutApprovalModelRef.handleDetail(item)
+ this.$refs.equipmentLeanOutApprovalModelRef.disableSubmit = false
+ },
+ 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
+ }
+ },
+ handleToolOutStorageApproval(item) {
+ if (item && item.dataId) {
+ this.selectOutBoundOrderData = Object.assign({}, item)
+ this.$refs.outBoundOrderHandle.auditVisible = true
+ this.$refs.outBoundOrderHandle.clearTableSource()
+ this.$refs.outBoundOrderHandle.getAllApproveData(item)
+ }
}
}
}
--
Gitblit v1.9.3