From 8905bdd0a74c4bd6cabc206c36a299341488041e Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 11 九月 2025 11:00:26 +0800
Subject: [PATCH] 合并设备借出与归还流程，增加借出归还列表详情功能
---
src/views/flowable/workflow/transfer/EquipmentTransferApprovalModal.vue | 168 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 144 insertions(+), 24 deletions(-)
diff --git a/src/views/flowable/workflow/transfer/EquipmentTransferApprovalModal.vue b/src/views/flowable/workflow/transfer/EquipmentTransferApprovalModal.vue
index a33291e..1f19d3f 100644
--- a/src/views/flowable/workflow/transfer/EquipmentTransferApprovalModal.vue
+++ b/src/views/flowable/workflow/transfer/EquipmentTransferApprovalModal.vue
@@ -21,7 +21,7 @@
<a-divider
orientation="center"
style="font-size: large;font-style: italic;color: #66aeed;"
- > 褰掑睘淇℃伅
+ > 璋冩嫧淇℃伅
</a-divider>
<a-row :gutter="24">
<a-col :span="12">
@@ -123,26 +123,26 @@
</a-form-model-item>
</a-col>
</a-row>
- <div v-if="approvalDisable">
+ <div v-if="useApprovalDisable">
<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"
+ prop="useLeaderApprovalDealType"
label="瀹℃壒绫诲瀷"
>
<j-dict-select-tag
type="radio"
- v-model="model.approvalDealType"
+ v-model="model.useLeaderApprovalDealType"
dictCode="approved_rejected"
placeholder="璇烽�夋嫨澶勭悊绫诲瀷"
- :disabled="disableSubmit || initialAcceptanceDisable"
+ :disabled="disableSubmit || leanOutApprovalDisable"
/>
</a-form-model-item>
</a-col>
@@ -150,13 +150,116 @@
<a-form-model-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
- prop="approvalComment"
+ prop="useLeaderApprovalComment"
label="瀹℃壒鎰忚"
>
<a-textarea
placeholder="璇疯緭鍏ユ剰瑙�"
- v-model="model.approvalComment"
- :disabled="disableSubmit || returnDisable"
+ v-model="model.useLeaderApprovalComment"
+ :disabled="disableSubmit || leanOutApprovalDisable"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ </div>
+ <div v-if="leanOutApprovalDisable">
+ <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="transferLeaderApprovalDealType"
+ label="瀹℃壒绫诲瀷"
+ >
+ <j-dict-select-tag
+ type="radio"
+ v-model="model.transferLeaderApprovalDealType"
+ dictCode="approved_rejected"
+ placeholder="璇烽�夋嫨澶勭悊绫诲瀷"
+ :disabled="disableSubmit || externalConfirmDisable"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="transferLeaderApprovalComment"
+ label="瀹℃壒鎰忚"
+ >
+ <a-textarea
+ placeholder="璇疯緭鍏ユ剰瑙�"
+ v-model="model.transferLeaderApprovalComment"
+ :disabled="disableSubmit || externalConfirmDisable"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ </div>
+ <div v-if="externalConfirmDisable">
+ <a-divider
+ orientation="center"
+ style="font-size: large;font-style: italic;color: #66aeed;"
+ > 鏈哄姩鍔炵‘璁�
+ </a-divider>
+ <a-row :gutter="24">
+ <a-col :span="24">
+ <a-form-model-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="companyLeaderCheck"
+ label="鏄惁闇�瑕佸叕鍙搁瀵煎鎵�"
+ >
+ <j-dict-select-tag
+ type="radio"
+ v-model="model.companyLeaderCheck"
+ dictCode="yn"
+ placeholder="璇烽�夋嫨鏄惁"
+ :disabled="disableSubmit || companyApprovalDisable"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ </div>
+ <div v-if="companyApprovalDisable">
+ <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="companyLeaderApprovalDealType"
+ label="瀹℃壒绫诲瀷"
+ >
+ <j-dict-select-tag
+ type="radio"
+ v-model="model.companyLeaderApprovalDealType"
+ dictCode="approved_rejected"
+ placeholder="璇烽�夋嫨澶勭悊绫诲瀷"
+ :disabled="disableSubmit"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="companyLeaderApprovalComment"
+ label="瀹℃壒鎰忚"
+ >
+ <a-textarea
+ placeholder="璇疯緭鍏ユ剰瑙�"
+ v-model="model.companyLeaderApprovalComment"
+ :disabled="disableSubmit"
/>
</a-form-model-item>
</a-col>
@@ -190,41 +293,44 @@
treeData: [],
labelCol: {
xs: { span: 24 },
- sm: { span: 5 }
+ sm: { span: 6 }
},
wrapperCol: {
xs: { span: 24 },
- sm: { span: 18 }
+ sm: { span: 16 }
},
labelColLong: {
xs: { span: 24 },
- sm: { span: 2 }
+ sm: { span: 3 }
},
wrapperColLong: {
xs: { span: 24 },
- sm: { span: 21 }
+ sm: { span: 20 }
},
confirmLoading: false,
spinning: false,
imageSrc: null,
validatorRules: {
- approvalDealType: [
+ useLeaderApprovalDealType: [
{ required: true, message: '璇烽�夋嫨閫氳繃鎴栭┏鍥�!' }
],
- unsealApprovalDealType: [
+ transferLeaderApprovalDealType: [
{ required: true, message: '璇烽�夋嫨閫氳繃鎴栭┏鍥�!' }
],
- approvalComment: [
+ companyLeaderCheck: [
+ { required: true, message: '璇烽�夋嫨鏄垨鍚�!' }
+ ],
+ companyLeaderApprovalDealType: [
+ { required: true, message: '璇烽�夋嫨閫氳繃鎴栭┏鍥�!' }
+ ],
+ useLeaderApprovalComment: [
{ required: true, message: '璇疯緭鍏ュ鎵规剰瑙�!' }
],
- unsealApprovalComment: [
+ transferLeaderApprovalComment: [
{ required: true, message: '璇疯緭鍏ュ鎵规剰瑙�!' }
],
- returnComment: [
- { required: true, message: '璇疯緭鍏ュ綊杩樺娉�!' }
- ],
- confirmComment: [
- { required: true, message: '璇疯緭鍏ョ‘璁ゆ剰瑙�!' }
+ companyLeaderApprovalComment: [
+ { required: true, message: '璇疯緭鍏ュ鎵规剰瑙�!' }
]
},
url: {
@@ -239,8 +345,21 @@
this.loadAllProductionTree()
},
computed: {
- approvalDisable: function () {
- return ['WAIT_SUBMIT', 'WAIT_APPROVAL', 'WAIT_RETURN', 'WAIT_CONFIRM', 'COMPLETE',].includes(this.model.transferStatus)
+ //浣跨敤鍗曚綅棰嗗瀹℃壒
+ useApprovalDisable: function () {
+ return ['WAIT_SUBMIT', 'WAIT_USE_LEADER_CHECK', 'WAIT_TRANSFER_LEADER_CHECK', 'WAIT_EXTERNAL_CONFIRM', 'WAIT_COMPANY_LEADER_CHECK', 'REJECT', 'COMPLETE'].includes(this.model.transferStatus)
+ },
+ //璋冨叆鍗曚綅棰嗗瀹℃壒WAIT_USE_LEADER_CHECK
+ leanOutApprovalDisable: function () {
+ return ['WAIT_TRANSFER_LEADER_CHECK', 'WAIT_EXTERNAL_CONFIRM', 'WAIT_COMPANY_LEADER_CHECK', 'REJECT', 'COMPLETE'].includes(this.model.transferStatus)
+ },
+ //鏈哄姩鍔炵‘璁�
+ externalConfirmDisable: function () {
+ return ['WAIT_EXTERNAL_CONFIRM', 'WAIT_COMPANY_LEADER_CHECK', 'REJECT', 'COMPLETE'].includes(this.model.transferStatus)
+ },
+ // 鍏徃棰嗗瀹℃壒
+ companyApprovalDisable: function () {
+ return ['WAIT_COMPANY_LEADER_CHECK', 'REJECT', 'COMPLETE'].includes(this.model.transferStatus)
},
},
methods: {
@@ -261,6 +380,7 @@
console.log('record', record)
this.initParams()
this.model = Object.assign({}, record)
+ this.spinning = false
},
initParams() {
--
Gitblit v1.9.3