合并冲突
Showing
1 changed file
with
8 additions
and
9 deletions
... | @@ -173,6 +173,14 @@ | ... | @@ -173,6 +173,14 @@ |
173 | <input :disabled="disabled" class="formInput" type="number" v-model="formData.jg"/> | 173 | <input :disabled="disabled" class="formInput" type="number" v-model="formData.jg"/> |
174 | </td> | 174 | </td> |
175 | </tr> | 175 | </tr> |
176 | <tr> | ||
177 | <td colspan="2" class="tdright"><i class="requisite">*</i>坐落</td> | ||
178 | <td colspan="10"> | ||
179 | <input type="text" :disabled="disabled" @blur="inputBlur($event)" ref="zl" | ||
180 | class="formInput" v-model="formData.zl"/> | ||
181 | </td> | ||
182 | </tr> | ||
183 | |||
176 | <tr> | 184 | <tr> |
177 | <td colspan="2" class="tdright">容积率</td> | 185 | <td colspan="2" class="tdright">容积率</td> |
178 | <td colspan="2"> | 186 | <td colspan="2"> |
... | @@ -282,15 +290,6 @@ | ... | @@ -282,15 +290,6 @@ |
282 | <input type="text" :disabled="disabled" class="formInput" v-model="formData.tfh"/> | 290 | <input type="text" :disabled="disabled" class="formInput" v-model="formData.tfh"/> |
283 | </td> | 291 | </td> |
284 | </tr> | 292 | </tr> |
285 | |||
286 | <tr> | ||
287 | <td colspan="2" class="tdright"><i class="requisite">*</i>坐落</td> | ||
288 | <td colspan="10"> | ||
289 | <input type="text" :disabled="disabled" @blur="inputBlur($event)" ref="zl" | ||
290 | class="formInput" v-model="formData.zl"/> | ||
291 | </td> | ||
292 | </tr> | ||
293 | |||
294 | <tr> | 293 | <tr> |
295 | <td colspan="2" rowspan="4" class="tdright">宗地四至</td> | 294 | <td colspan="2" rowspan="4" class="tdright">宗地四至</td> |
296 | <td colspan="2" class="tdright"><i class="requisite">*</i>北至</td> | 295 | <td colspan="2" class="tdright"><i class="requisite">*</i>北至</td> | ... | ... |
-
Please register or sign in to post a comment