Merge branch 'gaoang-2024-8' into 'dev'

feat: 流程详情添加签章

See merge request itc-framework/ma/2024/front!13

src/components/SecondDev/FlowHistory.vue

@@ -4,11 +4,20 @@
             <template v-if="mode === 'simple'">
                 <div class="row">
                     <div class="col-node">{{ item.taskName }}</div>
-                    <div class="col-1">{{ item.approveUserName }}</div>
+                    <div class="col-1" style="display: flex;">
+                            {{ item.approveUserName }} 
+                        <a-image v-if="item.approveStampUrl" class="signature" :src="item.approveStampUrl"></a-image>
+                    </div>
                     <div class="col-2">{{ parseTime(item.approveTime) }}</div>
-                    <div class="col-3"
-                        ><span :class="getTagCls(item)">[{{ item.approveResult }}]</span>{{ item.approveComment }}</div
-                    >
+                    <div class="col-3">
+                        <span :class="getTagCls(item)">
+                            [{{ item.approveResult }}]
+                            <template v-if="item.approveComment != '' && item.approveComment != null">
+                            [补充意见]
+                             </template>
+                        </span>
+                        {{ item.approveComment }}
+                    </div>
                 </div>
             </template>
             <template v-if="mode === 'complex'">
@@ -29,6 +38,10 @@
 
 <style lang="less">
     .geg-flow-history {
+        .signature {
+            height: 20px;
+            width: 50px;
+        }
         .row {
             display: flex;
             flex-direction: row;
@@ -38,7 +51,7 @@
         }
 
         .col-1 {
-            width: 140px;
+            width: 160px;
         }
 
         .col-2 {