收费管理 bug修复

operationSupport/src/views/assetManagement/housingManagement/saveEdits.vue

@@ -104,8 +104,8 @@
             </el-row>
         </el-form>
         <div style="text-align: right">
-            <el-button type="primary" @click="submitForm('ruleForm')">提交</el-button>
             <el-button @click="cancelSaving">取消</el-button>
+            <el-button type="primary" @click="submitForm('ruleForm')">保存</el-button>
         </div>
     </div>
 </template>
@@ -147,7 +147,7 @@ export default {
                 remarks: '' //备注
             },
             rules: {
-               communityId:[this.$valid.selectRequired('请选择社区')],
+                communityId: [this.$valid.selectRequired('请选择社区')],
                 roomNumber: [{ required: true, message: '请输入房屋号', trigger: 'change' }],
                 buildingId: [this.$valid.selectRequired('请选择楼栋')],
                 floorNumber: [this.$valid.selectRequired('请选择楼层')],

operationSupport/src/views/buildingManagement/pageJump/addoredit.vue

@@ -63,6 +63,9 @@
                 <div class="right_content_info">
                     <div class="head_fr">
                         <div class="head_content head_add">
+                            <div class="checkbox_style">
+                                <el-checkbox @change="checkedUnit" v-model="initialUnitList.checkedUnit"></el-checkbox>
+                            </div>
                             <div class="form_content">
                                 <zz-form
                                     :cols="unitCols"
@@ -358,6 +361,7 @@
                             </div>
                             <div class="btns footer_btn">
                                 <el-button @click="resetForm">重置</el-button>
+                                <el-button @click="close">取消</el-button>
                                 <el-button type="primary" @click="submit">确认</el-button>
                             </div>
                         </div>

operationSupport/src/views/buildingManagement/pageJump/popup.scss

@@ -313,8 +313,10 @@
 							display: flex;
 							height: initial;
 							flex-direction: row;
-							align-items: flex-end;
-							padding: 0 10px 4px 10px;
+							// align-items: flex-end;
+							align-items: flex-start;
+							// padding: 0 10px 4px 10px;
+							padding: 5px 10px 5px 15px;
 						}
 
 						.form_content {

operationSupport/src/views/communityManagement/pageJump/AddOrEdit.vue

@@ -225,29 +225,6 @@ export default {
                         .catch(() => {});
                 }
             });
-            // new Promise((resolve) => {
-            //     this.$refs.ruleForm.validate(resolve);
-            // })
-            //     .then(() => {
-
-            //         let url = '/sc-community/assets/community/add';
-            //         let params = this.ruleForm;
-            //         if (!this.isAdd) {
-            //             url = '/sc-community/assets/community/update';
-            //         }
-            //         this.$http
-            //             .post(url, params)
-            //             .then(({ status, msg }) => {
-            //                 if (status == 0) {
-            //                     this.$message.success(msg);
-            //                     this.close();
-            //                 } else {
-            //                     this.$message.error(msg);
-            //                 }
-            //             })
-            //             .catch(() => {});
-            //     })
-            //     .catch(() => {});
         },
 
         //所属地区

operationSupport/src/views/parkingLotAdministration/pageJump/parkingLotSaveEdits.vue

@@ -28,11 +28,11 @@
                             <el-input v-model="ruleForm.prefix"></el-input>
                         </el-form-item>
                         <el-form-item label="起始编号" v-if="codingStatus" prop="parkingBeginNumber">
-                            <el-input v-model="ruleForm.parkingBeginNumber"></el-input>
+                            <el-input v-model.trim="ruleForm.parkingBeginNumber" oninput="value=value.replace(/[^0-9.]/g,'')"></el-input>
                         </el-form-item>
 
                         <el-form-item label="车位编号" v-if="!codingStatus" prop="parkingNumber">
-                            <el-input v-model="ruleForm.parkingNumber"></el-input>
+                            <el-input v-model.trim="ruleForm.parkingNumber" oninput="value=value.replace(/[^0-9.]/g,'')"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
@@ -76,6 +76,13 @@
 export default {
     props: ['params'],
     data() {
+        var inputNumber = (rule, value, callback) => {
+            if (!Number.isInteger(value)) {
+                callback(new Error('请输入数字'));
+            } else {
+                callback();
+            }
+        };
         return {
             communityList: [], //社区名称下拉列表
             garageList: [], //车库名称下拉列表
@@ -92,6 +99,7 @@ export default {
                 parkingArea: '', //车位面积
                 remarks: '' //备注
             },
+
             rules: {
                 communityId: [
                     { required: true, message: '请输入社区名称', trigger: 'change' }
@@ -99,8 +107,14 @@ export default {
                 ],
                 garageId: [{ required: true, message: '请选择车库名称', trigger: 'change' }],
                 parkingType: [{ required: true, message: '请选择车位类别', trigger: 'change' }],
-                parkingBeginNumber: [{ required: true, message: '请填写起始编码', trigger: 'change' }],
-                parkingEndNumber: [{ required: true, message: '请填写结束编码', trigger: 'change' }],
+                parkingBeginNumber: [
+                    { required: true, message: '请填写起始编码', trigger: 'blur' }
+                    // { validator: inputNumber, trigger: 'blur' }
+                ],
+                parkingEndNumber: [
+                    { required: true, message: '请填写结束编码', trigger: 'blur' }
+                    // { validator: inputNumber, trigger: 'blur' }
+                ],
                 parkingNumber: [{ required: true, message: '请填写车位编号', trigger: 'change' }]
             },
             radio: '1'
@@ -125,6 +139,8 @@ export default {
                                 this.$message.success(msg);
                                 this.params.callback();
                                 this.$emit('close');
+                            } else {
+                                this.$message.error(msg);
                             }
                             loading.close();
                         })
@@ -184,7 +200,6 @@ export default {
             this.garageAreaList = [];
             let onOption = '';
             this.$http.post('/sc-community/assets/garage/area/list', { communityId: this.ruleForm.garageId }).then((res) => {
-                debugger;
                 res.data.map((res) => {
                     onOption = {
                         label: res.areaName,

operationSupport/src/views/parkingLotAdministration/pageJump/zoneAddEdit.vue

@@ -57,7 +57,7 @@ export default {
         garageNameList() {
             this.garageList = [];
             let onOption = '';
-            this.$http.post('/sc-community/assets/garage/list', { communityId: '' }).then((res) => {
+            this.$http.post('/sc-community/assets/garage/list', { communityId: sessionStorage.getItem('communityId') }).then((res) => {
                 res.data.map((res) => {
                     onOption = {
                         label: res.garageName,