Commit 7caa1e00f8309fcabd26cdfe565d5a65e3ec8639

Authored by wuxw
1 parent 10d41618

v1.9 优化添加单元乱码问题

src/components/room/addUnit.vue
1 <template> 1 <template>
2 <el-dialog :title="$t('addUnit.title')" :visible.sync="visible" width="50%" :before-close="handleClose"> 2 <el-dialog :title="$t('addUnit.title')" :visible.sync="visible" width="50%" :before-close="handleClose">
3 - <el-form ref="form" :model="addUnitInfo" label-width="120px">  
4 - <el-form-item :label="$t('addUnit.unitNum')" prop="unitNum" required> 3 + <el-form ref="form" :model="addUnitInfo" :rules="rules" label-width="120px">
  4 + <el-form-item :label="$t('addUnit.unitNum')" prop="unitNum">
5 <el-input v-model="addUnitInfo.unitNum" :placeholder="$t('addUnit.unitNumPlaceholder')"></el-input> 5 <el-input v-model="addUnitInfo.unitNum" :placeholder="$t('addUnit.unitNumPlaceholder')"></el-input>
6 </el-form-item> 6 </el-form-item>
7 7
8 - <el-form-item :label="$t('addUnit.layerCount')" prop="layerCount" required> 8 + <el-form-item :label="$t('addUnit.layerCount')" prop="layerCount">
9 <el-input v-model.number="addUnitInfo.layerCount" type="number" 9 <el-input v-model.number="addUnitInfo.layerCount" type="number"
10 :placeholder="$t('addUnit.layerCountPlaceholder')"></el-input> 10 :placeholder="$t('addUnit.layerCountPlaceholder')"></el-input>
11 </el-form-item> 11 </el-form-item>
12 12
13 - <el-form-item :label="$t('addUnit.unitArea')" prop="unitArea" required> 13 + <el-form-item :label="$t('addUnit.unitArea')" prop="unitArea">
14 <el-input v-model="addUnitInfo.unitArea" :placeholder="$t('addUnit.unitAreaPlaceholder')"></el-input> 14 <el-input v-model="addUnitInfo.unitArea" :placeholder="$t('addUnit.unitAreaPlaceholder')"></el-input>
15 </el-form-item> 15 </el-form-item>
16 16
17 - <el-form-item :label="$t('addUnit.lift')" prop="lift" required> 17 + <el-form-item :label="$t('addUnit.lift')" prop="lift">
18 <el-select v-model="addUnitInfo.lift" :placeholder="$t('addUnit.liftPlaceholder')" style="width: 100%"> 18 <el-select v-model="addUnitInfo.lift" :placeholder="$t('addUnit.liftPlaceholder')" style="width: 100%">
19 <el-option :label="$t('addUnit.liftOption1')" value="1010"></el-option> 19 <el-option :label="$t('addUnit.liftOption1')" value="1010"></el-option>
20 <el-option :label="$t('addUnit.liftOption2')" value="2020"></el-option> 20 <el-option :label="$t('addUnit.liftOption2')" value="2020"></el-option>
@@ -50,6 +50,20 @@ export default { @@ -50,6 +50,20 @@ export default {
50 remark: '', 50 remark: '',
51 communityId: '', 51 communityId: '',
52 unitArea: '' 52 unitArea: ''
  53 + },
  54 + rules: {
  55 + unitNum: [
  56 + { required: true, message: this.$t('addUnit.unitNumRequired'), trigger: 'blur' }
  57 + ],
  58 + layerCount: [
  59 + { required: true, message: this.$t('addUnit.layerCountRequired'), trigger: 'blur' }
  60 + ],
  61 + unitArea: [
  62 + { required: true, message: this.$t('addUnit.unitAreaRequired'), trigger: 'blur' }
  63 + ],
  64 + lift: [
  65 + { required: true, message: this.$t('addUnit.liftRequired'), trigger: 'change' }
  66 + ]
53 } 67 }
54 } 68 }
55 }, 69 },
src/components/room/editUnit.vue
@@ -5,15 +5,15 @@ @@ -5,15 +5,15 @@
5 width="50%" 5 width="50%"
6 :before-close="handleClose" 6 :before-close="handleClose"
7 > 7 >
8 - <el-form ref="form" :model="editUnitInfo" label-width="120px">  
9 - <el-form-item :label="$t('editUnit.unitNum')" prop="unitNum" required> 8 + <el-form ref="form" :model="editUnitInfo" :rules="rules" label-width="120px">
  9 + <el-form-item :label="$t('editUnit.unitNum')" prop="unitNum">
10 <el-input 10 <el-input
11 v-model="editUnitInfo.unitNum" 11 v-model="editUnitInfo.unitNum"
12 :placeholder="$t('editUnit.unitNumPlaceholder')" 12 :placeholder="$t('editUnit.unitNumPlaceholder')"
13 ></el-input> 13 ></el-input>
14 </el-form-item> 14 </el-form-item>
15 15
16 - <el-form-item :label="$t('editUnit.layerCount')" prop="layerCount" required> 16 + <el-form-item :label="$t('editUnit.layerCount')" prop="layerCount">
17 <el-input 17 <el-input
18 v-model.number="editUnitInfo.layerCount" 18 v-model.number="editUnitInfo.layerCount"
19 type="number" 19 type="number"
@@ -21,14 +21,14 @@ @@ -21,14 +21,14 @@
21 ></el-input> 21 ></el-input>
22 </el-form-item> 22 </el-form-item>
23 23
24 - <el-form-item :label="$t('editUnit.unitArea')" prop="unitArea" required> 24 + <el-form-item :label="$t('editUnit.unitArea')" prop="unitArea">
25 <el-input 25 <el-input
26 v-model="editUnitInfo.unitArea" 26 v-model="editUnitInfo.unitArea"
27 :placeholder="$t('editUnit.unitAreaPlaceholder')" 27 :placeholder="$t('editUnit.unitAreaPlaceholder')"
28 ></el-input> 28 ></el-input>
29 </el-form-item> 29 </el-form-item>
30 30
31 - <el-form-item :label="$t('editUnit.lift')" prop="lift" required> 31 + <el-form-item :label="$t('editUnit.lift')" prop="lift">
32 <el-select 32 <el-select
33 v-model="editUnitInfo.lift" 33 v-model="editUnitInfo.lift"
34 :placeholder="$t('editUnit.liftPlaceholder')" 34 :placeholder="$t('editUnit.liftPlaceholder')"
@@ -79,6 +79,20 @@ export default { @@ -79,6 +79,20 @@ export default {
79 remark: '', 79 remark: '',
80 communityId: '', 80 communityId: '',
81 unitArea: '' 81 unitArea: ''
  82 + },
  83 + rules: {
  84 + unitNum: [
  85 + { required: true, message: this.$t('editUnit.unitNumRequired'), trigger: 'blur' }
  86 + ],
  87 + layerCount: [
  88 + { required: true, message: this.$t('editUnit.layerCountRequired'), trigger: 'blur' }
  89 + ],
  90 + unitArea: [
  91 + { required: true, message: this.$t('editUnit.unitAreaRequired'), trigger: 'blur' }
  92 + ],
  93 + lift: [
  94 + { required: true, message: this.$t('editUnit.liftRequired'), trigger: 'change' }
  95 + ]
82 } 96 }
83 } 97 }
84 }, 98 },
src/views/room/roomLang.js
@@ -316,12 +316,16 @@ export const messages = { @@ -316,12 +316,16 @@ export const messages = {
316 title: 'Add Unit', 316 title: 'Add Unit',
317 unitNum: 'Unit Number', 317 unitNum: 'Unit Number',
318 unitNumPlaceholder: 'Required, please enter unit number', 318 unitNumPlaceholder: 'Required, please enter unit number',
  319 + unitNumRequired: 'Unit number is required',
319 layerCount: 'Total Floors', 320 layerCount: 'Total Floors',
320 layerCountPlaceholder: 'Required, please enter total floors', 321 layerCountPlaceholder: 'Required, please enter total floors',
  322 + layerCountRequired: 'Total floors is required',
321 unitArea: 'Building Area', 323 unitArea: 'Building Area',
322 unitAreaPlaceholder: 'Required, please enter building area', 324 unitAreaPlaceholder: 'Required, please enter building area',
  325 + unitAreaRequired: 'Building area is required',
323 lift: 'Elevator', 326 lift: 'Elevator',
324 liftPlaceholder: 'Required, please select elevator availability', 327 liftPlaceholder: 'Required, please select elevator availability',
  328 + liftRequired: 'Elevator availability is required',
325 liftOption1: 'Yes', 329 liftOption1: 'Yes',
326 liftOption2: 'No', 330 liftOption2: 'No',
327 remark: 'Remark', 331 remark: 'Remark',
@@ -336,12 +340,16 @@ export const messages = { @@ -336,12 +340,16 @@ export const messages = {
336 title: 'Edit Unit', 340 title: 'Edit Unit',
337 unitNum: 'Unit Number', 341 unitNum: 'Unit Number',
338 unitNumPlaceholder: 'Required, please enter unit number', 342 unitNumPlaceholder: 'Required, please enter unit number',
  343 + unitNumRequired: 'Unit number is required',
339 layerCount: 'Total Floors', 344 layerCount: 'Total Floors',
340 layerCountPlaceholder: 'Required, please enter total floors', 345 layerCountPlaceholder: 'Required, please enter total floors',
  346 + layerCountRequired: 'Total floors is required',
341 unitArea: 'Building Area', 347 unitArea: 'Building Area',
342 unitAreaPlaceholder: 'Required, please enter building area', 348 unitAreaPlaceholder: 'Required, please enter building area',
  349 + unitAreaRequired: 'Building area is required',
343 lift: 'Elevator', 350 lift: 'Elevator',
344 liftPlaceholder: 'Required, please select elevator availability', 351 liftPlaceholder: 'Required, please select elevator availability',
  352 + liftRequired: 'Elevator availability is required',
345 liftOption1: 'Yes', 353 liftOption1: 'Yes',
346 liftOption2: 'No', 354 liftOption2: 'No',
347 remark: 'Remark', 355 remark: 'Remark',
@@ -697,12 +705,16 @@ export const messages = { @@ -697,12 +705,16 @@ export const messages = {
697 title: '添加单元', 705 title: '添加单元',
698 unitNum: '单元编号', 706 unitNum: '单元编号',
699 unitNumPlaceholder: '必填,请填写单元编号', 707 unitNumPlaceholder: '必填,请填写单元编号',
  708 + unitNumRequired: '请填写单元编号',
700 layerCount: '总层数', 709 layerCount: '总层数',
701 layerCountPlaceholder: '必填,请填写单元总层数', 710 layerCountPlaceholder: '必填,请填写单元总层数',
  711 + layerCountRequired: '请填写单元总层数',
702 unitArea: '建筑面积', 712 unitArea: '建筑面积',
703 unitAreaPlaceholder: '必填,请填写建筑面积', 713 unitAreaPlaceholder: '必填,请填写建筑面积',
  714 + unitAreaRequired: '请填写建筑面积',
704 lift: '电梯', 715 lift: '电梯',
705 liftPlaceholder: '必填,请选择是否有电梯', 716 liftPlaceholder: '必填,请选择是否有电梯',
  717 + liftRequired: '请选择是否有电梯',
706 liftOption1: '有', 718 liftOption1: '有',
707 liftOption2: '无', 719 liftOption2: '无',
708 remark: '备注', 720 remark: '备注',
@@ -717,12 +729,16 @@ export const messages = { @@ -717,12 +729,16 @@ export const messages = {
717 title: '修改单元', 729 title: '修改单元',
718 unitNum: '单元编号', 730 unitNum: '单元编号',
719 unitNumPlaceholder: '必填,请填写单元编号', 731 unitNumPlaceholder: '必填,请填写单元编号',
  732 + unitNumRequired: '请填写单元编号',
720 layerCount: '总层数', 733 layerCount: '总层数',
721 layerCountPlaceholder: '必填,请填写单元总层数', 734 layerCountPlaceholder: '必填,请填写单元总层数',
  735 + layerCountRequired: '请填写单元总层数',
722 unitArea: '建筑面积', 736 unitArea: '建筑面积',
723 unitAreaPlaceholder: '必填,请填写建筑面积', 737 unitAreaPlaceholder: '必填,请填写建筑面积',
  738 + unitAreaRequired: '请填写建筑面积',
724 lift: '电梯', 739 lift: '电梯',
725 liftPlaceholder: '必填,请选择是否有电梯', 740 liftPlaceholder: '必填,请选择是否有电梯',
  741 + liftRequired: '请选择是否有电梯',
726 liftOption1: '有', 742 liftOption1: '有',
727 liftOption2: '无', 743 liftOption2: '无',
728 remark: '备注', 744 remark: '备注',