Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
e83a1806 by 焦泽平
Options

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

2 parents f3959d54 940fe3f2
Inline Side-by-side
Showing 5 changed files with 42 additions and 25 deletions
...@@ -564,11 +564,13 @@ ...@@ -564,11 +564,13 @@
564 564
565 //行双击事件 565 //行双击事件
566 rowDbclick(row){ 566 rowDbclick(row){
567 this.dialogVisible = true; 567 if (+this.qszt == 0) {
568 this.update=true; 568 this.dialogVisible = true;
569 this.formData=row; 569 this.update=true;
570 if(row.frList.length>0){ 570 this.formData=row;
571 this.formData.fr=row.frList[0]; 571 if(row.frList.length>0){
572 this.formData.fr=row.frList[0];
573 }
572 } 574 }
573 }, 575 },
574 576
......
1 <template> 1 <template>
2 <div class="main"> 2 <div class="main">
3 <div id="mountNode" ref="containerWidth"> 3 <div id="mountNode" ref="containerWidth">
4 <div v-show="showhide" style="margin: 20px 0 0 20px;color:red;"> 4 <div class="noData" v-show="showhide" style="color:red;">
5 暂无变更业务，没有历史回溯数据 5 暂无变更业务，没有历史回溯数据
6 </div> 6 </div>
7 </div> 7 </div>
...@@ -402,10 +402,16 @@ export default { ...@@ -402,10 +402,16 @@ export default {
402 width: 60%; 402 width: 60%;
403 height: calc(100% - 10px); 403 height: calc(100% - 10px);
404 border: 1px solid #e6e6e6; 404 border: 1px solid #e6e6e6;
405 background: white; 405 background: white;
406 position: relative; 406 position: relative;
407 float: left; 407 float: left;
408 /*border: 1px solid red;*/ 408 /*border: 1px solid red;*/
409 .noData{
410 box-sizing: border-box;
411 padding: 20px;
412 height: 100%;
413 width: 100%;
414 }
409 } 415 }
410 416
411 #mountNodeRight { 417 #mountNodeRight {
...@@ -413,8 +419,8 @@ export default { ...@@ -413,8 +419,8 @@ export default {
413 float: right; 419 float: right;
414 height: calc(100% - 8px)!important; 420 height: calc(100% - 8px)!important;
415 border: 1px solid #e6e6e6; 421 border: 1px solid #e6e6e6;
416 background: white; 422 background: white;
417 box-sizing: border-box; 423 box-sizing: border-box;
418 // padding: 20px 20px 0 20px; 424 // padding: 20px 20px 0 20px;
419 } 425 }
420 426
......
...@@ -349,6 +349,7 @@ export default { ...@@ -349,6 +349,7 @@ export default {
349 path: '/zd', query:{ 349 path: '/zd', query:{
350 source: 2, 350 source: 2,
351 bsm:res.processInstance.title, 351 bsm:res.processInstance.title,
352 ywbsm:res.processInstance.businessId,
352 workitemInstanceId:res.workitemInstance.id 353 workitemInstanceId:res.workitemInstance.id
353 } 354 }
354 }); 355 });
...@@ -422,6 +423,7 @@ export default { ...@@ -422,6 +423,7 @@ export default {
422 path: '/zrz', query:{ 423 path: '/zrz', query:{
423 source: 1, 424 source: 1,
424 bsm:res.processInstance.title, 425 bsm:res.processInstance.title,
426 ywbsm:res.processInstance.businessId,
425 workitemInstanceId:res.workitemInstance.id, 427 workitemInstanceId:res.workitemInstance.id,
426 auth: '0,1,2' 428 auth: '0,1,2'
427 } 429 }
...@@ -550,6 +552,7 @@ export default { ...@@ -550,6 +552,7 @@ export default {
550 path: '/dz', query:{ 552 path: '/dz', query:{
551 source: 1, 553 source: 1,
552 bsm:res.processInstance.title, 554 bsm:res.processInstance.title,
555 ywbsm:res.processInstance.businessId,
553 workitemInstanceId:res.workitemInstance.id, 556 workitemInstanceId:res.workitemInstance.id,
554 auth: '0,1,2' 557 auth: '0,1,2'
555 } 558 }
......
1 <template> 1 <template>
2 <div ref="lpb" class="content_box"> 2 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" >
3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" > 3 <el-tab-pane label="自然幢信息" name="zrzxx"><zrzxx></zrzxx></el-tab-pane>
4 <el-tab-pane label="自然幢信息" name="zrzxx"><zrzxx></zrzxx></el-tab-pane> 4 <el-tab-pane label="业主共有" name="yzgy"><yzgy v-if="yzgyLoad" :is-disabled="isDisabled"></yzgy></el-tab-pane>
5 <el-tab-pane label="业主共有" name="yzgy"><yzgy v-if="yzgyLoad" :is-disabled="isDisabled"></yzgy></el-tab-pane> 5 <el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane>
6 <el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane> 6 <el-tab-pane label="楼盘表" name="lpb"><lpb v-if="lpbLoad"></lpb></el-tab-pane>
7 <el-tab-pane label="楼盘表" name="lpb"><lpb v-if="lpbLoad"></lpb></el-tab-pane> 7 <el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible" :type="type" :bsm="$route.query.bsm"></lshs></el-tab-pane>
8 <el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible" :type="type" :bsm="$route.query.bsm"></lshs></el-tab-pane> 8 <el-tab-pane label="附件材料" name="fjcl"><fjcl ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane>
9 <el-tab-pane label="附件材料" name="fjcl"><fjcl ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane> 9 </el-tabs>
10 </el-tabs>
11 </div>
12 </template> 10 </template>
13 11
14 <script> 12 <script>
...@@ -70,7 +68,7 @@ export default { ...@@ -70,7 +68,7 @@ export default {
70 }; 68 };
71 </script> 69 </script>
72 <style scoped lang="less"> 70 <style scoped lang="less">
73 .content_box{ 71 .el-tab-pane{
74 padding: 0 0 6px; 72 overflow-y: scroll;
75 } 73 }
76 </style> 74 </style>
......
...@@ -674,6 +674,14 @@ ...@@ -674,6 +674,14 @@
674 } 674 }
675 vm.rollback(data); 675 vm.rollback(data);
676 }, 676 },
677 //宗地审核流程退回
678 thzd(){
679 let data = {
680 "targetNodeId": this.workFlowData.rollbackDetails[0].id,
681 "workitemInstanceId": this.$route.query.workitemInstanceId
682 }
683 vm.rollback(data);
684 },
677 //宗地流程终止 685 //宗地流程终止
678 lczz(){ 686 lczz(){
679 vm.termProcess(this.workFlowData.processInstance.id); 687 vm.termProcess(this.workFlowData.processInstance.id);
...@@ -940,9 +948,9 @@ ...@@ -940,9 +948,9 @@
940 </script> 948 </script>
941 <style rel="stylesheet/less" lang="less" scoped> 949 <style rel="stylesheet/less" lang="less" scoped>
942 .main { 950 .main {
943 box-sizing: border-box; 951 box-sizing: border-box;
944 padding: 18px; 952 padding: 18px;
945 height: auto; 953 height: auto!important;
946 .iconfont{ 954 .iconfont{
947 cursor: pointer; 955 cursor: pointer;
948 } 956 }
......