Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

@@ -4,12 +4,12 @@
     <div class="from-clues-header">
     <div class="from-clues-header">
       <el-form ref="queryForm" label-width="90px">
       <el-form ref="queryForm" label-width="90px">
         <ul style="margin-bottom:15px">
         <ul style="margin-bottom:15px">
-          <li v-for="(item,index) in list" class="listDetail">
+          <li v-for="(item,index) in dataList" class="listDetail" :key="index">
             <p class="icon">
             <p class="icon">
               <i class="el-icon-circle-check"></i>
               <i class="el-icon-circle-check"></i>
             </p>
             </p>
-            <p>{{item.title}}</p>
-            <p>{{item.value}}</p>
+            <p>{{item.activityName}}</p>
+            <p v-for="(child,childIndex) in item.userInfos" :key="childIndex">{{child.name}}</p>
           </li>
           </li>
         </ul>
         </ul>
         <el-form-item label="退回意见:">
         <el-form-item label="退回意见:">
@@ -24,27 +24,31 @@
 import { getTaskBackNode, sendBackTask } from "@/api/fqsq.js"
 import { getTaskBackNode, sendBackTask } from "@/api/fqsq.js"
 export default {
 export default {
   props: {
   props: {
+    formData: {
+      type: Object,
+      default: {}
+    }
   },
   },
   data () {
   data () {
     return {
     return {
-      list: [
-        {
-          title: "初审",
-          value: '',
-        },
-        {
-          title: "复审",
-          value: '',
-        },
-        {
-          title: "录入",
-          value: '',
-        }
-      ],
+      dataList: [],
       outstepopinion: ''
       outstepopinion: ''
     }
     }
   },
   },
+  created() {
+    this.getBackNode();
+  },
   methods: {
   methods: {
+    childFn () {
+      console.log(1111);
+    },
+    getBackNode() {
+      getTaskBackNode(this.formData).then(res => {
+        if(res.code == 200){
+          this.dataList = res.result
+        }
+      })
+    }
   }
   }
 }
 }
 </script>
 </script>

@@ -285,7 +285,10 @@ export default {
             editItem: "workflow/components/th",
             editItem: "workflow/components/th",
             height: "330px",
             height: "330px",
             width: '30%',
             width: '30%',
-            formData: {},
+            formData: {
+              bsmSlsq: this.bsmSlsq,
+              bestepid: this.bestepid
+            },
             btnShow: true,
             btnShow: true,
             cancel: () => {
             cancel: () => {
               console.log("取消回调");
               console.log("取消回调");