Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
ec5ce720 by 杨威
Options

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

2 parents 4910876d 235b39d4
Inline Side-by-side
Showing 8 changed files with 75 additions and 43 deletions
...@@ -56,17 +56,18 @@ ...@@ -56,17 +56,18 @@
56 <div class="table-bode"> 56 <div class="table-bode">
57 <table border="1"> 57 <table border="1">
58 <tr> 58 <tr>
59 <td>序号</td> 59 <th>序号</th>
60 <td>操作</td> 60 <th>操作</th>
61 <td>宗地代码</td> 61 <th>宗地代码</th>
62 <td>不动产单元号</td> 62 <th>不动产单元号</th>
63 <td>项目名称</td> 63 <th>项目名称</th>
64 <td>不动产权证号</td> 64 <th>不动产权证号</th>
65 <td>权利人</td> 65 <th>权利人</th>
66 <td>坐落</td> 66 <th>坐落</th>
67 <th>自然幢数量</th>
67 </tr> 68 </tr>
68 <tr v-if="Data.length==0"> 69 <tr v-if="Data.length===0">
69 <td colspan="8"> 70 <td colspan="9">
70 <span class="noData">暂无数据</span> 71 <span class="noData">暂无数据</span>
71 </td> 72 </td>
72 </tr> 73 </tr>
...@@ -79,8 +80,9 @@ ...@@ -79,8 +80,9 @@
79 <td>{{item.bdcdyh}}</td> 80 <td>{{item.bdcdyh}}</td>
80 <td>{{item.xmmc}}</td> 81 <td>{{item.xmmc}}</td>
81 <td>{{item.bdcqzh}}</td> 82 <td>{{item.bdcqzh}}</td>
82 <td>{{item.qlr}}</td> 83 <td>{{item.qlrmc}}</td>
83 <td>{{item.zl}}</td> 84 <td>{{item.zl}}</td>
85 <td>{{item.zrzCount}}</td>
84 </tr> 86 </tr>
85 </table> 87 </table>
86 </div> 88 </div>
...@@ -208,7 +210,9 @@ ...@@ -208,7 +210,9 @@
208 background-color: #F5F7FA; 210 background-color: #F5F7FA;
209 } 211 }
210 } 212 }
211 213 th{
214 height: 36px;
215 }
212 td { 216 td {
213 text-align: center; 217 text-align: center;
214 height: 36px; 218 height: 36px;
......
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
8 <el-row> 8 <el-row>
9 <el-col :span="14" class="fl" style="line-height:32px"> 9 <el-col :span="14" class="fl" style="line-height:32px">
10 <el-radio-group v-model="gyfs"> 10 <el-radio-group v-model="gyfs">
11 <el-radio :label="item.bsm" :disabled="qszt!='0' || item.disabled" :key="item.bsm" v-for="item in gyfsList">{{item.mc}}</el-radio> 11 <el-radio :label="item.bsm" :disabled="+qszt!==0 || item.disabled" :key="item.bsm" v-for="item in gyfsList">{{item.mc}}</el-radio>
12 </el-radio-group> 12 </el-radio-group>
13 </el-col> 13 </el-col>
14 <el-col :span="10" class="fr"> 14 <el-col :span="10" class="fr">
15 <div v-show="qszt=='0'" class="fr" style="margin-right:20px"> 15 <!-- <div v-show="qszt=='0'" class="fr" style="margin-right:20px">
16 <el-button class="qlrBtn" size="mini" @click="addRow"> 16 <el-button class="qlrBtn" size="mini" @click="addRow">
17 <i class="iconfont iconxinzeng"></i> 新增 17 <i class="iconfont iconxinzeng"></i> 新增
18 </el-button> 18 </el-button>
...@@ -22,15 +22,15 @@ ...@@ -22,15 +22,15 @@
22 <el-button class="qlrBtn" size="mini" @click="delRow"> 22 <el-button class="qlrBtn" size="mini" @click="delRow">
23 <i class="iconfont iconshanchu"></i> 删除 23 <i class="iconfont iconshanchu"></i> 删除
24 </el-button> 24 </el-button>
25 </div> 25 </div>-->
26 <div v-show="qszt!='0'" class="fr" style="margin-right:20px"> 26 <div v-show="+qszt === 0" class="fr" style="margin-right:20px">
27 <el-button class="qlrBtn" size="mini" disabled> 27 <el-button class="qlrBtn" size="mini" :disabled="+qszt!==0 || (tableData.length>0 && gyfs ==='PSHGSBDCQJDC000000000000DC340010') " @click="addRow">
28 <i class="iconfont iconxinzeng"></i> 新增 28 <i class="iconfont iconxinzeng" :disabled="+qszt!==0"></i> 新增
29 </el-button> 29 </el-button>
30 <el-button class="qlrBtn" size="mini" disabled> 30 <el-button class="qlrBtn" size="mini" :disabled="+qszt!==0" @click="changeRow">
31 <i class="iconfont iconbianji"></i> 编辑 31 <i class="iconfont iconbianji"></i> 编辑
32 </el-button> 32 </el-button>
33 <el-button class="qlrBtn" size="mini" disabled> 33 <el-button class="qlrBtn" size="mini" :disabled="+qszt!==0" @click="delRow">
34 <i class="iconfont iconshanchu"></i> 删除 34 <i class="iconfont iconshanchu"></i> 删除
35 </el-button> 35 </el-button>
36 </div> 36 </div>
...@@ -403,6 +403,9 @@ ...@@ -403,6 +403,9 @@
403 403
404 //新增行数据 404 //新增行数据
405 addRow() { 405 addRow() {
406
407 console.log(this.gyfs,'共有方式')
408
406 this.update=false; 409 this.update=false;
407 let flag=false; 410 let flag=false;
408 for(let i = 0;i<this.$store.state.gyfsList.length;i++){ 411 for(let i = 0;i<this.$store.state.gyfsList.length;i++){
...@@ -641,6 +644,19 @@ ...@@ -641,6 +644,19 @@
641 } 644 }
642 }, 645 },
643 watch:{ 646 watch:{
647 tableData:{
648 handler:function (v) {
649 console.log(v,'权利人')
650 this.gyfsList[0].disabled = v.length() > 1;
651 } ,
652 deep:true
653 },
654 gyfsList:{
655 handler:function(v){
656 console.log(v,"共有方式")
657 },
658 deep:true
659 },
644 dialogVisible(n){ 660 dialogVisible(n){
645 if(n == false){ 661 if(n == false){
646 this.formData = { 662 this.formData = {
......
...@@ -56,14 +56,15 @@ ...@@ -56,14 +56,15 @@
56 <div class="table-bode"> 56 <div class="table-bode">
57 <table border="1"> 57 <table border="1">
58 <tr> 58 <tr>
59 <td>序号</td> 59 <th>序号</th>
60 <td>操作</td> 60 <th>操作</th>
61 <td>宗地代码</td> 61 <th>宗地代码</th>
62 <td>不动产单元号</td> 62 <th>不动产单元号</th>
63 <td>项目名称</td> 63 <th>项目名称</th>
64 <td>不动产权证号</td> 64 <th>不动产权证号</th>
65 <td>权利人</td> 65 <th>权利人</th>
66 <td>坐落</td> 66 <th>坐落</th>
67 <th>自然幢数量</th>
67 </tr> 68 </tr>
68 <tr v-if="Data.length===0"> 69 <tr v-if="Data.length===0">
69 <td colspan="8"> 70 <td colspan="8">
...@@ -81,6 +82,7 @@ ...@@ -81,6 +82,7 @@
81 <td>{{item.bdcqzh}}</td> 82 <td>{{item.bdcqzh}}</td>
82 <td>{{item.qlrmc}}</td> 83 <td>{{item.qlrmc}}</td>
83 <td>{{item.zl}}</td> 84 <td>{{item.zl}}</td>
85 <td>{{item.zrzCount}}</td>
84 </tr> 86 </tr>
85 </table> 87 </table>
86 </div> 88 </div>
...@@ -167,7 +169,11 @@ ...@@ -167,7 +169,11 @@
167 this.getData(this.queryData) 169 this.getData(this.queryData)
168 }, 170 },
169 addData: function (val) { 171 addData: function (val) {
170 this.$emit("getData",val) 172 if (val.zrzCount < 1) {
173 this.$message.warning("当前宗地下没有自然幢,请重新选择")
174 return
175 }
176 this.$emit("getData",val);
171 }, 177 },
172 isClose(flag){ 178 isClose(flag){
173 179
...@@ -208,7 +214,9 @@ ...@@ -208,7 +214,9 @@
208 background-color: #F5F7FA; 214 background-color: #F5F7FA;
209 } 215 }
210 } 216 }
211 217 th{
218 height: 36px;
219 }
212 td { 220 td {
213 text-align: center; 221 text-align: center;
214 height: 36px; 222 height: 36px;
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
50 <tr> 50 <tr>
51 <th class="cz"> 51 <th class="cz">
52 <i class="iconfont iconicon-test2 " style="color:#66b1ff;font-size:30px" @click="addRow"></i> 52 <i class="iconfont iconicon-test2 " style="color:#66b1ff;font-size:30px" @click="addRow"></i>
53 53
54 </th> 54 </th>
55 <th class="xh">序号</th> 55 <th class="xh">序号</th>
56 <th class="xzq">行政区</th> 56 <th class="xzq">行政区</th>
......
...@@ -157,8 +157,10 @@ ...@@ -157,8 +157,10 @@
157 watch:{ 157 watch:{
158 cbsm: { 158 cbsm: {
159 handler: function (item) { 159 handler: function (item) {
160 console.log(item,"item")
161 console.log(this.$parent.$parent.menuType,"this.$parent.$parent.menuType")
160 if(item!='' && this.$parent.$parent.menuType == 'c'){ 162 if(item!='' && this.$parent.$parent.menuType == 'c'){
161 this.getLjzInfo(this.item) 163 this.getCinfo(item)
162 } 164 }
163 }, 165 },
164 immediate: true 166 immediate: true
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
21 <td colspan="2" align="center" >不动产单元号<i class="requisite">*</i></td> 21 <td colspan="2" align="center" >不动产单元号<i class="requisite">*</i></td>
22 <!-- todo 此处暂时存放的是不动产单元号标识码，而不是不动产单元号--> 22 <!-- todo 此处暂时存放的是不动产单元号标识码，而不是不动产单元号-->
23 <td colspan="4" class="psr"> 23 <td colspan="4" class="psr">
24 <el-input v-model="form.bdcdyh" class="percent80" :disabled="disableFlag" ref="bdcdyh" @blur="inputBlur($event)"></el-input> 24 <el-input v-model="form.bdcdyh" class="percent80" :disabled="disableFlag" ref="bdcdyh"></el-input>
25 <el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning">生成</el-button> 25 <el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning">生成</el-button>
26 </td> 26 </td>
27 <td colspan="2" align="center" >原不动产单元</td> 27 <td colspan="2" align="center" >原不动产单元</td>
...@@ -1014,7 +1014,7 @@ ...@@ -1014,7 +1014,7 @@
1014 1014
1015 "form.bdcdyh":function (val) { 1015 "form.bdcdyh":function (val) {
1016 if (val != '') { 1016 if (val != '') {
1017 this.$refs.bdcdyh.style.border = ''; 1017 this.$refs.bdcdyh.$el.style.border = '';
1018 } 1018 }
1019 }, 1019 },
1020 1020
......
...@@ -412,9 +412,11 @@ export default { ...@@ -412,9 +412,11 @@ export default {
412 Message.warning("已提交的户无法继续操作") 412 Message.warning("已提交的户无法继续操作")
413 }else{ 413 }else{
414 batchCommit(this.bsms).then(res=>{ 414 batchCommit(this.bsms).then(res=>{
415 if (res.success) { 415 if(res.code === 200){
416 Message.success("提交成功"); 416 Message.success("提交成功");
417 this.getlpbData(); 417 this.getlpbData();
418 }else {
419 this.$message.error(res.message);
418 } 420 }
419 }) 421 })
420 } 422 }
......
...@@ -55,33 +55,33 @@ ...@@ -55,33 +55,33 @@
55 <tr height="30"> 55 <tr height="30">
56 <td colspan="2" align="center">预测建筑面积(㎡)</td> 56 <td colspan="2" align="center">预测建筑面积(㎡)</td>
57 <td colspan="4"> 57 <td colspan="4">
58 <el-input v-model="form.ycjzmj"></el-input> 58 <el-input v-model="form.ycjzmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input>
59 </td> 59 </td>
60 <td colspan="2" align="center">实测建筑面积(㎡)</td> 60 <td colspan="2" align="center">实测建筑面积(㎡)</td>
61 <td colspan="4"> 61 <td colspan="4">
62 <el-input v-model="form.scjzmj"></el-input> 62 <el-input v-model="form.scjzmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input>
63 </td> 63 </td>
64 </tr> 64 </tr>
65 65
66 <tr height="30"> 66 <tr height="30">
67 <td colspan="2" align="center">预测地下面积(㎡)</td> 67 <td colspan="2" align="center">预测地下面积(㎡)</td>
68 <td colspan="4"> 68 <td colspan="4">
69 <el-input v-model="form.ycdxmj"></el-input> 69 <el-input v-model="form.ycdxmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input>
70 </td> 70 </td>
71 <td colspan="2" align="center">实测地下面积(㎡)</td> 71 <td colspan="2" align="center">实测地下面积(㎡)</td>
72 <td colspan="4"> 72 <td colspan="4">
73 <el-input v-model="form.scdxmj"></el-input> 73 <el-input v-model="form.scdxmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input>
74 </td> 74 </td>
75 </tr> 75 </tr>
76 76
77 <tr height="30"> 77 <tr height="30">
78 <td colspan="2" align="center">预测其他面积(㎡)</td> 78 <td colspan="2" align="center">预测其他面积(㎡)</td>
79 <td colspan="4"> 79 <td colspan="4">
80 <el-input v-model="form.ycqtmj"></el-input> 80 <el-input v-model="form.ycqtmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input>
81 </td> 81 </td>
82 <td colspan="2" align="center">实测其他面积(㎡)</td> 82 <td colspan="2" align="center">实测其他面积(㎡)</td>
83 <td colspan="4"> 83 <td colspan="4">
84 <el-input v-model="form.scqymj"></el-input> 84 <el-input v-model="form.scqymj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null"></el-input>
85 </td> 85 </td>
86 </tr> 86 </tr>
87 87
...@@ -346,7 +346,7 @@ export default { ...@@ -346,7 +346,7 @@ export default {
346 } 346 }
347 }); 347 });
348 }else{ 348 }else{
349 //逻辑幢更新接口调用 TODO 349 //逻辑幢更新接口调用 TODO
350 console.log('保存'); 350 console.log('保存');
351 updateQjLjz(this.form).then((res)=>{ 351 updateQjLjz(this.form).then((res)=>{
352 if(res.code === 200){ 352 if(res.code === 200){
...@@ -414,7 +414,7 @@ export default { ...@@ -414,7 +414,7 @@ export default {
414 ljzbsm: { 414 ljzbsm: {
415 handler: function (item) { 415 handler: function (item) {
416 console.log(item,'item'); 416 console.log(item,'item');
417 if(item!='' && this.$parent.$parent.menuType == 'ljz'){ 417 if(item!='' && this.$parent.menuType == 'ljz'){
418 this.getLjzInfo(this.ljzbsm) 418 this.getLjzInfo(this.ljzbsm)
419 } 419 }
420 }, 420 },
......