From 0af7ddaab76e430d586eed37897df96be09ba220 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 28 七月 2025 15:41:05 +0800
Subject: [PATCH] 设备处置流程方面的问题修改
---
src/views/flowable/workflow/transfer/EquipmentTransferApprovalModal.vue | 140 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 112 insertions(+), 28 deletions(-)
diff --git a/src/views/flowable/workflow/transfer/EquipmentTransferApprovalModal.vue b/src/views/flowable/workflow/transfer/EquipmentTransferApprovalModal.vue
index c0f5b68..a33291e 100644
--- a/src/views/flowable/workflow/transfer/EquipmentTransferApprovalModal.vue
+++ b/src/views/flowable/workflow/transfer/EquipmentTransferApprovalModal.vue
@@ -9,70 +9,155 @@
@ok="handleOk"
@cancel="handleCancel"
centered
- cancelText="鍏抽棴">
+ cancelText="鍏抽棴"
+ >
<a-spin :spinning="spinning">
- <a-form-model ref="form" :model="model" :rules="validatorRules">
- <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 褰掑睘淇℃伅
+ <a-form-model
+ ref="form"
+ :model="model"
+ :rules="validatorRules"
+ >
+ <a-divider
+ orientation="center"
+ style="font-size: large;font-style: italic;color: #66aeed;"
+ > 褰掑睘淇℃伅
</a-divider>
<a-row :gutter="24">
<a-col :span="12">
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="code" label="鍗曟嵁鍙�">
- <a-input v-model="model.code" disabled />
+ <a-form-model-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="code"
+ label="鍗曟嵁鍙�"
+ >
+ <a-input
+ v-model="model.code"
+ disabled
+ />
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentId" label="璁惧缂栫爜">
- <lx-search-equipment-select placeholder="璇疯緭鍏ヨ澶囩紪鍙锋垨鍚嶇О鎼滅储"
- v-model="model.equipmentId" disabled></lx-search-equipment-select>
+ <a-form-model-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="equipmentId"
+ label="璁惧缂栫爜"
+ >
+ <lx-search-equipment-select
+ placeholder="璇疯緭鍏ヨ澶囩紪鍙锋垨鍚嶇О鎼滅储"
+ v-model="model.equipmentId"
+ disabled
+ ></lx-search-equipment-select>
</a-form-model-item>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="newDepartId_dictText" label="璋冨叆閮ㄩ棬">
- <a-input v-model="model.newDepartId_dictText" disabled />
+ <a-form-model-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="newDepartId_dictText"
+ label="璋冨叆閮ㄩ棬"
+ >
+ <a-input
+ v-model="model.newDepartId_dictText"
+ disabled
+ />
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="oldDepartId_dictText" label="璋冨嚭閮ㄩ棬">
- <a-input v-model="model.oldDepartId_dictText" disabled />
+ <a-form-model-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="oldDepartId_dictText"
+ label="璋冨嚭閮ㄩ棬"
+ >
+ <a-input
+ v-model="model.oldDepartId_dictText"
+ disabled
+ />
</a-form-model-item>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="reportUser_dictText" label="鐢宠浜�">
- <a-input v-model="model.reportUser_dictText" disabled />
+ <a-form-model-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="reportUser_dictText"
+ label="鐢宠浜�"
+ >
+ <a-input
+ v-model="model.reportUser_dictText"
+ disabled
+ />
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="transferReason" label="鍙樺姩鍘熷洜">
- <a-input v-model="model.transferReason" disabled />
+ <a-form-model-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="transferReason"
+ label="鍙樺姩鍘熷洜"
+ >
+ <a-input
+ v-model="model.transferReason"
+ disabled
+ />
</a-form-model-item>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="24">
- <a-form-model-item :labelCol="labelColLong" :wrapperCol="wrapperColLong" prop="remark" label="澶囨敞">
- <a-textarea v-model="model.remark" disabled />
+ <a-form-model-item
+ :labelCol="labelColLong"
+ :wrapperCol="wrapperColLong"
+ prop="remark"
+ label="澶囨敞"
+ >
+ <a-textarea
+ v-model="model.remark"
+ disabled
+ />
</a-form-model-item>
</a-col>
</a-row>
<div v-if="approvalDisable">
- <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 绠＄悊鍛樺皝瀛樺鏍�
+ <a-divider
+ orientation="center"
+ style="font-size: large;font-style: italic;color: #66aeed;"
+ > 绠＄悊鍛樺皝瀛樺鏍�
</a-divider>
<a-row :gutter="24">
<a-col :span="12">
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="approvalDealType" label="瀹℃壒绫诲瀷">
- <j-dict-select-tag type="radio" v-model="model.approvalDealType" dictCode="approved_rejected"
- placeholder="璇烽�夋嫨澶勭悊绫诲瀷" :disabled="disableSubmit || initialAcceptanceDisable" />
+ <a-form-model-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="approvalDealType"
+ label="瀹℃壒绫诲瀷"
+ >
+ <j-dict-select-tag
+ type="radio"
+ v-model="model.approvalDealType"
+ dictCode="approved_rejected"
+ placeholder="璇烽�夋嫨澶勭悊绫诲瀷"
+ :disabled="disableSubmit || initialAcceptanceDisable"
+ />
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="approvalComment" label="瀹℃壒鎰忚">
- <a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.approvalComment"
- :disabled="disableSubmit || returnDisable" />
+ <a-form-model-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="approvalComment"
+ label="瀹℃壒鎰忚"
+ >
+ <a-textarea
+ placeholder="璇疯緭鍏ユ剰瑙�"
+ v-model="model.approvalComment"
+ :disabled="disableSubmit || returnDisable"
+ />
</a-form-model-item>
</a-col>
</a-row>
@@ -154,8 +239,8 @@
this.loadAllProductionTree()
},
computed: {
- approvalDisable: function() {
- return ['WAIT_CHECK'].includes(this.model.transferStatus)
+ approvalDisable: function () {
+ return ['WAIT_SUBMIT', 'WAIT_APPROVAL', 'WAIT_RETURN', 'WAIT_CONFIRM', 'COMPLETE',].includes(this.model.transferStatus)
},
},
methods: {
@@ -231,5 +316,4 @@
</script>
<style lang="less" scoped>
-
</style>
\ No newline at end of file
--
Gitblit v1.9.3