From 3de531b7986ebec5b022d2360fbb930aa54a1a80 Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期二, 29 七月 2025 14:18:41 +0800
Subject: [PATCH] 设备归还修改
---
src/views/flowable/workflow/FlowCompleted.vue | 208 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 175 insertions(+), 33 deletions(-)
diff --git a/src/views/flowable/workflow/FlowCompleted.vue b/src/views/flowable/workflow/FlowCompleted.vue
index e592092..f6dbded 100644
--- a/src/views/flowable/workflow/FlowCompleted.vue
+++ b/src/views/flowable/workflow/FlowCompleted.vue
@@ -7,29 +7,69 @@
<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 :xl="6" :lg="7" :md="8" :sm="24">
+ <a-col
+ :xl="6"
+ :lg="7"
+ :md="8"
+ :sm="24"
+ >
<a-form-item label="娴佺▼鍒嗙被">
- <j-dict-select-tag placeholder="璇烽�夋嫨娴佺▼鍒嗙被" v-model="queryParam.category"
- dictCode="flow_type"></j-dict-select-tag>
+ <j-dict-select-tag
+ placeholder="璇烽�夋嫨娴佺▼鍒嗙被"
+ v-model="queryParam.category"
+ dictCode="flow_type"
+ ></j-dict-select-tag>
</a-form-item>
</a-col>
- <a-col :xl="10" :lg="11" :md="12" :sm="24">
+ <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"
- v-model="queryParam.startTime"></j-date>
+ <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"
- v-model="queryParam.endTime"></j-date>
+ <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>
- <a-col :xl="6" :lg="7" :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-col
+ :xl="6"
+ :lg="7"
+ :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>
</span>
</a-col>
</a-row>
@@ -51,32 +91,76 @@
:pagination="ipagination"
:loading="loading"
class="j-table-force-nowrap"
- @change="handleTableChange">
+ @change="handleTableChange"
+ >
- <span slot="action" slot-scope="text, record">
- <a @click="handelDetial(record,text)">璇︽儏</a>
+ <span
+ slot="action"
+ slot-scope="text, record"
+ >
+ <a @click="handelDetial(record,text)">璇︽儏</a>
</span>
</a-table>
</div>
- <AssignFileStreamXq ref="modalFormApproval" :selectShenpiData="selectShenpiData"></AssignFileStreamXq>
+ <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" />
- <stocktaking-bound-handle ref="stocktakingBoundHandle" :selectShenpiData="selectStocktakingBoundOrderData"
- @searchReset="searchReset"></stocktaking-bound-handle>
+ <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>
- <loss-bound-handle ref="lossBoundHandle" :selectShenpiData="selectLossBoundOrderData"
- @searchReset="searchReset"></loss-bound-handle>
+ <equipment-lean-out-approval-modal
+ ref='equipmentLeanOutApprovalModelRef'
+ @searchReset='searchReset'
+ />
+ <equipment-seal-up-approval-modal
+ ref='equipmentSealUpApprovalModelRef'
+ @searchReset='searchReset'
+ />
+ <equipment-transfer-approval-modal
+ ref='equipmentTransferApprovalModelRef'
+ @searchReset='searchReset'
+ />
+ <equipment-scrap-approval-modal
+ ref='equipmentScrapApprovalModelRef'
+ @searchReset='searchReset'
+ />
</a-card>
</template>
@@ -94,6 +178,10 @@
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'
+import EquipmentLeanOutApprovalModal from '@views/flowable/workflow/leanOut/EquipmentLeanOutApprovalModal.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'
export default {
name: 'NcDeviceCharactersList',
@@ -107,7 +195,11 @@
WeekMaintenanceApprovalModal,
InspectionOrderHandle,
JDictSelectTag,
- OutBoundOrderHandle
+ OutBoundOrderHandle,
+ EquipmentLeanOutApprovalModal,
+ EquipmentSealUpApprovalModal,
+ EquipmentTransferApprovalModal,
+ EquipmentScrapApprovalModal
},
data() {
return {
@@ -120,7 +212,7 @@
key: 'rowIndex',
width: 200,
align: 'center',
- customRender: function(t, r, index) {
+ customRender: function (t, r, index) {
return parseInt(index) + 1
}
},
@@ -180,13 +272,18 @@
selectRepairOrderData: {},
selectOutBoundOrderData: {},
selectLossBoundOrderData: {},
- selectStocktakingBoundOrderData: {}
+ selectStocktakingBoundOrderData: {},
+ // selectEquipmentLeanOutData: {},
+ // selectEquipmentSealUpData: {},
+ // selectEquipmentTransferData: {},
+ // selectEquipmentScrapData: {},
+
}
},
created() {
},
computed: {
- importExcelUrl: function() {
+ importExcelUrl: function () {
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
}
},
@@ -221,6 +318,21 @@
break
case 'toolsLossApproval':
this.handleToolLossApproval(item)
+ break
+ case 'equipment_seal_up':
+ this.handleEquipmentSealUp(item)
+ break
+ case 'equipment_unseal':
+ this.handleEquipmentUnSeal(item)
+ break
+ case 'equipment_lean_out':
+ this.handleEquipmentLeanOut(item)
+ break
+ case 'equipment_transfer':
+ this.handleEquipmentTransfer(item)
+ break
+ case 'equipment_scrap':
+ this.handleEquipmentScrap(item)
break
default:
alert('娌℃壘鍒拌娴佺▼')
@@ -326,7 +438,37 @@
this.$refs.lossBoundHandle.clearTableSource()
this.$refs.lossBoundHandle.getAllApproveData(item)
- }
+ },
+ handleEquipmentLeanOut(item) {
+ this.$refs.equipmentLeanOutApprovalModelRef.visible = false
+ this.$refs.equipmentLeanOutApprovalModelRef.disableSubmit = true
+ this.$refs.equipmentLeanOutApprovalModelRef.handleDetail(item)
+ this.$refs.equipmentLeanOutApprovalModelRef.title = item.name
+ },
+ handleEquipmentSealUp(item) {
+ this.$refs.equipmentSealUpApprovalModelRef.visible = true
+ this.$refs.equipmentSealUpApprovalModelRef.title = item.name
+ this.$refs.equipmentSealUpApprovalModelRef.handleDetail(item)
+ this.$refs.equipmentSealUpApprovalModelRef.disableSubmit = true
+ },
+ handleEquipmentUnSeal(item) {
+ this.$refs.equipmentSealUpApprovalModelRef.visible = true
+ this.$refs.equipmentSealUpApprovalModelRef.title = item.name
+ this.$refs.equipmentSealUpApprovalModelRef.handleDetail(item)
+ this.$refs.equipmentSealUpApprovalModelRef.disableSubmit = true
+ },
+ handleEquipmentTransfer(item) {
+ this.$refs.equipmentTransferApprovalModelRef.visible = true
+ this.$refs.equipmentTransferApprovalModelRef.title = item.name
+ this.$refs.equipmentTransferApprovalModelRef.handleDetail(item)
+ this.$refs.equipmentTransferApprovalModelRef.disableSubmit = true
+ },
+ handleEquipmentScrap(item) {
+ this.$refs.equipmentScrapApprovalModelRef.visible = true
+ this.$refs.equipmentScrapApprovalModelRef.title = item.name
+ this.$refs.equipmentScrapApprovalModelRef.handleDetail(item)
+ this.$refs.equipmentScrapApprovalModelRef.disableSubmit = true
+ },
}
}
</script>
--
Gitblit v1.9.3