From f2ce587e752798a2a454e0f029069b4e82a41bc8 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 27 六月 2025 17:36:52 +0800
Subject: [PATCH] 增加提交样式，新增批量处理dnc审签
---
src/views/flowable/workflow/FlowTodo.vue | 353 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 284 insertions(+), 69 deletions(-)
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index af6ba4b..9a452fc 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -7,12 +7,23 @@
<a-card :bordered='false'>
<!-- 鏌ヨ鍖哄煙 -->
<div class='table-page-search-wrapper'>
- <a-form layout='inline' @keyup.enter.native='searchQuery'>
+ <a-form
+ layout='inline'
+ @keyup.enter.native='searchQuery'
+ >
<a-row :gutter='24'>
- <a-col :lg='6' :md='8' :sm='24' :xl='4'>
+ <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>
+ <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 +31,83 @@
<!--<a-input placeholder="璇疯緭鍏ユ祦绋嬪悕绉�" v-model="queryParam.flowName"></a-input>-->
<!--</a-form-item>-->
<!--</a-col>-->
- <a-col :lg='6' :md='8' :sm='24' :xl='4'>
+ <a-col
+ :lg='6'
+ :md='8'
+ :sm='24'
+ :xl='4'
+ >
<a-form-item label='褰撳墠鑺傜偣'>
- <a-input v-model='queryParam.name' placeholder='璇疯緭鍏ュ綋鍓嶈妭鐐圭簿纭煡璇�'></a-input>
+ <a-input
+ v-model='queryParam.name'
+ placeholder='璇疯緭鍏ュ綋鍓嶈妭鐐圭簿纭煡璇�'
+ ></a-input>
</a-form-item>
</a-col>
- <a-col :lg='6' :md='8' :sm='24' :xl='4'>
+ <a-col
+ :lg='6'
+ :md='8'
+ :sm='24'
+ :xl='4'
+ >
<a-form-item label='绠�瑕佹弿杩�'>
- <a-input v-model='queryParam.title' placeholder='璇疯緭鍏ョ畝瑕佹弿杩�'></a-input>
+ <a-input
+ v-model='queryParam.title'
+ placeholder='璇疯緭鍏ョ畝瑕佹弿杩�'
+ ></a-input>
</a-form-item>
</a-col>
<template v-if='toggleSearchStatus'>
- <a-col :lg='8' :md='12' :sm='24' :xl='8'>
+ <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>
+ <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>
+ <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 :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'>
+ <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>
@@ -63,7 +122,10 @@
<div class='table-operator'>
<a-dropdown v-if='selectedRowKeys.length > 0 '>
<a-menu slot='overlay'>
- <a-menu-item key='1' @click='batchHandle'>
+ <a-menu-item
+ key='1'
+ @click='batchHandle'
+ >
<a-icon type='delete' />
鎵归噺澶勭悊
</a-menu-item>
@@ -76,10 +138,16 @@
<!-- table鍖哄煙-begin -->
<div>
- <div class='ant-alert ant-alert-info' style='margin-bottom: 16px;'>
+ <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
@@ -93,54 +161,130 @@
bordered
rowKey='id'
size='middle'
- @change='handleTableChange'>
+ @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' @ok='modalFormOk'
- @searchReset='searchReset'></DispatchFileBachHandleStyle>
+ <AssignFileStreamHandle
+ ref='modalFormApproval'
+ :selectShenpiData='selectShenpiData'
+ @searchReset='searchReset'
+ ></AssignFileStreamHandle>
+ <DispatchFileHandle
+ ref='modalFormDispatchFileXq'
+ :selectShenpiData='selectDispatchFileXqData'
+ @searchReset='searchReset'
+ ></DispatchFileHandle>
+ <StandardizedProcessHandle
+ ref='StandardizedProcessHandle'
+ :selectShenpiData='selectDispatchFileXqData'
+ @searchReset='searchReset'
+ ></StandardizedProcessHandle>
+ <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' :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>
+ <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' :taskList='selectionRows'
- @searchReset='searchReset' />
+ <inspection-order-batch-handle
+ ref='inspectionOrderBatchHandleRef'
+ :taskList='selectionRows'
+ @searchReset='searchReset'
+ />
- <week-maintenance-batch-approval-modal ref='weenMaintenanceBatchApprovalModalRef' :taskList='selectionRows'
- @searchReset='searchReset' />
- <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' />
- <equipment-scrap-approval-modal ref='equipmentScrapApprovalModelRef' @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'
+ />
+ <spare-part-apply-handle
+ ref='sparePartApplyModal'
+ :selectSparePartApplyData='selectSparePartApplyData'
+ @searchReset='searchReset'
+ ></spare-part-apply-handle>
+ <guide-card-batch-handle
+ ref='guideCardBatchHandle'
+ :selectShenpiData='selectGuideCardData'
+ @searchReset='searchReset'
+ ></guide-card-batch-handle>
+ <AssignEquipmentFileStreamHandle
+ ref='assignEquipmentFileStreamHandle'
+ :selectShenpiData='selectEquipmentSealUpData'
+ @searchReset='searchReset'
+ ></AssignEquipmentFileStreamHandle>
</a-card>
</template>
@@ -153,17 +297,17 @@
import WeekMaintenanceApprovalModal from '@views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal'
import RepairOrderApprovalModal from '@views/flowable/workflow/repairOrder/RepairOrderApprovalModal'
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 GuideCardBatchHandle from '@views/flowable/workflow/guideCardBatch/GuideCardBatchHandle.vue'
+import AssignEquipmentFileStreamHandle from '@views/flowable/workflow/assignEquipmentFileStream/AssignEquipmentFileStreamHandle.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'
@@ -171,6 +315,8 @@
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'
+import SparePartApplyHandle from '@views/flowable/workflow/sparePartApply/SparePartApplyHandle.vue'
+import StandardizedProcessHandle from '@views/flowable/workflow/standardizedProcess/StandardizedProcessHandle.vue'
export default {
name: 'NcDeviceCharactersList',
@@ -194,7 +340,11 @@
EquipmentSealUpApprovalModal,
InboundOrderHandle,
EquipmentTransferApprovalModal,
- EquipmentScrapApprovalModal
+ EquipmentScrapApprovalModal,
+ SparePartApplyHandle,
+ StandardizedProcessHandle,
+ GuideCardBatchHandle,
+ AssignEquipmentFileStreamHandle
},
data() {
return {
@@ -207,14 +357,15 @@
key: 'rowIndex',
width: 60,
align: 'center',
- customRender: function(t, r, index) {
+ customRender: function (t, r, index) {
return parseInt(index) + 1
}
},
{
title: '娴佺▼鍒嗙被',
align: 'center',
- dataIndex: 'category_dictText'
+ dataIndex: 'category_dictText',
+ width: 100
},
{
title: '娴佺▼鍚嶇О',
@@ -280,6 +431,10 @@
selectLossBoundOrderData: {},
selectStocktakingBoundOrderData: {},
selectInboundOrderData: {},
+ selectSparePartApplyData: {},
+ selectGuideCardData:{},
+ selectEquipmentAssignProductData:{},
+ selectEquipmentSealUpData:{},
//涓氬姟淇℃伅ID
dataId: undefined
}
@@ -287,7 +442,7 @@
created() {
},
computed: {
- importExcelUrl: function() {
+ importExcelUrl: function () {
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
},
getTableColumnsTotalWidth() {
@@ -342,6 +497,9 @@
case 'ggApproval':
this.handDispatchFileDetial(item)
break
+ case 'ncFileSettingProcessApproval':
+ this.handStandardizedDetial(item)
+ break
case 'sbdjApproval':
this.handInspectionOrder(item)
break
@@ -381,6 +539,15 @@
case 'equipment_scrap':
this.handleEquipmentScrap(item)
break
+ case 'spare_part_apply':
+ this.handleSparePartApplyApproval(item)
+ break
+ case 'programConfirmApproval':
+ this.handleGuideCardApproval(item)
+ break
+ case 'equipmentAssignProductApproval':
+ this.handleEquipmentAssignProductApproval(item)
+ break
default:
alert('娌℃壘鍒拌娴佺▼')
}
@@ -413,6 +580,26 @@
} else if (categorySet.has('WEEK_MAINTENANCE')) {
this.$refs.weenMaintenanceBatchApprovalModalRef.handleDetail(this.selectionRows[0])
this.$refs.weenMaintenanceBatchApprovalModalRef.title = this.selectionRows[0].name
+ }else if (categorySet.has('ggApproval')){
+ let ids = ''
+ for (let 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
+ })
+ }
+ })
}
},
@@ -421,18 +608,24 @@
let result = parts[0]
return result
},
-
+ //DNC-鎸囨淳NC绋嬪簭鑷宠澶�
handDrDetial(item) {
this.selectShenpiData = item
this.$refs.modalFormApproval.clearTableSource()
this.$refs.modalFormApproval.getAllApproveData(item)
},
-
+ //DNC-NC绋嬪簭绛炬淳
handDispatchFileDetial(item) {
console.log('item----->', item)
this.selectDispatchFileXqData = item
this.$refs.modalFormDispatchFileXq.clearTableSource()
this.$refs.modalFormDispatchFileXq.getAllApproveData(item)
+ },
+ //DNC-瀹氬瀷瀹℃壒椤甸潰
+ handStandardizedDetial(item){
+ this.selectDispatchFileXqData = item
+ this.$refs.StandardizedProcessHandle.clearTableSource()
+ this.$refs.StandardizedProcessHandle.getAllApproveData(item)
},
handInspectionOrder(record) {
@@ -536,6 +729,28 @@
this.$refs.equipmentScrapApprovalModelRef.title = item.name
this.$refs.equipmentScrapApprovalModelRef.handleDetail(item)
this.$refs.equipmentScrapApprovalModelRef.disableSubmit = false
+ },
+ handleSparePartApplyApproval(item) {
+ if (item && item.dataId) {
+ this.selectSparePartApplyData = Object.assign({}, item)
+ this.$refs.sparePartApplyModal.auditVisible = true
+ this.$refs.sparePartApplyModal.clearTableSource()
+ this.$refs.sparePartApplyModal.getAllApproveData(item)
+ }
+ },
+ //DNC-绋嬪簭纭琛ㄦ祦绋�
+ handleGuideCardApproval(item) {
+ console.log('item----->', item)
+ this.selectGuideCardData = item
+ this.$refs.guideCardBatchHandle.clearTableSource()
+ this.$refs.guideCardBatchHandle.getAllApproveData(item)
+ },
+ //DNC-璁惧缁撴瀯鏍戞寚娲句骇鍝佺粨鏋勬爲
+ handleEquipmentAssignProductApproval(item){
+ console.log('item----->', item)
+ this.selectEquipmentSealUpData = item
+ this.$refs.assignEquipmentFileStreamHandle.clearTableSource()
+ this.$refs.assignEquipmentFileStreamHandle.getAllApproveData(item)
}
}
}
--
Gitblit v1.9.3