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/AssignFileStreamHandle.vue |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue b/src/views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue
index c52df86..745176b 100644
--- a/src/views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue
+++ b/src/views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue
@@ -13,7 +13,7 @@
   >
     <a-card :bordered="false">
       <div>
-        <b>{{ selectShenpiData.title }}</b>
+        <b>{{ selectShenpiData.description }}</b>
         <br>
         <br>
         <a-tag color="blue">
@@ -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>
@@ -320,7 +320,9 @@
           httpAction(url,flowTaskVo,method).then((res)=>{
             if(res.success){
               that.$message.success(res.message);
-              that.$emit('ok');
+              that.visible = false
+              //鍒锋柊琛ㄦ牸
+              that.$emit('searchReset')
             }else{
               that.$message.warning(res.message);
             }

--
Gitblit v1.9.3