Skip to content

任超 / js.CadastralSystem

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

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

2 parents d379e4b0 103ff0b3
Inline Side-by-side
Showing 10 changed files with 48 additions and 61 deletions
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
17 <span class="span" @click="delRow">删除</span> 17 <span class="span" @click="delRow">删除</span>
18 </el-col> 18 </el-col>
19 <el-col :span="4" class="fr" v-show="qszt!='0'"> 19 <el-col :span="4" class="fr" v-show="qszt!='0'">
20 <span class="noEdit" @click="addRow">新增</span> 20 <span class="noEdit" >新增</span>
21 <span class="noEdit" @click="changeRow">修改</span> 21 <span class="noEdit" >修改</span>
22 <span class="noEdit" @click="delRow">删除</span> 22 <span class="noEdit" >删除</span>
23 </el-col> 23 </el-col>
24 </el-row> 24 </el-row>
25 </td> 25 </td>
......
...@@ -105,6 +105,7 @@ ...@@ -105,6 +105,7 @@
105 :disabled="formData.qszt!='0'" 105 :disabled="formData.qszt!='0'"
106 v-model="childItem.tdsyqssj" 106 v-model="childItem.tdsyqssj"
107 type="date" 107 type="date"
108
108 value-format="yyyy-MM-dd" 109 value-format="yyyy-MM-dd"
109 placeholder="选择日期" 110 placeholder="选择日期"
110 > 111 >
...@@ -134,7 +135,6 @@ ...@@ -134,7 +135,6 @@
134 type="text" 135 type="text"
135 style="top: -1px;" 136 style="top: -1px;"
136 :disabled="formData.qszt!='0'" 137 :disabled="formData.qszt!='0'"
137
138 v-model="childItem.pzytdm" 138 v-model="childItem.pzytdm"
139 class="formInput" 139 class="formInput"
140 /> 140 />
...@@ -143,7 +143,6 @@ ...@@ -143,7 +143,6 @@
143 <input 143 <input
144 type="text" 144 type="text"
145 :disabled="formData.qszt!='0'" 145 :disabled="formData.qszt!='0'"
146
147 v-model="childItem.sjytdm" 146 v-model="childItem.sjytdm"
148 class="formInput" 147 class="formInput"
149 /> 148 />
...@@ -151,8 +150,8 @@ ...@@ -151,8 +150,8 @@
151 <li> 150 <li>
152 <input 151 <input
153 type="text" 152 type="text"
154 :disabled="formData.qszt!='0'"
155 153
154 :disabled="formData.qszt!='0'"
156 v-model="childItem.syqx" 155 v-model="childItem.syqx"
157 class="formInput" 156 class="formInput"
158 /> 157 />
...@@ -212,6 +211,7 @@ ...@@ -212,6 +211,7 @@
212 :disabled="formData.qszt!='0'" 211 :disabled="formData.qszt!='0'"
213 v-model="childItem.tdsyjssj" 212 v-model="childItem.tdsyjssj"
214 type="date" 213 type="date"
214
215 value-format="yyyy-MM-dd" 215 value-format="yyyy-MM-dd"
216 placeholder="选择日期" 216 placeholder="选择日期"
217 > 217 >
......
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
122 cs: [ 122 cs: [
123 { 123 {
124 key: '1', 124 key: '1',
125 label: '明义层', 125 label: '名义层',
126 value: '1' 126 value: '1'
127 }, { 127 }, {
128 key: '2', 128 key: '2',
......
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
174 cgz: [ 174 cgz: [
175 { 175 {
176 key: '1', 176 key: '1',
177 label: '明义层', 177 label: '名义层',
178 value: '1' 178 value: '1'
179 }, { 179 }, {
180 key: '2', 180 key: '2',
......
...@@ -47,7 +47,8 @@ const store = new Vuex.Store({ ...@@ -47,7 +47,8 @@ const store = new Vuex.Store({
47 hbsm:'', 47 hbsm:'',
48 contentWidth:'', //内容区域宽度 48 contentWidth:'', //内容区域宽度
49 zrzh:'', //自然幢号 49 zrzh:'', //自然幢号
50 dzbsm:'' // 多幢bsm 50 dzbsm:'', // 多幢bsm
51 treeData:[], // 树数据
51 }, 52 },
52 modules: { 53 modules: {
53 user, 54 user,
......
...@@ -177,9 +177,11 @@ export default { ...@@ -177,9 +177,11 @@ export default {
177 "$store.state.zdbsm": function(bsm) { 177 "$store.state.zdbsm": function(bsm) {
178 this.getRightTree(bsm); 178 this.getRightTree(bsm);
179 }, 179 },
180 // "$store.state.zdbsms":function (zdbsms) { 180
181 // this.getTreeByS(zdbsms) 181 "$store.state.treeData":function (val) {
182 // } 182 console.log(val,'val');
183 this.pd = val;
184 }
183 }, 185 },
184 mounted(){ 186 mounted(){
185 187
......
...@@ -8,12 +8,12 @@ ...@@ -8,12 +8,12 @@
8 <div class="fgq"> 8 <div class="fgq">
9 <div class="data"> 9 <div class="data">
10 <ul> 10 <ul>
11 <li>宗地代码:{{zdFgqData.zddm}}</li> 11 <li><span>宗地代码:</span>{{zdFgqData.zddm}}</li>
12 <li>不动产单元号:{{zdFgqData.bdcdyh}}</li> 12 <li><span>不动产单元号:</span>{{zdFgqData.bdcdyh}}</li>
13 <li>项目名称:{{zdFgqData.xmmc}}</li> 13 <li><span>项目名称:</span>{{zdFgqData.xmmc}}</li>
14 <li>不动产权证号:{{zdFgqData.bdcqzh}}</li> 14 <li><span>不动产权证号:</span>{{zdFgqData.bdcqzh}}</li>
15 <li>权利人:{{zdFgqData.qlr}}</li> 15 <li><span>权利人:</span>{{zdFgqData.qlr}}</li>
16 <li>坐落:{{zdFgqData.zl}}</li> 16 <li><span>坐落:</span>{{zdFgqData.zl}}</li>
17 </ul> 17 </ul>
18 </div> 18 </div>
19 <div class="zxx"> 19 <div class="zxx">
...@@ -227,12 +227,12 @@ ...@@ -227,12 +227,12 @@
227 <div class="fgq"> 227 <div class="fgq">
228 <div class="data"> 228 <div class="data">
229 <ul> 229 <ul>
230 <li>宗地代码:{{dzFgqData.zddm}}</li> 230 <li><span>宗地代码:</span>{{dzFgqData.zddm}}</li>
231 <li>不动产单元号:{{dzFgqData.bdcdyh}}</li> 231 <li><span>不动产单元号:</span>{{dzFgqData.bdcdyh}}</li>
232 <li>项目名称:{{dzFgqData.xmmc}}</li> 232 <li><span>项目名称:</span>{{dzFgqData.xmmc}}</li>
233 <li>不动产权证号:{{dzFgqData.bdcqzh}}</li> 233 <li><span>不动产权证号:</span>{{dzFgqData.bdcqzh}}</li>
234 <li>权利人:{{dzFgqData.qlr}}</li> 234 <li><span>权利人:</span>{{dzFgqData.qlr}}</li>
235 <li>坐落:{{dzFgqData.zl}}</li> 235 <li><span>坐落:</span>{{dzFgqData.zl}}</li>
236 </ul> 236 </ul>
237 </div> 237 </div>
238 <div class="zxx"> 238 <div class="zxx">
...@@ -412,12 +412,12 @@ ...@@ -412,12 +412,12 @@
412 <div class="fgq"> 412 <div class="fgq">
413 <div class="data"> 413 <div class="data">
414 <ul> 414 <ul>
415 <li>宗地代码:{{zdFgqData.zddm}}</li> 415 <li><span>宗地代码:</span>{{zdFgqData.zddm}}</li>
416 <li>不动产单元号:{{zdFgqData.bdcdyh}}</li> 416 <li><span>不动产单元号:</span>{{zdFgqData.bdcdyh}}</li>
417 <li>项目名称:{{zdFgqData.xmmc}}</li> 417 <li><span>项目名称:</span>{{zdFgqData.xmmc}}</li>
418 <li>不动产权证号:{{zdFgqData.bdcqzh}}</li> 418 <li><span>不动产权证号:</span>{{zdFgqData.bdcqzh}}</li>
419 <li>权利人:{{zdFgqData.qlr}}</li> 419 <li><span>权利人:</span>{{zdFgqData.qlr}}</li>
420 <li>坐落:{{zdFgqData.zl}}</li> 420 <li><span>坐落:</span>{{zdFgqData.zl}}</li>
421 </ul> 421 </ul>
422 </div> 422 </div>
423 <div class="zxx"> 423 <div class="zxx">
...@@ -842,7 +842,6 @@ ...@@ -842,7 +842,6 @@
842 saveZd() { 842 saveZd() {
843 zdfg(this.zdFghData).then(res => { 843 zdfg(this.zdFghData).then(res => {
844 if (res.success) { 844 if (res.success) {
845 Message.success('保存成功')
846 this.$store.state.zdbsms=res.result; 845 this.$store.state.zdbsms=res.result;
847 this.$router.push({ 846 this.$router.push({
848 path: '/zd', 847 path: '/zd',
...@@ -1147,6 +1146,9 @@ ...@@ -1147,6 +1146,9 @@
1147 li { 1146 li {
1148 padding: 5px; 1147 padding: 5px;
1149 line-height: 20px; 1148 line-height: 20px;
1149 span{
1150
1151 }
1150 } 1152 }
1151 } 1153 }
1152 } 1154 }
......
...@@ -331,8 +331,6 @@ export default { ...@@ -331,8 +331,6 @@ export default {
331 message: "创建成功！", 331 message: "创建成功！",
332 type: "success", 332 type: "success",
333 }); 333 });
334 //todo 跳转到自然幢基本信息内容表页面 (预留)
335 this.close();
336 this.$store.state.zdbsm=res.result.zdbsm; 334 this.$store.state.zdbsm=res.result.zdbsm;
337 this.$store.state.dzbsm=res.result.bsm; 335 this.$store.state.dzbsm=res.result.bsm;
338 this.$store.state.xmmc=res.result.xmmc; 336 this.$store.state.xmmc=res.result.xmmc;
...@@ -342,6 +340,7 @@ export default { ...@@ -342,6 +340,7 @@ export default {
342 bsm:res.result.bsm 340 bsm:res.result.bsm
343 } 341 }
344 }); 342 });
343 this.close();
345 } else { 344 } else {
346 this.$message.error("创建失败！"); 345 this.$message.error("创建失败！");
347 } 346 }
......
...@@ -20,7 +20,6 @@ import jzx from "./jzx"; ...@@ -20,7 +20,6 @@ import jzx from "./jzx";
20 import djb from "./djb"; 20 import djb from "./djb";
21 import lshs from "./lshs"; 21 import lshs from "./lshs";
22 import fjcl from "./fjcl/fjcl" 22 import fjcl from "./fjcl/fjcl"
23 import {queryjzd,queryjzx} from "@/api/zd"
24 export default { 23 export default {
25 name: "", 24 name: "",
26 components: { 25 components: {
...@@ -30,34 +29,12 @@ export default { ...@@ -30,34 +29,12 @@ export default {
30 data() { 29 data() {
31 return { 30 return {
32 activeName: "djdcb", 31 activeName: "djdcb",
33 jzd:[],
34 jzx:[]
35 }; 32 };
36 }, 33 },
37 methods: { 34 methods: {
38 handleClick(tab, event) { 35 handleClick(tab, event) {
39 // console.log(tab, event); 36 // console.log(tab, event);
40 }, 37 },
41 //查询界址点
42 getJZD(){
43 var bsm = this.$store.state.zdbsm;
44 this.jzx = [];
45 queryjzd({glBsm:bsm}).then(res => {
46 if(res.code == 200){
47 this.jzd = res.data.data;
48 }
49 })
50 },
51 //查询界址线
52 getJZX(){
53 var bsm = this.$store.state.zdbsm;
54 this.jzx = [];
55 queryjzx({glBsm:bsm}).then(res => {
56 if(res.code = 200){
57 this.jzx = res.data.data;
58 }
59 });
60 }
61 }, 38 },
62 created() {}, 39 created() {},
63 mounted() {}, 40 mounted() {},
......
...@@ -339,7 +339,7 @@ ...@@ -339,7 +339,7 @@
339 </table> 339 </table>
340 340
341 <div style="min-height: 40px;text-align: center;margin-top: 10px"> 341 <div style="min-height: 40px;text-align: center;margin-top: 10px">
342 <el-button type="success" @click="updateZDxx()">保存</el-button> 342 <el-button type="success" @click="updateZDxx">保存</el-button>
343 <el-button type="primary" @click="submitZDxx">提交</el-button> 343 <el-button type="primary" @click="submitZDxx">提交</el-button>
344 </div> 344 </div>
345 </div> 345 </div>
...@@ -349,12 +349,13 @@ ...@@ -349,12 +349,13 @@
349 <script> 349 <script>
350 import Qlr from "../../../components/formMenu/qlr"; 350 import Qlr from "../../../components/formMenu/qlr";
351 import Qlxz from "../../../components/formMenu/qlxz"; 351 import Qlxz from "../../../components/formMenu/qlxz";
352 import {submit} from "../../../api/common"
353 import { 352 import {
354 getAllList, 353 getAllList,
355 getDdicByMC, 354 getDdicByMC,
356 getListByXzqbsm, 355 getListByXzqbsm,
357 getListByPbsm, 356 getListByPbsm,
357 submit,
358 getTree,
358 } from "../../../api/common"; 359 } from "../../../api/common";
359 import { 360 import {
360 getBdcdyh, 361 getBdcdyh,
...@@ -623,11 +624,16 @@ export default { ...@@ -623,11 +624,16 @@ export default {
623 status:1, 624 status:1,
624 type:"zd" 625 type:"zd"
625 } 626 }
626
627 submit(data).then((res)=>{ 627 submit(data).then((res)=>{
628 if(res.code===200){ 628 if(res.code===200){
629 this.$message.success("提交完成！") 629 this.$message.success("提交成功！")
630 this.getZdjbxxData(this.$store.state.zdbsm); 630 this.getZdjbxxData(this.curZdbsm);
631 getTree(this.curZdbsm).then((res) => {
632 if (res.success) {
633 // console.log('successsuccesssuccesssuccess');
634 this.$store.state.treeData = res.result;
635 }
636 });
631 } 637 }
632 }) 638 })
633 }, 639 },
......