7f96a1f6 by weimo934

Merge remote-tracking branch 'origin/master'

2 parents 8324edc9 7fd064d0
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="temp"> 2 <div class="temp">
3 <table class="tempTable" cellspacing="0" cellpadding="0" border="1"> 3 <table class="tempTable" cellspacing="0" cellpadding="0" border="1">
4 <tr> 4 <tr>
5 <td colspan="2" width="50px">权利</td> 5 <td colspan="2" width="50px"><span class="table-title">权利人信息</span></td>
6 <td colspan="2">共有方式</td> 6 <td colspan="2">共有方式</td>
7 <td colspan="8"> 7 <td colspan="8">
8 <el-row> 8 <el-row>
...@@ -567,6 +567,10 @@ ...@@ -567,6 +567,10 @@
567 padding: 10px 0; 567 padding: 10px 0;
568 } 568 }
569 } 569 }
570 .table-title{
571 font-weight: 700;
572 font-size: 15px;
573 }
570 .el-table th { 574 .el-table th {
571 background-color: #fff !important; 575 background-color: #fff !important;
572 } 576 }
......
...@@ -38,6 +38,10 @@ let bdcLxArray = [ ...@@ -38,6 +38,10 @@ let bdcLxArray = [
38 value: "h1", 38 value: "h1",
39 }, 39 },
40 { 40 {
41 label: "户",
42 value: "h",
43 },
44 {
41 label: "多幢", 45 label: "多幢",
42 value: "dz", 46 value: "dz",
43 }, 47 },
......
...@@ -30,12 +30,6 @@ const constantRoutes = [ ...@@ -30,12 +30,6 @@ const constantRoutes = [
30 component: () => import("@/views/panel/index"), 30 component: () => import("@/views/panel/index"),
31 }, 31 },
32 { 32 {
33 path: "/create",
34 name: "新建",
35 code: "0-2",
36 component: () => import("@/views/panel/create/index"),
37 },
38 {
39 path: "/add", 33 path: "/add",
40 name: "添加", 34 name: "添加",
41 code: "0-6", 35 code: "0-6",
...@@ -77,12 +71,6 @@ const constantRoutes = [ ...@@ -77,12 +71,6 @@ const constantRoutes = [
77 code: "1-5", 71 code: "1-5",
78 component: () => import("@/views/zd/index"), 72 component: () => import("@/views/zd/index"),
79 }, 73 },
80 {
81 path: "/c",
82 name: "层",
83 code: "1-7",
84 component: () => import("@/views/zrz/c/index"),
85 },
86 ], 74 ],
87 }, 75 },
88 ]; 76 ];
......
...@@ -204,7 +204,24 @@ export default { ...@@ -204,7 +204,24 @@ export default {
204 // this.sortNavigation(this.navigationList, indId); 204 // this.sortNavigation(this.navigationList, indId);
205 // } 205 // }
206 this.getDic(); 206 this.getDic();
207 this.getTreeList(); 207 //刷新页面后根据不同路由获取不同树结构数据
208 if(this.$route.path == '/zrz'){
209 this.getRightTreeByZrzbsm(this.$store.state.zrzbsm)
210 }else if(this.$route.path == '/zd'){
211 this.getRightTree(this.$store.state.zdbsm)
212 }else{
213 this.getTreeList();
214 }
215 //刷新页面后根据不同路由高亮相对应的导航
216 if(this.$route.path == '/zrz' || this.$route.path == '/zd' || this.$route.path == '/dz'){
217
218 }else{
219 this.headTop.forEach(item=>{
220 if (item.path == this.$route.path) {
221 item.select = true;
222 }
223 })
224 }
208 this.$nextTick(()=>{ 225 this.$nextTick(()=>{
209 this.treeHeight = this.$el.clientHeight - 120; 226 this.treeHeight = this.$el.clientHeight - 120;
210 }); 227 });
......
...@@ -93,8 +93,8 @@ ...@@ -93,8 +93,8 @@
93 <el-button type="info" size="mini" style="" @click="deleteYtInfo(index)" circle>删除</el-button> 93 <el-button type="info" size="mini" style="" @click="deleteYtInfo(index)" circle>删除</el-button>
94 规划用途 94 规划用途
95 </td> 95 </td>
96 <td colspan="4" align="center" > 96 <td colspan="3" align="center" >
97 <el-select-tree class="formInput" 97 <el-select-tree style="width:100%"
98 v-if="show" 98 v-if="show"
99 :default-expand-all="defaultExpandAll" 99 :default-expand-all="defaultExpandAll"
100 :multiple="multiple" 100 :multiple="multiple"
...@@ -107,9 +107,9 @@ ...@@ -107,9 +107,9 @@
107 v-model="item1.fwytzdbsm" 107 v-model="item1.fwytzdbsm"
108 ></el-select-tree> 108 ></el-select-tree>
109 </td> 109 </td>
110 <td colspan="1" align="center" >用途</td> 110 <td colspan="2" align="center" >用途</td>
111 <td colspan="4" align="center" > 111 <td colspan="4">
112 <el-select-tree class="formInput" 112 <el-select-tree style="width:100%"
113 v-if="show" 113 v-if="show"
114 :default-expand-all="defaultExpandAll" 114 :default-expand-all="defaultExpandAll"
115 :multiple="multiple" 115 :multiple="multiple"
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
189 <span>审查日期</span> 189 <span>审查日期</span>
190 </td> 190 </td>
191 <td colspan="2" > 191 <td colspan="2" >
192 <el-date-picker 192 <el-date-picker style="width:100%"
193 v-model="form.date" 193 v-model="form.date"
194 type="date" 194 type="date"
195 placeholder="选择日期"> 195 placeholder="选择日期">
...@@ -478,12 +478,9 @@ ...@@ -478,12 +478,9 @@
478 </script> 478 </script>
479 <style rel="stylesheet/less" lang="less" scoped> 479 <style rel="stylesheet/less" lang="less" scoped>
480 .dz { 480 .dz {
481 min-height: 200px; 481 box-sizing: border-box;
482 width: 80%; 482 padding: 18px;
483 margin-top: 10px; 483 padding-bottom: 0;
484 margin-left: 10%;
485 float: left;
486
487 /deep/.el-input__inner{ 484 /deep/.el-input__inner{
488 width: 100%; 485 width: 100%;
489 border: 0; 486 border: 0;
......
1 <template> 1 <template>
2 <div class="content_box"> 2 <div class="content_box">
3 <el-tabs v-model="activeName" @tab-click="handleClick"> 3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick">
4 <el-tab-pane label="多幢基本信息" name="dzxx"><dzxx></dzxx></el-tab-pane> 4 <el-tab-pane label="多幢基本信息" name="dzxx"><dzxx></dzxx></el-tab-pane>
5 </el-tabs> 5 </el-tabs>
6 </div> 6 </div>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 <el-tab-pane label="分割" name="fg"><fg></fg></el-tab-pane> 4 <el-tab-pane label="分割" name="fg"><fg></fg></el-tab-pane>
5 <el-tab-pane label="合并" name="hb"><hb v-if="hbLoad"></hb></el-tab-pane> 5 <el-tab-pane label="合并" name="hb"><hb v-if="hbLoad"></hb></el-tab-pane>
6 <el-tab-pane label="范围属性变更" name="fwsxbg"><fwsxbg v-if="fwsxbgLoad"></fwsxbg></el-tab-pane> 6 <el-tab-pane label="范围属性变更" name="fwsxbg"><fwsxbg v-if="fwsxbgLoad"></fwsxbg></el-tab-pane>
7 <el-tab-pane label="重新落宗" name="cxlz"><cxlz></cxlz></el-tab-pane> 7 <el-tab-pane label="重新落宗" name="cxlz"><cxlz v-if="cxlzLoad"></cxlz></el-tab-pane>
8 </el-tabs> 8 </el-tabs>
9 </div> 9 </div>
10 </template> 10 </template>
...@@ -25,6 +25,7 @@ export default { ...@@ -25,6 +25,7 @@ export default {
25 activeName: "fg", 25 activeName: "fg",
26 hbLoad:false, //默认不加载合并tab 26 hbLoad:false, //默认不加载合并tab
27 fwsxbgLoad:false, //默认不加载范围属性变更tab 27 fwsxbgLoad:false, //默认不加载范围属性变更tab
28 cxlzLoad:false, //默认不加载重新落宗tab
28 }; 29 };
29 }, 30 },
30 methods: { 31 methods: {
...@@ -36,6 +37,9 @@ export default { ...@@ -36,6 +37,9 @@ export default {
36 if(!this.fwsxbgLoad){ 37 if(!this.fwsxbgLoad){
37 this.fwsxbgLoad = tab.name == 'fwsxbg' ? true : false 38 this.fwsxbgLoad = tab.name == 'fwsxbg' ? true : false
38 } 39 }
40 if(!this.cxlzLoad){
41 this.cxlzLoad = tab.name == 'cxlz' ? true : false
42 }
39 }, 43 },
40 }, 44 },
41 created() {}, 45 created() {},
......
...@@ -145,6 +145,7 @@ ...@@ -145,6 +145,7 @@
145 this.$store.state.dzbsm = row.glbsm; 145 this.$store.state.dzbsm = row.glbsm;
146 path = "/dz"; 146 path = "/dz";
147 break; 147 break;
148 case "h":
148 case "h0": 149 case "h0":
149 case "h1": 150 case "h1":
150 this.hbsm = row.glbsm; 151 this.hbsm = row.glbsm;
......
...@@ -411,6 +411,8 @@ export default { ...@@ -411,6 +411,8 @@ export default {
411 { label: "-", value: "-" }, 411 { label: "-", value: "-" },
412 ], 412 ],
413 formData: {}, 413 formData: {},
414
415 dpdm:'', //宗地底盘代码
414 }; 416 };
415 }, 417 },
416 created() { 418 created() {
...@@ -463,6 +465,34 @@ export default { ...@@ -463,6 +465,34 @@ export default {
463 .catch((error) => {}); 465 .catch((error) => {});
464 }, 466 },
465 467
468 //构造底盘代码,前6位是xzqbsm,接着3位djqbsm,3位djzqbsm,最后2位是syqlxbsm 860101555888GB
469 generatorDpdm() {
470 this.$store.state.xzqList.forEach((item)=>{
471 if(item.bsm === this.formData.xzqbsm){
472 this.dpdm = item.dm;
473 }
474 });
475 this.$store.state.djqList.forEach((item)=>{
476 if(item.bsm === this.formData.djqbsm){
477 this.dpdm = this.dpdm + item.dm;
478 }
479 });
480 this.$store.state.djzqList.forEach((item)=>{
481 if(item.bsm === this.formData.djzqbsm){
482 this.dpdm = this.dpdm + item.dm;
483 }
484 });
485
486 console.log(this.formData.syqlxbsm);
487 this.dpdm = this.dpdm + this.formData.syqlxbsm;
488 this.$store.state.zdtzmList.forEach((item)=>{
489 if(item.zdtzmbsm === this.formData.zdtzmbsm){
490 this.dpdm = this.dpdm + item.dm;
491 }
492 });
493 console.log(this.dpdm)
494 },
495
466 //不动产单元号再次生成提示框 496 //不动产单元号再次生成提示框
467 open() { 497 open() {
468 this.$confirm('已经存在不动产单元号或者自然幢号, 是否继续?', '提示', { 498 this.$confirm('已经存在不动产单元号或者自然幢号, 是否继续?', '提示', {
...@@ -470,7 +500,8 @@ export default { ...@@ -470,7 +500,8 @@ export default {
470 cancelButtonText: '取消', 500 cancelButtonText: '取消',
471 type: 'warning' 501 type: 'warning'
472 }).then(() => { 502 }).then(() => {
473 getBdcdyh("860101555888GB", "zd") 503 this.generatorDpdm();
504 getBdcdyh(this.dpdm, "zd")
474 .then((res) => { 505 .then((res) => {
475 console.log(res); 506 console.log(res);
476 this.formData.zddm = res.result.substring(0, 19); 507 this.formData.zddm = res.result.substring(0, 19);
...@@ -496,9 +527,9 @@ export default { ...@@ -496,9 +527,9 @@ export default {
496 this.open(); 527 this.open();
497 return; 528 return;
498 } 529 }
530 this.generatorDpdm();
499 531
500 //前6位是xzqbsm,接着3位djqbsm,3位djzqbsm,最后2位是syqlxbsm 860101555888GB 532 getBdcdyh(this.dpdm, "zd")
501 getBdcdyh("860101555888GB", "zd")
502 .then((res) => { 533 .then((res) => {
503 console.log(res); 534 console.log(res);
504 this.formData.zddm = res.result.substring(0, 19); 535 this.formData.zddm = res.result.substring(0, 19);
......
...@@ -8,21 +8,21 @@ ...@@ -8,21 +8,21 @@
8 <td colspan="12" align="center" ><font size="4">户基本信息</font></td> 8 <td colspan="12" align="center" ><font size="4">户基本信息</font></td>
9 </tr> 9 </tr>
10 <tr height="30"> 10 <tr height="30">
11 <td colspan="2" align="center" >宗地代码</td> 11 <td colspan="2" align="center" >宗地代码<i class="requisite">*</i></td>
12 <td colspan="4" > 12 <td colspan="4" >
13 <el-input v-model="form.zddm" disabled></el-input> 13 <el-input v-model="form.zddm" disabled></el-input>
14 </td> 14 </td>
15 <td colspan="2" align="center" >自然幢号</td> 15 <td colspan="2" align="center" >自然幢号<i class="requisite">*</i></td>
16 <td colspan="4" > 16 <td colspan="4" >
17 <el-input v-model="form.zrzh" disabled></el-input> 17 <el-input v-model="form.zrzh" disabled></el-input>
18 </td> 18 </td>
19 </tr> 19 </tr>
20 <tr height="30"> 20 <tr height="30">
21 <td colspan="2" align="center" >不动产单元号</td> 21 <td colspan="2" align="center" >不动产单元号<i class="requisite">*</i></td>
22 <!-- todo 此处暂时存放的是不动产单元号标识码,而不是不动产单元号--> 22 <!-- todo 此处暂时存放的是不动产单元号标识码,而不是不动产单元号-->
23 <td colspan="4" > 23 <td colspan="4" >
24 <el-input v-model="form.bdcdyh" style="width: 70%" disabled></el-input> 24 <el-input v-model="form.bdcdyh" style="width: 82%" disabled></el-input>
25 <el-button @click.prevent="generatorCode" size="mini" type="primary" style="width:25%;margin-left:3%">生成</el-button> 25 <el-button @click.prevent="generatorCode" size="mini" type="primary" style="width:17%;margin-left:1%">生成</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" >
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
64 </tr> 64 </tr>
65 65
66 <tr height="30"> 66 <tr height="30">
67 <td colspan="2" align="center" >房屋类型</td> 67 <td colspan="2" align="center" >房屋类型<i class="requisite">*</i></td>
68 <td colspan="4" > 68 <td colspan="4" >
69 <el-select v-model="form.fwlxbsm" placeholder="请选择" > 69 <el-select v-model="form.fwlxbsm" placeholder="请选择" >
70 <el-option 70 <el-option
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
75 </el-option> 75 </el-option>
76 </el-select> 76 </el-select>
77 </td> 77 </td>
78 <td colspan="2" align="center" >房屋性质</td> 78 <td colspan="2" align="center" >房屋性质<i class="requisite">*</i></td>
79 <td colspan="4" > 79 <td colspan="4" >
80 <el-select v-model="form.fwxzbsm" placeholder="请选择" > 80 <el-select v-model="form.fwxzbsm" placeholder="请选择" >
81 <el-option 81 <el-option
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
125 </tr> 125 </tr>
126 126
127 <tr height="30"> 127 <tr height="30">
128 <td colspan="2" align="center" >产别</td> 128 <td colspan="2" align="center" >产别<i class="requisite">*</i></td>
129 <td colspan="4" > 129 <td colspan="4" >
130 <el-select v-model="form.fwcbbsm" placeholder="请选择" > 130 <el-select v-model="form.fwcbbsm" placeholder="请选择" >
131 <el-option 131 <el-option
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
136 </el-option> 136 </el-option>
137 </el-select> 137 </el-select>
138 </td> 138 </td>
139 <td colspan="2" align="center" >产权来源</td> 139 <td colspan="2" align="center" >产权来源<i class="requisite">*</i></td>
140 <td colspan="4" > 140 <td colspan="4" >
141 <el-select v-model="form.fwcqlybsm" placeholder="请选择" > 141 <el-select v-model="form.fwcqlybsm" placeholder="请选择" >
142 <el-option 142 <el-option
...@@ -216,7 +216,7 @@ ...@@ -216,7 +216,7 @@
216 <tr height="30" v-for="(item1,index) in form.fwytList" :key="index"> 216 <tr height="30" v-for="(item1,index) in form.fwytList" :key="index">
217 <td v-if="index===0" colspan="2" :rowspan="ytTitleRowspan" align="center" id="ytTitle"> 217 <td v-if="index===0" colspan="2" :rowspan="ytTitleRowspan" align="center" id="ytTitle">
218 <el-button type="primary" size="mini" style="margin-right: 10px" @click="addYtInfo">添加</el-button> 218 <el-button type="primary" size="mini" style="margin-right: 10px" @click="addYtInfo">添加</el-button>
219 <span>用途</span> 219 <span>用途<i class="requisite">*</i></span>
220 </td> 220 </td>
221 221
222 <td width="30" colspan="1" align="center" > 222 <td width="30" colspan="1" align="center" >
...@@ -257,7 +257,7 @@ ...@@ -257,7 +257,7 @@
257 <tr height="30" v-for="(item1,index) in form.fwjgList" :key="'jg'+index"> 257 <tr height="30" v-for="(item1,index) in form.fwjgList" :key="'jg'+index">
258 <td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" align="center" > 258 <td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" align="center" >
259 <el-button type="primary" size="mini" style="margin-right: 10px" @click="addFwjgInfo">添加</el-button> 259 <el-button type="primary" size="mini" style="margin-right: 10px" @click="addFwjgInfo">添加</el-button>
260 <span>房屋结构</span> 260 <span>房屋结构<i class="requisite">*</i></span>
261 </td> 261 </td>
262 <td colspan="1" align="center" > 262 <td colspan="1" align="center" >
263 <span @click="deleteFwjgInfo(index)">删除</span> 263 <span @click="deleteFwjgInfo(index)">删除</span>
...@@ -303,7 +303,7 @@ ...@@ -303,7 +303,7 @@
303 303
304 <tr height="30"> 304 <tr height="30">
305 <td colspan="2" align="center" > 305 <td colspan="2" align="center" >
306 <span>坐落</span> 306 <span>坐落<i class="requisite">*</i></span>
307 </td> 307 </td>
308 <td colspan="10" > 308 <td colspan="10" >
309 <el-input v-model="form.zl"></el-input> 309 <el-input v-model="form.zl"></el-input>
......
...@@ -12,17 +12,17 @@ ...@@ -12,17 +12,17 @@
12 <input v-model="form.zddm" class="formInput" disabled> 12 <input v-model="form.zddm" class="formInput" disabled>
13 <input v-show="false" :disabled="form.qszt!='0'" class="formInput" v-model="form.zdbsm"> 13 <input v-show="false" :disabled="form.qszt!='0'" class="formInput" v-model="form.zdbsm">
14 </td> 14 </td>
15 <td colspan="2" >自然幢号</td> 15 <td colspan="2" >自然幢号<i class="requisite">*</i></td>
16 <td colspan="4" > 16 <td colspan="4" >
17 <input class="formInput" :disabled="form.qszt!='0'" v-model="form.zrzh" style="width: 70%"> 17 <input class="formInput" :disabled="form.qszt!='0'" v-model="form.zrzh">
18 </td> 18 </td>
19 </tr> 19 </tr>
20 <tr> 20 <tr>
21 <td colspan="2" >项目名称</td> 21 <td colspan="2" >项目名称<i class="requisite">*</i></td>
22 <td colspan="4" > 22 <td colspan="4" >
23 <input class="formInput" :disabled="form.qszt!='0'" v-model="form.xmmc"> 23 <input class="formInput" :disabled="form.qszt!='0'" v-model="form.xmmc">
24 </td> 24 </td>
25 <td colspan="2" >不动产单元号</td> 25 <td colspan="2" >不动产单元号<i class="requisite">*</i></td>
26 <td colspan="4" > 26 <td colspan="4" >
27 <input class="formInput percent78" :disabled="form.qszt!='0'" v-model="form.bdcdyh" style="width: 70%"> 27 <input class="formInput percent78" :disabled="form.qszt!='0'" v-model="form.bdcdyh" style="width: 70%">
28 <el-button @click.prevent="generatorCode" type="primary" size="mini" style="width:25%;margin-left:3%">生成</el-button> 28 <el-button @click.prevent="generatorCode" type="primary" size="mini" style="width:25%;margin-left:3%">生成</el-button>
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
41 </tr> 41 </tr>
42 42
43 <tr> 43 <tr>
44 <td colspan="2" >房屋性质</td> 44 <td colspan="2" >房屋性质<i class="requisite">*</i></td>
45 <td colspan="4" > 45 <td colspan="4" >
46 <el-select class="formSelect" :disabled="form.qszt!='0'" v-model="form.fwxzbsm" placeholder="请选择" > 46 <el-select class="formSelect" :disabled="form.qszt!='0'" v-model="form.fwxzbsm" placeholder="请选择" >
47 <el-option 47 <el-option
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
119 </tr> 119 </tr>
120 120
121 <tr> 121 <tr>
122 <td colspan="2" >产别</td> 122 <td colspan="2" >产别<i class="requisite">*</i></td>
123 <td colspan="4" > 123 <td colspan="4" >
124 <el-select v-model="form.fwcbbsm" :disabled="form.qszt!='0'" placeholder="请选择" > 124 <el-select v-model="form.fwcbbsm" :disabled="form.qszt!='0'" placeholder="请选择" >
125 <el-option 125 <el-option
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
130 </el-option> 130 </el-option>
131 </el-select> 131 </el-select>
132 </td> 132 </td>
133 <td colspan="2" >产权来源</td> 133 <td colspan="2" >产权来源<i class="requisite">*</i></td>
134 <td colspan="4" > 134 <td colspan="4" >
135 <el-select v-model="form.fwcqlybsm" :disabled="form.qszt!='0'" placeholder="请选择" > 135 <el-select v-model="form.fwcqlybsm" :disabled="form.qszt!='0'" placeholder="请选择" >
136 <el-option 136 <el-option
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
146 <tr v-for="(item1,index) in form.fwytList" :key="index"> 146 <tr v-for="(item1,index) in form.fwytList" :key="index">
147 <td colspan="2" v-if="index===0" :rowspan="ytTitleRowspan" id="ytTitle"> 147 <td colspan="2" v-if="index===0" :rowspan="ytTitleRowspan" id="ytTitle">
148 <el-button type="primary" size="mini" style="margin-right: 10px" @click="addYtInfo">添加</el-button> 148 <el-button type="primary" size="mini" style="margin-right: 10px" @click="addYtInfo">添加</el-button>
149 <span>用途</span> 149 <span>用途<i class="requisite">*</i></span>
150 </td> 150 </td>
151 151
152 <td colspan="1" style="min-width:120px"> 152 <td colspan="1" style="min-width:120px">
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
154 规划用途 154 规划用途
155 </td> 155 </td>
156 <td colspan="3" > 156 <td colspan="3" >
157 <el-select-tree 157 <el-select-tree style="width:100%"
158 v-if="show" 158 v-if="show"
159 :default-expand-all="defaultExpandAll" 159 :default-expand-all="defaultExpandAll"
160 :multiple="multiple" 160 :multiple="multiple"
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
169 </td> 169 </td>
170 <td colspan="2" >用途</td> 170 <td colspan="2" >用途</td>
171 <td colspan="4" > 171 <td colspan="4" >
172 <el-select-tree 172 <el-select-tree style="width:100%"
173 v-if="show" 173 v-if="show"
174 :default-expand-all="defaultExpandAll" 174 :default-expand-all="defaultExpandAll"
175 :multiple="multiple" 175 :multiple="multiple"
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
187 <tr v-for="(item1,index) in form.fwjgList" :key="'jg'+index"> 187 <tr v-for="(item1,index) in form.fwjgList" :key="'jg'+index">
188 <td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" > 188 <td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" >
189 <el-button type="primary" size="mini" style="margin-right: 10px" @click="addFwjgInfo">添加</el-button> 189 <el-button type="primary" size="mini" style="margin-right: 10px" @click="addFwjgInfo">添加</el-button>
190 <span>房屋结构</span> 190 <span>房屋结构<i class="requisite">*</i></span>
191 </td> 191 </td>
192 <td colspan="1" > 192 <td colspan="1" >
193 <span @click="deleteFwjgInfo(index)">删除</span> 193 <span @click="deleteFwjgInfo(index)">删除</span>
...@@ -215,7 +215,7 @@ ...@@ -215,7 +215,7 @@
215 215
216 <tr> 216 <tr>
217 <td colspan="2" > 217 <td colspan="2" >
218 <span>坐落</span> 218 <span>坐落<i class="requisite">*</i></span>
219 </td> 219 </td>
220 <td colspan="10" > 220 <td colspan="10" >
221 <input class="formInput" :disabled="form.qszt!='0'" v-model="form.zl"> 221 <input class="formInput" :disabled="form.qszt!='0'" v-model="form.zl">
......