5374e1e6 by weimo934

Merge remote-tracking branch 'origin/master'

2 parents 9cac7d22 81a99aa9
...@@ -195,3 +195,14 @@ export function getDetailInfo(zrzbsm,lx) { ...@@ -195,3 +195,14 @@ export function getDetailInfo(zrzbsm,lx) {
195 }, 195 },
196 }) 196 })
197 } 197 }
198
199 /**
200 * 批量删除户基本信息表,data为一个数组List<String>
201 */
202 export function batchDeleteHByHbsms(data) {
203 return request({
204 url:'/system/qjH/batchDeleteHByBsms',
205 method:'post',
206 data:data
207 })
208 }
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 width="70%" 6 width="70%"
7 @close="close" 7 @close="close"
8 :modal-append-to-body="false" 8 :modal-append-to-body="false"
9 center> 9 >
10 <div class="search"> 10 <div class="search">
11 <el-row> 11 <el-row>
12 <el-col :span="24"> 12 <el-col :span="24">
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 <el-tab-pane label="宗地分割" name="zd"> 4 <el-tab-pane label="宗地分割" name="zd">
5 <div class="fg-tabs top20"> 5 <div class="fg-tabs top20">
6 <span class="tips">分割前宗地信息</span> 6 <span class="tips">分割前宗地信息</span>
7 <el-button type="primary" class="addBtn" @click="newAdd" icon="el-icon-plus">新增</el-button> 7 <el-button type="primary" class="addBtn" @click="newAdd('zd')" icon="el-icon-plus">新增</el-button>
8 <div class="fgq"> 8 <div class="fgq">
9 <el-card class="data"> 9 <el-card class="data">
10 <div slot="header" class="clearfix"> 10 <div slot="header" class="clearfix">
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
171 </template> 171 </template>
172 </table> 172 </table>
173 </div> 173 </div>
174 <zd-query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :isZdClose="true" 174 <zd-query-data @getData="getData" :centerDialogVisible.sync="centerDialogZdVisible" :isZdClose="true"
175 @close="close"></zd-query-data> 175 @close="close"></zd-query-data>
176 <div class="header-button" :style="{width:fgBoxWidth+'px'}"> 176 <div class="header-button" :style="{width:fgBoxWidth+'px'}">
177 <el-button type="primary" class="saveBtn" @click="save">保存</el-button> 177 <el-button type="primary" class="saveBtn" @click="save">保存</el-button>
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
181 <el-tab-pane label="多幢分割" name="dz"> 181 <el-tab-pane label="多幢分割" name="dz">
182 <div class="fg-tabs top20"> 182 <div class="fg-tabs top20">
183 <span class="tips">分割前多幢信息</span> 183 <span class="tips">分割前多幢信息</span>
184 <el-button type="primary" class="addBtn" @click="newAdd" icon="el-icon-plus">新增</el-button> 184 <el-button type="primary" class="addBtn" @click="newAdd('dz')" icon="el-icon-plus">新增</el-button>
185 <div class="fgq"> 185 <div class="fgq">
186 <el-card class="data"> 186 <el-card class="data">
187 <div slot="header" class="clearfix"> 187 <div slot="header" class="clearfix">
...@@ -277,7 +277,7 @@ ...@@ -277,7 +277,7 @@
277 </tr> 277 </tr>
278 </table> 278 </table>
279 </div> 279 </div>
280 <dz-query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" 280 <dz-query-data @getData="getData" :centerDialogVisible.sync="centerDialogDzVisible"
281 :isClose="false" 281 :isClose="false"
282 @close="close"> 282 @close="close">
283 </dz-query-data> 283 </dz-query-data>
...@@ -321,7 +321,8 @@ ...@@ -321,7 +321,8 @@
321 data() { 321 data() {
322 return { 322 return {
323 tabName: 'zd', 323 tabName: 'zd',
324 centerDialogVisible: false, 324 centerDialogZdVisible: false,
325 centerDialogDzVisible: false,
325 zdFgqData: {}, // 宗地分割前数据 326 zdFgqData: {}, // 宗地分割前数据
326 mapDefault:require('@assets/images/map_default.png'), 327 mapDefault:require('@assets/images/map_default.png'),
327 dzFgqData: {}, //多幢分割前数据 328 dzFgqData: {}, //多幢分割前数据
...@@ -812,16 +813,27 @@ ...@@ -812,16 +813,27 @@
812 } 813 }
813 }, 814 },
814 close: function () { 815 close: function () {
815 this.centerDialogVisible = false; 816 this.centerDialogDzVisible = false;
817 this.centerDialogZdVisible = false;
816 }, 818 },
817 newAdd: function () { 819 newAdd: function (type) {
818 this.result(); 820 this.result();
819 this.centerDialogVisible = true; 821 switch (type) {
822 case 'dz':
823 this.centerDialogDzVisible = true;
824 break;
825 case 'zd':
826 this.centerDialogZdVisible = true;
827 break;
828
829 default:
830 break;
831 }
820 }, 832 },
821 getData: function (data) { 833 getData: function (data) {
822 switch (this.tabName) { 834 switch (this.tabName) {
823 case "zd": 835 case "zd":
824 this.centerDialogVisible=false; 836 this.centerDialogZdVisible=false;
825 this.zdFgqData = data; 837 this.zdFgqData = data;
826 break; 838 break;
827 case "dz": 839 case "dz":
...@@ -830,7 +842,7 @@ ...@@ -830,7 +842,7 @@
830 break 842 break
831 } 843 }
832 this.dzFgqData = data; 844 this.dzFgqData = data;
833 this.centerDialogVisible=false; 845 this.centerDialogDzVisible=false;
834 break; 846 break;
835 case "h": 847 case "h":
836 this.hFgqData = data; 848 this.hFgqData = data;
......
...@@ -24,9 +24,15 @@ ...@@ -24,9 +24,15 @@
24 <el-input v-model="form.bdcdyh" class="percent80" :disabled="disableFlag" ref="bdcdyh"></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>-->
28 <td colspan="4" > 28 <!-- <td colspan="4" >-->
29 <el-input v-model="form.ydybsm" disabled></el-input> 29 <!-- <el-input v-model="form.ydybsm" disabled></el-input>-->
30 <!-- </td>-->
31 <td colspan="2" align="center" >
32 <span>坐落<i class="requisite">*</i></span>
33 </td>
34 <td colspan="4" >
35 <input class="formInput" v-model="form.zl" ref="zl" @blur="inputBlur($event)" :disabled="disableFlag" />
30 </td> 36 </td>
31 </tr> 37 </tr>
32 38
...@@ -320,17 +326,6 @@ ...@@ -320,17 +326,6 @@
320 <tr></tr> 326 <tr></tr>
321 <tr></tr> 327 <tr></tr>
322 328
323
324
325 <tr height="30">
326 <td colspan="2" align="center" >
327 <span>坐落<i class="requisite">*</i></span>
328 </td>
329 <td colspan="10" >
330 <input class="formInput" v-model="form.zl" ref="zl" @blur="inputBlur($event)" :disabled="disableFlag" />
331 </td>
332 </tr>
333
334 <tr height="30"> 329 <tr height="30">
335 <td colspan="2" align="center" >东墙体归属</td> 330 <td colspan="2" align="center" >东墙体归属</td>
336 <td colspan="4" > 331 <td colspan="4" >
......
...@@ -629,7 +629,7 @@ export default { ...@@ -629,7 +629,7 @@ export default {
629 this.getDyztBsmList(); 629 this.getDyztBsmList();
630 this.getLpbFwytAndQlxz(); 630 this.getLpbFwytAndQlxz();
631 //改变楼盘表子组件的key值,重新渲染 631 //改变楼盘表子组件的key值,重新渲染
632 this.time = new Date().getTime(); 632 // this.time = new Date().getTime();
633 }, 633 },
634 //实预测装换 634 //实预测装换
635 plScYcChange() { 635 plScYcChange() {
......