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

@@ -9,6 +9,14 @@ export function completeTask (data) {
         data
     })
 }
+// 回退表格数据
+export function getTaskBackNode (params) {
+    return request({
+      url: '/business/workFlow/getTaskBackNode',
+      method: 'get',
+      params: params
+    })
+  }
 // 获取左侧列表
 export function leftMenu (data) {
     return request({

@@ -120,8 +120,8 @@ export default {
     openDialog () {
       console.log(999999999999999);
     },
-    ywhClick (bsmSlsq) {
-      const { href } = this.$router.resolve('/fqsq?bsmSlsq=' + bsmSlsq)
+    ywhClick (item) {
+      const { href } = this.$router.resolve('/fqsq?bsmSlsq=' + item.bsmSlsq + '&bestepid='+item.bestepid)
       window.open(href, '_blank');
     },
   },

@@ -40,7 +40,7 @@ class data extends filter {
         label: '业务号',
         align: 'center',
         render: (h, scope) => {
-          return <el-button type="text" onClick={() => { vm.ywhClick(scope.row.bsmSlsq) }}>{scope.row.ywh}</el-button>
+          return <el-button type="text" onClick={() => { vm.ywhClick(scope.row) }}>{scope.row.ywh}</el-button>
         }
       },
       {

 <template>
-  <dialogBox title="转出" @submitForm="submitForm" :saveloding="saveloding" saveButton="确认转出" width="45%" 
-    height='30%' @closeDialog="closeDialog" v-model="value">
+  <dialogBox title="转出" @submitForm="submitForm" :saveloding="saveloding" saveButton="确认转出" width="80%" 
+     @closeDialog="closeDialog" v-model="value">
     <div class="from-clues">
       <!-- 表单部分 -->
       <div class="from-clues-header">
-        <lb-table :column="columns" border :key="key" :heightNum="390"  :pagination="false" heightNumSetting
-        :data="tableData">
+        <div v-for='(item,index) in arr' :key='item.bdcdyid'>
+          <p>不动产单元号：{{item.bdcdyh}}</p>
+          <lb-table :column="columns" border  :heightNum="390"  :pagination="false" heightNumSetting
+          :data="item.nodeList">
         </lb-table>
+        </div>
+        
         <el-form :model="queryForm" ref="queryForm" label-width="120px">
               <el-form-item label="退回意见:">
                 <el-input type="textarea" v-model="queryForm.shyj"></el-input>
@@ -18,13 +22,13 @@
 </template>
 
 <script>
-   import { completeTask } from "@/api/fqsq.js"
+   import { getTaskBackNode } from "@/api/fqsq.js"
 export default {
   components: {
   },
   props: {
     value: { type: Boolean, default: false },
-    queryForm:{type:Object,default:false}
+    queryForm:{type:Object}
   },
   data () {
     return {
@@ -34,24 +38,54 @@ export default {
         label: '',
         align: 'center',
         render: (h, scope) => {
-          return  <el-radio-group> <el-radio label="3">备选项</el-radio></el-radio-group>
+          return   <el-radio label={scope.row.taskid} v-model={scope.row.radio}>{''}</el-radio>
         }
       },
       {
-        prop: "thhjmc",
+        prop: "fromstepname",
         label: "退回环节名称",
       },
       {
-        prop: "blr",
+        prop: "username",
         label: "办理人",
       },
      
     ],
+    arr:[{
+      bdcdyh:'123123123',
+      bdcdyid:'456789',
+      nodeList:[{
+        fromstepname:'录入',
+        username:'超级管理员',
+        radio:"",
+      },{
+        fromstepname:'测试',
+        username:'超级管理员',
+        radio:"",
+      }]
+    },{
+      bdcdyh:'222222',
+      bdcdyid:'333333',
+      nodeList:[{
+        fromstepname:'扫描',
+        username:'超级管理员',
+        radio:""
+      }]
+    }],
       tableData:[],
       radio:3
     }
   },
+  mounted(){
+  },
   methods: {
+    tablelistFn(){
+      getTaskBackNode(this.queryForm).then(res => {
+        if (res.code === 200) {
+            console.log(res)
+        }
+      })
+    },
     submitForm () {
     
     },

@@ -49,7 +49,7 @@
         </el-tabs></div>
     </div>
     <zc v-model="zcDialog" :queryForm='queryForm' />
-    <thDialog v-model="thflag"  />
+    <thDialog ref='thdialogRef' v-model="thflag" :queryForm='queryForm' />
   </div>
 </template>
 <script>
@@ -66,6 +66,7 @@ export default {
       queryForm:{
         shyj:"",
         bsmSlsq:"",
+        bestepid:"",
       },
       isShowdrawer: true,
       key: 0,
@@ -158,6 +159,7 @@ export default {
     if(this.$route.query.bsmSlsq){
         this.list(this.$route.query.bsmSlsq)
         this.queryForm.bsmSlsq = this.$route.query.bsmSlsq
+        this.queryForm.bestepid = this.$route.query.bestepid
     }
   },
   methods: {
@@ -194,6 +196,9 @@ export default {
         }
       }else if(item.icon=='fqsq8'){
        this.thflag = true
+       this.$nextTick(()=>{
+         this.$refs.thdialogRef.tablelistFn()
+       })
       }
       else if(item.icon=='fqsq9'){
         this.zcDialog = true

@@ -45,6 +45,7 @@
         <div class="from-clues-content">
           <lb-table :page-size="pageData.pageSize" :heightNum="400" :current-page.sync="pageData.currentPage"
             :total="tableData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
+            @selection-change="handleSelectionChange"
             :column="tableData.columns" :data="tableData.data">
           </lb-table>
         </div>
@@ -106,7 +107,7 @@ export default {
       }
     },
     submitForm () {
-      if (this.bdcdyid == '') {
+      if (this.bdcdysz.length == 0) {
         this.$message.error('请至少选择一条数据');
         return
       }