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/scrap/EquipmentScrapApprovalModal.vue | 116 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 92 insertions(+), 24 deletions(-)
diff --git a/src/views/flowable/workflow/scrap/EquipmentScrapApprovalModal.vue b/src/views/flowable/workflow/scrap/EquipmentScrapApprovalModal.vue
index 9ec7e26..5a0afd4 100644
--- a/src/views/flowable/workflow/scrap/EquipmentScrapApprovalModal.vue
+++ b/src/views/flowable/workflow/scrap/EquipmentScrapApprovalModal.vue
@@ -9,58 +9,127 @@
centered
switchFullscreen
@cancel='handleCancel'
- @ok='handleOk'>
+ @ok='handleOk'
+ >
<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' label='鍗曟嵁鍙�' prop='code'>
- <a-input v-model='model.code' disabled />
+ <a-form-model-item
+ :labelCol='labelCol'
+ :wrapperCol='wrapperCol'
+ label='鍗曟嵁鍙�'
+ prop='code'
+ >
+ <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' label='璁惧缂栫爜' prop='equipmentId'>
- <lx-search-equipment-select v-model='model.equipmentId'
- disabled placeholder='璇疯緭鍏ヨ澶囩紪鍙锋垨鍚嶇О鎼滅储'></lx-search-equipment-select>
+ <a-form-model-item
+ :labelCol='labelCol'
+ :wrapperCol='wrapperCol'
+ label='璁惧缂栫爜'
+ prop='equipmentId'
+ >
+ <lx-search-equipment-select
+ v-model='model.equipmentId'
+ disabled
+ placeholder='璇疯緭鍏ヨ澶囩紪鍙锋垨鍚嶇О鎼滅储'
+ ></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' label='鐢宠浜�' prop='reportUser_dictText'>
- <a-input v-model='model.reportUser_dictText' disabled />
+ <a-form-model-item
+ :labelCol='labelCol'
+ :wrapperCol='wrapperCol'
+ label='鐢宠浜�'
+ prop='reportUser_dictText'
+ >
+ <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' label='澶勭疆鍘熷洜' prop='scrapReason'>
- <a-input v-model='model.scrapReason' disabled />
+ <a-form-model-item
+ :labelCol='labelCol'
+ :wrapperCol='wrapperCol'
+ label='澶勭疆鍘熷洜'
+ prop='scrapReason'
+ >
+ <a-input
+ v-model='model.scrapReason'
+ 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' label='澶囨敞' prop='remark'>
- <a-textarea v-model='model.remark' disabled />
+ <a-form-model-item
+ :labelCol='labelCol'
+ :wrapperCol='wrapperCol'
+ label='澶囨敞'
+ prop='remark'
+ >
+ <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' label='瀹℃壒绫诲瀷' prop='approvalDealType'>
- <j-dict-select-tag v-model='model.approvalDealType' :disabled='disableSubmit || initialAcceptanceDisable' dictCode='approved_rejected'
- placeholder='璇烽�夋嫨澶勭悊绫诲瀷' type='radio' />
+ <a-form-model-item
+ :labelCol='labelCol'
+ :wrapperCol='wrapperCol'
+ label='瀹℃壒绫诲瀷'
+ prop='approvalDealType'
+ >
+ <j-dict-select-tag
+ v-model='model.approvalDealType'
+ :disabled='disableSubmit || initialAcceptanceDisable'
+ dictCode='approved_rejected'
+ placeholder='璇烽�夋嫨澶勭悊绫诲瀷'
+ type='radio'
+ />
</a-form-model-item>
</a-col>
<a-col :span='12'>
- <a-form-model-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='瀹℃壒鎰忚' prop='approvalComment'>
- <a-textarea v-model='model.approvalComment' :disabled='disableSubmit || returnDisable'
- placeholder='璇疯緭鍏ユ剰瑙�' />
+ <a-form-model-item
+ :labelCol='labelCol'
+ :wrapperCol='wrapperCol'
+ label='瀹℃壒鎰忚'
+ prop='approvalComment'
+ >
+ <a-textarea
+ v-model='model.approvalComment'
+ :disabled='disableSubmit || returnDisable'
+ placeholder='璇疯緭鍏ユ剰瑙�'
+ />
</a-form-model-item>
</a-col>
</a-row>
@@ -142,8 +211,8 @@
this.loadAllProductionTree()
},
computed: {
- approvalDisable: function() {
- return ['WAIT_CHECK'].includes(this.model.scrapStatus)
+ approvalDisable: function () {
+ return ['WAIT_SUBMIT', 'WAIT_CHECK', 'COMPLETE'].includes(this.model.scrapStatus)
}
},
methods: {
@@ -219,5 +288,4 @@
</script>
<style lang='less' scoped>
-
</style>
\ No newline at end of file
--
Gitblit v1.9.3