From ae04b97ebcf944137619ab4ee15236c5bb070219 Mon Sep 17 00:00:00 2001 From: Houjie <714924425@qq.com> Date: 星期一, 26 五月 2025 10:32:26 +0800 Subject: [PATCH] 待办/已办 新增 工具报损 盘点流程 --- src/views/flowable/workflow/FlowCompleted.vue | 466 +++++++++++++++++++++++++++++++-------------------------- 1 files changed, 255 insertions(+), 211 deletions(-) diff --git a/src/views/flowable/workflow/FlowCompleted.vue b/src/views/flowable/workflow/FlowCompleted.vue index 48bacaf..e592092 100644 --- a/src/views/flowable/workflow/FlowCompleted.vue +++ b/src/views/flowable/workflow/FlowCompleted.vue @@ -17,10 +17,12 @@ </a-col> <a-col :xl="10" :lg="11" :md="12" :sm="24"> <a-form-item label="鎿嶄綔鏃堕棿"> - <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="璇烽�夋嫨寮�濮嬫椂闂�" class="query-group-cust" + <j-date :show-time="true" 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="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="璇烽�夋嫨缁撴潫鏃堕棿" class="query-group-cust" + <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="璇烽�夋嫨缁撴潫鏃堕棿" + class="query-group-cust" v-model="queryParam.endTime"></j-date> </a-form-item> </a-col> @@ -60,232 +62,274 @@ <AssignFileStreamXq ref="modalFormApproval" :selectShenpiData="selectShenpiData"></AssignFileStreamXq> - <DispatchFileXq ref="modalFormDispatchFileXq" :selectShenpiData="selectDispatchFileXqData"></DispatchFileXq> + <DispatchFileXq ref="modalFormDispatchFileXq" :selectShenpiData="selectDispatchFileXqData"></DispatchFileXq> - <inspection-order-handle ref="modalFormInspectionOrderXq" :selectShenpiData="selectInspectionOrderXqData"/> + <inspection-order-handle ref="modalFormInspectionOrderXq" :selectShenpiData="selectInspectionOrderXqData" /> - <week-maintenance-approval-modal ref="weekMaintenanceApprovalModal" :selectShenpiData="selectWeekMaintenanceData"/> + <week-maintenance-approval-modal ref="weekMaintenanceApprovalModal" :selectShenpiData="selectWeekMaintenanceData" /> - <repair-order-approval-modal ref="repairOrderApprovalModal" :selectShenpiData="selectRepairOrderData"/> + <repair-order-approval-modal ref="repairOrderApprovalModal" :selectShenpiData="selectRepairOrderData" /> - <out-bound-order-handle ref="outBoundOrderHandle" :selectShenpiData="selectOutBoundOrderData"/> + <out-bound-order-handle ref="outBoundOrderHandle" :selectShenpiData="selectOutBoundOrderData" /> + <stocktaking-bound-handle ref="stocktakingBoundHandle" :selectShenpiData="selectStocktakingBoundOrderData" + @searchReset="searchReset"></stocktaking-bound-handle> + + + <loss-bound-handle ref="lossBoundHandle" :selectShenpiData="selectLossBoundOrderData" + @searchReset="searchReset"></loss-bound-handle> </a-card> </template> <script> - import '@/assets/less/TableExpand.less' - import { mixinDevice } from '@/utils/mixin' - import { JeecgListMixin } from '@/mixins/JeecgListMixin' - import JDictSelectTag from '@/components/dict/JDictSelectTag.vue' - import AssignFileStreamXq from '@views/flowable/workflow/assignFileStream/AssignFileStreamXq.vue' - import DispatchFileXq from '@views/flowable/workflow/dispatchFile/DispatchFileXq.vue' - import InspectionOrderHandle from './InspectionOrder/InspectionOrderHandle' - import WeekMaintenanceApprovalModal from './weekMaintenance/WeekMaintenanceApprovalModal' - import RepairOrderApprovalModal from './repairOrder/RepairOrderApprovalModal' - import OutBoundOrderHandle from '@views/flowable/workflow/outBoundOrder/OutBoundOrderHandle.vue' +import '@/assets/less/TableExpand.less' +import { mixinDevice } from '@/utils/mixin' +import { JeecgListMixin } from '@/mixins/JeecgListMixin' +import JDictSelectTag from '@/components/dict/JDictSelectTag.vue' +import AssignFileStreamXq from '@views/flowable/workflow/assignFileStream/AssignFileStreamXq.vue' +import DispatchFileXq from '@views/flowable/workflow/dispatchFile/DispatchFileXq.vue' +import InspectionOrderHandle from './InspectionOrder/InspectionOrderHandle' +import WeekMaintenanceApprovalModal from './weekMaintenance/WeekMaintenanceApprovalModal' +import RepairOrderApprovalModal from './repairOrder/RepairOrderApprovalModal' +import OutBoundOrderHandle from '@views/flowable/workflow/outBoundOrder/OutBoundOrderHandle.vue' +import lossBoundHandle from '@views/flowable/workflow/lossBound/lossBoundHandle.vue' +import stocktakingBoundHandle from '@views/flowable/workflow/stocktakingBound/stocktakingBoundHandle.vue' - export default { - name: 'NcDeviceCharactersList', - mixins: [JeecgListMixin, mixinDevice], - components: { - DispatchFileXq, - AssignFileStreamXq: AssignFileStreamXq, - RepairOrderApprovalModal, - WeekMaintenanceApprovalModal, - InspectionOrderHandle, - JDictSelectTag, - OutBoundOrderHandle - }, - data() { - return { - description: '宸ヤ綔娴�-宸插姙', - // 琛ㄥご - columns: [ - { - title: '搴忓彿', - dataIndex: '', - key: 'rowIndex', - width: 200, - align: 'center', - customRender: function(t, r, index) { - return parseInt(index) + 1 - } - }, - { - title: '娴佺▼鍒嗙被', - align: 'center', - dataIndex: 'category_dictText', - width: 200 - }, - { - title: '娴佺▼鍚嶇О', - align: 'center', - dataIndex: 'procDefName', - width: 200 - }, - { - title: '娴佺▼涓氬姟绠�瑕佹弿杩�', - align: 'center', - dataIndex: 'description', - width: 300 - }, - { - title: '娴佺▼鍙戣捣浜哄悕绉�', - align: 'center', - dataIndex: 'startUserName', - width: 250 - }, - { - title: '浠诲姟鍚嶇О', - align: 'center', - dataIndex: 'taskName', - width: 250 - }, - { - title: '鎿嶄綔鏃堕棿', - align: 'center', - dataIndex: 'finishTime', - width: 300 - }, - { - title: '鎿嶄綔', - dataIndex: 'action', - scopedSlots: { customRender: 'action' }, - align: 'center', - width: 200, - fixed: 'right' +export default { + name: 'NcDeviceCharactersList', + mixins: [JeecgListMixin, mixinDevice], + components: { + stocktakingBoundHandle, + lossBoundHandle, + DispatchFileXq, + AssignFileStreamXq: AssignFileStreamXq, + RepairOrderApprovalModal, + WeekMaintenanceApprovalModal, + InspectionOrderHandle, + JDictSelectTag, + OutBoundOrderHandle + }, + data() { + return { + description: '宸ヤ綔娴�-宸插姙', + // 琛ㄥご + columns: [ + { + title: '搴忓彿', + dataIndex: '', + key: 'rowIndex', + width: 200, + align: 'center', + customRender: function(t, r, index) { + return parseInt(index) + 1 } - ], - url: { - list: '/assign/flow/finishedList' }, - dictOptions: {}, - selectShenpiData: {}, - selectDispatchFileXqData:{}, - selectWeekMaintenanceData: {}, - selectInspectionOrderXqData: {}, - selectRepairOrderData: {}, - selectOutBoundOrderData: {} - } - }, - created() { - }, - computed: { - importExcelUrl: function() { - return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}` - } - }, - methods: { - handelDetial(item, index) { - console.log('鐐瑰嚮浜嗚鎯�') - console.log('item----->', item) - console.log('index----->', index) - let approcesstype = this.splitAprocessType(item.category) - console.log('approcesstype--->', approcesstype) - switch (approcesstype) { - case 'drApproval': - this.handDrDetial(item) - break - case 'ggApproval': - this.handDispatchFileDetial(item) - break - case 'sbdjApproval': - this.handInspectionOrder(item) - break - case 'WEEK_MAINTENANCE': - this.handleWeekMaintenance(item) - break - case 'eam_repair': - this.handleRepairOrder(item) - break - case 'toolOutStorageApproval': - this.handleToolOutStorageApproval(item) - break - default: - alert('娌℃壘鍒拌娴佺▼') + { + title: '娴佺▼鍒嗙被', + align: 'center', + dataIndex: 'category_dictText', + width: 200 + }, + { + title: '娴佺▼鍚嶇О', + align: 'center', + dataIndex: 'procDefName', + width: 200 + }, + { + title: '娴佺▼涓氬姟绠�瑕佹弿杩�', + align: 'center', + dataIndex: 'description', + width: 300 + }, + { + title: '娴佺▼鍙戣捣浜哄悕绉�', + align: 'center', + dataIndex: 'startUserName', + width: 250 + }, + { + title: '浠诲姟鍚嶇О', + align: 'center', + dataIndex: 'taskName', + width: 250 + }, + { + title: '鎿嶄綔鏃堕棿', + align: 'center', + dataIndex: 'finishTime', + width: 300 + }, + { + title: '鎿嶄綔', + dataIndex: 'action', + scopedSlots: { customRender: 'action' }, + align: 'center', + width: 200, + fixed: 'right' } + ], + url: { + list: '/assign/flow/finishedList' }, - - splitAprocessType(title) { - let parts = title.split('锛�') // 娉ㄦ剰鍐掑彿鏄叏瑙掑瓧绗︼紝浣跨敤瀵瑰簲鐨勫瓧杩涜鍒嗗壊 - let result = parts[0] - return result - }, - handDrDetial(item) { - this.selectShenpiData = item - this.selectShenpiData.assignee_dictText=item.todoUsers_dictText - this.selectShenpiData.procInstId=item.procInsId - this.selectShenpiData.title=item.description - this.$refs.modalFormApproval.clearTableSource() - this.$refs.modalFormApproval.getAllApproveData(item) - }, - handDispatchFileDetial(item){ - console.log('item----->', item) - this.selectDispatchFileXqData = item - this.selectDispatchFileXqData.assignee_dictText=item.todoUsers_dictText - this.selectDispatchFileXqData.procInstId=item.procInsId - this.selectDispatchFileXqData.processInstanceId=item.procInsId - this.selectDispatchFileXqData.title=item.description - this.$refs.modalFormDispatchFileXq.clearTableSource() - this.$refs.modalFormDispatchFileXq.getAllApproveData(item) - }, - handleWeekMaintenance(record) { - this.selectWeekMaintenanceData = Object.assign({}, record) - this.$refs.weekMaintenanceApprovalModal.handleDetail(record) - this.$refs.weekMaintenanceApprovalModal.title = '璇︽儏' - this.$refs.weekMaintenanceApprovalModal.disableSubmit = true - }, - - handInspectionOrder(record) { - console.log('record----->', record) - this.selectInspectionOrderXqData = Object.assign({}, record) - const { todoUsers_dictText, procInsId, description, taskName } = this.selectInspectionOrderXqData - this.selectInspectionOrderXqData.assignee_dictText = todoUsers_dictText - this.selectInspectionOrderXqData.procInstId = procInsId - this.selectInspectionOrderXqData.processInstanceId = procInsId - this.selectInspectionOrderXqData.title = description - this.$refs.modalFormInspectionOrderXq.visible = true - this.$refs.modalFormInspectionOrderXq.title = taskName - this.$refs.modalFormInspectionOrderXq.disableSubmit = true - this.$refs.modalFormInspectionOrderXq.getAllApproveData({ - ...record, - procInstId: procInsId, - processInstanceId: procInsId - }) - this.$refs.modalFormInspectionOrderXq.getBasicInformation(record) - }, - - /** - * 鐐瑰嚮璁惧缁翠慨鍒嗙被娴佺▼璇︽儏鏃惰Е鍙� - * @param record - */ - handleRepairOrder(record) { - this.selectRepairOrderData = Object.assign({}, record) - const { procInsId, taskName } = this.selectRepairOrderData - this.$refs.repairOrderApprovalModal.visible = true - this.$refs.repairOrderApprovalModal.disableSubmit = true - this.$refs.repairOrderApprovalModal.title = taskName - this.$refs.modalFormInspectionOrderXq.getAllApproveData({ - ...record, - procInstId: procInsId, - processInstanceId: procInsId - }) - this.$refs.repairOrderApprovalModal.getBasicInformation(record) - }, - - handleToolOutStorageApproval(item) { - this.selectOutBoundOrderData = Object.assign({}, item) - item.procInstId = item.procInsId - item.processInstanceId = item.procInsId - this.selectOutBoundOrderData.assignee_dictText = item.todoUsers_dictText - this.$refs.outBoundOrderHandle.auditVisible = false - this.$refs.outBoundOrderHandle.clearTableSource() - this.$refs.outBoundOrderHandle.getAllApproveData(item) + dictOptions: {}, + selectShenpiData: {}, + selectDispatchFileXqData: {}, + selectWeekMaintenanceData: {}, + selectInspectionOrderXqData: {}, + selectRepairOrderData: {}, + selectOutBoundOrderData: {}, + selectLossBoundOrderData: {}, + selectStocktakingBoundOrderData: {} + } + }, + created() { + }, + computed: { + importExcelUrl: function() { + return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}` + } + }, + methods: { + handelDetial(item, index) { + console.log('鐐瑰嚮浜嗚鎯�') + console.log('item----->', item) + console.log('index----->', index) + let approcesstype = this.splitAprocessType(item.category) + console.log('approcesstype--->', approcesstype) + switch (approcesstype) { + case 'drApproval': + this.handDrDetial(item) + break + case 'ggApproval': + this.handDispatchFileDetial(item) + break + case 'sbdjApproval': + this.handInspectionOrder(item) + break + case 'WEEK_MAINTENANCE': + this.handleWeekMaintenance(item) + break + case 'eam_repair': + this.handleRepairOrder(item) + break + case 'toolOutStorageApproval': + this.handleToolOutStorageApproval(item) + break + case 'toolsStocktakingBound': + this.handleToolStocktakingApproval(item) + break + case 'toolsLossApproval': + this.handleToolLossApproval(item) + break + default: + alert('娌℃壘鍒拌娴佺▼') } + }, + + splitAprocessType(title) { + let parts = title.split('锛�') // 娉ㄦ剰鍐掑彿鏄叏瑙掑瓧绗︼紝浣跨敤瀵瑰簲鐨勫瓧杩涜鍒嗗壊 + let result = parts[0] + return result + }, + handDrDetial(item) { + this.selectShenpiData = item + this.selectShenpiData.assignee_dictText = item.todoUsers_dictText + this.selectShenpiData.procInstId = item.procInsId + this.selectShenpiData.title = item.description + this.$refs.modalFormApproval.clearTableSource() + this.$refs.modalFormApproval.getAllApproveData(item) + }, + handDispatchFileDetial(item) { + console.log('item----->', item) + this.selectDispatchFileXqData = item + this.selectDispatchFileXqData.assignee_dictText = item.todoUsers_dictText + this.selectDispatchFileXqData.procInstId = item.procInsId + this.selectDispatchFileXqData.processInstanceId = item.procInsId + this.selectDispatchFileXqData.title = item.description + this.$refs.modalFormDispatchFileXq.clearTableSource() + this.$refs.modalFormDispatchFileXq.getAllApproveData(item) + }, + handleWeekMaintenance(record) { + this.selectWeekMaintenanceData = Object.assign({}, record) + this.$refs.weekMaintenanceApprovalModal.handleDetail(record) + this.$refs.weekMaintenanceApprovalModal.title = '璇︽儏' + this.$refs.weekMaintenanceApprovalModal.disableSubmit = true + }, + + handInspectionOrder(record) { + console.log('record----->', record) + this.selectInspectionOrderXqData = Object.assign({}, record) + const { todoUsers_dictText, procInsId, description, taskName } = this.selectInspectionOrderXqData + this.selectInspectionOrderXqData.assignee_dictText = todoUsers_dictText + this.selectInspectionOrderXqData.procInstId = procInsId + this.selectInspectionOrderXqData.processInstanceId = procInsId + this.selectInspectionOrderXqData.title = description + this.$refs.modalFormInspectionOrderXq.visible = true + this.$refs.modalFormInspectionOrderXq.title = taskName + this.$refs.modalFormInspectionOrderXq.disableSubmit = true + this.$refs.modalFormInspectionOrderXq.getAllApproveData({ + ...record, + procInstId: procInsId, + processInstanceId: procInsId + }) + this.$refs.modalFormInspectionOrderXq.getBasicInformation(record) + }, + + /** + * 鐐瑰嚮璁惧缁翠慨鍒嗙被娴佺▼璇︽儏鏃惰Е鍙� + * @param record + */ + handleRepairOrder(record) { + this.selectRepairOrderData = Object.assign({}, record) + const { procInsId, taskName } = this.selectRepairOrderData + this.$refs.repairOrderApprovalModal.visible = true + this.$refs.repairOrderApprovalModal.disableSubmit = true + this.$refs.repairOrderApprovalModal.title = taskName + this.$refs.modalFormInspectionOrderXq.getAllApproveData({ + ...record, + procInstId: procInsId, + processInstanceId: procInsId + }) + this.$refs.repairOrderApprovalModal.getBasicInformation(record) + }, + + handleToolOutStorageApproval(item) { + this.selectOutBoundOrderData = Object.assign({}, item) + item.procInstId = item.procInsId + item.processInstanceId = item.procInsId + this.selectOutBoundOrderData.assignee_dictText = item.todoUsers_dictText + this.$refs.outBoundOrderHandle.auditVisible = false + this.$refs.outBoundOrderHandle.clearTableSource() + this.$refs.outBoundOrderHandle.getAllApproveData(item) + }, + + handleToolStocktakingApproval(item) { + + this.selectStocktakingBoundOrderData = Object.assign({}, item) + item.procInstId = item.procInsId + item.processInstanceId = item.procInsId + this.selectStocktakingBoundOrderData.assignee_dictText = item.todoUsers_dictText + this.$refs.stocktakingBoundHandle.auditVisible = false + this.$refs.stocktakingBoundHandle.disableSubmit = true + this.$refs.stocktakingBoundHandle.clearTableSource() + this.$refs.stocktakingBoundHandle.getAllApproveData(item) + + }, + handleToolLossApproval(item) { + this.selectLossBoundOrderData = Object.assign({}, item) + item.procInstId = item.procInsId + item.processInstanceId = item.procInsId + this.selectStocktakingBoundOrderData.assignee_dictText = item.todoUsers_dictText + this.$refs.lossBoundHandle.auditVisible = false + this.$refs.lossBoundHandle.disableSubmit = true + this.$refs.lossBoundHandle.clearTableSource() + this.$refs.lossBoundHandle.getAllApproveData(item) + } } +} </script> <style scoped> - @import '~@assets/less/common.less'; +@import '~@assets/less/common.less'; </style> \ No newline at end of file -- Gitblit v1.9.3