Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
f6a1dfe4 by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents c86881ca 7cea3fc6
Expand all
Inline Side-by-side
Showing 8 changed files with 150 additions and 14 deletions
...@@ -53,9 +53,9 @@ ...@@ -53,9 +53,9 @@
53 .el-icon-full-screen{ 53 .el-icon-full-screen{
54 cursor: pointer; 54 cursor: pointer;
55 } 55 }
56 // .el-dialog__wrapper{ 56 .el-dialog__wrapper{
57 // overflow: hidden!important; 57 overflow: hidden!important;
58 // } 58 }
59 59
60 //table样式 60 //table样式
61 .el-table .even-row { 61 .el-table .even-row {
......
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>
...@@ -406,6 +406,12 @@ export default { ...@@ -406,6 +406,12 @@ export default {
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 {
......
1 <template> 1 <template>
2 <div ref="lpb" class="content_box">
3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" > 2 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" >
4 <el-tab-pane label="自然幢信息" name="zrzxx"><zrzxx></zrzxx></el-tab-pane> 3 <el-tab-pane label="自然幢信息" name="zrzxx"><zrzxx></zrzxx></el-tab-pane>
5 <el-tab-pane label="业主共有" name="yzgy"><yzgy v-if="yzgyLoad" :is-disabled="isDisabled"></yzgy></el-tab-pane> 4 <el-tab-pane label="业主共有" name="yzgy"><yzgy v-if="yzgyLoad" :is-disabled="isDisabled"></yzgy></el-tab-pane>
...@@ -8,7 +7,6 @@ ...@@ -8,7 +7,6 @@
8 <el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible" :type="type" :bsm="$route.query.bsm"></lshs></el-tab-pane> 7 <el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible" :type="type" :bsm="$route.query.bsm"></lshs></el-tab-pane>
9 <el-tab-pane label="附件材料" name="fjcl"><fjcl ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane> 8 <el-tab-pane label="附件材料" name="fjcl"><fjcl ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane>
10 </el-tabs> 9 </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>
......
1 <template>
2 <el-tabs v-model="activeName" @tab-click="handleClick">
3 <el-tab-pane label="户基本信息表" name="hjbxx">
4 <hbj ref="hbj" :bsm="hbsm"></hbj>
5 </el-tab-pane>
6 <el-tab-pane label="登记簿" name="djb">
7 <djb v-if="djbVisible" :style="{'height' : formHeight+'px'}"></djb>
8 </el-tab-pane>
9 <el-tab-pane label="附件材料" name="fjcl">
10 <fjcl v-if="fjclVisible" ref="fjcl" :style="{'height' : formHeight+'px'}" :is-disabled="isDisabled"></fjcl>
11 </el-tab-pane>
12 </el-tabs>
13 </template>
14
15 <script>
16 import hbj from "../index"
17 import djb from "../../../../../zd/djb/index";
18 import fjcl from "../../../../../zd/fjcl/fjcl"
19 import {queryStatus} from "@api/search"
20 export default {
21 name: "index",
22 components: {
23 hbj, djb, fjcl
24 },
25 data() {
26 return {
27 isDisabled:false,
28 hbsm:this.$store.state.hbsm,
29 activeName: "hjbxx",
30 djbVisible: false,
31 fjclVisible: false,
32 formHeight:0,
33 }
34 },
35 mounted() {
36 this.formHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 260
37 },
38 methods: {
39 loadingStatus() {
40 debugger
41 let bsm=this.$store.state.hbsm;
42 queryStatus(bsm).then(res => {
43 if (res.success) {
44 let qszt = res.result.qszt;
45 this.isDisabled = +qszt !== 0;
46 }
47 })
48 },
49 handleClick(tab, event) {
50 this.loadingStatus()
51 // console.log(tab, event);
52 switch (tab.name) {
53 case 'djb':
54 this.djbVisible = true;
55 break;
56 case 'fjcl':
57 this.fjclVisible = true;
58 break;
59 default:
60 break;
61 }
62 },
63 },
64 watch: {}
65 }
66 </script>
67
68 <style scoped lang="less">
69 .el-tabs{
70 /deep/.el-tabs__nav-scroll{
71 margin-left: -35px;
72 }
73 }
74 </style>
...@@ -85,6 +85,13 @@ ...@@ -85,6 +85,13 @@
85 @click="batchDelete" 85 @click="batchDelete"
86 ><i class="iconfont iconhuzhongxinlazong"></i>批量删除</el-button 86 ><i class="iconfont iconhuzhongxinlazong"></i>批量删除</el-button
87 > 87 >
88 <el-button
89 class="radioBtn"
90 label="7"
91 border
92 @click="batchUpload"
93 ><i class="iconfont iconhuzhongxinlazong"></i>批量上传</el-button
94 >
88 </div> 95 </div>
89 </el-col> 96 </el-col>
90 </el-row> 97 </el-row>
...@@ -139,6 +146,13 @@ ...@@ -139,6 +146,13 @@
139 > 146 >
140 <span>房屋用途</span> 147 <span>房屋用途</span>
141 </div> 148 </div>
149 <div
150 :class="selectedZt == 'qsx' ? 'qsx selectedZt' : 'qsx'"
151 @click="selectedZt = 'qsx'"
152 >
153 <span>缺失项</span>
154 </div>
155
142 </div> 156 </div>
143 <div 157 <div
144 class="legendTable-wrap" 158 class="legendTable-wrap"
...@@ -230,6 +244,34 @@ ...@@ -230,6 +244,34 @@
230 <td colspan="3" class="tac">暂无数据</td> 244 <td colspan="3" class="tac">暂无数据</td>
231 </tr> 245 </tr>
232 </table> 246 </table>
247
248 <table
249 class="legendTable"
250 v-show="selectedZt == 'qsx'"
251 cellspacing="1"
252 cellpadding="1"
253 border="1"
254 >
255 <tr>
256 <th>数据缺失项</th>
257 <th>套数</th>
258 </tr>
259 <tr
260 v-for="(item, index) in fwytList"
261 :key="index"
262 class="cp"
263 @click="handleChoosedH(item.bsms,item.color)"
264 >
265 <td>
266 <i class="fa fa-circle" :style="{ color: item.color }"></i
267 >{{ item.name }}
268 </td>
269 <td>{{ item.ts }}</td>
270 </tr>
271 <tr v-show="fwytList.length < 1">
272 <td colspan="3" class="tac">暂无数据</td>
273 </tr>
274 </table>
233 </div> 275 </div>
234 </div> 276 </div>
235 </div> 277 </div>
...@@ -957,12 +999,14 @@ export default { ...@@ -957,12 +999,14 @@ export default {
957 } 999 }
958 .dyzt, 1000 .dyzt,
959 .fwxz, 1001 .fwxz,
960 .fwyt { 1002 .fwyt,
1003 .qsx {
961 height: 122px; 1004 height: 122px;
962 } 1005 }
963 .dyzt, 1006 .dyzt,
964 .fwxz, 1007 .fwxz,
965 .fwyt { 1008 .fwyt,
1009 .qsx {
966 cursor: pointer; 1010 cursor: pointer;
967 border-bottom: 1px solid #e6e6e6; 1011 border-bottom: 1px solid #e6e6e6;
968 border-left: 1px solid #e6e6e6; 1012 border-left: 1px solid #e6e6e6;
......
...@@ -394,7 +394,7 @@ import { getLpb, insertUpDownC, deleteCByBsm } from "@api/lpb"; ...@@ -394,7 +394,7 @@ import { getLpb, insertUpDownC, deleteCByBsm } from "@api/lpb";
394 import { hhb,hfg } from "@api/h"; 394 import { hhb,hfg } from "@api/h";
395 import { Message } from 'element-ui'; 395 import { Message } from 'element-ui';
396 import { fwsxbgbl } from "@api/common"; 396 import { fwsxbgbl } from "@api/common";
397 import hbj from "../hbj/index"; 397 import hbj from "../hbj/lpb-hbj/index";
398 export default { 398 export default {
399 name: "", 399 name: "",
400 components: { moveH,hbj,HCxlz, }, 400 components: { moveH,hbj,HCxlz, },
...@@ -479,6 +479,7 @@ export default { ...@@ -479,6 +479,7 @@ export default {
479 this.$refs.lpbContent.clientHeight - 479 this.$refs.lpbContent.clientHeight -
480 6; 480 6;
481 }, 200); 481 }, 200);
482 window.lpbContent = this;
482 }, 483 },
483 methods: { 484 methods: {
484 loadingData(zrzbsm,scyclx) { 485 loadingData(zrzbsm,scyclx) {
...@@ -688,10 +689,10 @@ export default { ...@@ -688,10 +689,10 @@ export default {
688 dbclick(bsm) { 689 dbclick(bsm) {
689 clearTimeout(this.time); 690 clearTimeout(this.time);
690 this.hbsm = bsm; 691 this.hbsm = bsm;
691 this.$store.state.hbsm=this.data; 692 this.$store.state.hbsm=bsm;
692 this.hbjVisible = true; 693 this.hbjVisible = true;
693 this.$nextTick(function() { 694 this.$nextTick(function() {
694 this.$refs.hbj.getHInfo(this.hbsm); 695 this.$refs.hbj.$refs.hbj.getHInfo(this.hbsm);
695 }); 696 });
696 // if (this.isHbfg) { 697 // if (this.isHbfg) {
697 698
...@@ -1383,5 +1384,10 @@ export default { ...@@ -1383,5 +1384,10 @@ export default {
1383 top: 1px; 1384 top: 1px;
1384 } 1385 }
1385 } 1386 }
1387 .hbjDialog{
1388 /deep/.el-dialog{
1389 margin-top: 10vh!important;
1390 }
1391 }
1386 } 1392 }
1387 </style> 1393 </style>
......
...@@ -676,6 +676,14 @@ ...@@ -676,6 +676,14 @@
676 } 676 }
677 vm.rollback(data); 677 vm.rollback(data);
678 }, 678 },
679 //宗地审核流程退回
680 thzd(){
681 let data = {
682 "targetNodeId": this.workFlowData.rollbackDetails[0].id,
683 "workitemInstanceId": this.$route.query.workitemInstanceId
684 }
685 vm.rollback(data);
686 },
679 //宗地流程终止 687 //宗地流程终止
680 lczz(){ 688 lczz(){
681 vm.termProcess(this.workFlowData.processInstance.id); 689 vm.termProcess(this.workFlowData.processInstance.id);
...@@ -947,7 +955,7 @@ ...@@ -947,7 +955,7 @@
947 .main { 955 .main {
948 box-sizing: border-box; 956 box-sizing: border-box;
949 padding: 18px; 957 padding: 18px;
950 height: auto; 958 height: auto!important;
951 .iconfont{ 959 .iconfont{
952 cursor: pointer; 960 cursor: pointer;
953 } 961 }
......