From bf4cb4fdbd57f1785cdd1ddeadfb20a835d5fb6f Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 05 六月 2025 15:18:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/flowable/workflow/assignFileStream/AssignFileStreamXq.vue |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/flowable/workflow/assignFileStream/AssignFileStreamXq.vue b/src/views/flowable/workflow/assignFileStream/AssignFileStreamXq.vue
index 6b602c7..e74754c 100644
--- a/src/views/flowable/workflow/assignFileStream/AssignFileStreamXq.vue
+++ b/src/views/flowable/workflow/assignFileStream/AssignFileStreamXq.vue
@@ -76,12 +76,12 @@
                   </a-row>
                   <a-row>
                     <a-col :span='span'>
-                      <a-form-model-item label='璁惧绫诲悕绉�' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='deviceManagementCode'>
+                      <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-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>
@@ -200,7 +200,7 @@
       url: {
         queryBomDataById: '/nc/activit/selectVoById',
         diagramView: '/assign/flow/diagramView',
-        queryHisTaskList:'/assign/flow/queryHisTaskList',
+        queryHisTaskList:'/dncFlow/dispatchFile/queryHisTaskList',
         approve:"/activit/assign/file/approve",
       },
       dictOptions: {},
@@ -295,7 +295,7 @@
         'id': item.dataId
       }
       let parmhis={
-        'procInstId': item.processInstanceId
+        'procInstId': item.procInstId
       }
       getAction(this.url.queryHisTaskList,parmhis).then(res=>{
         this.hitaskDataSource=res.result

--
Gitblit v1.9.3