Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
7a84d435 by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents ff02ed10 5810b0e0
Inline Side-by-side
Showing 5 changed files with 76 additions and 51 deletions
...@@ -116,11 +116,11 @@ ...@@ -116,11 +116,11 @@
116 <td colspan="5"> 116 <td colspan="5">
117 <el-select class="selectTitle" v-model="form.fwjgbsm"> 117 <el-select class="selectTitle" v-model="form.fwjgbsm">
118 <el-option 118 <el-option
119 v-for="i in $store.state.fwjgList" 119 v-for="item in $store.state.jgOptions"
120 :key="i.bsm" 120 :key="item.bsm"
121 :label="i.mc" 121 :label="item.mc"
122 :value="i.bsm" 122 :value="item.bsm">
123 ></el-option> 123 </el-option>
124 </el-select> 124 </el-select>
125 </td> 125 </td>
126 </tr> 126 </tr>
...@@ -177,10 +177,10 @@ ...@@ -177,10 +177,10 @@
177 <td colspan="9" > 177 <td colspan="9" >
178 <el-select v-model="item1.fwjgzdbsm" placeholder="请选择" > 178 <el-select v-model="item1.fwjgzdbsm" placeholder="请选择" >
179 <el-option 179 <el-option
180 v-for="item in $store.state.fwjgList" 180 v-for="item in $store.state.jgOptions"
181 :key="item.bsm" 181 :key="item.bsm"
182 :label="item.mc" 182 :label="item.mc"
183 :value="item.bsm"> 183 :value="item.bsm">
184 </el-option> 184 </el-option>
185 </el-select> 185 </el-select>
186 </td> 186 </td>
......
1 <template> 1 <template>
2 <div class="dz content-form"> 2 <div class="dz content-form" ref="mainBox">
3 <el-form ref="form" :model="form" label-width="160px"> 3 <el-form ref="form" :model="form" label-width="160px">
4 <Qlr ref="qlrxxModule" :bsm="bsm"></Qlr> 4 <Qlr ref="qlrxxModule" :bsm="bsm"></Qlr>
5 <table border="1" width="100%" cellspacing="0" cellpadding="0" class="dzTable"> 5 <table border="1" width="100%" cellspacing="0" cellpadding="0" class="dzTable">
...@@ -189,8 +189,8 @@ ...@@ -189,8 +189,8 @@
189 </tbody> 189 </tbody>
190 </table> 190 </table>
191 </el-form> 191 </el-form>
192 <div style="min-height: 40px;text-align: center;margin-top: 10px"> 192 <div class="header-button" :style="{width:mainBoxWidth+'px'}">
193 <el-button type="success" @click="onSave">保存</el-button> 193 <el-button type="primary" class="saveBtn" @click="onSave">保存</el-button>
194 <el-button type="primary" @click="onSubmit">提交</el-button> 194 <el-button type="primary" @click="onSubmit">提交</el-button>
195 <el-button type="primary" @click="registerCall">登记调用</el-button> 195 <el-button type="primary" @click="registerCall">登记调用</el-button>
196 </div> 196 </div>
...@@ -281,8 +281,29 @@ ...@@ -281,8 +281,29 @@
281 }], 281 }],
282 value: '', 282 value: '',
283 ytTitleRowspan:1, //用途的单元格垂直合并数量 283 ytTitleRowspan:1, //用途的单元格垂直合并数量
284 mainBoxWidth: 0,
284 } 285 }
285 }, 286 },
287 created() {
288 if(this.source===1){
289 this.bsm=this.$route.query.bsm;
290 this.form.dzbsm=this.$route.query.bsm;
291 this.getZddm(this.$store.state.zdbsm);
292 }else {
293 this.bsm=this.$route.query.bsm;
294 this.form.dzbsm=this.$route.query.bsm;
295 }
296 if(this.source!==1){
297 this.bsm=this.$route.query.bsm;
298 this.form.dzbsm=this.$route.query.bsm;
299 this.getDzDetailByBsm(this.$route.query.bsm)
300 }
301 },
302 mounted(){
303 this.$nextTick(() => {
304 this.mainBoxWidth = this.$refs.mainBox.clientWidth;
305 })
306 },
286 methods: { 307 methods: {
287 registerCall(){ 308 registerCall(){
288 let data={ 309 let data={
...@@ -480,21 +501,6 @@ ...@@ -480,21 +501,6 @@
480 }) 501 })
481 }, 502 },
482 }, 503 },
483 created() {
484 if(this.source===1){
485 this.bsm=this.$route.query.bsm;
486 this.form.dzbsm=this.$route.query.bsm;
487 this.getZddm(this.$store.state.zdbsm);
488 }else {
489 this.bsm=this.$route.query.bsm;
490 this.form.dzbsm=this.$route.query.bsm;
491 }
492 if(this.source!==1){
493 this.bsm=this.$route.query.bsm;
494 this.form.dzbsm=this.$route.query.bsm;
495 this.getDzDetailByBsm(this.$route.query.bsm)
496 }
497 },
498 computed: { 504 computed: {
499 dzbsm() { 505 dzbsm() {
500 return this.$route.query.bsm; 506 return this.$route.query.bsm;
...@@ -525,6 +531,7 @@ ...@@ -525,6 +531,7 @@
525 box-sizing: border-box; 531 box-sizing: border-box;
526 padding: 18px; 532 padding: 18px;
527 padding-bottom: 0; 533 padding-bottom: 0;
534 margin-bottom: 50px;
528 .iconfont{ 535 .iconfont{
529 cursor: pointer; 536 cursor: pointer;
530 } 537 }
...@@ -578,5 +585,26 @@ ...@@ -578,5 +585,26 @@
578 text-align: center; 585 text-align: center;
579 } 586 }
580 } 587 }
588 .header-button {
589 z-index: 3;
590 height: 50px;
591 position: fixed;
592 bottom: 0;
593 right: 0;
594 text-align: center;
595 background-color: #ffffff;
596 .el-button {
597 padding: 10px 30px;
598 margin-top: 8px;
599 }
600 .saveBtn {
601 background-color: #00CACD;
602 border-color: #00CACD;
603 }
604 .saveBtn:hover {
605 background-color: rgba(0, 202, 205, .8);
606 border-color: rgba(0, 202, 205, .8);
607 }
608 }
581 } 609 }
582 </style> 610 </style>
......
1 <template> 1 <template>
2 <div class="content_box"> 2 <div class="content_box">
3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick"> 3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" type="border-card" >
4 <el-tab-pane label="多幢基本信息" name="dzxx"><dzxx v-if="dzJbxxVisble"></dzxx></el-tab-pane> 4 <el-tab-pane label="多幢基本信息" name="dzxx"><dzxx v-if="dzJbxxVisble"></dzxx></el-tab-pane>
5 <el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible"></fjcl></el-tab-pane> 5 <el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible"></fjcl></el-tab-pane>
6 </el-tabs> 6 </el-tabs>
...@@ -43,4 +43,22 @@ ...@@ -43,4 +43,22 @@
43 watch: {}, 43 watch: {},
44 }; 44 };
45 </script> 45 </script>
46 <style scoped lang="less"></style> 46 <style scoped lang="less">
47 .el-tabs{
48 height: calc(100% - 50px);
49 /deep/.el-tabs__content{
50 //height: 100%;
51 /deep/.el-tab-pane{
52 height: 100%;
53 }
54 background: #eaedf5;
55 padding: 0;
56 }
57 /deep/ .el-tabs__item {
58 height: 48px;
59 }
60 /deep/ .el-tabs__header{
61 background-color: #ffffff;
62 }
63 }
64 </style>
......
...@@ -2,18 +2,6 @@ ...@@ -2,18 +2,6 @@
2 <div class="main" ref="mainBox"> 2 <div class="main" ref="mainBox">
3 <div class="formMenu"> 3 <div class="formMenu">
4 <Qlr ref="qlrxxModule" :bsm="curZdbsm" :qszt="formData.qszt"></Qlr> 4 <Qlr ref="qlrxxModule" :bsm="curZdbsm" :qszt="formData.qszt"></Qlr>
5 <!-- <el-button
6 type="primary"
7 class="changeBtn"
8 @click="getQlrxxData"
9 >获取权利人信息数据</el-button
10 >
11 <el-button
12 type="primary"
13 class="changeBtn"
14 @click="getQlxzData"
15 >获取权利性质组件数据</el-button
16 > -->
17 <table class="zdjbxxTable" cellspacing="0" cellpadding="0" border="1"> 5 <table class="zdjbxxTable" cellspacing="0" cellpadding="0" border="1">
18 <tr> 6 <tr>
19 <th colspan="12">宗地基本信息</th> 7 <th colspan="12">宗地基本信息</th>
...@@ -365,19 +353,10 @@ ...@@ -365,19 +353,10 @@
365 </td> 353 </td>
366 </tr> 354 </tr>
367 </table> 355 </table>
368
369 <!-- <div style="min-height: 40px;text-align: center;margin-top: 10px">
370 <el-button type="success" class="saveBtn" @click="updateZDxx">保存</el-button>
371 <el-button type="primary" @click="submitZDxx">提交</el-button>
372 <el-button type="primary" @click="registerCall">登记调用</el-button>
373 </div> -->
374
375 <div class="header-button" :style="{width:mainBoxWidth+'px'}"> 356 <div class="header-button" :style="{width:mainBoxWidth+'px'}">
376
377 <el-button type="primary" class="saveBtn" @click="updateZDxx">保存</el-button> 357 <el-button type="primary" class="saveBtn" @click="updateZDxx">保存</el-button>
378 <el-button type="primary" @click="submitZDxx">提交</el-button> 358 <el-button type="primary" @click="submitZDxx">提交</el-button>
379 <el-button type="primary" @click="registerCall">登记调用</el-button> 359 <el-button type="primary" @click="registerCall">登记调用</el-button>
380 <!-- <el-button type="primary" class="saveBtn" @click="save">保存</el-button> -->
381 </div> 360 </div>
382 </div> 361 </div>
383 </div> 362 </div>
......
...@@ -284,7 +284,7 @@ ...@@ -284,7 +284,7 @@
284 <td colspan="9" > 284 <td colspan="9" >
285 <el-select v-model="item1.fwjgzdbsm" placeholder="请选择" :disabled="disableFlag"> 285 <el-select v-model="item1.fwjgzdbsm" placeholder="请选择" :disabled="disableFlag">
286 <el-option 286 <el-option
287 v-for="item in $store.state.fwjgList" 287 v-for="item in $store.state.jgOptions"
288 :key="item.bsm" 288 :key="item.bsm"
289 :label="item.mc" 289 :label="item.mc"
290 :value="item.bsm"> 290 :value="item.bsm">
......