73b5e427 by weimo934

Merge remote-tracking branch 'origin/master'

2 parents 1e6a684d a43dbd9f
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
15 "axios": "^0.19.0", 15 "axios": "^0.19.0",
16 "core-js": "^2.6.5", 16 "core-js": "^2.6.5",
17 "e-icon-picker": "^1.0.7", 17 "e-icon-picker": "^1.0.7",
18 "el-select-tree": "^1.0.26",
19 "el-tree-select": "^3.1.10",
18 "element-ui": "^2.13.2", 20 "element-ui": "^2.13.2",
19 "file-saver": "^2.0.2", 21 "file-saver": "^2.0.2",
20 "form-making": "^1.2.9", 22 "form-making": "^1.2.9",
......
...@@ -19,6 +19,9 @@ ...@@ -19,6 +19,9 @@
19 .db{ 19 .db{
20 display: block; 20 display: block;
21 } 21 }
22 .dn{
23 display: none;
24 }
22 .fl{ 25 .fl{
23 float: left; 26 float: left;
24 } 27 }
...@@ -32,15 +35,20 @@ table,td,tr,.el-col,.title{ ...@@ -32,15 +35,20 @@ table,td,tr,.el-col,.title{
32 border-color: #E6E6E6 !important; 35 border-color: #E6E6E6 !important;
33 } 36 }
34 .formInput { 37 .formInput {
35 height: 20px; 38 height: 100%;
36 width: 96%; 39 width: 100%;
37 line-height: 20px; 40 line-height: 20px;
38 outline: none; 41 outline: none;
39 border: none; 42 border: none;
40 color: #606764; 43 color: #606764;
41 overflow: visible; 44 overflow: visible;
42 cursor: text; 45 cursor: text;
43 text-align: center; 46 text-align: left;
47 text-indent: 20px;
48 padding: 0;
49 }
50 .formInput:focus{
51 border: 1px solid #A0C5F6!important;
44 } 52 }
45 .psr{ 53 .psr{
46 position: relative; 54 position: relative;
......
...@@ -53,26 +53,34 @@ ...@@ -53,26 +53,34 @@
53 <el-col :span="4" :key="childIndex+'6'" :class="childIndex>0 ? 'childYT':''"> 53 <el-col :span="4" :key="childIndex+'6'" :class="childIndex>0 ? 'childYT':''">
54 <ul> 54 <ul>
55 <li> 55 <li>
56 <el-select class="formSelect percent30" v-model="childItem.pzytdm"> 56 <el-select-tree
57 <el-option 57 class="formSelect percent30"
58 v-for="item in $store.state.tdytList" 58 v-if="show"
59 :key="item.dm" 59 :default-expand-all="defaultExpandAll"
60 :label="item.mc" 60 :multiple="multiple"
61 :value="item.dm" 61 :placeholder="placeholder"
62 > 62 :disabled="disabled"
63 </el-option> 63 :data="$store.state.tdytList"
64 </el-select> 64 :props="treeProps"
65 :check-strictly="checkStrictly"
66 :clearable="clearable"
67 v-model="childItem.pzytdm"
68 ></el-select-tree>
65 </li> 69 </li>
66 <li> 70 <li>
67 <el-select class="formSelect percent30" v-model="childItem.sjytdm"> 71 <el-select-tree
68 <el-option 72 class="formSelect percent30"
69 v-for="item in $store.state.tdytList" 73 v-if="show"
70 :key="item.dm" 74 :default-expand-all="defaultExpandAll"
71 :label="item.mc" 75 :multiple="multiple"
72 :value="item.dm" 76 :placeholder="placeholder"
73 > 77 :disabled="disabled"
74 </el-option> 78 :data="$store.state.tdytList"
75 </el-select> 79 :props="treeProps"
80 :check-strictly="checkStrictly"
81 :clearable="clearable"
82 v-model="childItem.sjytdm"
83 ></el-select-tree>
76 </li> 84 </li>
77 <li> 85 <li>
78 <el-date-picker 86 <el-date-picker
...@@ -150,15 +158,18 @@ ...@@ -150,15 +158,18 @@
150 </template> 158 </template>
151 159
152 <div class="title"> 160 <div class="title">
153 <el-select class="formSelect" v-model="items.qlxzdm"> 161 <el-select-tree
154 <el-option 162 v-if="show"
155 v-for="item in $store.state.qlxzList" 163 :default-expand-all="defaultExpandAll"
156 :key="item.dm" 164 :multiple="multiple"
157 :label="item.mc" 165 :placeholder="placeholder"
158 :value="item.dm" 166 :disabled="disabled"
159 > 167 :data="$store.state.qlxzList"
160 </el-option> 168 :props="treeProps"
161 </el-select> 169 :check-strictly="checkStrictly"
170 :clearable="clearable"
171 v-model="items.qlxzdm"
172 ></el-select-tree>
162 </div> 173 </div>
163 </el-row> 174 </el-row>
164 </div> 175 </div>
...@@ -175,6 +186,20 @@ export default { ...@@ -175,6 +186,20 @@ export default {
175 }, 186 },
176 data() { 187 data() {
177 return { 188 return {
189 //树型结构
190 show:true,
191 clearable: true,
192 defaultExpandAll: true,
193 multiple: false,
194 placeholder: '请选择',
195 disabled: false,
196 checkStrictly: false,
197 treeProps: {
198 value: 'dm',
199 children: 'children',
200 label: 'mc'
201 },
202
178 countList: [ 203 countList: [
179 { 204 {
180 id: Math.random(), 205 id: Math.random(),
......
...@@ -53,26 +53,32 @@ ...@@ -53,26 +53,32 @@
53 <el-col :span="5" :key="childIndex+'6'" :class="childIndex>0 ? 'childYT':''"> 53 <el-col :span="5" :key="childIndex+'6'" :class="childIndex>0 ? 'childYT':''">
54 <ul> 54 <ul>
55 <li> 55 <li>
56 <el-select class="formSelect percent30" v-model="childItem.pzytdm"> 56 <el-select-tree
57 <el-option 57 v-if="show"
58 v-for="item in $store.state.tdytList" 58 :default-expand-all="defaultExpandAll"
59 :key="item.dm" 59 :multiple="multiple"
60 :label="item.mc" 60 :placeholder="placeholder"
61 :value="item.dm" 61 :disabled="disabled"
62 > 62 :data="$store.state.tdytList"
63 </el-option> 63 :props="treeProps"
64 </el-select> 64 :check-strictly="checkStrictly"
65 :clearable="clearable"
66 v-model="childItem.pzytdm"
67 ></el-select-tree>
65 </li> 68 </li>
66 <li> 69 <li>
67 <el-select class="formSelect percent30" v-model="childItem.sjytdm"> 70 <el-select-tree
68 <el-option 71 v-if="show"
69 v-for="item in $store.state.tdytList" 72 :default-expand-all="defaultExpandAll"
70 :key="item.dm" 73 :multiple="multiple"
71 :label="item.mc" 74 :placeholder="placeholder"
72 :value="item.dm" 75 :disabled="disabled"
73 > 76 :data="$store.state.tdytList"
74 </el-option> 77 :props="treeProps"
75 </el-select> 78 :check-strictly="checkStrictly"
79 :clearable="clearable"
80 v-model="childItem.sjytdm"
81 ></el-select-tree>
76 </li> 82 </li>
77 <li> 83 <li>
78 <el-date-picker 84 <el-date-picker
...@@ -139,6 +145,20 @@ export default { ...@@ -139,6 +145,20 @@ export default {
139 }, 145 },
140 data() { 146 data() {
141 return { 147 return {
148 //树型结构
149 show:true,
150 clearable: true,
151 defaultExpandAll: true,
152 multiple: false,
153 placeholder: '请选择',
154 disabled: false,
155 checkStrictly: false,
156 treeProps: {
157 value: 'dm',
158 children: 'children',
159 label: 'mc'
160 },
161
142 countList: [ 162 countList: [
143 { 163 {
144 id: Math.random(), 164 id: Math.random(),
......
...@@ -135,25 +135,33 @@ ...@@ -135,25 +135,33 @@
135 规划用途 135 规划用途
136 </td> 136 </td>
137 <td width="30" colspan="4" align="center" > 137 <td width="30" colspan="4" align="center" >
138 <el-select v-model="item1.fwytzdbsm" placeholder="请选择" > 138 <el-select-tree
139 <el-option 139 v-if="show"
140 v-for="item in $store.state.fwytList" 140 :default-expand-all="defaultExpandAll"
141 :key="item.bsm" 141 :multiple="multiple"
142 :label="item.mc" 142 :placeholder="placeholder"
143 :value="item.bsm"> 143 :disabled="disabled"
144 </el-option> 144 :data="$store.state.fwytList"
145 </el-select> 145 :props="treeProps"
146 :check-strictly="checkStrictly"
147 :clearable="clearable"
148 v-model="item1.fwytzdbsm"
149 ></el-select-tree>
146 </td> 150 </td>
147 <td width="30" colspan="1" align="center" >用途</td> 151 <td width="30" colspan="1" align="center" >用途</td>
148 <td width="30" colspan="4" align="center" > 152 <td width="30" colspan="4" align="center" >
149 <el-select v-model="item1.fwsjytbsm" placeholder="请选择" > 153 <el-select-tree
150 <el-option 154 v-if="show"
151 v-for="item in $store.state.fwytList" 155 :default-expand-all="defaultExpandAll"
152 :key="item.bsm" 156 :multiple="multiple"
153 :label="item.mc" 157 :placeholder="placeholder"
154 :value="item.bsm"> 158 :disabled="disabled"
155 </el-option> 159 :data="$store.state.fwytList"
156 </el-select> 160 :props="treeProps"
161 :check-strictly="checkStrictly"
162 :clearable="clearable"
163 v-model="item1.fwsjytbsm"
164 ></el-select-tree>
157 </td> 165 </td>
158 </tr> 166 </tr>
159 167
...@@ -228,6 +236,21 @@ ...@@ -228,6 +236,21 @@
228 }, 236 },
229 data() { 237 data() {
230 return { 238 return {
239
240 //树型结构
241 show:true,
242 clearable: true,
243 defaultExpandAll: true,
244 multiple: false,
245 placeholder: '请选择',
246 disabled: false,
247 checkStrictly: false,
248 treeProps: {
249 value: 'bsm',
250 children: 'children',
251 label: 'mc'
252 },
253
231 form:{ 254 form:{
232 jzmj:'', 255 jzmj:'',
233 tnjzmj:'', 256 tnjzmj:'',
......
...@@ -110,17 +110,18 @@ export default { ...@@ -110,17 +110,18 @@ export default {
110 }; 110 };
111 }, 111 },
112 created() { 112 created() {
113 },
114 mounted() {
113 let self = this; 115 let self = this;
114 document.onkeydown = function(e) { 116 document.onkeydown = function(e) {
115 //按下回车提交 117 //按下回车提交
116 let key = window.event.keyCode; 118 let key = window.event.keyCode;
117 //事件中keycode=13为回车事件 119 //事件中keycode=13为回车事件
118 if (key == 13) { 120 if (key == 13) {
119 self.onSubmit(); 121 // self.onSubmit();
120 } 122 }
121 }; 123 };
122 }, 124 },
123 mounted() {},
124 methods: { 125 methods: {
125 //重置 126 //重置
126 reset() { 127 reset() {
......
...@@ -5,6 +5,9 @@ import store from '@store' ...@@ -5,6 +5,9 @@ import store from '@store'
5 import ElementUI from 'element-ui' 5 import ElementUI from 'element-ui'
6 import 'element-ui/lib/theme-chalk/index.css' 6 import 'element-ui/lib/theme-chalk/index.css'
7 import '../mock/index.js' 7 import '../mock/index.js'
8 import ElTreeSelect from 'el-select-tree'
9 //树型选择器
10 Vue.use(ElTreeSelect);
8 //引入富文本编辑器 11 //引入富文本编辑器
9 import VueQuillEditor from 'vue-quill-editor' 12 import VueQuillEditor from 'vue-quill-editor'
10 // 导入富文本编辑器的样式 13 // 导入富文本编辑器的样式
......
...@@ -224,25 +224,33 @@ ...@@ -224,25 +224,33 @@
224 规划用途 224 规划用途
225 </td> 225 </td>
226 <td width="30" colspan="4" align="center" > 226 <td width="30" colspan="4" align="center" >
227 <el-select v-model="item1.fwytzdbsm" placeholder="请选择" > 227 <el-select-tree
228 <el-option 228 v-if="show"
229 v-for="item in $store.state.fwytList" 229 :default-expand-all="defaultExpandAll"
230 :key="item.bsm" 230 :multiple="multiple"
231 :label="item.mc" 231 :placeholder="placeholder"
232 :value="item.bsm"> 232 :disabled="disabled"
233 </el-option> 233 :data="$store.state.fwytList"
234 </el-select> 234 :props="treeProps"
235 :check-strictly="checkStrictly"
236 :clearable="clearable"
237 v-model="item1.fwytzdbsm"
238 ></el-select-tree>
235 </td> 239 </td>
236 <td width="30" colspan="1" align="center" >用途</td> 240 <td width="30" colspan="1" align="center" >用途</td>
237 <td width="30" colspan="4" align="center" > 241 <td width="30" colspan="4" align="center" >
238 <el-select v-model="item1.fwsjytbsm" placeholder="请选择" > 242 <el-select-tree
239 <el-option 243 v-if="show"
240 v-for="item in $store.state.fwytList" 244 :default-expand-all="defaultExpandAll"
241 :key="item.bsm" 245 :multiple="multiple"
242 :label="item.mc" 246 :placeholder="placeholder"
243 :value="item.bsm"> 247 :disabled="disabled"
244 </el-option> 248 :data="$store.state.fwytList"
245 </el-select> 249 :props="treeProps"
250 :check-strictly="checkStrictly"
251 :clearable="clearable"
252 v-model="item1.fwsjytbsm"
253 ></el-select-tree>
246 </td> 254 </td>
247 </tr> 255 </tr>
248 256
...@@ -389,6 +397,21 @@ ...@@ -389,6 +397,21 @@
389 }, 397 },
390 data () { 398 data () {
391 return { 399 return {
400
401 //树型结构
402 show:true,
403 clearable: true,
404 defaultExpandAll: true,
405 multiple: false,
406 placeholder: '请选择',
407 disabled: false,
408 checkStrictly: false,
409 treeProps: {
410 value: 'bsm',
411 children: 'children',
412 label: 'mc'
413 },
414
392 form:{ 415 form:{
393 bsm:'',//户标识码 416 bsm:'',//户标识码
394 zrzbsm:'', //自然幢标识码 417 zrzbsm:'', //自然幢标识码
...@@ -651,7 +674,67 @@ ...@@ -651,7 +674,67 @@
651 }) 674 })
652 }, 675 },
653 onReset(){ 676 onReset(){
654 677 this.form.bdcdyh='', //不动产单元号
678 this.form.mjdwbsm='', //面积单位编号
679 this.form.hxbsm='', //户型标识码
680 this.form.hxjgbsm='', //户型结构标识码
681 this.form.dltdmj='', //独立使用土地面积
682 this.form.fttdmj='', //分摊土地使用面积
683 this.form.gytdmj='', //共有土地面积
684 this.form.fwlxbsm='', //房屋类型标识码
685 this.form.fwxzbsm='', //房屋性质标识码
686 this.form.sjc='', //实际层
687 this.form.dqtgs='', //东墙体归属
688 this.form.nqtgs='', //南墙体归属
689 this.form.xqtgs='', //西墙体归属
690 this.form.bqtgs='', //北墙体归属
691 this.form.fwbh='', //房屋编号
692 this.form.fjsm='', //附加说明
693 this.form.fwcbbsm='', //房屋产别标识码
694 this.form.sjhs='', //实际户数
695 this.form.shbw='', //室号部位
696 this.form.fwcqlybsm='', //房屋产权来源标识码
697 //预测数据
698 this.form.ycjzmj='', //建筑面积
699 this.form.yctnjzmj='', //套内建筑面积
700 this.form.ycftjzmj='', //分摊建筑面积
701 this.form.ycdxbfjzmj='', //地下部分建筑面积
702 this.form.ycqtjzmj='', //其它建筑面积
703 this.form.ycftxs='', //分摊系数
704 //实测数据
705 this.form.scjzmj='', //建筑面积
706 this.form.sctnjzmj='', //套内建筑面积
707 this.form.scftjzmj='', //分摊建筑面积
708 this.form.scdxbfjzmj='', //地下部分建筑面积
709 this.form.scqtjzmj='', //其它建筑面积
710 this.form.scftxs='', //分摊系数
711 this.form.scyclx='0', //实预测类型(0:预测,1:实测;),区别户是实测还是预测数据
712 this.form.scycglbsm='', //实测预测关联标识码
713 this.form.bz='', //备注
714 this.form.name='',
715 this.form.date='',
716 this.form.fwytList=[{
717 glbsm:'', //关联标识码
718 fwytzdbsm:'', //房屋用途字典标识码
719 sx:'', //顺序
720 fwsjytbsm:'', //房屋实际用途字典标识码
721 }],
722 this.form.fwjgList=[{
723 fwjgzdbsm:'', //房屋结构字典标识码
724 glbsm:'', //关联标识码
725 sx:'', //顺序
726 }],
727 this.form.qlxzList=[{
728 qlxzdm:'', //权利性质代码
729 glbsm:'', //宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM
730 qlxzzdbsm:'', //权利性质字典表标识码
731 qlxzmc:'', //权利名称名称
732 zhqlxzlx:'', //除宗海数据外,默认都是空;0:用海类型权利性质;2:海岛用途权利性质
733 addQjTdytRequestList:[{
734 }], //土地用途新增实体列表
735 }]
736 console.log("----------------------------------")
737 console.log(this.form)
655 }, 738 },
656 generatorCode(){ 739 generatorCode(){
657 getBdcdyh(this.form.zrzh,"h") 740 getBdcdyh(this.form.zrzh,"h")
......
...@@ -346,6 +346,12 @@ export default { ...@@ -346,6 +346,12 @@ export default {
346 inputChange(){ 346 inputChange(){
347 if (this.bdcdyh!='') { 347 if (this.bdcdyh!='') {
348 console.log('查询'+this.bdcdyh); 348 console.log('查询'+this.bdcdyh);
349 this.$refs.lpbContent.lpbDataMap(this.bdcdyh);
350 }else{
351 this.$message({
352 message: "请输入内容后查询",
353 type: "warning",
354 })
349 } 355 }
350 }, 356 },
351 //户保存 357 //户保存
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 <!-- 显示层数 --> 14 <!-- 显示层数 -->
15 <td class="floor">{{cs.sjc}}</td> 15 <td class="floor">{{cs.sjc}}</td>
16 <!-- 显示户 --> 16 <!-- 显示户 -->
17 <td v-for="(hs,hsIndex) in cs.hs" :key="hsIndex" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)">{{hs.hh}}</td> 17 <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? hs.bsm : ''" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)">{{hs.shbw}}</td>
18 </tr> 18 </tr>
19 </table> 19 </table>
20 <!-- </div> --> 20 <!-- </div> -->
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
30 <!-- 显示层数 --> 30 <!-- 显示层数 -->
31 <td class="floor">{{cs.sjc}}</td> 31 <td class="floor">{{cs.sjc}}</td>
32 <!-- 显示户 --> 32 <!-- 显示户 -->
33 <td v-for="(hs,hsIndex) in cs.hs" :key="hsIndex" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)">{{hs.hh}}</td> 33 <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? hs.bsm : ''" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)">{{hs.shbw}}</td>
34 </tr> 34 </tr>
35 </table> 35 </table>
36 </div> 36 </div>
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
55 <!-- 显示层数 --> 55 <!-- 显示层数 -->
56 <td class="floor">{{cs.sjc}}</td> 56 <td class="floor">{{cs.sjc}}</td>
57 <!-- 显示户 --> 57 <!-- 显示户 -->
58 <td v-for="(hs,hsIndex) in cs.hs" :key="hsIndex" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)">{{hs.hh}}</td> 58 <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? hs.bsm : ''" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)">{{hs.shbw}}</td>
59 </tr> 59 </tr>
60 </table> 60 </table>
61 </div> 61 </div>
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
67 <!-- 显示层数 --> 67 <!-- 显示层数 -->
68 <td class="floor">{{cs.sjc}}</td> 68 <td class="floor">{{cs.sjc}}</td>
69 <!-- 显示户 --> 69 <!-- 显示户 -->
70 <td v-for="(hs,hsIndex) in cs.hs" :key="hsIndex" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)">{{hs.hh}}</td> 70 <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? hs.bsm : ''" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)">{{hs.shbw}}</td>
71 </tr> 71 </tr>
72 </table> 72 </table>
73 </div> 73 </div>
...@@ -107,6 +107,7 @@ export default { ...@@ -107,6 +107,7 @@ export default {
107 loading:true, 107 loading:true,
108 hbsmList:[], 108 hbsmList:[],
109 time:null, //区分单双击事件的定时器 109 time:null, //区分单双击事件的定时器
110 searchNum:Math.random()
110 }; 111 };
111 }, 112 },
112 created() { 113 created() {
...@@ -140,6 +141,11 @@ export default { ...@@ -140,6 +141,11 @@ export default {
140 } 141 }
141 })) 142 }))
142 }, 143 },
144 //按照bdcdyh或shbw筛选户
145 lpbDataMap(sh){
146 // console.log('查询'+sh);
147 this.searchNum = sh;
148 },
143 //自然幢下元素高度宽度计算 149 //自然幢下元素高度宽度计算
144 dataChange(){ 150 dataChange(){
145 //计算逻辑幢宽度 20为marginRight值 151 //计算逻辑幢宽度 20为marginRight值
...@@ -207,17 +213,16 @@ export default { ...@@ -207,17 +213,16 @@ export default {
207 self.time = setTimeout(() => { 213 self.time = setTimeout(() => {
208 //判断点击的户是否选中 214 //判断点击的户是否选中
209 if(e.target.className.indexOf('tdSelect') == -1){ 215 if(e.target.className.indexOf('tdSelect') == -1){
210 //未选中 216 //未选中→选中
211 e.target.className = 'tdSelect'; //加边框 217 e.target.className = 'tdSelect'; //加边框
212 this.hbsmList.push(bsm) // 将户bsm放进hbsmList 218 this.hbsmList.push(bsm) // 将户bsm放进hbsmList
213 }else{ 219 }else{
214 //选中 220 //选中→未选中
215 e.target.className = ''; 221 e.target.className = '';
216 this.deleteArrOption(this.hbsmList,bsm); 222 this.deleteArrOption(this.hbsmList,bsm);
217 } 223 }
218 this.$parent.getHbsm(this.hbsmList,false); 224 this.$parent.getHbsm(this.hbsmList,false);
219 }, 200); 225 }, 200);
220
221 }, 226 },
222 //户双击事件 227 //户双击事件
223 dbclick(bsm){ 228 dbclick(bsm){
...@@ -253,6 +258,22 @@ export default { ...@@ -253,6 +258,22 @@ export default {
253 this.lpbContentWidth = this.$refs.lpbContent.offsetWidth -6; 258 this.lpbContentWidth = this.$refs.lpbContent.offsetWidth -6;
254 }, 501); 259 }, 501);
255 }, 260 },
261 //监听有无通过输入框查询选择到的户,如果有,将其bsm放入hbsmList
262 searchNum(n){
263 console.log(this.$refs.hBsm,'this.$refs.hBsm');
264 this.$nextTick(()=>{
265 this.$refs.hBsm.forEach(item=>{
266 console.log(item.dataset,'item');
267 if(item.dataset.bsm != ''){
268 console.log(item.dataset.bsm,'item.dataset.bsm');
269 // 判断hbsmList中是否已经存在
270 if(this.hbsmList.indexOf(item.dataset.bsm) == -1){
271 this.hbsmList.push(item.dataset.bsm) // 将户bsm放进hbsmList
272 }
273 }
274 })
275 })
276 }
256 }, 277 },
257 }; 278 };
258 </script> 279 </script>
......
...@@ -157,25 +157,33 @@ ...@@ -157,25 +157,33 @@
157 规划用途 157 规划用途
158 </td> 158 </td>
159 <td width="30" colspan="4" align="center" > 159 <td width="30" colspan="4" align="center" >
160 <el-select v-model="item1.fwytzdbsm" placeholder="请选择" > 160 <el-select-tree
161 <el-option 161 v-if="show"
162 v-for="item in $store.state.tdytList" 162 :default-expand-all="defaultExpandAll"
163 :key="item.bsm" 163 :multiple="multiple"
164 :label="item.mc" 164 :placeholder="placeholder"
165 :value="item.bsm"> 165 :disabled="disabled"
166 </el-option> 166 :data="$store.state.tdytList"
167 </el-select> 167 :props="treeProps"
168 :check-strictly="checkStrictly"
169 :clearable="clearable"
170 v-model="item1.fwytzdbsm"
171 ></el-select-tree>
168 </td> 172 </td>
169 <td width="30" colspan="1" align="center" >用途</td> 173 <td width="30" colspan="1" align="center" >用途</td>
170 <td width="30" colspan="4" align="center" > 174 <td width="30" colspan="4" align="center" >
171 <el-select v-model="item1.fwsjytbsm" placeholder="请选择" > 175 <el-select-tree
172 <el-option 176 v-if="show"
173 v-for="item in $store.state.tdytList" 177 :default-expand-all="defaultExpandAll"
174 :key="item.bsm" 178 :multiple="multiple"
175 :label="item.mc" 179 :placeholder="placeholder"
176 :value="item.bsm"> 180 :disabled="disabled"
177 </el-option> 181 :data="$store.state.tdytList"
178 </el-select> 182 :props="treeProps"
183 :check-strictly="checkStrictly"
184 :clearable="clearable"
185 v-model="item1.fwytzdbsm"
186 ></el-select-tree>
179 </td> 187 </td>
180 </tr> 188 </tr>
181 189
...@@ -282,6 +290,21 @@ ...@@ -282,6 +290,21 @@
282 inject:['reload'], 290 inject:['reload'],
283 data () { 291 data () {
284 return { 292 return {
293
294 //树型结构
295 show:true,
296 clearable: true,
297 defaultExpandAll: true,
298 multiple: false,
299 placeholder: '请选择',
300 disabled: false,
301 checkStrictly: false,
302 treeProps: {
303 value: 'bsm',
304 children: 'children',
305 label: 'mc'
306 },
307
285 lx:"zrz", 308 lx:"zrz",
286 bsm:'', 309 bsm:'',
287 form:{ 310 form:{
......