修复style bug

operationSupport/src/components/common/Header.vue

@@ -158,7 +158,7 @@ export default {
         },
         editUserInfo() {
             new Promise((resolve) => {
-                this.$store.dispatch('openModal', {
+                this.$store.dispatch('addPopup', {
                     url: '/system/users/popups/edituser.vue',
                     width: '500px',
                     height: '500px',

operationSupport/src/views/assetManagement/shopManagement/details.vue

@@ -74,7 +74,7 @@ export default {
                         prop: 'unitName'
                     },
                     {
-                        lable: '房屋号',
+                        lable: '商铺号',
                         prop: 'roomNumber'
                     },
                     {
@@ -84,26 +84,26 @@ export default {
                     {
                         lable: '公摊面积',
                         prop: 'publicArea'
-                    },
-                    {
-                        lable: '装修性质',
-                        prop: 'decorateProperties',
-                        typeArray: [
-                            { type: 1, lable: '毛胚' },
-                            { type: 2, lable: '简单装修' },
-                            { type: 3, lable: '中等装修' },
-                            { type: 4, lable: '精装修' },
-                            { type: 5, lable: '豪华装修' }
-                        ]
-                    },
-                    {
-                        lable: '房屋编号',
-                        prop: 'assetNumber'
                     }
+                    // {
+                    //     lable: '装修性质',
+                    //     prop: 'decorateProperties',
+                    //     typeArray: [
+                    //         { type: 1, lable: '毛胚' },
+                    //         { type: 2, lable: '简单装修' },
+                    //         { type: 3, lable: '中等装修' },
+                    //         { type: 4, lable: '精装修' },
+                    //         { type: 5, lable: '豪华装修' }
+                    //     ]
+                    // },
+                    // {
+                    //     lable: '房屋编号',
+                    //     prop: 'assetNumber'
+                    // }
                 ],
                 right: [
                     {
-                        lable: '楼宇名称',
+                        lable: '楼栋名称',
                         prop: 'buildingName'
                     },
                     {
@@ -123,32 +123,32 @@ export default {
                         prop: 'useArea'
                     },
                     {
-                        lable: '房屋户型',
-                        prop: 'housingType',
-                        typeArray: [
-                            { type: 1, lable: '室' },
-                            { type: 2, lable: '厅' },
-                            { type: 3, lable: '卫' }
-                        ]
-                    },
-                    {
-                        lable: '房屋朝向',
-                        prop: 'orientationOfRoom',
-                        typeArray: [
-                            { type: 1, lable: '东' },
-                            { type: 2, lable: '南' },
-                            { type: 3, lable: '西' },
-                            { type: 4, lable: '北' },
-                            { type: 5, lable: '东南' },
-                            { type: 6, lable: '西南' },
-                            { type: 7, lable: '西北' },
-                            { type: 8, lable: '东北' }
-                        ]
-                    },
-                    {
-                        lable: '',
-                        prop: ''
+                        lable: '商铺编号',
+                        prop: 'assetNumber'
                     }
+                    // {
+                    //     lable: '房屋户型',
+                    //     prop: 'housingType',
+                    //     typeArray: [
+                    //         { type: 1, lable: '室' },
+                    //         { type: 2, lable: '厅' },
+                    //         { type: 3, lable: '卫' }
+                    //     ]
+                    // },
+                    // {
+                    //     lable: '房屋朝向',
+                    //     prop: 'orientationOfRoom',
+                    //     typeArray: [
+                    //         { type: 1, lable: '东' },
+                    //         { type: 2, lable: '南' },
+                    //         { type: 3, lable: '西' },
+                    //         { type: 4, lable: '北' },
+                    //         { type: 5, lable: '东南' },
+                    //         { type: 6, lable: '西南' },
+                    //         { type: 7, lable: '西北' },
+                    //         { type: 8, lable: '东北' }
+                    //     ]
+                    // },
                 ]
             },
             householdTable: {

operationSupport/src/views/assetManagement/shopManagement/index.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="content">
-        <building-tree @buildingInformation="buildingInformation" :buildingType="2" v-if="!showaddDialog"></building-tree>
-        <div class="content-right" v-if="!showaddDialog">
+        <building-tree @buildingInformation="buildingInformation" :buildingType="2"></building-tree>
+        <div class="content-right">
             <div class="search">
                 <el-input clearable placeholder="房屋号" class="search-input" v-trim v-model="mixins_query.roomNumber"></el-input>
                 <el-select v-model="mixins_query.useStatus" clearable placeholder="请选择社区名称">
@@ -71,7 +71,7 @@
                 </template>
             </zz-table>
         </div>
-        <save-edits v-else :params="activeData" @clerOwnerStatus="clerOwnerStatus" :isAdd="isAdd"></save-edits>
+        <!-- <save-edits v-else :params="activeData" @clerOwnerStatus="clerOwnerStatus" :isAdd="isAdd"></save-edits> -->
     </div>
 </template>
 
@@ -171,7 +171,7 @@ export default {
         },
         addCommand(command) {
             if (command === 'add') {
-                this.addOrEdit('todo');
+                this.addOrEdit('add');
             }
             if (command === 'template') {
                 this.__exportExcel('/sc-community/excel/download/template', { importType: 'HOUSE' });
@@ -184,12 +184,34 @@ export default {
             this.isAdd = true;
             this.mixins_search();
         },
-        addOrEdit(todo, row) {
-            if (todo == 'edit') {
-                this.activeData = row;
-                this.isAdd = false;
-            }
-            this.showaddDialog = todo;
+        addOrEdit(todo, data = {}) {
+            new Promise((resolve) => {
+                let title = '新增商铺';
+                if (todo !== 'add') {
+                    title = '修改商铺';
+                }
+                this.$store.dispatch('addPopup', {
+                    url: '/assetManagement/shopManagement/saveEdits.vue',
+                    width: '850px',
+                    height: '500px',
+                    props: {
+                        data,
+                        todo,
+                        productOptions: this.productOptions,
+                        callback: resolve
+                    },
+                    title: title
+                });
+            }).then(() => {
+                this.mixins_search();
+            });
+
+            // addPopup;
+            // if (todo == 'edit') {
+            //     this.activeData = row;
+            //     this.isAdd = false;
+            // }
+            // this.showaddDialog = todo;
         },
         deleteRow(row) {
             const { communityName, buildingName, unitName, roomNumber } = row;

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

@@ -1,6 +1,5 @@
 <template>
     <div class="main">
-        <div class="blockName">{{ !isAdd ? '编辑' : '新增' }}商铺（<span class="show-required-icon-star"></span>为必填项）</div>
         <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="130px">
             <div class="formContent">
                 <div class="formContent-item">
@@ -27,7 +26,7 @@
                     <el-form-item label="房屋号" prop="roomNumber">
                         <el-input v-model="ruleForm.roomNumber"></el-input>
                     </el-form-item>
-                    <el-form-item label="房屋编号" >
+                    <el-form-item label="房屋编号">
                         <el-input v-model="ruleForm.assetNumber"></el-input>
                     </el-form-item>
                     <el-form-item label="使用面积">
@@ -70,33 +69,31 @@
                 </div>
             </div>
             <el-row>
-                <el-col :span="24">
+                <el-col :span="12">
                     <el-form-item label="备注信息">
-                        <el-input type="textarea" :rows="4" v-model="ruleForm.remarks" maxlength="300"> </el-input>
-                        <span style="position: absolute; bottom: 0; right: 10px" v-if="ruleForm.remarks"
-                            >{{ ruleForm.remarks.length }}/300</span
+                        <el-input
+                            type="textarea"
+                            resize="none"
+                            :rows="3"
+                            v-model="ruleForm.remarks"
+                            maxlength="300"
+                            show-word-limit
+                            placeholder="请输入备注信息"
                         >
+                        </el-input>
                     </el-form-item>
                 </el-col>
             </el-row>
         </el-form>
-        <div style="text-align: right">
+        <!-- <div style="text-align: right">
             <el-button type="primary" @click="submitForm('ruleForm')">提交</el-button>
             <el-button @click="cancelSaving">取消</el-button>
-        </div>
+        </div> -->
     </div>
 </template>
 <script>
 export default {
-    props: {
-        params: {
-            type: Object
-        },
-        isAdd: {
-            type: Boolean,
-            default: true
-        }
-    },
+    props: ['params'],
     data() {
         return {
             buildingList: [], //楼栋下拉选择列表
@@ -108,7 +105,7 @@ export default {
                 unitName: '', //单元
                 floorNumber: '', //单元楼层
                 roomNumber: '', //房屋号
-                assetNumber:'',//编号
+                assetNumber: '', //编号
                 buildingType: 2, //房屋类型
                 useArea: '', //使用面积
                 buildingArea: '', //建筑面积
@@ -160,11 +157,11 @@ export default {
         }
     },
     methods: {
-        submitForm(formName) {
-            this.$refs[formName].validate((valid) => {
+        submit() {
+            this.$refs['ruleForm'].validate((valid) => {
                 if (valid) {
                     let url = '/sc-community/assets/house/add';
-                    if (!this.isAdd) {
+                    if (this.params.todo == 'edit') {
                         url = '/sc-community/assets/house/update';
                     }
                     this.$http
@@ -172,7 +169,8 @@ export default {
                         .then(({ status, msg }) => {
                             if (status == 0) {
                                 this.$message.success(msg);
-                                this.cancelSaving();
+                                this.params.callback();
+                                this.$emit('close');
                             } else {
                                 this.$message.error(msg);
                             }
@@ -181,12 +179,12 @@ export default {
                 }
             });
         },
-        cancelSaving() {
-            this.$emit('clerOwnerStatus');
-        },
-        resetForm(formName) {
-            this.$refs[formName].resetFields();
-        },
+        // cancelSaving() {
+        //     this.$emit('clerOwnerStatus');
+        // },
+        // resetForm(formName) {
+        //     this.$refs[formName].resetFields();
+        // },
 
         //查询楼栋下拉列表
         buildingNameList() {
@@ -228,8 +226,8 @@ export default {
         }
     },
     created() {
-        if (!!this.params.id) {
-            this.getDetails(this.params.id);
+        if (!!this.params.data.id) {
+            this.getDetails(this.params.data.id);
         }
     }
 };

operationSupport/src/views/deviceManagement/popups/addDeviceManagement.vue

@@ -2,7 +2,7 @@
     <div class="alert-body__main_content">
         <zz-form :cols="formCols" :data="formData" :rules="formRules" :errors="formErrors" labelWidth="120" ref="form">
             <template slot="communityId">
-                <el-select v-model="formData.communityId" @change="productChange($event)">
+                <el-select v-model="formData.communityId">
                     <el-option v-for="(item, index) in communityArr" :key="index" :label="item.communityName" :value="item.id"></el-option>
                 </el-select>
             </template>
@@ -84,17 +84,19 @@ export default {
             }
         };
     },
+    watch: {
+        'formData.communityId'(val, old) {
+            if (val) {
+                this.getTenantsTree(val);
+            }
+        }
+    },
     computed: {
         communityArr() {
             return this.$store.getters['getAreaSelect'];
         }
     },
     methods: {
-        productChange(va) {
-            if (this.formData.communityId) {
-                this.getTenantsTree(va);
-            }
-        },
         getTenantsTree(va) {
             this.$http.get('/sc-community/assets/tree/community/find').then(({ status, data, msg }) => {
                 if (status === 0 && data) {
@@ -115,7 +117,7 @@ export default {
             new Promise((resolve) => {
                 this.$store.dispatch('addPopup', {
                     url: '/deviceManagement/popups/poptreeSelect.vue',
-                     width: '300px',
+                    width: '300px',
                     height: '400px',
                     props: {
                         tenantsTree: this.addressTree,

operationSupport/src/views/deviceManagement/popups/addFacilities.vue

@@ -12,7 +12,7 @@
                 </el-input>
             </template>
             <template slot="communityId">
-                <el-select v-model="formData.communityId" @change="productChange($event)">
+                <el-select v-model="formData.communityId" >
                     <el-option v-for="(item, index) in communityArr" :key="index" :label="item.communityName" :value="item.id"></el-option>
                 </el-select>
             </template>
@@ -79,12 +79,14 @@ export default {
             return this.$store.getters['getAreaSelect'];
         }
     },
-    methods: {
-        productChange(va) {
-            if (this.formData.communityId) {
-                this.getTenantsTree(va);
+    watch: {
+        'formData.communityId'(val, old) {
+            if (val) {
+                this.getTenantsTree(val);
             }
-        },
+        }
+    },
+    methods: {
         getTenantsTree(va) {
             this.$http.get('/sc-community/assets/tree/community/find').then(({ status, data, msg }) => {
                 if (status === 0 && data) {

operationSupport/src/views/parkingLotAdministration/garageList.vue

@@ -129,7 +129,7 @@ export default {
             });
         },
         addEditPopUps(title, row, todo) {
-            this.$store.dispatch('openModal', {
+            this.$store.dispatch('addPopup', {
                 url: '/parkingLotAdministration/pageJump/garageSaveEdits.vue',
                 title: title,
                 width: '500px',

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

@@ -58,24 +58,19 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
-                <el-row>
-                    <el-col :span="24">
-                        <el-form-item label="备注信息">
-                            <el-input
-                                type="textarea"
-                                :rows="4"
-                                v-model="ruleForm.remarks"
-                                maxlength="300"
-                                show-word-limit
-                                placeholder="请输入备注信息"
-                            >
-                            </el-input>
-                            <span style="position: absolute; bottom: 0; right: 10px" v-if="ruleForm.remarks"
-                                >{{ ruleForm.remarks.length }}/300</span
-                            >
-                        </el-form-item>
-                    </el-col>
-                </el-row>
+                <el-col :span="12">
+                    <el-form-item label="备注信息">
+                        <el-input
+                            type="textarea"
+                            :rows="3"
+                            v-model="ruleForm.remarks"
+                            maxlength="300"
+                            show-word-limit
+                            placeholder="请输入备注信息"
+                        >
+                        </el-input>
+                    </el-form-item>
+                </el-col>
             </el-form>
         </div>
     </div>

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

@@ -98,7 +98,7 @@ export default {
         },
 
         addEditPopUps(title, row, todo) {
-            this.$store.dispatch('openModal', {
+            this.$store.dispatch('addPopup', {
                 url: '/parkingLotAdministration/pageJump/zoneAddEdit.vue',
                 title: title,
                 width: '850px',

operationSupport/src/views/parkingLotAdministration/parkingSpaceList.vue

@@ -152,11 +152,11 @@ export default {
             });
         },
         addEditPopUps(title, row, todo) {
-            this.$store.dispatch('openModal', {
+            this.$store.dispatch('addPopup', {
                 url: '/parkingLotAdministration/pageJump/parkingLotSaveEdits.vue',
                 title: title,
                 width: '850px',
-                height: '600px',
+                height: '470px',
                 props: {
                     data: row,
                     todo: todo,

operationSupport/src/views/payService/billingRules/index.vue

@@ -9,8 +9,8 @@
                 <el-option label="物业费" :value="1"></el-option>
                 <el-option label="水费" :value="2"></el-option>
                 <el-option label="电费" :value="3"></el-option>
-                <el-option label="车位费" :value="4"></el-option>
-                <el-option label="二次供水费" :value="5"></el-option>
+                <!-- <el-option label="车位费" :value="4"></el-option>
+                <el-option label="二次供水费" :value="5"></el-option> -->
             </el-select>
             <el-button type="primary" class="search-btn" @click="mixins_search" icon="el-icon-search">查询 </el-button>
             <div class="search-icon">
@@ -32,7 +32,8 @@
                     <span v-if="scope.row.chargeMode === 3">阶梯计费 </span>
                 </template>
                 <template slot-scope="scope" slot="chargePrice">
-                    <template v-if="scope.row.chargePriceLadder !== 'null'">
+                    <div v-if="!!scope.row.chargePrice">{{ scope.row.chargePrice }}</div>
+                    <template v-else>
                         <div v-for="(item, index) in JSON.parse(scope.row.chargePriceLadder)" :key="index">
                             <div>
                                 <span v-if="item.ladder === 1">一 阶价格：{{ item.price }}</span>
@@ -44,7 +45,6 @@
                             </div>
                         </div>
                     </template>
-                    <div v-else>{{ scope.row.chargePrice }}</div>
                 </template>
 
                 <template slot-scope="scope" slot="opt">

operationSupport/src/views/payService/billingRules/stepPage/add.vue

@@ -54,7 +54,7 @@
                     :min="0"
                     :max="100"
                 >
-                    <i slot="suffix" style="font-style: normal; margin-right: 60px"
+                    <i slot="suffix" style="font-style: normal; margin-right: 70px"
                         >‰
                         <div class="input-button">
                             <span class="button down" @click="lateAdd('-')"><i class="el-icon-arrow-down"></i></span>
@@ -108,8 +108,9 @@ export default {
                 chargeName: '',
                 chargeMode: '',
                 chargePrice: '',
-                chargeCycle: '',
+                chargeCycle: 1,
                 chargeCycleUnit: 1,
+                generationRules: '',
                 lateFee: 0.0,
                 remark: '',
                 ladderList: [
@@ -405,6 +406,9 @@ export default {
     }
     .input-number {
         width: 110px;
+        /deep/ .el-input--suffix .el-input__inner {
+            padding-right: 50px;
+        }
         .input-button {
             line-height: 15px;
             .up {

operationSupport/src/views/payService/chargeSetting/index.vue

@@ -112,12 +112,12 @@ export default {
                 },
                 {
                     label: '计费周期',
-                    prop: 'chargeCycleUnit'
+                    prop: 'chargeCycle'
                 },
 
                 {
                     label: '首次生效时间',
-                    prop: 'createDate'
+                    prop: 'firstEffectiveDate'
                 },
                 {
                     label: '操作',

operationSupport/src/views/payService/chargeSetting/stepPage/add.vue

@@ -69,9 +69,8 @@ export default {
                 });
         },
         getList() {
-            this.$http.get('/sc-charge/scChargeStrategy/page', { pageNum: 1, pageSize: 15 }).then(({ data, status, msg }) => {
-                this.list = data.list;
-                console.log(data);
+            this.$http.get('/sc-charge/scChargeStrategy/list').then(({ data, status, msg }) => {
+                this.list = data;
             });
         }
     },
@@ -108,7 +107,7 @@ export default {
         }
     }
 }
-.title{
+.title {
     font-size: 12px;
 }
 </style>

operationSupport/src/views/payService/electricManagement/index.vue

@@ -12,7 +12,7 @@
                 <el-option v-for="(item, index) in communityArr" :key="index" :label="item.communityName" :value="item.id"></el-option>
             </el-select>
             电费余额
-            <el-select class="width65" v-model="mixins_query.symbol" clearable>
+            <el-select class="width90" v-model="mixins_query.symbol" clearable>
                 <el-option label="=" :value="1"></el-option>
                 <el-option label=">" :value="2"></el-option>
                 <el-option label=">=" :value="3"></el-option>
@@ -156,7 +156,7 @@ export default {
     font-size: 12px;
     color: #424656;
 }
-.width65 {
-    width: 65px;
+.width90 {
+    width: 90px;
 }
 </style>

operationSupport/src/views/payService/waterManagement/index.vue

@@ -12,7 +12,7 @@
                 <el-option v-for="(item, index) in communityArr" :key="index" :label="item.communityName" :value="item.id"></el-option>
             </el-select>
             水费余额
-            <el-select class="width65" v-model="mixins_query.symbol" clearable>
+            <el-select class="width90" v-model="mixins_query.symbol" clearable>
                 <el-option label="=" :value="1"></el-option>
                 <el-option label=">" :value="2"></el-option>
                 <el-option label=">=" :value="3"></el-option>
@@ -156,7 +156,7 @@ export default {
     font-size: 12px;
     color: #424656;
 }
-.width65 {
-    width: 65px;
+.width90 {
+    width: 90px;
 }
 </style>

operationSupport/src/views/system/users/userGroup.vue

@@ -86,7 +86,7 @@ export default {
                     row = datarow;
                     title = '修改用户组';
                 }
-                this.$store.dispatch('openModal', {
+                this.$store.dispatch('addPopup', {
                     url: '/system/users/popups/AddUserGroup.vue',
                     width: '500px',
                     height: '400px',
@@ -168,7 +168,7 @@ export default {
             new Promise((resolve) => {
                 let row = rowitem,
                     title = '用户列表';
-                this.$store.dispatch('openModal', {
+                this.$store.dispatch('addPopup', {
                     url: '/system/users/popups/UserListTransfer.vue',
                     width: '700px',
                     height: '500px',

operationSupport/src/views/system/users/userInfo.vue

@@ -222,7 +222,7 @@ export default {
                 }
             }).then(() => {
                 new Promise((resolve) => {
-                    this.$store.dispatch('openModal', {
+                    this.$store.dispatch('addPopup', {
                         url: '/system/users/popups/AddOrEditUserInfo.vue',
                         width: '500px',
                         height: '700px',