Merge pull request 'master' (#434) from master into prod

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/434

src/views/project-demand/requirement/moblieDetail/CollectionDetailMoblie.vue

@@ -74,7 +74,7 @@
         </div>
         <div class="process">
           <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0&&!changeDiagram"
-                            :operation-list="data.operationList"
+                            :operation-list="data.operationList" :isColumn="true"
                             :state="data.state"/>
           <process-diagram-viewer v-if="processViewer&&changeDiagram" id-name="collectionProcess"/>
         </div>

src/views/project-management/mobledetail/ApprovalDetailMoblie.vue

@@ -34,7 +34,7 @@
         </div>
       </div>
       <div class="process">
-        <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0&&!changeDiagram"
+        <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0&&!changeDiagram" :isColumn="true"
                           :operation-list="data.operationList"
                           :state="data.state"/>
         <process-diagram-viewer v-if="processViewer&&changeDiagram" :id-name="idName?idName:type"/>

src/views/project-management/mobledetail/CollectionDetailMoblie.vue

@@ -73,7 +73,7 @@
           </div>
         </div>
         <div class="process">
-          <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0&&!changeDiagram"
+          <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0&&!changeDiagram" :isColumn="true"
                             :operation-list="data.operationList"
                             :state="data.state"/>
           <process-diagram-viewer v-if="processViewer&&changeDiagram" id-name="collectionProcess"/>

src/views/project-management/mobledetail/ProjectApplyMoblie.vue

@@ -34,7 +34,7 @@
           </div>
         </div>
         <div class="process">
-          <operation-render v-if="mode === 'resubmit'&&!changeDiagram" :operation-list="data.operationList"
+          <operation-render v-if="mode === 'resubmit'&&!changeDiagram" :operation-list="data.operationList" :isColumn="true"
                             :state="data.state"/>
           <process-diagram-viewer mode="view" :idName="title" v-if="processDiagramViewer&&changeDiagram"/>
         </div>

src/views/project-management/mobledetail/ShareDetailMobile.vue

@@ -46,7 +46,7 @@
     </div>
     <div class="process">
       <operation-render
-          v-if="shareProcessViewer&& shareData.operationList && shareData.operationList.length > 0&&!changeDiagram"
+          v-if="shareProcessViewer&& shareData.operationList && shareData.operationList.length > 0&&!changeDiagram"  :isColumn="true"
           :operation-list="shareData.operationList"
           :state="shareData.state"/>
       <process-diagram-viewer v-if="shareProcessViewer&&changeDiagram" id-name="shareProcess"/>

src/views/project-management/mobledetail/SpecialFundDetailMobile.vue

@@ -78,7 +78,7 @@
           </div>
         </div>
         <div class="process">
-          <operation-render v-if="fundProcessViewer && fundData.operationList && fundData.operationList.length > 0&&!changeDiagram"
+          <operation-render v-if="fundProcessViewer && fundData.operationList && fundData.operationList.length > 0&&!changeDiagram" :isColumn="true"
                             :operation-list="fundData.operationList"
                             :state="fundData.state"/>
           <process-diagram-viewer v-if="fundProcessViewer&&changeDiagram" id-name="fundProcess"/>

src/views/project-management/mobledetail/SummaryDetailMoblie.vue

@@ -170,7 +170,7 @@
           </div>
         </div>
         <div class="process">
-          <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0&&!changeDiagram"
+          <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0&&!changeDiagram" :isColumn="true"
                             :operation-list="data.operationList"
                             :state="data.state"/>
           <process-diagram-viewer v-if="processViewer&&changeDiagram" id-name="summaryProcess"/>

src/views/project-management/phaseDetailMoblie/ApprovalDetailMoblie.vue

@@ -35,7 +35,7 @@
       </div>
       <div class="process">
         <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0&&!changeDiagram"
-                          :operation-list="data.operationList"
+                          :operation-list="data.operationList" :isColumn="true"
                           :state="data.state"/>
         <process-diagram-viewer v-if="processViewer&&changeDiagram" :id-name="idName?idName:type"/>
       </div>

src/views/workflow/common/OperationRender.vue

@@ -12,8 +12,8 @@
             当前节点: {{ operation.operationName }}
           </div>
           <div class="card">
-            <div v-for="(user,index) in operation.userInfo" :key="index" class="avatar_name">
+            <div v-for="(user,index) in operation.userInfo" :key="index" class="avatar_name" :style="{'flex-direction': isColumn?'column':'row'}">
-              <div class="avatar-block">
+              <div class="avatar-block" :style="{'margin-bottom': isColumn?'10px':'0'}">
                 <name-circle :user="user"/>
                 <div class="name">
                   <span>{{ user.name }}</span>
@@ -64,6 +64,10 @@ const props = defineProps({
     default: () => {
       return '1'
     }
+  },
+  isColumn: {
+    type: Boolean,
+    default:false
   }
 })