Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
d0218596 by 焦泽平
Options

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

2 parents 55135939 c34224b9
Expand all
Inline Side-by-side
Showing 10 changed files with 65 additions and 20 deletions
...@@ -47,9 +47,9 @@ ...@@ -47,9 +47,9 @@
47 <el-checkbox label="dz" name="type">多幢</el-checkbox> 47 <el-checkbox label="dz" name="type">多幢</el-checkbox>
48 <el-checkbox label="zrz" name="type">自然幢</el-checkbox> 48 <el-checkbox label="zrz" name="type">自然幢</el-checkbox>
49 <el-checkbox label="h" name="type">户</el-checkbox> 49 <el-checkbox label="h" name="type">户</el-checkbox>
50 <el-checkbox label="gzw" name="type">构筑物</el-checkbox> 50 <!-- <el-checkbox label="gzw" name="type">构筑物</el-checkbox>
51 <el-checkbox label="lq" name="type">林权</el-checkbox> 51 <el-checkbox label="lq" name="type">林权</el-checkbox>
52 <el-checkbox label="zh" name="type">宗海</el-checkbox> 52 <el-checkbox label="zh" name="type">宗海</el-checkbox> -->
53 </el-checkbox-group> 53 </el-checkbox-group>
54 </el-form-item> 54 </el-form-item>
55 </el-form> 55 </el-form>
......
...@@ -209,6 +209,7 @@ ...@@ -209,6 +209,7 @@
209 import Qlxz from "../../../components/formMenu/qlxz_simple"; 209 import Qlxz from "../../../components/formMenu/qlxz_simple";
210 import {saveDzInfo,getBdcdyh,getDzDetailByBsm} from "../../../api/dz"; 210 import {saveDzInfo,getBdcdyh,getDzDetailByBsm} from "../../../api/dz";
211 import {getQjZdjbxxDetailById} from "../../../api/zd" 211 import {getQjZdjbxxDetailById} from "../../../api/zd"
212 import {submit} from "../../../api/common"
212 export default { 213 export default {
213 name:'zrz', 214 name:'zrz',
214 components:{ 215 components:{
...@@ -416,6 +417,17 @@ ...@@ -416,6 +417,17 @@
416 }, 417 },
417 onSubmit(){ 418 onSubmit(){
418 console.log(this.form) 419 console.log(this.form)
420 let data={
421 glbsm:this.bsm,
422 status:1,
423 type:"dz"
424 }
425 submit(data).then((res)=>{
426 if(res.code===200){
427 this.$message.success("提交完成！");
428 this.getDzDetailByBsm(this.$route.query.bsm)
429 }
430 })
419 }, 431 },
420 getZddm(zdbsm){ 432 getZddm(zdbsm){
421 getQjZdjbxxDetailById(zdbsm).then((res)=>{ 433 getQjZdjbxxDetailById(zdbsm).then((res)=>{
......
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
82 </el-form-item> 82 </el-form-item>
83 </el-form> 83 </el-form>
84 </el-tab-pane> 84 </el-tab-pane>
85 <el-tab-pane class="eltabspane" v-if="!auth" label="宗海" name="zh">宗海</el-tab-pane> 85 <!-- <el-tab-pane class="eltabspane" v-if="!auth" label="宗海" name="zh">宗海</el-tab-pane> -->
86 <el-tab-pane class="eltabspane" label="自然幢" name="zrz"> 86 <el-tab-pane class="eltabspane" label="自然幢" name="zrz">
87 <el-form :inline="true" :rules="rules1" :model="ruleForm1" ref="ruleForm1" class="zrzProject"> 87 <el-form :inline="true" :rules="rules1" :model="ruleForm1" ref="ruleForm1" class="zrzProject">
88 <el-form-item label="项目名称" prop="xmmc"> 88 <el-form-item label="项目名称" prop="xmmc">
...@@ -115,8 +115,8 @@ ...@@ -115,8 +115,8 @@
115 </el-form-item> 115 </el-form-item>
116 </el-form> 116 </el-form>
117 </el-tab-pane> 117 </el-tab-pane>
118 <el-tab-pane class="eltabspane" label="林权" name="lq">林权</el-tab-pane> 118 <!-- <el-tab-pane class="eltabspane" label="林权" name="lq">林权</el-tab-pane>
119 <el-tab-pane class="eltabspane" label="构筑物" name="gzw">构筑物</el-tab-pane> 119 <el-tab-pane class="eltabspane" label="构筑物" name="gzw">构筑物</el-tab-pane> -->
120 </el-tabs> 120 </el-tabs>
121 </template> 121 </template>
122 <script> 122 <script>
...@@ -217,10 +217,10 @@ export default { ...@@ -217,10 +217,10 @@ export default {
217 }, 217 },
218 methods: { 218 methods: {
219 // 重置 219 // 重置
220 result(){ 220 reset(){
221 this.$refs['ruleForm'].resetFields() 221 this.$refs['ruleForm'].resetFields();
222 this.$refs["ruleForm1"].resetFields() 222 this.$refs["ruleForm1"].resetFields();
223 this.$refs["ruleForm2"].resetFields() 223 this.$refs["ruleForm2"].resetFields();
224 }, 224 },
225 handleClick(tab, event) { 225 handleClick(tab, event) {
226 console.log(tab, event); 226 console.log(tab, event);
...@@ -260,13 +260,13 @@ export default { ...@@ -260,13 +260,13 @@ export default {
260 this.ruleForm1.dzbsm = this.$store.state.dzbsm != '' ? this.$store.state.dzbsm : ''; 260 this.ruleForm1.dzbsm = this.$store.state.dzbsm != '' ? this.$store.state.dzbsm : '';
261 insertZrzjbxx(this.ruleForm1) 261 insertZrzjbxx(this.ruleForm1)
262 .then((res) => { 262 .then((res) => {
263 debugger
263 if (res.code == "200") { 264 if (res.code == "200") {
264 this.$message({ 265 this.$message({
265 message: "创建成功！", 266 message: "创建成功！",
266 type: "success", 267 type: "success",
267 }); 268 });
268 //todo 跳转到自然幢基本信息内容表页面 (预留) 269 //todo 跳转到自然幢基本信息内容表页面 (预留)
269 this.close();
270 this.$store.state.zdbsm=res.result.zdbsm; 270 this.$store.state.zdbsm=res.result.zdbsm;
271 this.$store.state.zrzbsm=res.result.bsm; 271 this.$store.state.zrzbsm=res.result.bsm;
272 this.$store.state.xmmc=res.result.xmmc; 272 this.$store.state.xmmc=res.result.xmmc;
...@@ -276,6 +276,7 @@ export default { ...@@ -276,6 +276,7 @@ export default {
276 bsm:res.result.bsm 276 bsm:res.result.bsm
277 } 277 }
278 }); 278 });
279 this.close();
279 } else { 280 } else {
280 this.$message.error("创建失败！"); 281 this.$message.error("创建失败！");
281 } 282 }
...@@ -370,7 +371,7 @@ export default { ...@@ -370,7 +371,7 @@ export default {
370 }, 371 },
371 close() { 372 close() {
372 this.$emit("closeDialog"); 373 this.$emit("closeDialog");
373 this.result(); 374 this.reset();
374 }, 375 },
375 }, 376 },
376 computed: {}, 377 computed: {},
......
...@@ -591,6 +591,7 @@ export default { ...@@ -591,6 +591,7 @@ export default {
591 submit(data).then((res)=>{ 591 submit(data).then((res)=>{
592 if(res.code===200){ 592 if(res.code===200){
593 this.$message.success("提交完成！") 593 this.$message.success("提交完成！")
594 this.getZdjbxxData(this.$store.state.zdbsm);
594 } 595 }
595 }) 596 })
596 }, 597 },
......
...@@ -53,6 +53,10 @@ export default { ...@@ -53,6 +53,10 @@ export default {
53 type: Boolean, 53 type: Boolean,
54 default: false, 54 default: false,
55 }, 55 },
56 scyclx:{
57 type: String,
58 default: "1",
59 },
56 }, 60 },
57 data() { 61 data() {
58 return { 62 return {
...@@ -67,7 +71,7 @@ export default { ...@@ -67,7 +71,7 @@ export default {
67 zdymc:"", 71 zdymc:"",
68 zdybsm: "", 72 zdybsm: "",
69 zrzbsm: "", 73 zrzbsm: "",
70 scyclx: "0", 74 scyclx: "1",
71 qsc: "", 75 qsc: "",
72 jsc: "", 76 jsc: "",
73 hs: "", 77 hs: "",
...@@ -130,7 +134,7 @@ export default { ...@@ -130,7 +134,7 @@ export default {
130 ljzbsm: "", 134 ljzbsm: "",
131 zdybsm: "", 135 zdybsm: "",
132 zrzbsm: "", 136 zrzbsm: "",
133 scyclx: "0", 137 scyclx: this.scyclx,
134 qsc: "", 138 qsc: "",
135 jsc: "", 139 jsc: "",
136 hs: "", 140 hs: "",
...@@ -165,6 +169,13 @@ export default { ...@@ -165,6 +169,13 @@ export default {
165 immediate: true, 169 immediate: true,
166 deep: true, 170 deep: true,
167 }, 171 },
172 scyclx:{
173 handler(n){
174 this.$nextTick(()=>{
175 this.formData.scyclx = this.scyclx;
176 })
177 }
178 }
168 }, 179 },
169 }; 180 };
170 </script> 181 </script>
......
...@@ -411,7 +411,11 @@ ...@@ -411,7 +411,11 @@
411 Qlxz, 411 Qlxz,
412 }, 412 },
413 props:{ 413 props:{
414 bsm:String //户标识码 414 bsm:String, //户标识码
415 scyclx:{
416 type: String,
417 default: "1",
418 },
415 }, 419 },
416 data () { 420 data () {
417 return { 421 return {
...@@ -792,6 +796,15 @@ ...@@ -792,6 +796,15 @@
792 this.form.bdcdyh=res.result; 796 this.form.bdcdyh=res.result;
793 }) 797 })
794 }, 798 },
799 },
800 watch: {
801 scyclx:{
802 handler(n){
803 this.$nextTick(()=>{
804 this.form.scyclx = this.scyclx;
805 })
806 }
807 }
795 } 808 }
796 } 809 }
797 </script> 810 </script>
......
...@@ -224,6 +224,7 @@ ...@@ -224,6 +224,7 @@
224 <div class="addCh" v-show="menuType == 'ch'"> 224 <div class="addCh" v-show="menuType == 'ch'">
225 <addCh 225 <addCh
226 ref="ch" 226 ref="ch"
227 :scyclx="scyclx"
227 :dialogVisible="dialogVisible" 228 :dialogVisible="dialogVisible"
228 :treeData="treeData" 229 :treeData="treeData"
229 ></addCh> 230 ></addCh>
...@@ -248,7 +249,7 @@ ...@@ -248,7 +249,7 @@
248 ></h-cxlz> 249 ></h-cxlz>
249 <!-- 双击户的弹出框 --> 250 <!-- 双击户的弹出框 -->
250 <el-dialog title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="70%" center> 251 <el-dialog title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="70%" center>
251 <hbj ref="hbj" :bsm="hbsm"></hbj> 252 <hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj>
252 <div class="btnGroup"> 253 <div class="btnGroup">
253 <el-button type="primary" @click="hbjSaveInfo">保存</el-button> 254 <el-button type="primary" @click="hbjSaveInfo">保存</el-button>
254 <el-button type="primary" @click="hbjResetInfo">重置</el-button> 255 <el-button type="primary" @click="hbjResetInfo">重置</el-button>
...@@ -572,7 +573,7 @@ export default { ...@@ -572,7 +573,7 @@ export default {
572 plScYcChange() { 573 plScYcChange() {
573 let data = { 574 let data = {
574 zrzbsm: this.$store.state.zrzbsm, 575 zrzbsm: this.$store.state.zrzbsm,
575 scyclx: "0", 576 scyclx: this.scyclx,
576 }; 577 };
577 batchScYcChange(data).then((res) => { 578 batchScYcChange(data).then((res) => {
578 if (res.code === 200) { 579 if (res.code === 200) {
...@@ -606,7 +607,7 @@ export default { ...@@ -606,7 +607,7 @@ export default {
606 getDyztBsmList() { 607 getDyztBsmList() {
607 let data = { 608 let data = {
608 zrzbsm: this.$store.state.zrzbsm, 609 zrzbsm: this.$store.state.zrzbsm,
609 scyclx: "0", 610 scyclx: this.scyclx,
610 }; 611 };
611 getLpbTj(data).then((res) => { 612 getLpbTj(data).then((res) => {
612 if (res.code === 200) { 613 if (res.code === 200) {
...@@ -663,7 +664,7 @@ export default { ...@@ -663,7 +664,7 @@ export default {
663 getLpbFwytAndQlxz(){ 664 getLpbFwytAndQlxz(){
664 let data = { 665 let data = {
665 zrzbsm: this.$store.state.zrzbsm, 666 zrzbsm: this.$store.state.zrzbsm,
666 scyclx: "0", 667 scyclx: this.scyclx,
667 }; 668 };
668 getLpbFwytAndQlxz(data).then((res) => { 669 getLpbFwytAndQlxz(data).then((res) => {
669 if (res.code === 200) { 670 if (res.code === 200) {
......
...@@ -241,7 +241,12 @@ export default { ...@@ -241,7 +241,12 @@ export default {
241 highest = 0; 241 highest = 0;
242 } 242 }
243 } else { 243 } else {
244 // this.zdyWidth = 124; 244 //有且仅有独立层户
245 if(this.$refs.hBsm != undefined){
246 this.$refs.hBsm.forEach((item) => {
247 this.zdyWidth += item.offsetWidth + 21;
248 });
249 }
245 } 250 }
246 251
247 //计算逻辑幢下的幢单元和层户的高度 252 //计算逻辑幢下的幢单元和层户的高度
......
...@@ -432,7 +432,8 @@ ...@@ -432,7 +432,8 @@
432 } 432 }
433 submit(data).then((res)=>{ 433 submit(data).then((res)=>{
434 if(res.code===200){ 434 if(res.code===200){
435 this.$message.success("提交完成！") 435 this.$message.success("提交完成！");
436 this.getZrzDetailByBsm(this.$route.query.bsm)
436 } 437 }
437 }) 438 })
438 }, 439 },
......