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

@@ -41,7 +41,7 @@ export function selectBdcdy (data) {
 // 待办箱列表查询接口
 // 待办箱列表查询接口
 export function searchTaskToDo (data) {
 export function searchTaskToDo (data) {
     return request({
     return request({
-        url: '/business/todoBox/searchTaskToDo',
+        url: '/workBox/search/searchTaskToDo',
         method: 'post',
         method: 'post',
         data
         data
     })
     })

@@ -57,7 +57,7 @@ export function getDetail(qlbsm) {
 // 进度查询列表
 // 进度查询列表
 export function getJdcxBysearch (data) {
 export function getJdcxBysearch (data) {
   return request({
   return request({
-      url: 'zhcx/jdcx/getJdcxBysearch',
+      url: '/zhcx/search/getJdcxBysearch',
       method: 'post',
       method: 'post',
       data
       data
   })
   })

@@ -102,7 +102,7 @@ export default {
       } else {//切换到该页面时执行
       } else {//切换到该页面时执行
         if (window.location.hash == '#/ywbl/dbx') {
         if (window.location.hash == '#/ywbl/dbx') {
           console.log('让我看看', window.location)
           console.log('让我看看', window.location)
-          that.fetchData()
+          this.fetchData()
         }
         }
       }
       }
     },
     },

@@ -16,7 +16,7 @@ class data extends filter {
         width: '50'
         width: '50'
       },
       },
       {
       {
-        prop: "ywly",
+        prop: "ywlymc",
         label: "业务来源",
         label: "业务来源",
       },
       },
       {
       {
@@ -26,7 +26,7 @@ class data extends filter {
             case '1':
             case '1':
               return <span>进行中</span>
               return <span>进行中</span>
             case '2':
             case '2':
-              return <span>进行中</span>
+              return <span>已结束</span>
             case '3':
             case '3':
               return <span>进行中</span>
               return <span>进行中</span>
           }
           }

@@ -5,12 +5,12 @@
       <!-- 表单部分 -->
       <!-- 表单部分 -->
       <div class="from-clues-header">
       <div class="from-clues-header">
         <el-form ref="queryForm" label-width="120px">
         <el-form ref="queryForm" label-width="120px">
-        <div v-for='(item,index) in tableData' :key='item.bdcdyid'>
-          <el-form-item label="不动产单元号:">
+        <div>
+          <!-- <el-form-item label="不动产单元号:">
             <p>{{item.bdcdyh}}</p>
             <p>{{item.bdcdyh}}</p>
-          </el-form-item>
+          </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="tableData">
         </lb-table>
         </lb-table>
         <el-form-item label="退回意见:">
         <el-form-item label="退回意见:">
           <el-input class="textArea" type="textarea" v-model="outstepopinion"></el-input>
           <el-input class="textArea" type="textarea" v-model="outstepopinion"></el-input>
@@ -29,7 +29,9 @@ export default {
   },
   },
   props: {
   props: {
     value: { type: Boolean, default: false },
     value: { type: Boolean, default: false },
-    queryForm:{type:Object}
+    queryForm:{type:Object},
+    taskId:{type:String},
+    bsmBusiness:{type:String}
   },
   },
   data () {
   data () {
     const columns=[
     const columns=[
@@ -56,11 +58,11 @@ export default {
         },
         },
       },
       },
       {
       {
-        prop: "fromstepname",
+        prop: "activityName",
         label: "退回环节名称",
         label: "退回环节名称",
       },
       },
       {
       {
-        prop: "username",
+        prop: "assignee",
         label: "办理人",
         label: "办理人",
       },
       },
      
      
@@ -75,6 +77,8 @@ export default {
       bsmSlsq:"",
       bsmSlsq:"",
       backNodeList:[],
       backNodeList:[],
     },
     },
+    sumbitList:{},
+    taskid:"",
     }
     }
   },
   },
   mounted(){
   mounted(){
@@ -84,7 +88,7 @@ export default {
   },
   },
   methods: {
   methods: {
     tablelistFn(){
     tablelistFn(){
-      getTaskBackNode(this.queryForm).then(res => {
+      getTaskBackNode({taskId:this.taskId}).then(res => {
         if (res.code === 200) {
         if (res.code === 200) {
             this.tableData = res.result 
             this.tableData = res.result 
         }
         }
@@ -92,28 +96,33 @@ export default {
     },
     },
     radioClick(scope){
     radioClick(scope){
       this.taskid = scope.taskid
       this.taskid = scope.taskid
-     
+      this.sumbitList = scope
+    
     },
     },
     submitForm () {
     submitForm () {
       if(this.taskid==undefined){
       if(this.taskid==undefined){
         this.$message.error('请至少选择一条数据');
         this.$message.error('请至少选择一条数据');
         return
         return
       }
       }
-      this.list.backNodeList = this.tableData.map((item,index)=>{
-        return {
-          id:item.id,
+      this.list.backNodeList.push({
+          id:this.taskId,
           taskid:this.taskid,
           taskid:this.taskid,
-          processInstanceId:item.processInstanceId,
+          processInstanceId:this.sumbitList.processInstanceId,
+          bsmBusiness:this.bsmBusiness,
           outstepopinion:this.outstepopinion
           outstepopinion:this.outstepopinion
-        }
-      })
+        })
       sendBackTask(this.list).then(res => {
       sendBackTask(this.list).then(res => {
-        console.log(res,11)
         if (res.code === 200) {
         if (res.code === 200) {
-          window.opener = null;
+          this.$message.success('退回成功')
+          setTimeout(() => {
+            window.opener = null;
           window.open("about:blank", "_self");
           window.open("about:blank", "_self");
           window.close();
           window.close();
            this.$emit('input', false)
            this.$emit('input', false)
+          }, 1000);
+         
+        }else{
+          this.$message.error(res.message)
         }
         }
       })
       })
     },
     },

@@ -37,12 +37,13 @@ export default {
       completeTask(this.queryForm).then(res => {
       completeTask(this.queryForm).then(res => {
         console.log(res)
         console.log(res)
         if (res.code === 200) {
         if (res.code === 200) {
-           console.log(res,555)
-      window.opener = null;
-      window.open("about:blank", "_self");
-      window.close();
-        this.$emit('input', false)
-           
+          this.$message.success('转件成功')
+          setTimeout(() => {
+            window.opener = null;
+          window.open("about:blank", "_self");
+          window.close();
+           this.$emit('input', false)
+          }, 1000);
         }
         }
       })
       })
     },
     },

@@ -50,7 +50,7 @@
       </div>
       </div>
     </div>
     </div>
     <zc v-model="zcDialog" :queryForm='queryForm' />
     <zc v-model="zcDialog" :queryForm='queryForm' />
-    <thDialog ref='thdialogRef' v-model="thflag" :queryForm='queryForm' />
+    <thDialog ref='thdialogRef' v-model="thflag" :taskId='taskId' :bsmBusiness='bsmBusiness' :queryForm='queryForm' />
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
@@ -139,6 +139,7 @@ export default {
       editItem: '',
       editItem: '',
       issplitScreen: false,
       issplitScreen: false,
       unitData: [],
       unitData: [],
+      taskId:"",
     };
     };
   },
   },
   watch: {
   watch: {
@@ -173,12 +174,16 @@ export default {
           this.unitData = res.result
           this.unitData = res.result
           setTimeout(() => {
           setTimeout(() => {
             that.$refs.slxx[0].list(that.unitData[0].bsmSldy)
             that.$refs.slxx[0].list(that.unitData[0].bsmSldy)
+            this.taskId = that.unitData[0].taskId
+            this.bsmBusiness = that.unitData[0].bsmBusiness
           }, 300);
           }, 300);
         }
         }
       })
       })
     },
     },
     //  左侧列表点击调用接口
     //  左侧列表点击调用接口
     unitClick (item) {
     unitClick (item) {
+      this.taskId = item.taskId
+      this.bsmBusiness = item.bsmBusiness
       this.$nextTick(() => {
       this.$nextTick(() => {
         this.$refs.slxx[0].list(item.bsmSldy)
         this.$refs.slxx[0].list(item.bsmSldy)
       })
       })

@@ -31,7 +31,7 @@ class data extends filter {
         label: "状态",
         label: "状态",
       },
       },
       {
       {
-        prop: "qllx",
+        prop: "qllxmc",
         label: "权利类型",
         label: "权利类型",
       },
       },
       {
       {
@@ -43,7 +43,7 @@ class data extends filter {
         label: "不动产单元号",
         label: "不动产单元号",
       },
       },
       {
       {
-        prop: "qlxz",
+        prop: "showQlxz",
         label: "权利性质",
         label: "权利性质",
       },
       },
       {
       {
@@ -51,11 +51,11 @@ class data extends filter {
         label: "宗地面积",
         label: "宗地面积",
       },
       },
       {
       {
-        prop: "qlsdfs",
+        prop: "qlsdfsmc",
         label: "权利设定方式",
         label: "权利设定方式",
       },
       },
       {
       {
-        prop: "tdyt",
+        prop: "showTdyt",
         label: "土地用途",
         label: "土地用途",
       },
       },
       {
       {

@@ -26,7 +26,7 @@ class data extends filter {
             case '1':
             case '1':
               return <span>进行中</span>
               return <span>进行中</span>
             case '2':
             case '2':
-              return <span>进行中</span>
+              return <span>已结束</span>
             case '3':
             case '3':
               return <span>进行中</span>
               return <span>进行中</span>
           }
           }