Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
156cabf5 by 杨威
Options

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

2 parents e77a71fb 9b736d09
Inline Side-by-side
Showing 9 changed files with 49 additions and 40 deletions
...@@ -204,7 +204,7 @@ export function batchDelete(data) { ...@@ -204,7 +204,7 @@ export function batchDelete(data) {
204 url:'/system/qjH/batchDeleteHByBsms', 204 url:'/system/qjH/batchDeleteHByBsms',
205 method:'post', 205 method:'post',
206 data:{ 206 data:{
207 bsms:data 207 hbsms:data
208 } 208 }
209 }) 209 })
210 } 210 }
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
48 label="不动产权证号"> 48 label="不动产权证号">
49 </el-table-column> 49 </el-table-column>
50 <el-table-column 50 <el-table-column
51 prop="qlr" 51 prop="qlrmc"
52 label="权利人"> 52 label="权利人">
53 </el-table-column> 53 </el-table-column>
54 <el-table-column 54 <el-table-column
...@@ -72,10 +72,10 @@ ...@@ -72,10 +72,10 @@
72 <el-col :span="7" style="display: inline-block;"> 72 <el-col :span="7" style="display: inline-block;">
73 <el-select v-model="dzhbhData.xzqbsm" value-key="xzqbsm" placeholder="行政区" @change="changeXzq(dzhbhData.xzqbsm)" disabled> 73 <el-select v-model="dzhbhData.xzqbsm" value-key="xzqbsm" placeholder="行政区" @change="changeXzq(dzhbhData.xzqbsm)" disabled>
74 <el-option 74 <el-option
75 v-for="item in xzq" 75 v-for="xzqItem in xzq"
76 :key="item.bsm" 76 :key="xzqItem.bsm"
77 :label="item.mc" 77 :label="xzqItem.mc"
78 :value="item.bsm"> 78 :value="xzqItem.bsm">
79 </el-option> 79 </el-option>
80 </el-select> 80 </el-select>
81 </el-col> 81 </el-col>
...@@ -83,10 +83,10 @@ ...@@ -83,10 +83,10 @@
83 <el-col :span="7"> 83 <el-col :span="7">
84 <el-select v-model="dzhbhData.djqbsm" placeholder="地籍区" @change="changeDjq(dzhbhData.djqbsm)" disabled> 84 <el-select v-model="dzhbhData.djqbsm" placeholder="地籍区" @change="changeDjq(dzhbhData.djqbsm)" disabled>
85 <el-option 85 <el-option
86 v-for="item in djq" 86 v-for="djqItem in djq"
87 :key="item.bsm" 87 :key="djqItem.bsm"
88 :label="item.mc" 88 :label="djqItem.mc"
89 :value="item.bsm"> 89 :value="djqItem.bsm">
90 </el-option> 90 </el-option>
91 </el-select> 91 </el-select>
92 </el-col> 92 </el-col>
...@@ -94,10 +94,10 @@ ...@@ -94,10 +94,10 @@
94 <el-col :span="8"> 94 <el-col :span="8">
95 <el-select v-model="dzhbhData.djzqbsm" placeholder="地籍子区" @change="$forceUpdate()" disabled> 95 <el-select v-model="dzhbhData.djzqbsm" placeholder="地籍子区" @change="$forceUpdate()" disabled>
96 <el-option 96 <el-option
97 v-for="item in djzq" 97 v-for="djzqItem in djzq"
98 :key="item.bsm" 98 :key="djzqItem.bsm"
99 :label="item.mc" 99 :label="djzqItem.mc"
100 :value="item.bsm"> 100 :value="djzqItem.bsm">
101 </el-option> 101 </el-option>
102 </el-select> 102 </el-select>
103 </el-col> 103 </el-col>
......
...@@ -14,16 +14,19 @@ ...@@ -14,16 +14,19 @@
14 :show-file-list="false" 14 :show-file-list="false"
15 multiple 15 multiple
16 > 16 >
17 <el-button type="primary">上传</el-button> 17 <el-button type="primary" icon="iconfont iconshangchuan">上传</el-button>
18
18 <el-button type="primary" @click="downloadTemplate">下载模板</el-button> 19 <el-button type="primary" @click="downloadTemplate">下载模板</el-button>
20 <!-- <a href=`/api/tx/excelGeo/template?type=${dylx}`>下载模板</a>-->
21
19 </el-upload> 22 </el-upload>
20 </div> 23 </div>
21 <ul> 24 <ul>
22 <li v-for="(item,index) in errorData" :key="index">{{item}}</li> 25 <li v-for="(item,index) in errorData" :key="index">{{item}}</li>
23 </ul> 26 </ul>
24 <span slot="footer" class="dialog-footer"> 27 <span slot="footer" class="dialog-footer">
25 <el-button @click="dialogVisible = false">取 消</el-button> 28 <el-button @click="cancel">取 消</el-button>
26 <el-button type="primary" @click="dialogVisible = false">确 定</el-button> 29 <el-button type="primary" @click="confirm">确 定</el-button>
27 </span> 30 </span>
28 </el-dialog> 31 </el-dialog>
29 </div> 32 </div>
...@@ -59,6 +62,12 @@ ...@@ -59,6 +62,12 @@
59 this.$store.state.sxdrType = ''; 62 this.$store.state.sxdrType = '';
60 }, 63 },
61 methods: { 64 methods: {
65 cancel(){
66 this.close()
67 },
68 confirm(){
69 console.log("确定....")
70 },
62 loading() { 71 loading() {
63 this.$store.state.sxdrType = this.dylx; 72 this.$store.state.sxdrType = this.dylx;
64 }, 73 },
...@@ -71,7 +80,7 @@ ...@@ -71,7 +80,7 @@
71 this.reset(); 80 this.reset();
72 }, 81 },
73 downloadTemplate() { 82 downloadTemplate() {
74 window.open(`/api/tx/excelGeo/template?type=` + this.dylx); 83 window.open(`/api/tx/excelGeo/template?type=${this.dylx}`);
75 }, 84 },
76 uploadSuccess(res, file, fileList) { 85 uploadSuccess(res, file, fileList) {
77 this.errorData = []; 86 this.errorData = [];
......
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
192 <li><span class="label">不动产单元号:</span><span class="value">{{dzFgqData.bdcdyh}}</span></li> 192 <li><span class="label">不动产单元号:</span><span class="value">{{dzFgqData.bdcdyh}}</span></li>
193 <li><span class="label">项目名称:</span><span class="value">{{dzFgqData.xmmc}}</span></li> 193 <li><span class="label">项目名称:</span><span class="value">{{dzFgqData.xmmc}}</span></li>
194 <li><span class="label">不动产权证号:</span><span class="value">{{dzFgqData.bdcqzh}}</span></li> 194 <li><span class="label">不动产权证号:</span><span class="value">{{dzFgqData.bdcqzh}}</span></li>
195 <li><span class="label">权利人:</span><span class="value">{{dzFgqData.qlr}}</span></li> 195 <li><span class="label">权利人:</span><span class="value">{{dzFgqData.qlrmc}}</span></li>
196 <li><span class="label">坐落:</span><span class="value">{{dzFgqData.zl}}</span></li> 196 <li><span class="label">坐落:</span><span class="value">{{dzFgqData.zl}}</span></li>
197 </ul> 197 </ul>
198 <div class="zdmap"> 198 <div class="zdmap">
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
54 label="不动产权证号"> 54 label="不动产权证号">
55 </el-table-column> 55 </el-table-column>
56 <el-table-column 56 <el-table-column
57 prop="qlr" 57 prop="qlrmc"
58 label="权利人"> 58 label="权利人">
59 </el-table-column> 59 </el-table-column>
60 <el-table-column 60 <el-table-column
...@@ -257,7 +257,7 @@ ...@@ -257,7 +257,7 @@
257 this.$nextTick(() => { 257 this.$nextTick(() => {
258 this.fgBoxWidth = this.$refs.hbBox.clientWidth; 258 this.fgBoxWidth = this.$refs.hbBox.clientWidth;
259 this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 610 259 this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 610
260 }); 260 });
261 }, 261 },
262 methods: { 262 methods: {
263 263
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 :on-exceed="handleExceed" 14 :on-exceed="handleExceed"
15 :disabled="isDisabled" 15 :disabled="isDisabled"
16 > 16 >
17 <el-button size="small" type="primary" :disabled="isDisabled" >上传</el-button> 17 <el-button size="small" type="primary" :disabled="isDisabled" icon="iconfont iconshangchuan">上传</el-button>
18 </el-upload> 18 </el-upload>
19 <table border="2"> 19 <table border="2">
20 <tr> 20 <tr>
......
...@@ -364,7 +364,7 @@ ...@@ -364,7 +364,7 @@
364 </tr> 364 </tr>
365 </table> 365 </table>
366 <div class="header-button" :style="{width:mainBoxWidth+'px'}"> 366 <div class="header-button" :style="{width:mainBoxWidth+'px'}">
367 <el-button type="primary" class="saveBtn" @click="updateZDxx" :disabled="disabled">保存</el-button> 367 <el-button type="primary" class="saveBtn" @click="updateZDxx" :disabled="disabled" icon="el-icon-search">保存</el-button>
368 <el-button type="primary" @click="submitZDxx" :disabled="disabled">提交</el-button> 368 <el-button type="primary" @click="submitZDxx" :disabled="disabled">提交</el-button>
369 <el-button type="primary" @click="registerCall">登记调用</el-button> 369 <el-button type="primary" @click="registerCall">登记调用</el-button>
370 </div> 370 </div>
......
...@@ -233,7 +233,7 @@ ...@@ -233,7 +233,7 @@
233 </div> 233 </div>
234 </div> 234 </div>
235 </div> 235 </div>
236 236
237 <xxxx v-show="!bjztFlag"></xxxx> 237 <xxxx v-show="!bjztFlag"></xxxx>
238 238
239 <!-- 右键菜单弹出框 --> 239 <!-- 右键菜单弹出框 -->
...@@ -611,7 +611,7 @@ export default { ...@@ -611,7 +611,7 @@ export default {
611 getHbsm(data, type) { 611 getHbsm(data, type) {
612 if (type) { 612 if (type) {
613 // 双击 613 // 双击
614 614
615 } else { 615 } else {
616 //单击 TO DO 616 //单击 TO DO
617 this.bsms = data; 617 this.bsms = data;
...@@ -621,7 +621,7 @@ export default { ...@@ -621,7 +621,7 @@ export default {
621 getQsztList(data, type) { 621 getQsztList(data, type) {
622 if (type) { 622 if (type) {
623 // 双击 623 // 双击
624 624
625 } else { 625 } else {
626 //单击 TO DO 626 //单击 TO DO
627 this.qsztList = data; 627 this.qsztList = data;
......
...@@ -621,7 +621,7 @@ export default { ...@@ -621,7 +621,7 @@ export default {
621 this.$nextTick(()=>{ 621 this.$nextTick(()=>{
622 this.lpbContentWidth = this.zdyWidth > this.ljzWidth ?this.zdyWidth - 20 : this.ljzWidth-20; 622 this.lpbContentWidth = this.zdyWidth > this.ljzWidth ?this.zdyWidth - 20 : this.ljzWidth-20;
623 if (this.lpbContentWidth == 0) { 623 if (this.lpbContentWidth == 0) {
624 this.lpbContentWidth = this.$refs.lpbContent.offsetWidth 624 //his.lpbContentWidth = this.$refs.lpbContent.offsetWidth
625 } 625 }
626 }) 626 })
627 }, 627 },
...@@ -643,16 +643,16 @@ export default { ...@@ -643,16 +643,16 @@ export default {
643 self.fghbChoosedList.push(hs); 643 self.fghbChoosedList.push(hs);
644 break; 644 break;
645 case 'isFwsxbg': 645 case 'isFwsxbg':
646 646
647 break; 647 break;
648 case 'isCxlz': 648 case 'isCxlz':
649 649
650 break; 650 break;
651 case 'isLpb': 651 case 'isLpb':
652 this.$parent.getHbsm(this.hbsmList, false); 652 this.$parent.getHbsm(this.hbsmList, false);
653 this.$parent.getQsztList(this.hqsztList, false); 653 this.$parent.getQsztList(this.hqsztList, false);
654 break; 654 break;
655 655
656 default: 656 default:
657 break; 657 break;
658 } 658 }
...@@ -664,10 +664,10 @@ export default { ...@@ -664,10 +664,10 @@ export default {
664 self.fghbChoosedList = self.fghbChoosedList.filter(i=>i!=hs) 664 self.fghbChoosedList = self.fghbChoosedList.filter(i=>i!=hs)
665 break; 665 break;
666 case 'isFwsxbg': 666 case 'isFwsxbg':
667 667
668 break; 668 break;
669 case 'isCxlz': 669 case 'isCxlz':
670 670
671 break; 671 break;
672 case 'isLpb': 672 case 'isLpb':
673 this.hbsmList = this.hbsmList.filter(i=>i!=bsm); 673 this.hbsmList = this.hbsmList.filter(i=>i!=bsm);
...@@ -675,7 +675,7 @@ export default { ...@@ -675,7 +675,7 @@ export default {
675 this.$parent.getHbsm(this.hbsmList, false); 675 this.$parent.getHbsm(this.hbsmList, false);
676 this.$parent.getQsztList(this.hqsztList, false); 676 this.$parent.getQsztList(this.hqsztList, false);
677 break; 677 break;
678 678
679 default: 679 default:
680 break; 680 break;
681 } 681 }
...@@ -692,7 +692,7 @@ export default { ...@@ -692,7 +692,7 @@ export default {
692 this.$refs.hbj.getHInfo(this.hbsm); 692 this.$refs.hbj.getHInfo(this.hbsm);
693 }); 693 });
694 // if (this.isHbfg) { 694 // if (this.isHbfg) {
695 695
696 // }else{ 696 // }else{
697 // this.hbsmList.push(bsm); // 将户bsm放进hbsmList 697 // this.hbsmList.push(bsm); // 将户bsm放进hbsmList
698 // this.$parent.getHbsm(bsm, true); 698 // this.$parent.getHbsm(bsm, true);
...@@ -781,7 +781,7 @@ export default { ...@@ -781,7 +781,7 @@ export default {
781 this.rightClickFlag = type; 781 this.rightClickFlag = type;
782 this.lpbChVisible = true; 782 this.lpbChVisible = true;
783 break; 783 break;
784 784
785 default: 785 default:
786 break; 786 break;
787 } 787 }
...@@ -800,7 +800,7 @@ export default { ...@@ -800,7 +800,7 @@ export default {
800 if (e.target.className.indexOf("tdSelect") == -1) { 800 if (e.target.className.indexOf("tdSelect") == -1) {
801 //未选中→选中 801 //未选中→选中
802 e.target.className += " tdSelect"; //加边框 802 e.target.className += " tdSelect"; //加边框
803 this.cbsmList.push(item.bsm); 803 this.cbsmList.push(item.bsm);
804 } else { 804 } else {
805 //选中→未选中 805 //选中→未选中
806 e.target.className = "floor"; 806 e.target.className = "floor";
...@@ -808,7 +808,7 @@ export default { ...@@ -808,7 +808,7 @@ export default {
808 } 808 }
809 this.$parent.getCbsm(this.cbsmList); 809 this.$parent.getCbsm(this.cbsmList);
810 }else{ 810 }else{
811 811
812 } 812 }
813 }, 813 },
814 //关闭右键菜单 814 //关闭右键菜单
...@@ -901,7 +901,7 @@ export default { ...@@ -901,7 +901,7 @@ export default {
901 type: "warning", 901 type: "warning",
902 }) 902 })
903 .then(() => { 903 .then(() => {
904 //确定合并 调用合并接口 this.hbsmList为选中户bsm数组 TO DO 904 //确定合并 调用合并接口 this.hbsmList为选中户bsm数组 TO DO
905 let params = { 905 let params = {
906 "newuserbsm": "", 906 "newuserbsm": "",
907 "oldBsms": olbBsms, 907 "oldBsms": olbBsms,
...@@ -972,7 +972,7 @@ export default { ...@@ -972,7 +972,7 @@ export default {
972 }); 972 });
973 } 973 }
974 }).catch((error) => { 974 }).catch((error) => {
975 975
976 }); 976 });
977 }).catch(() => { 977 }).catch(() => {
978 978
...@@ -1191,7 +1191,7 @@ export default { ...@@ -1191,7 +1191,7 @@ export default {
1191 width: calc(100% - 32px); 1191 width: calc(100% - 32px);
1192 height: 40px; 1192 height: 40px;
1193 // background-color: darkorange; 1193 // background-color: darkorange;
1194 1194
1195 } 1195 }
1196 } 1196 }
1197 .mt30{ 1197 .mt30{
......