Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
5e61439b by weimo934
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/views/panel/change/fwsxbg/index.vue
2 parents 867c6bbc 2dd00fd9
Inline Side-by-side
Showing 7 changed files with 292 additions and 201 deletions
...@@ -57,6 +57,7 @@ table,td,tr,.el-col,.title{ ...@@ -57,6 +57,7 @@ table,td,tr,.el-col,.title{
57 } 57 }
58 input:disabled{ 58 input:disabled{
59 cursor: not-allowed; 59 cursor: not-allowed;
60 background-color: #F5F7FA;
60 } 61 }
61 .formInput:focus{ 62 .formInput:focus{
62 border: 1px solid #A0C5F6!important; 63 border: 1px solid #A0C5F6!important;
...@@ -148,16 +149,22 @@ ol, ul { list-style:none; } ...@@ -148,16 +149,22 @@ ol, ul { list-style:none; }
148 font-size: 12px; 149 font-size: 12px;
149 font-weight: 400; 150 font-weight: 400;
150 color: #333; 151 color: #333;
151 box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, 0.3); 152 box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, 0.3);
152 } 153 li {
153 .contextmenu li { 154 margin: 0;
154 margin: 0; 155 padding: 7px 16px;
155 padding: 7px 16px; 156 cursor: pointer;
156 cursor: pointer; 157 }
157 } 158 li:hover {
158 159 background: #eee;
159 .contextmenu li:hover { 160 }
160 background: #eee; 161 .noEdit{
162 color: #E6E6E6;
163 cursor: not-allowed;
164 }
165 .noEdit:hover{
166 background: #ffffff;
167 }
161 } 168 }
162 // end 169 // end
163 //生成按钮样式 170 //生成按钮样式
......
...@@ -132,6 +132,7 @@ ...@@ -132,6 +132,7 @@
132 <li> 132 <li>
133 <input 133 <input
134 type="text" 134 type="text"
135 style="top: -1px;"
135 :disabled="formData.qszt!='0'" 136 :disabled="formData.qszt!='0'"
136 placeholder="请输入" 137 placeholder="请输入"
137 v-model="childItem.pzytdm" 138 v-model="childItem.pzytdm"
...@@ -422,6 +423,8 @@ export default { ...@@ -422,6 +423,8 @@ export default {
422 input { 423 input {
423 position: relative; 424 position: relative;
424 top: -2px; 425 top: -2px;
426 height: 35px;
427 width: calc(100% - 1px) !important;
425 } 428 }
426 .el-input__inner { 429 .el-input__inner {
427 height: 34px; 430 height: 34px;
......
...@@ -5,20 +5,25 @@ ...@@ -5,20 +5,25 @@
5 v-for="(items, index) in countList" 5 v-for="(items, index) in countList"
6 :key="items.id" 6 :key="items.id"
7 > 7 >
8 <template v-for="(childItem,childIndex) in items.list" > 8 <template v-for="(childItem, childIndex) in items.list">
9 <el-col :span="2" class="btnCol" :key="childIndex+'1'" :class="childIndex>0 ? 'childYT noTopBorder':''"> 9 <el-col
10 :span="2"
11 class="btnCol"
12 :key="childIndex + '1'"
13 :class="childIndex > 0 ? 'childYT noTopBorder' : ''"
14 >
10 <el-button 15 <el-button
11 v-show="childIndex<1" 16 v-show="childIndex < 1"
12 type="primary" 17 type="primary"
13 class="changeBtn" 18 class="changeBtn addMinus outAdd"
14 @click="handleClick( index, 'add')" 19 @click="handleClick(index, 'add')"
15 >+</el-button 20 >+</el-button
16 > 21 >
17 <el-button 22 <el-button
18 v-show="childIndex<1" 23 v-show="childIndex < 1"
19 type="primary" 24 type="primary"
20 class="changeBtn" 25 class="changeBtn addMinus outMinus"
21 @click="handleClick( index, 'minus')" 26 @click="handleClick(index, 'minus')"
22 >-</el-button 27 >-</el-button
23 > 28 >
24 <div 29 <div
...@@ -26,58 +31,71 @@ ...@@ -26,58 +31,71 @@
26 v-if="items.isInside" 31 v-if="items.isInside"
27 ></div> 32 ></div>
28 </el-col> 33 </el-col>
29 <el-col :span="2" class="btnCol" :key="childIndex+'8'" :class="childIndex>0 ? 'childYT':''"> 34 <el-col
35 :span="2"
36 class="btnCol"
37 :key="childIndex + '8'"
38 :class="childIndex > 0 ? 'childYT' : ''"
39 >
30 <!-- <template v-if="childIndex>0"> --> 40 <!-- <template v-if="childIndex>0"> -->
31 <span class="qlxz" v-show="childIndex<1">权利性质</span><br> 41 <span class="qlxz" v-show="childIndex < 1">权利性质</span><br />
32 <el-button 42 <el-button
33 type="primary" 43 type="primary"
34 class="changeBtn" 44 class="changeBtn addMinus inAdd"
35 @click="handleInClick(index, childIndex, 'add')" 45 @click="handleInClick(index, childIndex, 'add')"
36 >+</el-button 46 >+</el-button
37 > 47 >
38 <el-button 48 <el-button
39 type="primary" 49 type="primary"
40 class="changeBtn" 50 class="changeBtn addMinus inMinus"
41 @click="handleInClick(index, childIndex, 'minus')" 51 @click="handleInClick(index, childIndex, 'minus')"
42 >-</el-button 52 >-</el-button
43 > 53 >
44 <!-- </template> --> 54 <!-- </template> -->
45 </el-col> 55 </el-col>
46 <el-col :span="5" :key="childIndex+'7'" :class="childIndex>0 ? 'childYT':''"> 56 <el-col
57 :span="5"
58 :key="childIndex + '7'"
59 :class="childIndex > 0 ? 'childYT' : ''"
60 >
47 <ul> 61 <ul>
48 <li>批准用途</li> 62 <li>批准用途</li>
49 <li>实际用途</li> 63 <li>实际用途</li>
50 <li>土地使用起始时间<i class="requisite">*</i></li> 64 <li>土地使用起始时间<i class="requisite">*</i></li>
51 </ul> 65 </ul>
52 </el-col> 66 </el-col>
53 <el-col :span="5" :key="childIndex+'6'" :class="childIndex>0 ? 'childYT':''"> 67 <el-col
68 :span="5"
69 :key="childIndex + '6'"
70 :class="childIndex > 0 ? 'childYT' : ''"
71 >
54 <ul> 72 <ul>
55 <li> 73 <li>
56 <el-select-tree 74 <el-select-tree
57 v-if="show" 75 v-if="show"
58 :default-expand-all="defaultExpandAll" 76 :default-expand-all="defaultExpandAll"
59 :multiple="multiple" 77 :multiple="multiple"
60 :placeholder="placeholder" 78 :placeholder="placeholder"
61 :disabled="disabled" 79 :disabled="disabled"
62 :data="$store.state.tdytList" 80 :data="$store.state.tdytList"
63 :props="treeProps" 81 :props="treeProps"
64 :check-strictly="checkStrictly" 82 :check-strictly="checkStrictly"
65 :clearable="clearable" 83 :clearable="clearable"
66 v-model="childItem.pzytdm" 84 v-model="childItem.pzytdm"
67 ></el-select-tree> 85 ></el-select-tree>
68 </li> 86 </li>
69 <li> 87 <li>
70 <el-select-tree 88 <el-select-tree
71 v-if="show" 89 v-if="show"
72 :default-expand-all="defaultExpandAll" 90 :default-expand-all="defaultExpandAll"
73 :multiple="multiple" 91 :multiple="multiple"
74 :placeholder="placeholder" 92 :placeholder="placeholder"
75 :disabled="disabled" 93 :disabled="disabled"
76 :data="$store.state.tdytList" 94 :data="$store.state.tdytList"
77 :props="treeProps" 95 :props="treeProps"
78 :check-strictly="checkStrictly" 96 :check-strictly="checkStrictly"
79 :clearable="clearable" 97 :clearable="clearable"
80 v-model="childItem.sjytdm" 98 v-model="childItem.sjytdm"
81 ></el-select-tree> 99 ></el-select-tree>
82 </li> 100 </li>
83 <li> 101 <li>
...@@ -91,34 +109,53 @@ ...@@ -91,34 +109,53 @@
91 </li> 109 </li>
92 </ul> 110 </ul>
93 </el-col> 111 </el-col>
94 <el-col :span="5" :key="childIndex+'5'" :class="childIndex>0 ? 'childYT':''"> 112 <el-col
113 :span="5"
114 :key="childIndex + '5'"
115 :class="childIndex > 0 ? 'childYT' : ''"
116 >
95 <ul> 117 <ul>
96 <li>地类编码</li> 118 <li>地类编码</li>
97 <li>地类编码</li> 119 <li>地类编码</li>
98 <li>土地使用结束时间<i class="requisite">*</i></li> 120 <li>土地使用结束时间<i class="requisite">*</i></li>
99 </ul> 121 </ul>
100 </el-col> 122 </el-col>
101 <el-col :span="5" :key="childIndex+'4'" :class="childIndex>0 ? 'childYT':''"> 123 <el-col
124 :span="5"
125 :key="childIndex + '4'"
126 :class="childIndex > 0 ? 'childYT' : ''"
127 >
102 <ul> 128 <ul>
103 <li> 129 <li>
104 <input type="text" placeholder="请输入" v-model="childItem.pzytdm" class="formInput" /> 130 <input
131 type="text"
132 style="top: -1px;"
133 placeholder="请输入"
134 v-model="childItem.pzytdm"
135 class="formInput"
136 />
105 </li> 137 </li>
106 <li> 138 <li>
107 <input type="text" placeholder="请输入" v-model="childItem.sjytdm" class="formInput" /> 139 <input
140 type="text"
141 placeholder="请输入"
142 v-model="childItem.sjytdm"
143 class="formInput"
144 />
108 </li> 145 </li>
109 <li> 146 <li>
110 <el-date-picker 147 <el-date-picker
111 v-model="childItem.tdsyjssj" 148 v-model="childItem.tdsyjssj"
112 type="date" 149 type="date"
113 value-format="yyyy-MM-dd" 150 value-format="yyyy-MM-dd"
114 placeholder="选择日期" 151 placeholder="选择日期"
115 > 152 >
116 </el-date-picker> 153 </el-date-picker>
117 </li> 154 </li>
118 </ul> 155 </ul>
119 </el-col> 156 </el-col>
120 </template> 157 </template>
121 158
122 <div class="title"> 159 <div class="title">
123 <el-select class="formSelect" v-model="items.qlxzdm"> 160 <el-select class="formSelect" v-model="items.qlxzdm">
124 <el-option 161 <el-option
...@@ -146,17 +183,17 @@ export default { ...@@ -146,17 +183,17 @@ export default {
146 data() { 183 data() {
147 return { 184 return {
148 //树型结构 185 //树型结构
149 show:true, 186 show: true,
150 clearable: true, 187 clearable: true,
151 defaultExpandAll: true, 188 defaultExpandAll: true,
152 multiple: false, 189 multiple: false,
153 placeholder: '请选择', 190 placeholder: "请选择",
154 disabled: false, 191 disabled: false,
155 checkStrictly: true, 192 checkStrictly: true,
156 treeProps: { 193 treeProps: {
157 value: 'dm', 194 value: "dm",
158 children: 'children', 195 children: "children",
159 label: 'mc' 196 label: "mc",
160 }, 197 },
161 198
162 countList: [ 199 countList: [
...@@ -164,97 +201,96 @@ export default { ...@@ -164,97 +201,96 @@ export default {
164 id: Math.random(), 201 id: Math.random(),
165 isInside: false, 202 isInside: false,
166 hasNotBorder: false, 203 hasNotBorder: false,
167 "bsm": "",//权利性质标识码 204 bsm: "", //权利性质标识码
168 "glbsm": "",//宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM 205 glbsm: "", //宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM
169 "qlxzdm": "", 206 qlxzdm: "",
170 "zhqlxzlx": "", //除宗海数据外，默认都是空；0:用海类型权利性质;2:海岛用途权利性质 207 zhqlxzlx: "", //除宗海数据外，默认都是空；0:用海类型权利性质;2:海岛用途权利性质
171 list:[ 208 list: [
172 { 209 {
173 "pzdjbsm": "", 210 pzdjbsm: "",
174 "pzdjmc": "", 211 pzdjmc: "",
175 "pzytdm": "", 212 pzytdm: "",
176 "pzytmc": "", 213 pzytmc: "",
177 "pzytmj": 0, 214 pzytmj: 0,
178 "qlxzbsm": "", 215 qlxzbsm: "",
179 "sjdjbsm": "", 216 sjdjbsm: "",
180 "sjdjmc": "", 217 sjdjmc: "",
181 "sjytdm": "", 218 sjytdm: "",
182 "sjytmc": "", 219 sjytmc: "",
183 "sjytmj": 0, 220 sjytmj: 0,
184 "syqx": "", 221 syqx: "",
185 "tdsyjssj": "", 222 tdsyjssj: "",
186 "tdsyqssj": "", 223 tdsyqssj: "",
187 "tdzh": "" 224 tdzh: "",
188 } 225 },
189 ] 226 ],
190 }, 227 },
191 ], 228 ],
192 outNum:0 229 outNum: 0,
193 }; 230 };
194 }, 231 },
195 created(){ 232 created() {},
196 },
197 methods: { 233 methods: {
198 //外层操作 234 //外层操作
199 handleClick( ind, type) { 235 handleClick(ind, type) {
200 let outsideObj = { 236 let outsideObj = {
201 id: Math.random(), 237 id: Math.random(),
202 isInside: false, 238 isInside: false,
203 hasNotBorder: false, 239 hasNotBorder: false,
204 "bsm": "",//权利性质标识码 240 bsm: "", //权利性质标识码
205 "glbsm": "",//宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM 241 glbsm: "", //宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM
206 "qlxzdm": "", 242 qlxzdm: "",
207 "zhqlxzlx": "", //除宗海数据外，默认都是空；0:用海类型权利性质;2:海岛用途权利性质 243 zhqlxzlx: "", //除宗海数据外，默认都是空；0:用海类型权利性质;2:海岛用途权利性质
208 list:[ 244 list: [
209 { 245 {
210 "pzdjbsm": "", 246 pzdjbsm: "",
211 "pzdjmc": "", 247 pzdjmc: "",
212 "pzytdm": "", 248 pzytdm: "",
213 "pzytmc": "", 249 pzytmc: "",
214 "pzytmj": 0, 250 pzytmj: 0,
215 "qlxzbsm": "", 251 qlxzbsm: "",
216 "sjdjbsm": "", 252 sjdjbsm: "",
217 "sjdjmc": "", 253 sjdjmc: "",
218 "sjytdm": "", 254 sjytdm: "",
219 "sjytmc": "", 255 sjytmc: "",
220 "sjytmj": 0, 256 sjytmj: 0,
221 "syqx": "", 257 syqx: "",
222 "tdsyjssj": "", 258 tdsyjssj: "",
223 "tdsyqssj": "", 259 tdsyqssj: "",
224 "tdzh": "" 260 tdzh: "",
225 } 261 },
226 ] 262 ],
227 }; 263 };
228 if (type === "add") { 264 if (type === "add") {
229 this.countList.push(outsideObj); 265 this.countList.push(outsideObj);
230 this.outNum++ 266 this.outNum++;
231 } else { 267 } else {
232 this.countList.forEach((item, index) => { 268 this.countList.forEach((item, index) => {
233 if (index == ind && this.countList.length > 1) { 269 if (index == ind && this.countList.length > 1) {
234 this.countList.splice(index, 1); 270 this.countList.splice(index, 1);
235 } 271 }
236 }); 272 });
237 this.outNum-- 273 this.outNum--;
238 } 274 }
239 }, 275 },
240 //内层操作 276 //内层操作
241 handleInClick(index, childIndex, type) { 277 handleInClick(index, childIndex, type) {
242 let insideObj = { 278 let insideObj = {
243 "pzdjbsm": "", 279 pzdjbsm: "",
244 "pzdjmc": "", 280 pzdjmc: "",
245 "pzytdm": "", 281 pzytdm: "",
246 "pzytmc": "", 282 pzytmc: "",
247 "pzytmj": 0, 283 pzytmj: 0,
248 "qlxzbsm": "", 284 qlxzbsm: "",
249 "sjdjbsm": "", 285 sjdjbsm: "",
250 "sjdjmc": "", 286 sjdjmc: "",
251 "sjytdm": "", 287 sjytdm: "",
252 "sjytmc": "", 288 sjytmc: "",
253 "sjytmj": 0, 289 sjytmj: 0,
254 "syqx": "", 290 syqx: "",
255 "tdsyjssj": "", 291 tdsyjssj: "",
256 "tdsyqssj": "", 292 tdsyqssj: "",
257 "tdzh": "" 293 tdzh: "",
258 }; 294 };
259 if (type === "add") { 295 if (type === "add") {
260 this.countList[index].list.splice(childIndex + 1, 0, insideObj); 296 this.countList[index].list.splice(childIndex + 1, 0, insideObj);
...@@ -273,7 +309,8 @@ export default { ...@@ -273,7 +309,8 @@ export default {
273 if (index == this.countList.length - 1) { 309 if (index == this.countList.length - 1) {
274 item.hasNotBorder = true; 310 item.hasNotBorder = true;
275 } else { 311 } else {
276 item.hasNotBorder = item.isInside && !this.countList[index + 1].isInside ? true : false; 312 item.hasNotBorder =
313 item.isInside && !this.countList[index + 1].isInside ? true : false;
277 } 314 }
278 }); 315 });
279 }, 316 },
...@@ -289,7 +326,7 @@ export default { ...@@ -289,7 +326,7 @@ export default {
289 .qlxzModule { 326 .qlxzModule {
290 height: auto; 327 height: auto;
291 position: relative; 328 position: relative;
292 border-bottom: 1px solid #E6E6E6; 329 border-bottom: 1px solid #e6e6e6;
293 .el-col { 330 .el-col {
294 // height: 100%; 331 // height: 100%;
295 border-right: 1px solid grey; 332 border-right: 1px solid grey;
...@@ -303,16 +340,22 @@ export default { ...@@ -303,16 +340,22 @@ export default {
303 height: 37px; 340 height: 37px;
304 line-height: 37px; 341 line-height: 37px;
305 text-decoration: none; 342 text-decoration: none;
306 border-bottom: 1px solid #E6E6E6; 343 border-bottom: 1px solid #e6e6e6;
307 .el-select{ 344 .el-select {
308 width: 100%; 345 width: 100%;
309 } 346 }
310 .el-input{ 347 .el-input {
311 width: 100%; 348 width: 100%;
312 } 349 }
313 .el-input__inner { 350 .el-input__inner {
314 height: 34px; 351 height: 34px;
315 } 352 }
353 input {
354 position: relative;
355 top: -2px;
356 height: 35px;
357 width: calc(100% - 1px) !important;
358 }
316 } 359 }
317 li:last-child { 360 li:last-child {
318 border-bottom: none; 361 border-bottom: none;
...@@ -330,12 +373,12 @@ export default { ...@@ -330,12 +373,12 @@ export default {
330 bottom: 2px; 373 bottom: 2px;
331 } 374 }
332 } 375 }
333 .childYT{ 376 .childYT {
334 height: 114px; 377 height: 114px;
335 border-top: 1px solid grey; 378 border-top: 1px solid grey;
336 ul { 379 ul {
337 margin-top: 0; 380 margin-top: 0;
338 li{ 381 li {
339 .el-input__inner { 382 .el-input__inner {
340 height: 29px; 383 height: 29px;
341 } 384 }
...@@ -348,10 +391,10 @@ export default { ...@@ -348,10 +391,10 @@ export default {
348 margin-top: 4px; 391 margin-top: 4px;
349 } 392 }
350 } 393 }
351 .noTopBorder{ 394 .noTopBorder {
352 border-top: 0; 395 border-top: 0;
353 } 396 }
354 .noRightBorder{ 397 .noRightBorder {
355 border-right: 0; 398 border-right: 0;
356 } 399 }
357 .el-col:nth-last-child(2) { 400 .el-col:nth-last-child(2) {
...@@ -397,5 +440,11 @@ export default { ...@@ -397,5 +440,11 @@ export default {
397 .el-row:nth-last-child(1) { 440 .el-row:nth-last-child(1) {
398 border-bottom: none; 441 border-bottom: none;
399 } 442 }
443 /deep/.el-select-tree {
444 width: 100%;
445 .el-input__inner {
446 height: 30px !important;
447 }
448 }
400 } 449 }
401 </style> 450 </style>
......
...@@ -62,7 +62,8 @@ ...@@ -62,7 +62,8 @@
62 <li v-show="isZD">导入属性</li> 62 <li v-show="isZD">导入属性</li>
63 <li v-show="!isZD">导入楼盘</li> 63 <li v-show="!isZD">导入楼盘</li>
64 <li>重叠分析</li> 64 <li>重叠分析</li>
65 <li v-show="isZD" @click="openCreateDialog">添加定着物</li> 65 <li v-show="isZD && (zdQszt == '1' || zdQszt == '2')" @click="openCreateDialog">添加定着物</li>
66 <li v-show="isZD && (zdQszt != '1' && zdQszt != '2')" class="noEdit">添加定着物</li>
66 <li @click="deleteByBsm()">删除</li> 67 <li @click="deleteByBsm()">删除</li>
67 </ul> 68 </ul>
68 <ul 69 <ul
...@@ -131,7 +132,9 @@ export default { ...@@ -131,7 +132,9 @@ export default {
131 //控制新建宗地菜单 132 //控制新建宗地菜单
132 createVisible:false, 133 createVisible:false,
133 //多幢 134 //多幢
134 dzVisible:false 135 dzVisible:false,
136 //宗地权属状态
137 zdQszt:null,
135 }; 138 };
136 }, 139 },
137 watch: { 140 watch: {
...@@ -175,7 +178,8 @@ export default { ...@@ -175,7 +178,8 @@ export default {
175 this.visible = data; 178 this.visible = data;
176 }, 179 },
177 changeZdData(data) { 180 changeZdData(data) {
178 this.zdData = data 181 this.zdData = data;
182 this.zdQszt = data.qszt;
179 }, 183 },
180 changeTop(data) { 184 changeTop(data) {
181 this.top = data; 185 this.top = data;
......
...@@ -121,55 +121,59 @@ export default { ...@@ -121,55 +121,59 @@ export default {
121 }, 121 },
122 //点击办理 122 //点击办理
123 handleClick(row) { 123 handleClick(row) {
124 console.log("fwsxbg"); 124 let params = { bsm: row.glbsm, type: row.dylx };
125 console.log(row); 125 this.$confirm('是否确定范围属性变更?', '提示', {
126 var params = { bsm: row.glbsm, type: row.dylx }; 126 confirmButtonText: '确定',
127 fwsxbgbl(params) 127 cancelButtonText: '取消',
128 .then((res) => { 128 type: 'warning'
129 if (res.code == 200) { 129 }).then(() => {
130 this.$message({ 130 fwsxbgbl(params)
131 message: res.message, 131 .then((res) => {
132 type: "success", 132 if (res.code == 200) {
133 }); 133 this.$message({
134 var newGlbsm=res.result; 134 message: res.message,
135 135 type: "变更成功",
136 let path = ""; 136 });
137 switch (row.dylx) { 137 let path = "";
138 case "zrz": 138 switch (row.dylx) {
139 this.$store.state.zrzbsm = newGlbsm; 139 case "zrz":
140 path = "/zrz"; 140 this.$store.state.zrzbsm = res.result;
141 break; 141 path = "/zrz";
142 case "zd": 142 break;
143 this.$store.state.zdbsm = newGlbsm; 143 case "zd":
144 path = "/zd"; 144 this.$store.state.zdbsm = res.result;
145 break; 145 path = "/zd";
146 case "dz": 146 break;
147 this.$store.state.dzbsm = newGlbsm; 147 case "dz":
148 path = "/dz"; 148 this.$store.state.dzbsm = res.result;
149 break; 149 path = "/dz";
150 default: 150 break;
151 break; 151 default:
152 } 152 break;
153 this.$router.push({
154 path: path,
155 query: {
156 bsm: newGlbsm,
157 source: 2
158 } 153 }
159 }); 154 this.$router.push({
160 } else { 155 path: path,
161 this.$message({ 156 query: {
162 message: res.message, 157 bsm: newGlbsm,
163 type: "warning", 158 source: 2
164 }); 159 }
165 } 160 });
166 }) 161 } else {
162 this.$message({
163 message: res.message,
164 type: "warning",
165 });
166 }
167 })
167 .catch((error) => { 168 .catch((error) => {
168 this.$message({ 169 this.$message({
169 message: res.message, 170 message: res.message,
170 type: "error", 171 type: "error",
171 }); 172 });
172 }); 173 });
174 }).catch(() => {
175
176 });
173 177
174 }, 178 },
175 }, 179 },
......
...@@ -215,12 +215,23 @@ ...@@ -215,12 +215,23 @@
215 215
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
219 type="primary"
220 style="margin-right: 10px"
221 class="changeBtn addMinus inAdd"
222 @click="addYtInfo"
223 >+</el-button
224 >
219 <span>用途<i class="requisite">*</i></span> 225 <span>用途<i class="requisite">*</i></span>
220 </td> 226 </td>
221 227
222 <td width="30" colspan="1" align="center" > 228 <td width="30" colspan="1" align="center" >
223 <el-button type="info" size="mini" style="" @click="deleteYtInfo(index)" circle>删除</el-button> 229 <el-button
230 type="primary"
231 class="changeBtn addMinus inMinus"
232 @click="deleteYtInfo(index)"
233 >-</el-button
234 >
224 规划用途 235 规划用途
225 </td> 236 </td>
226 <td width="30" colspan="4" align="center" > 237 <td width="30" colspan="4" align="center" >
...@@ -256,7 +267,14 @@ ...@@ -256,7 +267,14 @@
256 267
257 <tr height="30" v-for="(item1,index) in form.fwjgList" :key="'jg'+index"> 268 <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" > 269 <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> 270 <!-- <el-button type="primary" size="mini" style="margin-right: 10px" @click="addFwjgInfo">添加</el-button> -->
271 <el-button
272 type="primary"
273 style="margin-right: 10px"
274 class="changeBtn addMinus inAdd"
275 @click="addFwjgInfo"
276 >+</el-button
277 >
260 <span>房屋结构<i class="requisite">*</i></span> 278 <span>房屋结构<i class="requisite">*</i></span>
261 </td> 279 </td>
262 <td colspan="1" align="center" > 280 <td colspan="1" align="center" >
...@@ -808,7 +826,6 @@ ...@@ -808,7 +826,6 @@
808 826
809 td{ 827 td{
810 //bgcolor:#F1F4FC; 828 //bgcolor:#F1F4FC;
811 bgcolor:#fff;
812 width:8.33% 829 width:8.33%
813 } 830 }
814 831
...@@ -824,4 +841,11 @@ ...@@ -824,4 +841,11 @@
824 .hTable{ 841 .hTable{
825 margin-top: 10px; 842 margin-top: 10px;
826 } 843 }
844
845 /deep/.el-select-tree{
846 width: 100%;
847 .el-input__inner{
848 height: 30px !important;
849 }
850 }
827 </style> 851 </style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -13,19 +13,19 @@ ...@@ -13,19 +13,19 @@
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" >自然幢号<i class="requisite">*</i></td> 15 <td colspan="2" >自然幢号<i class="requisite">*</i></td>
16 <td colspan="4" > 16 <td colspan="4" class="psr">
17 <input class="formInput" :disabled="form.qszt!='0'" v-model="form.zrzh"> 17 <input class="formInput percent80" :disabled="form.qszt!='0'" v-model="form.zrzh">
18 <el-button @click.prevent="generatorCode" type="warning" class="createBtn" size="mini">生成</el-button>
18 </td> 19 </td>
19 </tr> 20 </tr>
20 <tr> 21 <tr>
21 <td colspan="2" >项目名称<i class="requisite">*</i></td> 22 <td colspan="2" >项目名称<i class="requisite">*</i></td>
22 <td colspan="4" > 23 <td colspan="4" >
23 <input class="formInput" :disabled="form.qszt!='0'" v-model="form.xmmc"> 24 <input class="formInput " :disabled="form.qszt!='0'" v-model="form.xmmc">
24 </td> 25 </td>
25 <td colspan="2" >不动产单元号<i class="requisite">*</i></td> 26 <td colspan="2" >不动产单元号<i class="requisite">*</i></td>
26 <td colspan="4" class="psr"> 27 <td colspan="4">
27 <input class="formInput percent80" :disabled="form.qszt!='0'" v-model="form.bdcdyh"> 28 <input class="formInput " :disabled="form.qszt!='0'" v-model="form.bdcdyh">
28 <el-button @click.prevent="generatorCode" type="warning" class="createBtn" size="mini">生成</el-button>
29 </td> 29 </td>
30 </tr> 30 </tr>
31 31
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
150 </td> 150 </td>
151 151
152 <td colspan="1" style="min-width:120px"> 152 <td colspan="1" style="min-width:120px">
153 <el-button type="info" class="outMinus addMinus" size="mini" style="" @click="deleteYtInfo(index)" circle>-</el-button> 153 <el-button type="info" class="inMinus addMinus" size="mini" style="" @click="deleteYtInfo(index)" circle>-</el-button>
154 规划用途 154 规划用途
155 </td> 155 </td>
156 <td colspan="3" > 156 <td colspan="3" >
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
190 <span>房屋结构<i class="requisite">*</i></span> 190 <span>房屋结构<i class="requisite">*</i></span>
191 </td> 191 </td>
192 <td colspan="1" > 192 <td colspan="1" >
193 <el-button type="primary" class="outMinus addMinus" size="mini" style="margin-right: 10px" @click="deleteFwjgInfo(index)">-</el-button> 193 <el-button type="primary" class="inMinus addMinus" size="mini" style="margin-right: 10px" @click="deleteFwjgInfo(index)">-</el-button>
194 <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;删除</span> 194 <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;删除</span>
195 </td> 195 </td>
196 <td colspan="9" > 196 <td colspan="9" >
...@@ -272,7 +272,7 @@ ...@@ -272,7 +272,7 @@
272 272
273 <script> 273 <script>
274 import Qlr from "../../../components/formMenu/qlr"; 274 import Qlr from "../../../components/formMenu/qlr";
275 import Qlxz from "../../../components/formMenu/qlxz"; 275 import Qlxz from "../../../components/formMenu/qlxz_simple";
276 import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm} from "../../../api/zrz" 276 import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm} from "../../../api/zrz"
277 import {getQjZdjbxxDetailById} from "../../../api/zd" 277 import {getQjZdjbxxDetailById} from "../../../api/zd"
278 import {submit} from "../../../api/common" 278 import {submit} from "../../../api/common"
......