Skip to content

任超 / js.CadastralSystem

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

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

2 parents 058c15db 8ff68bac
Inline Side-by-side
Showing 6 changed files with 43 additions and 24 deletions
...@@ -5,7 +5,7 @@ import request from '@/plugin/axios' ...@@ -5,7 +5,7 @@ import request from '@/plugin/axios'
5 export function getSearchList(data) { 5 export function getSearchList(data) {
6 return request({ 6 return request({
7 url: '/system/basiccommon/query', 7 url: '/system/basiccommon/query',
8 method: 'get', 8 method: 'post',
9 params : data, 9 data : data,
10 }) 10 })
11 } 11 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -14,6 +14,18 @@ export function savemjft(data) { ...@@ -14,6 +14,18 @@ export function savemjft(data) {
14 } 14 }
15 15
16 /** 16 /**
17 * 查询面积分摊表信息
18 */
19 export function getMjftInfo(zdBsm) {
20 return request({
21 url:"/zd/qjGygyzdmjft/getQjGygyzdmjftDetailById",
22 method:"get",
23 params:{
24 zdBsm
25 }
26 })
27 }
28 /**
17 * 新增宗地基本信息 29 * 新增宗地基本信息
18 */ 30 */
19 export function insertQjZdjbxx(data) { 31 export function insertQjZdjbxx(data) {
......
...@@ -247,8 +247,6 @@ ...@@ -247,8 +247,6 @@
247 methods: { 247 methods: {
248 getRightTree(bsm) { 248 getRightTree(bsm) {
249 getTree(bsm).then(res => { 249 getTree(bsm).then(res => {
250 console.log("=========================================")
251 console.log(res)
252 if (res.success) { 250 if (res.success) {
253 this.pd=res.result 251 this.pd=res.result
254 } 252 }
......
...@@ -181,7 +181,6 @@ ...@@ -181,7 +181,6 @@
181 }) 181 })
182 }, 182 },
183 save() { 183 save() {
184 console.log("保存....");
185 jzdsingleModify(this.jzdlist).then(res => { 184 jzdsingleModify(this.jzdlist).then(res => {
186 console.log(res) 185 console.log(res)
187 if (res.success) { 186 if (res.success) {
...@@ -230,7 +229,6 @@ ...@@ -230,7 +229,6 @@
230 229
231 }, 230 },
232 batchExit() { 231 batchExit() {
233 console.log("批量修改")
234 let flag = false; 232 let flag = false;
235 for (let item of this.jzdlist) { 233 for (let item of this.jzdlist) {
236 if (item.isCheck) { 234 if (item.isCheck) {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 <table border="1"> 3 <table border="1">
4 <tr> 4 <tr>
5 <td colspan="2">土地坐落</td> 5 <td colspan="2">土地坐落</td>
6 <td colspan="3"><input type="text" class="formInput" v-model="mjftData.tdzl" disabled/></td> 6 <td colspan="3"><input type="text" class="formInput" v-model="tdzl" disabled/></td>
7 </tr> 7 </tr>
8 <tr> 8 <tr>
9 <td colspan="2">宗地代码</td> 9 <td colspan="2">宗地代码</td>
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
11 </tr> 11 </tr>
12 <tr> 12 <tr>
13 <td colspan="2">宗地面积(㎡)</td> 13 <td colspan="2">宗地面积(㎡)</td>
14 <td><input type="number" class="formInput" v-model.number="mjftData.zdmj" disabled/></td> 14 <td><input type="number" class="formInput" v-model.number="zdmj" disabled/></td>
15 <td>定着物数量</td> 15 <td>定着物数量</td>
16 <td class="dzwsl">{{dzwdsl}}</td> 16 <td class="dzwsl">{{dzwdsl}}</td>
17 </tr> 17 </tr>
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
28 <td>独有独用土地面积(㎡)</td> 28 <td>独有独用土地面积(㎡)</td>
29 <td>分摊土地面积(㎡)</td> 29 <td>分摊土地面积(㎡)</td>
30 </tr> 30 </tr>
31 <tr v-for="(item,i) in mjftData.addQjZdftdzwRequestList" :key="i"> 31 <tr v-for="(item,i) in mjftData.list" :key="i">
32 <td @click="delRow(i)">-</td> 32 <td @click="delRow(i)">-</td>
33 <td><input type="text" class="formInput" v-model="item.dzwdm"/></td> 33 <td><input type="text" class="formInput" v-model="item.dzwdm"/></td>
34 <td><input type="number" class="formInput" v-model="item.tdsyqsyqmj" @keydown="oninput"/></td> 34 <td><input type="number" class="formInput" v-model="item.tdsyqsyqmj" @keydown="oninput"/></td>
...@@ -50,23 +50,23 @@ ...@@ -50,23 +50,23 @@
50 </template> 50 </template>
51 51
52 <script> 52 <script>
53 import {savemjft} from '../../../api/zd' 53 import {getMjftInfo,savemjft} from '../../../api/zd'
54 import {Message} from 'element-ui' 54 import {Message} from 'element-ui'
55 55
56 export default { 56 export default {
57 name: "index", 57 name: "index",
58 data() { 58 data() {
59 return { 59 return {
60 tdzl: '', // 土地坐落 继承获取
61 zdmj: '', // 宗地面积 继承获取
60 mjftData: { 62 mjftData: {
61 zdbsm: '', // 宗地标识码 继承获取 63 zdbsm: '', // 宗地标识码 继承获取
62 tdsyqsyqmjhj: '',// 土地所有权/使用权面积合计 64 tdsyqsyqmjhj: '',// 土地所有权/使用权面积合计
63 fttdmjhj: '', // 分摊土地面积合计 65 fttdmjhj: '', // 分摊土地面积合计
64 dzwdys: '', // 表示同一宗地内所有的定着物单元数 66 dzwdys: '', // 表示同一宗地内所有的定着物单元数
65 dydytdmjhj: '', // 根据该宗地下共有/共用定着物量自动计算。 , 67 dydytdmjhj: '', // 根据该宗地下共有/共用定着物量自动计算。 ,
66 bz: '', // 备注 68 bz: '' , // 备注
67 tdzl: '', // 土地坐落 继承获取 69 list: [
68 zdmj: '', // 宗地面积 继承获取
69 addQjZdftdzwRequestList: [
70 { 70 {
71 dydytdmj: '', // 独有独用土地面积 71 dydytdmj: '', // 独有独用土地面积
72 dzwdm: '', // 定着物代码 72 dzwdm: '', // 定着物代码
...@@ -80,9 +80,16 @@ ...@@ -80,9 +80,16 @@
80 }, 80 },
81 81
82 methods: { 82 methods: {
83 getData(bsm){
84 getMjftInfo(bsm).then(res=>{
85 if (res.success){
86 this.mjftData=res.result
87 }
88 })
89 },
83 save() { 90 save() {
84 console.log(this.mjftData); 91 console.log(this.mjftData);
85 for (let val of this.mjftData.addQjZdftdzwRequestList) { 92 for (let val of this.mjftData.list) {
86 if (val.dzwdm == '') { 93 if (val.dzwdm == '') {
87 Message.error("定着物代码不能为空") 94 Message.error("定着物代码不能为空")
88 return 95 return
...@@ -93,6 +100,7 @@ ...@@ -93,6 +100,7 @@
93 console.log(res) 100 console.log(res)
94 if (res.success) { 101 if (res.success) {
95 Message.success("保存成功") 102 Message.success("保存成功")
103 this.getData(this.mjftData.zdbsm)
96 } else { 104 } else {
97 Message.error(res.message) 105 Message.error(res.message)
98 } 106 }
...@@ -104,7 +112,7 @@ ...@@ -104,7 +112,7 @@
104 e.target.value = (e.target.value.match(/^\d*(\.?\d{0,2})/g)[0]) || null 112 e.target.value = (e.target.value.match(/^\d*(\.?\d{0,2})/g)[0]) || null
105 }, 113 },
106 addRow() { 114 addRow() {
107 this.mjftData.addQjZdftdzwRequestList.push({ 115 this.mjftData.list.push({
108 dydytdmj: '', 116 dydytdmj: '',
109 dzwdm: '', 117 dzwdm: '',
110 fttdmj: '', 118 fttdmj: '',
...@@ -113,14 +121,14 @@ ...@@ -113,14 +121,14 @@
113 }) 121 })
114 }, 122 },
115 delRow(index) { 123 delRow(index) {
116 this.mjftData.addQjZdftdzwRequestList.splice(index, 1) 124 this.mjftData.list.splice(index, 1)
117 } 125 }
118 }, 126 },
119 computed: { 127 computed: {
120 sumTdsyqsyqmj: function () { 128 sumTdsyqsyqmj: function () {
121 let self = this; 129 let self = this;
122 let sum = 0; 130 let sum = 0;
123 let data = this.mjftData.addQjZdftdzwRequestList; 131 let data = this.mjftData.list;
124 for (let i = 0; i < data.length; i++) { 132 for (let i = 0; i < data.length; i++) {
125 if (isNaN(parseFloat(data[i].tdsyqsyqmj))) { 133 if (isNaN(parseFloat(data[i].tdsyqsyqmj))) {
126 continue; 134 continue;
...@@ -134,7 +142,7 @@ ...@@ -134,7 +142,7 @@
134 sumDydytdmj: function () { 142 sumDydytdmj: function () {
135 let self = this; 143 let self = this;
136 let sum = 0; 144 let sum = 0;
137 let data = this.mjftData.addQjZdftdzwRequestList; 145 let data = this.mjftData.list;
138 for (let i = 0; i < data.length; i++) { 146 for (let i = 0; i < data.length; i++) {
139 if (isNaN(parseFloat(data[i].dydytdmj))) { 147 if (isNaN(parseFloat(data[i].dydytdmj))) {
140 continue; 148 continue;
...@@ -148,7 +156,7 @@ ...@@ -148,7 +156,7 @@
148 sumFttdmj: function () { 156 sumFttdmj: function () {
149 let self = this; 157 let self = this;
150 let sum = 0; 158 let sum = 0;
151 let data = this.mjftData.addQjZdftdzwRequestList; 159 let data = this.mjftData.list;
152 for (let i = 0; i < data.length; i++) { 160 for (let i = 0; i < data.length; i++) {
153 if (isNaN(parseFloat(data[i].fttdmj))) { 161 if (isNaN(parseFloat(data[i].fttdmj))) {
154 continue; 162 continue;
...@@ -161,7 +169,7 @@ ...@@ -161,7 +169,7 @@
161 }, 169 },
162 dzwdsl: function () { 170 dzwdsl: function () {
163 let self = this 171 let self = this
164 let num = this.mjftData.addQjZdftdzwRequestList.length 172 let num = this.mjftData.list.length?this.mjftData.list.length:0
165 self.mjftData.dzwdys = num 173 self.mjftData.dzwdys = num
166 return num; 174 return num;
167 } 175 }
...@@ -171,16 +179,19 @@ ...@@ -171,16 +179,19 @@
171 }, 179 },
172 mounted() { 180 mounted() {
173 console.log("mounted init...") 181 console.log("mounted init...")
182 if (this.mjftData.zdbsm){
183 this.getData()
184 }
174 }, 185 },
175 watch: { 186 watch: {
176 "$store.state.zdbsm": function (bsm) { 187 "$store.state.zdbsm": function (bsm) {
177 this.mjftData.zdbsm = bsm 188 this.mjftData.zdbsm = bsm
178 }, 189 },
179 "$store.state.zdmj": function (zdmj) { 190 "$store.state.zdmj": function (zdmj) {
180 this.mjftData.zdmj = zdmj 191 this.zdmj = zdmj
181 }, 192 },
182 "$store.state.zdzl": function (tdzl) { 193 "$store.state.zdzl": function (tdzl) {
183 this.mjftData.tdzl = tdzl 194 this.tdzl = tdzl
184 }, 195 },
185 } 196 }
186 } 197 }
......
...@@ -440,7 +440,7 @@ ...@@ -440,7 +440,7 @@
440 console.log(this.form) 440 console.log(this.form)
441 }, 441 },
442 generatorCode(){ 442 generatorCode(){
443 getBdcdyh(this.form.zdbsm,"zrz") 443 getBdcdyh(this.form.zddm,"zrz")
444 .then((res)=>{ 444 .then((res)=>{
445 this.form.zrzh=res.result.substring(0,24); 445 this.form.zrzh=res.result.substring(0,24);
446 this.form.bdcdyh=res.result; 446 this.form.bdcdyh=res.result;
......