From 0a04525d58093de7581950ae9a07129f55f2813f Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 06 六月 2025 15:54:44 +0800
Subject: [PATCH] 修改文件名称展示、批次

---
 src/views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue b/src/views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue
index 6fbbb4f..ed36204 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>
@@ -105,13 +105,11 @@
                   <a-timeline style="padding:0 1% 0 12%" >
                     <a-timeline-item color='white' v-for="(item,index1) in hitaskDataSource" :key="index1">
                       <div class="bottom">
-                        <p>寮�濮嬫椂闂达細{{item.startTime}}</p>
-                        <p>缁撴潫鏃堕棿锛歿{item.endTime}}</p>
-                        <p>澶勭悊浜猴細{{item.assignee}}</p>
-                        <p>鍔炵悊绫诲瀷锛歿{item.bllx_dictText}}</p>
-                        <p v-if="item.name == '鎻愪氦鐢宠'">鎸囨淳鍘熷洜锛歿{item.cause}}</p>
-                        <p v-else >澶勭悊鎰忚锛歿{item.cause}}</p>
-                        <div  class="left_qiu"><span>{{item.name}}</span></div>
+                        <p>澶勭悊浜猴細{{item.assignee_dictText}}</p>
+                        <p v-if="index1 !==0">澶勭悊鏃堕暱锛歿{item.duration}}</p>
+                        <p v-if="item.name !== '鎻愪氦鐢宠'">澶勭悊绫诲瀷锛歿{item.sequenceFlowName}}</p>
+                        <p v-if="item.description != null">澶勭悊鎰忚锛歿{item.description}}</p>
+                        <div class="left_qiu"><span>{{item.taskName}}</span></div>
                       </div>
                     </a-timeline-item>
                   </a-timeline>
@@ -143,11 +141,11 @@
                 <a-input :disabled='coldisabled' v-model='tableRowRecord.applyTime'></a-input>
               </a-form-model-item >
             </a-col>
-            <a-col :span="24">
-              <a-form-item label="瀵嗙骇涓�" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <j-dict-select-tag  type='list' v-model='assignFileStream.secretLevel' dictCode='dnc_secret_level' placeholder="璇烽�夋嫨瀵嗙骇"  />
-              </a-form-item>
-            </a-col>
+<!--            <a-col :span="24">-->
+<!--              <a-form-item label="瀵嗙骇涓�" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--                <j-dict-select-tag  type='list' v-model='assignFileStream.secretLevel' dictCode='dnc_secret_level' placeholder="璇烽�夋嫨瀵嗙骇"  />-->
+<!--              </a-form-item>-->
+<!--            </a-col>-->
             <a-col :span="24" class="btxx">
               <a-form-item label="瀹℃壒鐘舵��" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <j-dict-select-tag  type='list' v-model='assignFileStream.status' dictCode='dnc_assign_stream_status' placeholder="璇烽�夋嫨瀹℃壒鐘舵��"  />
@@ -246,8 +244,8 @@
       url: {
         queryBomDataById: '/nc/activit/selectVoById',
         diagramView: '/assign/flow/diagramView',
-        queryHisTaskList:'/assign/flow/queryHisTaskList',
-        approve:"/activit/assign/file/approve",
+        queryHisTaskList:'/dncFlow/dispatchFile/queryHisTaskList',
+        approve:"/nc/activit/assign/file/approve",
       },
       dictOptions: {},
       superFieldList: [],
@@ -322,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);
             }
@@ -340,7 +340,7 @@
         'id': item.dataId
       }
       let parmhis={
-        'procInstId': item.dataId
+        'procInstId': item.procInstId
       }
       getAction(this.url.queryHisTaskList,parmhis).then(res=>{
         this.hitaskDataSource=res.result

--
Gitblit v1.9.3