Merge branch 'dev'
Showing
1 changed file
with
44 additions
and
11 deletions
... | @@ -55,14 +55,7 @@ | ... | @@ -55,14 +55,7 @@ |
55 | <el-row :gutter="10"> | 55 | <el-row :gutter="10"> |
56 | <el-col :span="8"> | 56 | <el-col :span="8"> |
57 | <el-form-item label="房屋用途:"> | 57 | <el-form-item label="房屋用途:"> |
58 | <treeselect | 58 | <el-input disabled v-model="ruleForm.qjh.showfwyt"></el-input> |
59 | v-model="ruleForm.qjh.showfwyt" | ||
60 | noOptionsText="" | ||
61 | disabled | ||
62 | placeholder="" | ||
63 | :normalizer="normalizer" | ||
64 | :show-count="true" | ||
65 | :options="dictData['A17']" /> | ||
66 | </el-form-item> | 59 | </el-form-item> |
67 | </el-col> | 60 | </el-col> |
68 | <el-col :span="8"> | 61 | <el-col :span="8"> |
... | @@ -79,17 +72,56 @@ | ... | @@ -79,17 +72,56 @@ |
79 | <el-row :gutter="10"> | 72 | <el-row :gutter="10"> |
80 | <el-col :span="8"> | 73 | <el-col :span="8"> |
81 | <el-form-item label="建筑面积:"> | 74 | <el-form-item label="建筑面积:"> |
82 | <el-input disabled v-model="ruleForm.qjh.jzmj"></el-input> | 75 | <div class="flex"> |
76 | <el-input | ||
77 | maxlength="12" | ||
78 | v-model="ruleForm.qjh.jzmj" disabled | ||
79 | oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input> | ||
80 | <el-select disabled v-model="mjdw" style="width: 68px"> | ||
81 | <el-option | ||
82 | v-for="item in dictData['A7']" | ||
83 | :key="item.dcode" | ||
84 | :label="item.dname" | ||
85 | :value="item.dcode"> | ||
86 | </el-option> | ||
87 | </el-select> | ||
88 | </div> | ||
83 | </el-form-item> | 89 | </el-form-item> |
84 | </el-col> | 90 | </el-col> |
85 | <el-col :span="8"> | 91 | <el-col :span="8"> |
86 | <el-form-item label="套内建筑面积:"> | 92 | <el-form-item label="套内建筑面积:"> |
87 | <el-input disabled v-model="ruleForm.qjh.tnjzmj"></el-input> | 93 | <div class="flex"> |
94 | <el-input | ||
95 | maxlength="12" | ||
96 | v-model="ruleForm.qjh.tnjzmj" disabled | ||
97 | oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input> | ||
98 | <el-select disabled v-model="mjdw" style="width: 68px"> | ||
99 | <el-option | ||
100 | v-for="item in dictData['A7']" | ||
101 | :key="item.dcode" | ||
102 | :label="item.dname" | ||
103 | :value="item.dcode"> | ||
104 | </el-option> | ||
105 | </el-select> | ||
106 | </div> | ||
88 | </el-form-item> | 107 | </el-form-item> |
89 | </el-col> | 108 | </el-col> |
90 | <el-col :span="8"> | 109 | <el-col :span="8"> |
91 | <el-form-item label="分摊建筑面积:"> | 110 | <el-form-item label="分摊建筑面积:"> |
92 | <el-input disabled v-model="ruleForm.qjh.ftjzmj"></el-input> | 111 | <div class="flex"> |
112 | <el-input | ||
113 | maxlength="12" | ||
114 | v-model="ruleForm.qjh.ftjzmj" disabled | ||
115 | oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input> | ||
116 | <el-select disabled v-model="mjdw" style="width: 68px"> | ||
117 | <el-option | ||
118 | v-for="item in dictData['A7']" | ||
119 | :key="item.dcode" | ||
120 | :label="item.dname" | ||
121 | :value="item.dcode"> | ||
122 | </el-option> | ||
123 | </el-select> | ||
124 | </div> | ||
93 | </el-form-item> | 125 | </el-form-item> |
94 | </el-col> | 126 | </el-col> |
95 | </el-row> | 127 | </el-row> |
... | @@ -371,6 +403,7 @@ | ... | @@ -371,6 +403,7 @@ |
371 | }, | 403 | }, |
372 | data () { | 404 | data () { |
373 | return { | 405 | return { |
406 | mjdw: '1', | ||
374 | isSave: true, | 407 | isSave: true, |
375 | loading: false, | 408 | loading: false, |
376 | //表单是否可操作 | 409 | //表单是否可操作 | ... | ... |
-
Please register or sign in to post a comment