From eb59bf31b7cdc41f09d386dfc448d7c287c6d3d3 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 19 三月 2025 13:43:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/flowable/workflow/FlowNcZpi.vue | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/views/flowable/workflow/FlowNcZpi.vue b/src/views/flowable/workflow/FlowNcZpi.vue
index 50c3204..f958e3c 100644
--- a/src/views/flowable/workflow/FlowNcZpi.vue
+++ b/src/views/flowable/workflow/FlowNcZpi.vue
@@ -71,6 +71,18 @@
</a-row>
<a-row>
<a-col :span='span'>
+ <a-form-model-item label='璁惧绫诲悕绉�' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='deviceManagementCode'>
+ <a-input :disabled='coldisabled' v-model='tableRowRecord.deviceManagementCode'></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span='span'>
+ <a-form-model-item label='璁惧绫诲悕绉�' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='deviceManagementName'>
+ <a-input :disabled='coldisabled' v-model='tableRowRecord.deviceManagementName'></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span='span'>
<a-form-model-item label='鏂囨。鍚嶇О' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='docName'>
<a-input :disabled='coldisabled' v-model='tableRowRecord.docName'></a-input>
</a-form-model-item>
@@ -92,7 +104,8 @@
<p>缁撴潫鏃堕棿锛歿{item.endTime}}</p>
<p>澶勭悊浜猴細{{item.assignee}}</p>
<p>鍔炵悊绫诲瀷锛歿{item.bllx_dictText}}</p>
- <p>澶勭悊鎰忚锛歿{item.cause}}</p>
+ <p v-if="item.name == '鎻愪氦鐢宠'">鎸囨淳鍘熷洜锛歿{item.cause}}</p>
+ <p v-else >澶勭悊鎰忚锛歿{item.cause}}</p>
<div class="left_qiu"><span>{{item.name}}</span></div>
</div>
</a-timeline-item>
@@ -253,7 +266,9 @@
console.log('flowData----->', this.flowData)
try {
let parm = {
- taskId: this.flowData.id
+ processDefinitionId: this.flowData.processDefinitionId,
+ processInstanceId:this.flowData.processInstanceId,
+ TaskDefinitionKey:this.flowData.processDefinitionKey
}
downFile(this.url.diagramView,parm,'get').then((res=>{
console.log('Pica------>',res)
--
Gitblit v1.9.3