Merge pull request #75 from lanyulei/dev

fix: 修复主动接单引起数据缺失的问题。

src/views/process/list/apply-process-list.vue

@@ -137,8 +137,10 @@ export default {
 
   .process-div-title {
     font-size: 15px;
-    margin-top: 10px;
+    margin-top: 6px;
     color: #606266;
+    height: 18px;
+    line-height: 18px;
   }
 
   .process-div-remarks {

src/views/process/list/handle.vue

@@ -79,7 +79,8 @@
               currentNode.hideTpls.indexOf(tplItem.form_structure.id)!==-1) ||
               (currentNode.writeTpls===undefined ||
               currentNode.writeTpls===null ||
-              currentNode.writeTpls.indexOf(tplItem.form_structure.id)===-1)?true:false"
+              currentNode.writeTpls.indexOf(tplItem.form_structure.id)===-1)||
+              (isActiveProcessing && currentNode.activeOrder)?true:false"
             :remote="remoteFunc"
             :value="tplItem.form_data"
             :data="tplItem.form_structure"
@@ -318,7 +319,7 @@ export default {
         process_method: 'person',
         processor: [this.userId]
       }]
-      activeOrder(jsonData, this.$route.query.workOrderId).then(response => {
+      activeOrder(jsonData, this.$route.query.workOrderId).then(() => {
         this.getProcessNodeList()
       })
     }