Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

@@ -564,11 +564,13 @@
 
 		//行双击事件
 		rowDbclick(row){
-			this.dialogVisible = true;
-			this.update=true;
-			this.formData=row;
-			if(row.frList.length>0){
-				this.formData.fr=row.frList[0];
+			if (+this.qszt == 0) {
+				this.dialogVisible = true;
+				this.update=true;
+				this.formData=row;
+				if(row.frList.length>0){
+					this.formData.fr=row.frList[0];
+				}
 			}
 		},
 

 <template>
 	<div class="main">
 		<div id="mountNode" ref="containerWidth">
-			<div v-show="showhide" style="margin: 20px 0 0 20px;color:red;">
+			<div class="noData" v-show="showhide" style="color:red;">
 				暂无变更业务，没有历史回溯数据
 			</div>
 		</div>
@@ -402,10 +402,16 @@ export default {
 	width: 60%;
 	height: calc(100% - 10px);
 	border: 1px solid #e6e6e6;
-  background: white;
-  position: relative;
+	background: white;
+	position: relative;
 	float: left;
 	/*border: 1px solid red;*/
+	.noData{
+		box-sizing: border-box;
+		padding: 20px;
+		height: 100%;
+		width: 100%;
+	}
 }
 
 #mountNodeRight {
@@ -413,8 +419,8 @@ export default {
 	float: right;
 	height: calc(100% - 8px)!important;
 	border: 1px solid #e6e6e6;
-  background: white;
-  box-sizing: border-box;
+	background: white;
+	box-sizing: border-box;
 	// padding: 20px 20px 0 20px;
 }
 

@@ -349,6 +349,7 @@ export default {
 									path: '/zd', query:{
 										source: 2,
 										bsm:res.processInstance.title,
+										ywbsm:res.processInstance.businessId,
 										workitemInstanceId:res.workitemInstance.id
 									}
 								});
@@ -422,6 +423,7 @@ export default {
 										path: '/zrz', query:{
 											source: 1,
 											bsm:res.processInstance.title,
+											ywbsm:res.processInstance.businessId,
 											workitemInstanceId:res.workitemInstance.id,
 											auth: '0,1,2'
 										}
@@ -550,6 +552,7 @@ export default {
 										path: '/dz', query:{
 											source: 1,
 											bsm:res.processInstance.title,
+											ywbsm:res.processInstance.businessId,
 											workitemInstanceId:res.workitemInstance.id,
 											auth: '0,1,2'
 										}

 <template>
-	<div ref="lpb" class="content_box">
-		<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" >
-			<el-tab-pane label="自然幢信息" name="zrzxx"><zrzxx></zrzxx></el-tab-pane>
-			<el-tab-pane label="业主共有" name="yzgy"><yzgy v-if="yzgyLoad" :is-disabled="isDisabled"></yzgy></el-tab-pane>
-			<el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane>
-			<el-tab-pane label="楼盘表" name="lpb"><lpb v-if="lpbLoad"></lpb></el-tab-pane>
-			<el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible" :type="type" :bsm="$route.query.bsm"></lshs></el-tab-pane>
-			<el-tab-pane label="附件材料" name="fjcl"><fjcl ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane>
-		</el-tabs>
-	</div>
+	<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" >
+		<el-tab-pane label="自然幢信息" name="zrzxx"><zrzxx></zrzxx></el-tab-pane>
+		<el-tab-pane label="业主共有" name="yzgy"><yzgy v-if="yzgyLoad" :is-disabled="isDisabled"></yzgy></el-tab-pane>
+		<el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane>
+		<el-tab-pane label="楼盘表" name="lpb"><lpb v-if="lpbLoad"></lpb></el-tab-pane>
+		<el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible" :type="type" :bsm="$route.query.bsm"></lshs></el-tab-pane>
+		<el-tab-pane label="附件材料" name="fjcl"><fjcl ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane>
+	</el-tabs>
 </template>
 
 <script>
@@ -70,7 +68,7 @@ export default {
 };
 </script>
 <style scoped lang="less">
-.content_box{
-	padding: 0 0 6px;
+.el-tab-pane{
+	overflow-y: scroll;
 }
 </style>

@@ -674,6 +674,14 @@
                 }
                 vm.rollback(data);
             },
+            //宗地审核流程退回
+            thzd(){
+                let data = {
+                    "targetNodeId": this.workFlowData.rollbackDetails[0].id,
+                    "workitemInstanceId": this.$route.query.workitemInstanceId
+                }
+                vm.rollback(data);
+            },
             //宗地流程终止
             lczz(){
                 vm.termProcess(this.workFlowData.processInstance.id);
@@ -940,9 +948,9 @@
 </script>
 <style rel="stylesheet/less" lang="less" scoped>
 .main {
-	box-sizing: border-box;
-	padding: 18px;
-    height: auto;
+    box-sizing: border-box;
+    padding: 18px;
+    height: auto!important;
     .iconfont{
         cursor: pointer;
     }