Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiDaiBanInfo.vue

@@ -107,7 +107,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-show="currentLink">
+        <el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
           <el-col :span="24">
             <div class="span-sty"><span>当前环节:</span></div>
             <el-form-item><span class="addinputInfo">{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
@@ -216,7 +216,7 @@ export default {
     this.linkByParameter.instanceId = obj.instanceId
     this.linkByParameter.taskId = obj.taskId
     this.linkByParameter.taskDefKey = obj.taskDefKey
-    // this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
+    this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
     this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
     this.current.taskDefKey = obj.taskDefKey
     this.current.taskName = obj.taskName

anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiDaiBanInfo.vue

@@ -87,7 +87,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-show="currentLink">
+        <el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
           <el-col :span="24">
             <div class="span-sty"><span>当前环节:</span></div>
             <el-form-item><span class="addinputInfo">{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
@@ -175,7 +175,7 @@ export default {
     this.linkByParameter.instanceId = obj.instanceId
     this.linkByParameter.taskId = obj.taskId
     this.linkByParameter.taskDefKey = obj.taskDefKey
-    // this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
+    this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
     this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
     this.current.taskDefKey = obj.taskDefKey
     this.current.taskName = obj.taskName

anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiDaiBanInfo.vue

@@ -107,7 +107,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-show="currentLink">
+        <el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
           <el-col :span="24">
             <div class="span-sty"><span>当前环节:</span></div>
             <el-form-item><span class="addinputInfo">{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
@@ -215,7 +215,7 @@ export default {
     this.linkByParameter.instanceId = obj.instanceId
     this.linkByParameter.taskId = obj.taskId
     this.linkByParameter.taskDefKey = obj.taskDefKey
-    // this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
+    this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
     this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
     this.current.taskDefKey = obj.taskDefKey
     this.current.taskName = obj.taskName

anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiDaiBanInfo.vue

@@ -87,7 +87,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-show="currentLink">
+        <el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
           <el-col :span="24">
             <div class="span-sty"><span>当前环节:</span></div>
             <el-form-item><span class="addinputInfo">{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
@@ -193,7 +193,7 @@ export default {
     this.linkByParameter.instanceId = obj.instanceId
     this.linkByParameter.taskId = obj.taskId
     this.linkByParameter.taskDefKey = obj.taskDefKey
-    // this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
+    this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
     this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
     this.current.taskDefKey = obj.taskDefKey
     this.current.taskName = obj.taskName