Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
9c961d21 by 杨威
Options

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

2 parents 08f7a0c2 fdced0a6
Inline Side-by-side
Showing 4 changed files with 32 additions and 25 deletions
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
12 action="/api/tx/excelGeo/import" 12 action="/api/tx/excelGeo/import"
13 :data="sxdrData" 13 :data="sxdrData"
14 :on-success="uploadSuccess" 14 :on-success="uploadSuccess"
15 :on-error="uploadError"
16 :show-file-list="false" 15 :show-file-list="false"
17 multiple 16 multiple
18 > 17 >
......
...@@ -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" icon="el-icon-search">保存</el-button> 367 <el-button type="primary" class="saveBtn" @click="updateZDxx" :disabled="disabled" icon="iconfont 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>
...@@ -514,13 +514,12 @@ ...@@ -514,13 +514,12 @@
514 this.$refs.qlrxxModule.changeGyfs(res.result.gygyqlrqk); 514 this.$refs.qlrxxModule.changeGyfs(res.result.gygyqlrqk);
515 } 515 }
516 if(this.formData.bblx === 0 && this.formData.qszt === '0' && this.formData.bhqkbsm == null){ 516 if(this.formData.bblx === 0 && this.formData.qszt === '0' && this.formData.bhqkbsm == null){
517 console.log("12345")
518 this.disabled = false 517 this.disabled = false
519 }else { 518 }else {
520 console.log("1234567890") 519 // console.log("1234567890")
521 this.disabled = true 520 this.disabled = true
522 } 521 }
523 console.log(res.result, 'res.result'); 522 // console.log(res.result, 'res.result');
524 this.getXzqData(res.result.xzqbsm, res.result.djqbsm); 523 this.getXzqData(res.result.xzqbsm, res.result.djqbsm);
525 //如果没有宗地代码，自动生成 524 //如果没有宗地代码，自动生成
526 // if(res.result.zddm == null){ 525 // if(res.result.zddm == null){
...@@ -634,7 +633,7 @@ ...@@ -634,7 +633,7 @@
634 this.generatorDpdm(); 633 this.generatorDpdm();
635 getBdcdyh(this.dpdm, "zd") 634 getBdcdyh(this.dpdm, "zd")
636 .then((res) => { 635 .then((res) => {
637 console.log(res); 636 // console.log(res);
638 this.formData.zddm = res.result.substring(0, 19); 637 this.formData.zddm = res.result.substring(0, 19);
639 this.formData.bdcdyh = res.result; 638 this.formData.bdcdyh = res.result;
640 }) 639 })
...@@ -663,7 +662,6 @@ ...@@ -663,7 +662,6 @@
663 662
664 getBdcdyh(this.dpdm, "zd") 663 getBdcdyh(this.dpdm, "zd")
665 .then((res) => { 664 .then((res) => {
666 console.log(res);
667 this.formData.zddm = res.result.substring(0, 19); 665 this.formData.zddm = res.result.substring(0, 19);
668 this.formData.bdcdyh = res.result; 666 this.formData.bdcdyh = res.result;
669 }) 667 })
...@@ -672,9 +670,9 @@ ...@@ -672,9 +670,9 @@
672 }, 670 },
673 //修改宗地基本信息 671 //修改宗地基本信息
674 updateZDxx(formData) { 672 updateZDxx(formData) {
673 debugger
675 //获取权利性质数据 674 //获取权利性质数据
676 this.formData.list = this.$refs.qlxzModule.getQlxzDataList(); 675 this.formData.list = this.$refs.qlxzModule.getQlxzDataList();
677 console.log(this.$refs.qlxzModule.getRulesResult(), 'this.$refs.qlxzModule.getRules()');
678 //判断容密高是否为区间值，如果是区间值，则将输入框的值赋予 676 //判断容密高是否为区间值，如果是区间值，则将输入框的值赋予
679 this.formData.jyrjl = this.isInterval(this.formData.jyrjl) ? this.rjl : this.formData.jyrjl; 677 this.formData.jyrjl = this.isInterval(this.formData.jyrjl) ? this.rjl : this.formData.jyrjl;
680 this.formData.jyjzmd = this.isInterval(this.formData.jyjzmd) ? this.jzmd : this.formData.jyjzmd; 678 this.formData.jyjzmd = this.isInterval(this.formData.jyjzmd) ? this.jzmd : this.formData.jyjzmd;
...@@ -773,8 +771,8 @@ ...@@ -773,8 +771,8 @@
773 }else{ 771 }else{
774 updateQjZdjbxx(this.formData) 772 updateQjZdjbxx(this.formData)
775 .then((res) => { 773 .then((res) => {
774 console.log(res,'修改宗地基本信息')
776 if (res.code == 200) { 775 if (res.code == 200) {
777 console.log(res);
778 this.$message({ 776 this.$message({
779 message: '保存成功', 777 message: '保存成功',
780 type: "success", 778 type: "success",
...@@ -822,8 +820,8 @@ ...@@ -822,8 +820,8 @@
822 } 820 }
823 } 821 }
824 self.updAttributes(this.$store.state.zdbsm, 'zd', this.geoAttributes, function (res) { 822 self.updAttributes(this.$store.state.zdbsm, 'zd', this.geoAttributes, function (res) {
825 console.log("属性保存完成!!"); 823
826 }); 824 });
827 } 825 }
828 } 826 }
829 } else { 827 } else {
...@@ -861,11 +859,11 @@ ...@@ -861,11 +859,11 @@
861 }) 859 })
862 }, 860 },
863 getQlrxxData() { 861 getQlrxxData() {
864 console.log(this.$refs.qlrxxModule.getQlgyfsData()); //权利共有方式数据 862 // console.log(this.$refs.qlrxxModule.getQlgyfsData()); //权利共有方式数据
865 console.log(this.$refs.qlrxxModule.getQlrxxData()); //权利人表格数据 863 // console.log(this.$refs.qlrxxModule.getQlrxxData()); //权利人表格数据
866 }, 864 },
867 getQlxzData() { 865 getQlxzData() {
868 console.log(this.$refs.qlxzModule.getQlxzDataList()); //权利性质数据 866 // console.log(this.$refs.qlxzModule.getQlxzDataList()); //权利性质数据
869 }, 867 },
870 //行政区划选择 868 //行政区划选择
871 changeXzq(id) { 869 changeXzq(id) {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div ref="lpb" class="content_box"> 2 <div ref="lpb" class="content_box">
3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" type="card" > 3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" type="card" >
4 <el-tab-pane label="自然幢信息" name="zrzxx"><zrzxx></zrzxx></el-tab-pane> 4 <el-tab-pane label="自然幢信息" name="zrzxx"><zrzxx></zrzxx></el-tab-pane>
5 <el-tab-pane label="业主共有" name="yzgy"><yzgy v-if="yzgyLoad"></yzgy></el-tab-pane> 5 <el-tab-pane label="业主共有" name="yzgy"><yzgy v-if="yzgyLoad" :is-disabled="isDisabled"></yzgy></el-tab-pane>
6 <el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane> 6 <el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane>
7 <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>
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="lshs"><lshs v-if="lshsVisible" :type="type" :bsm="$route.query.bsm"></lshs></el-tab-pane>
...@@ -37,12 +37,14 @@ export default { ...@@ -37,12 +37,14 @@ export default {
37 }, 37 },
38 methods: { 38 methods: {
39 loadingStatus() { 39 loadingStatus() {
40 console.log("是否禁用")
41 let bsm=this.$store.state.zrzbsm; 40 let bsm=this.$store.state.zrzbsm;
42 queryStatus(bsm).then(res => { 41 queryStatus(bsm).then(res => {
43 if (res.success) { 42 if (res.success) {
44 let qszt = res.result.qszt; 43 if (res.result) {
45 this.isDisabled = +qszt !== 0; 44 let qszt = res.result.qszt;
45
46 this.isDisabled = +qszt !== 0;
47 }
46 } 48 }
47 }) 49 })
48 }, 50 },
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
21 type="primary" 21 type="primary"
22 class="changeBtn inAdd addMinus" 22 class="changeBtn inAdd addMinus"
23 @click="addRow" 23 @click="addRow"
24 :disabled="isDisabled"
24 >+ 25 >+
25 </el-button 26 </el-button
26 > 27 >
...@@ -38,36 +39,37 @@ ...@@ -38,36 +39,37 @@
38 type="primary" 39 type="primary"
39 class="changeBtn inMinus addMinus" 40 class="changeBtn inMinus addMinus"
40 @click="delRow(i)" 41 @click="delRow(i)"
42 :disabled="isDisabled"
41 >- 43 >-
42 </el-button 44 </el-button
43 > 45 >
44 </td> 46 </td>
45 <td> 47 <td>
46 <el-input v-model="item.jgzwbh" placeholder="请输入建(构)筑物编号" maxlength="10"></el-input> 48 <el-input v-model="item.jgzwbh" placeholder="请输入建(构)筑物编号" maxlength="10" :disabled="isDisabled"></el-input>
47 </td> 49 </td>
48 <td> 50 <td>
49 <el-input v-model="item.jgzsl" oninput="value = (value.match(/^\d{0,9}/g)) || null" 51 <el-input v-model="item.jgzsl" oninput="value = (value.match(/^\d{0,9}/g)) || null" :disabled="isDisabled"
50 placeholder="请输入建(构)筑物数量"></el-input> 52 placeholder="请输入建(构)筑物数量"></el-input>
51 </td> 53 </td>
52 <td> 54 <td>
53 <el-input v-model="item.jgzmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null" 55 <el-input v-model="item.jgzmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null" :disabled="isDisabled"
54 placeholder="请输入建(构)筑物面积(㎡)"></el-input> 56 placeholder="请输入建(构)筑物面积(㎡)"></el-input>
55 </td> 57 </td>
56 <td> 58 <td>
57 <el-input v-model="item.zdmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null" 59 <el-input v-model="item.zdmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null" :disabled="isDisabled"
58 placeholder="请输入占地面积(㎡)"></el-input> 60 placeholder="请输入占地面积(㎡)"></el-input>
59 </td> 61 </td>
60 <td> 62 <td>
61 <el-input v-model="item.fttdmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null" 63 <el-input v-model="item.fttdmj" oninput="value = (value.match(/^\d{0,9}(\.?\d{0,3})/g)[0]) || null" :disabled="isDisabled"
62 placeholder="请输入分摊土地面积(㎡)"></el-input> 64 placeholder="请输入分摊土地面积(㎡)"></el-input>
63 </td> 65 </td>
64 <td> 66 <td>
65 <el-input v-model="item.fj" placeholder="请输入附记"></el-input> 67 <el-input v-model="item.fj" placeholder="请输入附记" :disabled="isDisabled"></el-input>
66 </td> 68 </td>
67 </tr> 69 </tr>
68 </table> 70 </table>
69 <div class="header-button" :style="{width:mainBoxWidth+'px'}"> 71 <div class="header-button" :style="{width:mainBoxWidth+'px'}">
70 <el-button type="primary" class="saveBtn" @click="save">保存</el-button> 72 <el-button type="primary" class="saveBtn" @click="save" :disabled="isDisabled">保存</el-button>
71 </div> 73 </div>
72 </div> 74 </div>
73 </template> 75 </template>
...@@ -78,6 +80,12 @@ ...@@ -78,6 +80,12 @@
78 80
79 export default { 81 export default {
80 name: "", 82 name: "",
83 props:{
84 isDisabled:{
85 type:Boolean,
86 default:false
87 }
88 },
81 data() { 89 data() {
82 return { 90 return {
83 tdzl: '', // 土地坐落 继承获取 91 tdzl: '', // 土地坐落 继承获取
......