Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev
Showing
12 changed files
with
148 additions
and
43 deletions
... | @@ -117,6 +117,7 @@ | ... | @@ -117,6 +117,7 @@ |
117 | * @author: renchao | 117 | * @author: renchao |
118 | */ | 118 | */ |
119 | loadBdcdylist () { | 119 | loadBdcdylist () { |
120 | console.log("获取currentSelectProps表单并加载"); | ||
120 | var formdata = new FormData(); | 121 | var formdata = new FormData(); |
121 | if (this.bsmSlsq) { | 122 | if (this.bsmSlsq) { |
122 | formdata.append("bsmSlsq", this.bsmSlsq); | 123 | formdata.append("bsmSlsq", this.bsmSlsq); |
... | @@ -138,13 +139,11 @@ | ... | @@ -138,13 +139,11 @@ |
138 | * @author: renchao | 139 | * @author: renchao |
139 | */ | 140 | */ |
140 | getleftMenubl (row) { | 141 | getleftMenubl (row) { |
142 | console.log("获取右侧菜单传参",row); | ||
141 | 143 | ||
142 | leftMenubl(this.bsmSlsq).then((res) => { | 144 | leftMenubl(this.bsmSlsq).then((res) => { |
143 | this.supplementarylist = res.result; | 145 | this.supplementarylist = res.result; |
144 | if (row == 1) { | 146 | if (row) { |
145 | this.delel = false | ||
146 | } | ||
147 | if (row && row != 1) { | ||
148 | this.supplementarylist.forEach((item, index) => { | 147 | this.supplementarylist.forEach((item, index) => { |
149 | if (item.bsmRepair == row.bsmRepair) { | 148 | if (item.bsmRepair == row.bsmRepair) { |
150 | this.activeIndex = index.toString() | 149 | this.activeIndex = index.toString() |
... | @@ -152,13 +151,21 @@ | ... | @@ -152,13 +151,21 @@ |
152 | this.unitClick(index) | 151 | this.unitClick(index) |
153 | } | 152 | } |
154 | }) | 153 | }) |
155 | } | 154 | }else{ |
156 | if (this.supplementarylist.length) { | 155 | if (this.supplementarylist.length) { |
157 | this.unitClick(0) | 156 | this.unitClick(0) |
157 | this.activeIndex = "0" | ||
158 | } else { | 158 | } else { |
159 | console.log("左侧列表为空"); | ||
159 | this.loadBdcdylist() | 160 | this.loadBdcdylist() |
160 | // this.$emit("getCurrentSelectProps", this.currentSelectProps); | 161 | // this.$emit("getCurrentSelectProps", this.currentSelectProps); |
161 | } | 162 | } |
163 | |||
164 | } | ||
165 | |||
166 | |||
167 | |||
168 | |||
162 | }); | 169 | }); |
163 | }, | 170 | }, |
164 | /** | 171 | /** |
... | @@ -179,6 +186,7 @@ | ... | @@ -179,6 +186,7 @@ |
179 | * @author: renchao | 186 | * @author: renchao |
180 | */ | 187 | */ |
181 | unitClick (index) { | 188 | unitClick (index) { |
189 | console.log("index数据的下标",index); | ||
182 | this.currentSelectProps = this.supplementarylist[index]; | 190 | this.currentSelectProps = this.supplementarylist[index]; |
183 | this.$emit("getCurrentSelectProps", this.currentSelectProps); | 191 | this.$emit("getCurrentSelectProps", this.currentSelectProps); |
184 | }, | 192 | }, | ... | ... |
... | @@ -269,7 +269,6 @@ | ... | @@ -269,7 +269,6 @@ |
269 | oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input> | 269 | oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input> |
270 | <el-select | 270 | <el-select |
271 | v-model="ruleForm.diyaq.jedw" | 271 | v-model="ruleForm.diyaq.jedw" |
272 | :disabled="!ableOperation" | ||
273 | style="width: 20%"> | 272 | style="width: 20%"> |
274 | <el-option | 273 | <el-option |
275 | v-for="item in dictData['A7']" | 274 | v-for="item in dictData['A7']" | ... | ... |
... | @@ -119,8 +119,8 @@ | ... | @@ -119,8 +119,8 @@ |
119 | <el-input v-model="ruleForm.fdcq2.dytdmj" | 119 | <el-input v-model="ruleForm.fdcq2.dytdmj" |
120 | oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input> | 120 | oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input> |
121 | <el-select | 121 | <el-select |
122 | v-model="ruleForm.fdcq2.mjdw" | 122 | disabled |
123 | :disabled="!ableOperation" | 123 | v-model="mjdw" |
124 | style="width: 20%"> | 124 | style="width: 20%"> |
125 | <el-option | 125 | <el-option |
126 | v-for="item in dictData['A7']" | 126 | v-for="item in dictData['A7']" |
... | @@ -138,8 +138,8 @@ | ... | @@ -138,8 +138,8 @@ |
138 | <el-input v-model="ruleForm.fdcq2.fttdmj" | 138 | <el-input v-model="ruleForm.fdcq2.fttdmj" |
139 | oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input> | 139 | oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input> |
140 | <el-select | 140 | <el-select |
141 | v-model="ruleForm.fdcq2.mjdw" | 141 | disabled |
142 | :disabled="!ableOperation" | 142 | v-model="mjdw" |
143 | style="width: 20%"> | 143 | style="width: 20%"> |
144 | <el-option | 144 | <el-option |
145 | v-for="item in dictData['A7']" | 145 | v-for="item in dictData['A7']" |
... | @@ -259,8 +259,8 @@ | ... | @@ -259,8 +259,8 @@ |
259 | <el-input v-model="ruleForm.fdcq2.jzmj" | 259 | <el-input v-model="ruleForm.fdcq2.jzmj" |
260 | oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input> | 260 | oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input> |
261 | <el-select | 261 | <el-select |
262 | v-model="ruleForm.fdcq2.mjdw" | 262 | disabled |
263 | :disabled="!ableOperation" | 263 | v-model="mjdw" |
264 | style="width: 20%"> | 264 | style="width: 20%"> |
265 | <el-option | 265 | <el-option |
266 | v-for="item in dictData['A7']" | 266 | v-for="item in dictData['A7']" |
... | @@ -278,8 +278,8 @@ | ... | @@ -278,8 +278,8 @@ |
278 | <el-input v-model="ruleForm.fdcq2.zyjzmj" | 278 | <el-input v-model="ruleForm.fdcq2.zyjzmj" |
279 | oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input> | 279 | oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input> |
280 | <el-select | 280 | <el-select |
281 | v-model="ruleForm.fdcq2.mjdw" | 281 | disabled |
282 | :disabled="!ableOperation" | 282 | v-model="mjdw" |
283 | style="width: 20%"> | 283 | style="width: 20%"> |
284 | <el-option | 284 | <el-option |
285 | v-for="item in dictData['A7']" | 285 | v-for="item in dictData['A7']" |
... | @@ -297,8 +297,8 @@ | ... | @@ -297,8 +297,8 @@ |
297 | <el-input v-model="ruleForm.fdcq2.ftjzmj" | 297 | <el-input v-model="ruleForm.fdcq2.ftjzmj" |
298 | oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input> | 298 | oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input> |
299 | <el-select | 299 | <el-select |
300 | v-model="ruleForm.fdcq2.mjdw" | 300 | disabled |
301 | :disabled="!ableOperation" | 301 | v-model="mjdw" |
302 | style="width: 20%"> | 302 | style="width: 20%"> |
303 | <el-option | 303 | <el-option |
304 | v-for="item in dictData['A7']" | 304 | v-for="item in dictData['A7']" |
... | @@ -449,6 +449,7 @@ | ... | @@ -449,6 +449,7 @@ |
449 | }, | 449 | }, |
450 | data () { | 450 | data () { |
451 | return { | 451 | return { |
452 | mjdw:"1", | ||
452 | ssqlxxshow: true, | 453 | ssqlxxshow: true, |
453 | props: { | 454 | props: { |
454 | label: "bdcqzh", | 455 | label: "bdcqzh", | ... | ... |
... | @@ -132,7 +132,21 @@ | ... | @@ -132,7 +132,21 @@ |
132 | </el-col> --> | 132 | </el-col> --> |
133 | <el-col :span="8"> | 133 | <el-col :span="8"> |
134 | <el-form-item label="使用权面积:"> | 134 | <el-form-item label="使用权面积:"> |
135 | <el-input v-model="ruleForm.jsydsyq.syqmj"></el-input> | 135 | <div class="flex"> |
136 | <el-input v-model="ruleForm.jsydsyq.syqmj" | ||
137 | oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input> | ||
138 | <el-select | ||
139 | disabled | ||
140 | v-model="mjdw" | ||
141 | style="width: 20%"> | ||
142 | <el-option | ||
143 | v-for="item in dictData['A7']" | ||
144 | :key="item.dcode" | ||
145 | :label="item.dname" | ||
146 | :value="item.dcode"> | ||
147 | </el-option> | ||
148 | </el-select> | ||
149 | </div> | ||
136 | </el-form-item> | 150 | </el-form-item> |
137 | </el-col> | 151 | </el-col> |
138 | <el-col :span="8"> | 152 | <el-col :span="8"> |
... | @@ -302,6 +316,7 @@ export default { | ... | @@ -302,6 +316,7 @@ export default { |
302 | }, | 316 | }, |
303 | data() { | 317 | data() { |
304 | return { | 318 | return { |
319 | mjdw:"1", | ||
305 | ssqlxxshow:true, | 320 | ssqlxxshow:true, |
306 | props: { | 321 | props: { |
307 | label: "bdcqzh", | 322 | label: "bdcqzh", | ... | ... |
... | @@ -175,7 +175,7 @@ | ... | @@ -175,7 +175,7 @@ |
175 | oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" | 175 | oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" |
176 | ></el-input> | 176 | ></el-input> |
177 | <el-select | 177 | <el-select |
178 | v-model="ruleForm.tdsyq.mjdw" | 178 | v-model="ruleForm.tdsyq.mjdw1" |
179 | :disabled="!ableOperation" | 179 | :disabled="!ableOperation" |
180 | style="width: 20%" | 180 | style="width: 20%" |
181 | > | 181 | > |
... | @@ -199,7 +199,7 @@ | ... | @@ -199,7 +199,7 @@ |
199 | oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" | 199 | oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" |
200 | ></el-input> | 200 | ></el-input> |
201 | <el-select | 201 | <el-select |
202 | v-model="ruleForm.tdsyq.mjdw" | 202 | v-model="ruleForm.tdsyq.mjdw2" |
203 | :disabled="!ableOperation" | 203 | :disabled="!ableOperation" |
204 | style="width: 20%" | 204 | style="width: 20%" |
205 | > | 205 | > |
... | @@ -223,7 +223,7 @@ | ... | @@ -223,7 +223,7 @@ |
223 | oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" | 223 | oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" |
224 | ></el-input> | 224 | ></el-input> |
225 | <el-select | 225 | <el-select |
226 | v-model="ruleForm.tdsyq.mjdw" | 226 | v-model="ruleForm.tdsyq.mjdw3" |
227 | :disabled="!ableOperation" | 227 | :disabled="!ableOperation" |
228 | style="width: 20%" | 228 | style="width: 20%" |
229 | > | 229 | > |
... | @@ -249,7 +249,7 @@ | ... | @@ -249,7 +249,7 @@ |
249 | oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null" | 249 | oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null" |
250 | ></el-input> | 250 | ></el-input> |
251 | <el-select | 251 | <el-select |
252 | v-model="ruleForm.tdsyq.mjdw" | 252 | v-model="ruleForm.tdsyq.mjdw4" |
253 | :disabled="!ableOperation" | 253 | :disabled="!ableOperation" |
254 | style="width: 20%" | 254 | style="width: 20%" |
255 | > | 255 | > |
... | @@ -273,7 +273,7 @@ | ... | @@ -273,7 +273,7 @@ |
273 | oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" | 273 | oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" |
274 | ></el-input> | 274 | ></el-input> |
275 | <el-select | 275 | <el-select |
276 | v-model="ruleForm.tdsyq.mjdw" | 276 | v-model="ruleForm.tdsyq.mjdw5" |
277 | :disabled="!ableOperation" | 277 | :disabled="!ableOperation" |
278 | style="width: 20%" | 278 | style="width: 20%" |
279 | > | 279 | > |
... | @@ -297,7 +297,7 @@ | ... | @@ -297,7 +297,7 @@ |
297 | oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" | 297 | oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" |
298 | ></el-input> | 298 | ></el-input> |
299 | <el-select | 299 | <el-select |
300 | v-model="ruleForm.tdsyq.mjdw" | 300 | v-model="ruleForm.tdsyq.mjdw6" |
301 | :disabled="!ableOperation" | 301 | :disabled="!ableOperation" |
302 | style="width: 20%" | 302 | style="width: 20%" |
303 | > | 303 | > |
... | @@ -323,7 +323,7 @@ | ... | @@ -323,7 +323,7 @@ |
323 | oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" | 323 | oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" |
324 | ></el-input> | 324 | ></el-input> |
325 | <el-select | 325 | <el-select |
326 | v-model="ruleForm.tdsyq.mjdw" | 326 | v-model="ruleForm.tdsyq.mjdw7" |
327 | :disabled="!ableOperation" | 327 | :disabled="!ableOperation" |
328 | style="width: 20%" | 328 | style="width: 20%" |
329 | > | 329 | > | ... | ... |
... | @@ -48,6 +48,7 @@ export default { | ... | @@ -48,6 +48,7 @@ export default { |
48 | }, | 48 | }, |
49 | 49 | ||
50 | clicksss(el){ | 50 | clicksss(el){ |
51 | console.log("elllllllllllllllllllll",el); | ||
51 | this.qllx=el | 52 | this.qllx=el |
52 | }, | 53 | }, |
53 | handleSubmit() { | 54 | handleSubmit() { |
... | @@ -57,7 +58,6 @@ export default { | ... | @@ -57,7 +58,6 @@ export default { |
57 | qllx:this.qllx, | 58 | qllx:this.qllx, |
58 | bsmQlxx:"" | 59 | bsmQlxx:"" |
59 | }; | 60 | }; |
60 | |||
61 | this.$parent.addRepairRecord(qllxobj) | 61 | this.$parent.addRepairRecord(qllxobj) |
62 | }else{ | 62 | }else{ |
63 | this.$message({ | 63 | this.$message({ | ... | ... |
... | @@ -151,6 +151,7 @@ export default { | ... | @@ -151,6 +151,7 @@ export default { |
151 | getStepFormInfo(this.oneSelectProps).then((res) => { | 151 | getStepFormInfo(this.oneSelectProps).then((res) => { |
152 | this.$nextTick(function () { | 152 | this.$nextTick(function () { |
153 | this.tabList = res.result; | 153 | this.tabList = res.result; |
154 | console.log("加载的右侧界面组件名称",this.tabList); | ||
154 | this.tabName = this.tabList[0].value; | 155 | this.tabName = this.tabList[0].value; |
155 | this.ableOperation = this.tabList[0].ableOperation; | 156 | this.ableOperation = this.tabList[0].ableOperation; |
156 | this.getFromRouter(this.tabName); | 157 | this.getFromRouter(this.tabName); |
... | @@ -176,6 +177,7 @@ export default { | ... | @@ -176,6 +177,7 @@ export default { |
176 | * @author: renchao | 177 | * @author: renchao |
177 | */ | 178 | */ |
178 | getCurrentSelectProps(val) { | 179 | getCurrentSelectProps(val) { |
180 | console.log("渲染右侧选项卡"); | ||
179 | this.bsmRepair = val.bsmRepair; | 181 | this.bsmRepair = val.bsmRepair; |
180 | if (val.bdcdyid) { | 182 | if (val.bdcdyid) { |
181 | this.oneSelectProps = val; | 183 | this.oneSelectProps = val; |
... | @@ -257,6 +259,7 @@ export default { | ... | @@ -257,6 +259,7 @@ export default { |
257 | * @author: renchao | 259 | * @author: renchao |
258 | */ | 260 | */ |
259 | addRepairRecord(row, del) { | 261 | addRepairRecord(row, del) { |
262 | console.log("row",row,del); | ||
260 | let from = { | 263 | let from = { |
261 | bsmQlxx: "", | 264 | bsmQlxx: "", |
262 | bsmSlsq: this.bsmSlsq, | 265 | bsmSlsq: this.bsmSlsq, | ... | ... |
... | @@ -142,7 +142,6 @@ export default { | ... | @@ -142,7 +142,6 @@ export default { |
142 | let that = this; | 142 | let that = this; |
143 | this.$nextTick(() => { | 143 | this.$nextTick(() => { |
144 | if (val.length == 0 || !val) { | 144 | if (val.length == 0 || !val) { |
145 | console.log("进了"); | ||
146 | that.tableDataList = _.cloneDeep([ | 145 | that.tableDataList = _.cloneDeep([ |
147 | { | 146 | { |
148 | yt: null, | 147 | yt: null, | ... | ... |
... | @@ -104,12 +104,40 @@ | ... | @@ -104,12 +104,40 @@ |
104 | </el-col> | 104 | </el-col> |
105 | <el-col :span="8"> | 105 | <el-col :span="8"> |
106 | <el-form-item label="建筑面积:"> | 106 | <el-form-item label="建筑面积:"> |
107 | <el-input disabled v-model="ruleForm.qlxx.mj"></el-input> | 107 | <div class="flex"> |
108 | <el-input disabled v-model="ruleForm.qlxx.mj" | ||
109 | oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input> | ||
110 | <el-select | ||
111 | disabled | ||
112 | v-model="mjdw" | ||
113 | style="width: 20%"> | ||
114 | <el-option | ||
115 | v-for="item in dictData['A7']" | ||
116 | :key="item.dcode" | ||
117 | :label="item.dname" | ||
118 | :value="item.dcode"> | ||
119 | </el-option> | ||
120 | </el-select> | ||
121 | </div> | ||
108 | </el-form-item> | 122 | </el-form-item> |
109 | </el-col> | 123 | </el-col> |
110 | <el-col :span="8"> | 124 | <el-col :span="8"> |
111 | <el-form-item label="专有建筑面积:"> | 125 | <el-form-item label="专有建筑面积:"> |
112 | <el-input disabled v-model="ruleForm.fdcq2.zyjzmj"></el-input> | 126 | <div class="flex"> |
127 | <el-input disabled v-model="ruleForm.fdcq2.zyjzmj" | ||
128 | oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input> | ||
129 | <el-select | ||
130 | disabled | ||
131 | v-model="mjdw" | ||
132 | style="width: 20%"> | ||
133 | <el-option | ||
134 | v-for="item in dictData['A7']" | ||
135 | :key="item.dcode" | ||
136 | :label="item.dname" | ||
137 | :value="item.dcode"> | ||
138 | </el-option> | ||
139 | </el-select> | ||
140 | </div> | ||
113 | </el-form-item> | 141 | </el-form-item> |
114 | </el-col> | 142 | </el-col> |
115 | </el-row> | 143 | </el-row> |
... | @@ -117,7 +145,21 @@ | ... | @@ -117,7 +145,21 @@ |
117 | 145 | ||
118 | <el-col :span="8"> | 146 | <el-col :span="8"> |
119 | <el-form-item label="分摊建筑面积:"> | 147 | <el-form-item label="分摊建筑面积:"> |
120 | <el-input disabled v-model="ruleForm.fdcq2.ftjzmj"></el-input> | 148 | <div class="flex"> |
149 | <el-input disabled v-model="ruleForm.fdcq2.ftjzmj" | ||
150 | oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input> | ||
151 | <el-select | ||
152 | disabled | ||
153 | v-model="mjdw" | ||
154 | style="width: 20%"> | ||
155 | <el-option | ||
156 | v-for="item in dictData['A7']" | ||
157 | :key="item.dcode" | ||
158 | :label="item.dname" | ||
159 | :value="item.dcode"> | ||
160 | </el-option> | ||
161 | </el-select> | ||
162 | </div> | ||
121 | </el-form-item> | 163 | </el-form-item> |
122 | </el-col> | 164 | </el-col> |
123 | </el-row> | 165 | </el-row> |
... | @@ -234,6 +276,7 @@ | ... | @@ -234,6 +276,7 @@ |
234 | }, | 276 | }, |
235 | data () { | 277 | data () { |
236 | return { | 278 | return { |
279 | mjdw:"1", | ||
237 | disabled: true, | 280 | disabled: true, |
238 | tdytOption: [], | 281 | tdytOption: [], |
239 | czrOptions: [], | 282 | czrOptions: [], | ... | ... |
... | @@ -124,17 +124,59 @@ | ... | @@ -124,17 +124,59 @@ |
124 | <el-row :gutter="10" v-if="ruleForm.qlxx"> | 124 | <el-row :gutter="10" v-if="ruleForm.qlxx"> |
125 | <el-col :span="8"> | 125 | <el-col :span="8"> |
126 | <el-form-item label="建筑面积:"> | 126 | <el-form-item label="建筑面积:"> |
127 | <el-input disabled v-model="ruleForm.qlxx.mj"></el-input> | 127 | <div class="flex"> |
128 | <el-input disabled v-model="ruleForm.qlxx.mj" | ||
129 | oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input> | ||
130 | <el-select | ||
131 | disabled | ||
132 | v-model="mjdw" | ||
133 | style="width: 20%"> | ||
134 | <el-option | ||
135 | v-for="item in dictData['A7']" | ||
136 | :key="item.dcode" | ||
137 | :label="item.dname" | ||
138 | :value="item.dcode"> | ||
139 | </el-option> | ||
140 | </el-select> | ||
141 | </div> | ||
128 | </el-form-item> | 142 | </el-form-item> |
129 | </el-col> | 143 | </el-col> |
130 | <el-col :span="8"> | 144 | <el-col :span="8"> |
131 | <el-form-item label="专有建筑面积:"> | 145 | <el-form-item label="专有建筑面积:"> |
132 | <el-input disabled v-model="ruleForm.fdcq2.zyjzmj"></el-input> | 146 | <div class="flex"> |
147 | <el-input disabled v-model="ruleForm.fdcq2.zyjzmj" | ||
148 | oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input> | ||
149 | <el-select | ||
150 | disabled | ||
151 | v-model="mjdw" | ||
152 | style="width: 20%"> | ||
153 | <el-option | ||
154 | v-for="item in dictData['A7']" | ||
155 | :key="item.dcode" | ||
156 | :label="item.dname" | ||
157 | :value="item.dcode"> | ||
158 | </el-option> | ||
159 | </el-select> | ||
160 | </div> | ||
133 | </el-form-item> | 161 | </el-form-item> |
134 | </el-col> | 162 | </el-col> |
135 | <el-col :span="8"> | 163 | <el-col :span="8"> |
136 | <el-form-item label="分摊建筑面积:"> | 164 | <el-form-item label="分摊建筑面积:"> |
137 | <el-input disabled v-model="ruleForm.fdcq2.ftjzmj"></el-input> | 165 | <div class="flex"> |
166 | <el-input disabled v-model="ruleForm.fdcq2.ftjzmj" | ||
167 | oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input> | ||
168 | <el-select | ||
169 | disabled | ||
170 | v-model="mjdw" | ||
171 | style="width: 20%"> | ||
172 | <el-option | ||
173 | v-for="item in dictData['A7']" | ||
174 | :key="item.dcode" | ||
175 | :label="item.dname" | ||
176 | :value="item.dcode"> | ||
177 | </el-option> | ||
178 | </el-select> | ||
179 | </div> | ||
138 | </el-form-item> | 180 | </el-form-item> |
139 | </el-col> | 181 | </el-col> |
140 | </el-row> | 182 | </el-row> |
... | @@ -234,6 +276,7 @@ | ... | @@ -234,6 +276,7 @@ |
234 | }, | 276 | }, |
235 | data () { | 277 | data () { |
236 | return { | 278 | return { |
279 | mjdw:"1", | ||
237 | //表单是否可操作 | 280 | //表单是否可操作 |
238 | ableOperation: true, | 281 | ableOperation: true, |
239 | disabled: true, | 282 | disabled: true, | ... | ... |
... | @@ -71,13 +71,13 @@ | ... | @@ -71,13 +71,13 @@ |
71 | </el-row> | 71 | </el-row> |
72 | <el-row :gutter="10"> | 72 | <el-row :gutter="10"> |
73 | <el-col :span="8"> | 73 | <el-col :span="8"> |
74 | <el-form-item label="宗地面积:"> | 74 | <el-form-item label="使用权面积:"> |
75 | <div class="flex"> | 75 | <div class="flex"> |
76 | <el-input v-model="ruleForm.zdjbxx.zdmj" | 76 | <el-input v-model="ruleForm.jsydsyq.syqmj" |
77 | oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input> | 77 | oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input> |
78 | <el-select | 78 | <el-select |
79 | v-model="ruleForm.fdcq2.mjdw" | 79 | disabled |
80 | :disabled="!ableOperation" | 80 | v-model="mjdw" |
81 | style="width: 20%"> | 81 | style="width: 20%"> |
82 | <el-option | 82 | <el-option |
83 | v-for="item in dictData['A7']" | 83 | v-for="item in dictData['A7']" |
... | @@ -249,6 +249,7 @@ | ... | @@ -249,6 +249,7 @@ |
249 | }, | 249 | }, |
250 | data () { | 250 | data () { |
251 | return { | 251 | return { |
252 | mjdw:"1", | ||
252 | //表单是否可操作 | 253 | //表单是否可操作 |
253 | ableOperation: true, | 254 | ableOperation: true, |
254 | key: 0, | 255 | key: 0, | ... | ... |
... | @@ -85,13 +85,6 @@ | ... | @@ -85,13 +85,6 @@ |
85 | <el-input disabled v-model="ruleForm.zdjbxx.qlsdfsmc"></el-input> | 85 | <el-input disabled v-model="ruleForm.zdjbxx.qlsdfsmc"></el-input> |
86 | </el-form-item> | 86 | </el-form-item> |
87 | </el-col> | 87 | </el-col> |
88 | <el-col :span="8"> | ||
89 | <el-form-item label="面积单位:"> | ||
90 | <el-input | ||
91 | v-model="ruleForm.tdsyq.mjdw" | ||
92 | :disabled="!ableOperation"></el-input> | ||
93 | </el-form-item> | ||
94 | </el-col> | ||
95 | </el-row> | 88 | </el-row> |
96 | <el-row :gutter="10"> | 89 | <el-row :gutter="10"> |
97 | <el-col :span="8"> | 90 | <el-col :span="8"> | ... | ... |
-
Please register or sign in to post a comment