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

@@ -17,6 +17,14 @@ export function getTaskBackNode (params) {
       params: params
       params: params
     })
     })
   }
   }
+//   退回确认接口
+export function sendBackTask (data) {
+    return request({
+        url: '/business/workFlow/sendBackTask',
+        method: 'post',
+        data
+    })
+}
 // 获取左侧列表
 // 获取左侧列表
 export function leftMenu (data) {
 export function leftMenu (data) {
     return request({
     return request({

 <template>
 <template>
-  <dialogBox title="转出" @submitForm="submitForm" :saveloding="saveloding" saveButton="确认转出" width="80%" 
+  <dialogBox title="退回" @submitForm="submitForm" :saveloding="saveloding" saveButton="确认退回" width="80%" 
      @closeDialog="closeDialog" v-model="value">
      @closeDialog="closeDialog" v-model="value">
     <div class="from-clues">
     <div class="from-clues">
       <!-- 表单部分 -->
       <!-- 表单部分 -->
       <div class="from-clues-header">
       <div class="from-clues-header">
-        <div v-for='(item,index) in arr' :key='item.bdcdyid'>
-          <p>不动产单元号：{{item.bdcdyh}}</p>
+        <el-form ref="queryForm" label-width="120px">
+        <div v-for='(item,index) in tableData' :key='item.bdcdyid'>
+          <el-form-item label="不动产单元号:">
+            <p>{{item.bdcdyh}}</p>
+          </el-form-item>
           <lb-table :column="columns" border  :heightNum="390"  :pagination="false" heightNumSetting
           <lb-table :column="columns" border  :heightNum="390"  :pagination="false" heightNumSetting
           :data="item.nodeList">
           :data="item.nodeList">
         </lb-table>
         </lb-table>
+        <el-form-item label="退回意见:">
+          <el-input class="textArea" type="textarea" v-model="outstepopinion"></el-input>
+        </el-form-item>
         </div>
         </div>
-        
-        <el-form :model="queryForm" ref="queryForm" label-width="120px">
-              <el-form-item label="退回意见:">
-                <el-input type="textarea" v-model="queryForm.shyj"></el-input>
-              </el-form-item>
         </el-form>
         </el-form>
       </div>
       </div>
     </div>
     </div>
@@ -22,7 +23,7 @@
 </template>
 </template>
 
 
 <script>
 <script>
-   import { getTaskBackNode } from "@/api/fqsq.js"
+   import { getTaskBackNode,sendBackTask } from "@/api/fqsq.js"
 export default {
 export default {
   components: {
   components: {
   },
   },
@@ -31,15 +32,28 @@ export default {
     queryForm:{type:Object}
     queryForm:{type:Object}
   },
   },
   data () {
   data () {
-    return {
-      saveloding:false,
-      columns:[
+    const columns=[
+      // {
+      //   label: '',
+      //   align: 'center',
+      //   render: (h, scope) => {
+      //     return   <el-radio label={scope.row.taskid} v-model={this.radioVal} >{''}</el-radio>
+      //   }
+      // },
       {
       {
-        label: '',
-        align: 'center',
+        label: "",
+        width: "36px",
         render: (h, scope) => {
         render: (h, scope) => {
-          return   <el-radio label={scope.row.taskid} v-model={scope.row.radio}>{''}</el-radio>
-        }
+          return (
+            <div class="orgColumn">
+              <el-radio v-model={this.radioVal} label={scope.row.taskid}  onChange={() => {this.radioClick(scope.row);
+                    }}>
+                {" "}
+                &ensp;
+              </el-radio>
+            </div>
+          );
+        },
       },
       },
       {
       {
         prop: "fromstepname",
         prop: "fromstepname",
@@ -50,52 +64,71 @@ export default {
         label: "办理人",
         label: "办理人",
       },
       },
      
      
-    ],
-    arr:[{
-      bdcdyh:'123123123',
-      bdcdyid:'456789',
-      nodeList:[{
-        fromstepname:'录入',
-        username:'超级管理员',
-        radio:"",
-      },{
-        fromstepname:'测试',
-        username:'超级管理员',
-        radio:"",
-      }]
-    },{
-      bdcdyh:'222222',
-      bdcdyid:'333333',
-      nodeList:[{
-        fromstepname:'扫描',
-        username:'超级管理员',
-        radio:""
-      }]
-    }],
-      tableData:[],
-      radio:3
+    ];
+    return {
+    saveloding:false,
+    columns,
+    radioVal:"",
+    outstepopinion:"",
+    tableData:[],
+    list:{
+      bsmSlsq:"",
+      backNodeList:[],
+    },
     }
     }
   },
   },
   mounted(){
   mounted(){
+    if(this.$route.query.bsmSlsq){
+        this.list.bsmSlsq = this.$route.query.bsmSlsq
+    }
   },
   },
   methods: {
   methods: {
     tablelistFn(){
     tablelistFn(){
       getTaskBackNode(this.queryForm).then(res => {
       getTaskBackNode(this.queryForm).then(res => {
         if (res.code === 200) {
         if (res.code === 200) {
-            console.log(res)
+            this.tableData = res.result 
         }
         }
       })
       })
     },
     },
+    radioClick(scope){
+      this.taskid = scope.taskid
+     
+    },
     submitForm () {
     submitForm () {
-    
+      if(this.taskid==undefined){
+        this.$message.error('请至少选择一条数据');
+        return
+      }
+      this.list.backNodeList = this.tableData.map((item,index)=>{
+        return {
+          id:item.id,
+          taskid:this.taskid,
+          processInstanceId:item.processInstanceId,
+          outstepopinion:this.outstepopinion
+        }
+      })
+      sendBackTask(this.list).then(res => {
+        console.log(res,11)
+        if (res.code === 200) {
+          window.opener = null;
+          window.open("about:blank", "_self");
+          window.close();
+           this.$emit('input', false)
+        }
+      })
     },
     },
     closeDialog () {
     closeDialog () {
       this.$emit("input", false);
       this.$emit("input", false);
     },
     },
+  
   }
   }
 }
 }
 </script>
 </script>
 <style scoped lang="scss">
 <style scoped lang="scss">
 @import "~@/styles/mixin.scss";
 @import "~@/styles/mixin.scss";
-
+.textArea {
+  /deep/.el-textarea__inner {
+    min-height: 90px !important;
+  }
+}
 </style>
 </style>