From 57ec2038f86f47a87db6b73c0c6eb27c1c25b08e Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期三, 06 八月 2025 14:16:00 +0800
Subject: [PATCH] 我的已办、仓库管理相关调整
---
src/views/flowable/workflow/FlowCompleted.vue | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/src/views/flowable/workflow/FlowCompleted.vue b/src/views/flowable/workflow/FlowCompleted.vue
index 61e49f9..f80baeb 100644
--- a/src/views/flowable/workflow/FlowCompleted.vue
+++ b/src/views/flowable/workflow/FlowCompleted.vue
@@ -170,11 +170,11 @@
ref='equipmentReturnApprovalModelRef'
@searchReset='searchReset'
/>
- <inbound-order-handle
+ <inbound-order-handle-xq
ref='inboundOrderApprovalModal'
:selectInboundOrderData='selectInboundOrderData'
@searchReset='searchReset'
- ></inbound-order-handle>
+ ></inbound-order-handle-xq>
<second-maintenance-approval-modal
ref='secondMaintenanceApprovalModal'
:selectShenpiData='selectSecondMaintenanceData'
@@ -185,11 +185,11 @@
:selectShenpiData='selectThirdMaintenanceData'
@searchReset='searchReset'
></third-maintenance-approval-modal>
- <guide-card-batch-handle
- ref='guideCardBatchHandle'
+ <guide-card-batch-xq
+ ref='GuideCardBatchXq'
:selectShenpiData='selectGuideCardData'
@searchReset='searchReset'
- ></guide-card-batch-handle>
+ ></guide-card-batch-xq>
</a-card>
</template>
@@ -213,10 +213,10 @@
import EquipmentScrapApprovalModal from '@views/flowable/workflow/scrap/EquipmentScrapApprovalModal.vue'
import SparePartApplyHandle from '@views/flowable/workflow/sparePartApply/SparePartApplyHandle.vue'
import EquipmentReturnApprovalModal from '@views/flowable/workflow/leanOut/EquipmentReturnApprovalModal.vue'
-import GuideCardBatchHandle from '@views/flowable/workflow/guideCardBatch/GuideCardBatchHandle.vue'
+import GuideCardBatchXq from '@views/flowable/workflow/guideCardBatch/GuideCardBatchXq.vue'
import SecondMaintenanceApprovalModal from '@views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue'
import ThirdMaintenanceApprovalModal from '@views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue'
-import InboundOrderHandle from '@views/flowable/workflow/inboundOrder/InboundOrderHandle.vue'
+import InboundOrderHandleXq from '@views/flowable/workflow/inboundOrder/InboundOrderHandleXq.vue'
export default {
name: 'NcDeviceCharactersList',
@@ -239,8 +239,8 @@
EquipmentReturnApprovalModal,
SecondMaintenanceApprovalModal,
ThirdMaintenanceApprovalModal,
- InboundOrderHandle,
- GuideCardBatchHandle
+ InboundOrderHandleXq,
+ GuideCardBatchXq
},
data() {
@@ -418,11 +418,11 @@
this.$refs.equipmentReturnApprovalModelRef.disableSubmit = true
},
handleToolInStorage(item) {
- if (item && item.dataId) {
- this.selectInboundOrderData = Object.assign({}, item)
- this.$refs.inboundOrderApprovalModal.auditVisible = true
- this.$refs.inboundOrderApprovalModal.getAllApproveData(item)
- }
+ console.log('item----->', item)
+ this.selectInboundOrderData = item
+ this.selectGuideCardData.title = item.description
+ this.$refs.inboundOrderApprovalModal.clearTableSource()
+ this.$refs.inboundOrderApprovalModal.getAllApproveData(item)
},
handleSecondMaintenance(item) {
if (item && item.dataId) {
@@ -444,8 +444,12 @@
handleGuideCardApproval(item) {
console.log('item----->', item)
this.selectGuideCardData = item
- this.$refs.guideCardBatchHandle.clearTableSource()
- this.$refs.guideCardBatchHandle.getAllApproveData(item)
+ this.selectGuideCardData.assignee_dictText = item.todoUsers_dictText
+ this.selectGuideCardData.procInstId = item.procInsId
+ this.selectGuideCardData.processInstanceId = item.procInsId
+ this.selectGuideCardData.title = item.description
+ this.$refs.GuideCardBatchXq.clearTableSource()
+ this.$refs.GuideCardBatchXq.getAllApproveData(item)
},
handDrDetial(item) {
this.selectShenpiData = item
--
Gitblit v1.9.3