Merge branch 'new_web' of http://39.108.172.131:3000/Shannon_mu/SmartCommunity into new_web

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

@@ -37,7 +37,7 @@
                 </template>
                 <template slot-scope="scope" slot="chargePrice">
                     <div v-if="!!scope.row.chargePrice">{{ scope.row.chargePrice }}</div>
-                    <template v-else>
+                    <!-- <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>
@@ -48,7 +48,7 @@
                                 <span v-else>{{ scope.row.chargePrice }}</span>
                             </div>
                         </div>
-                    </template>
+                    </template> -->
                 </template>
 
                 <template slot-scope="scope" slot="opt">

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

@@ -50,15 +50,24 @@
                 <el-input
                     class="input-number"
                     v-model="formData.lateFee"
-                    disabled
                     controls-position="right"
                     oninput="value=value.replace(/[^0-9.]/g,'')"
                 >
                     <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>
-                            <span class="button up" @click="lateAdd('+')"><i class="el-icon-arrow-up"></i></span>
+                            <span
+                                class="button down"
+                                @click="formData.lateFee <= 0 ? null : lateAdd('-')"
+                                :class="formData.lateFee <= 0 ? 'no-drop' : ''"
+                                ><i class="el-icon-arrow-down"></i
+                            ></span>
+                            <span
+                                class="button up"
+                                :class="formData.lateFee >= 100 ? 'no-drop' : ''"
+                                @click="formData.lateFee >= 100 ? null : lateAdd('+')"
+                                ><i class="el-icon-arrow-up"></i
+                            ></span>
                         </div>
                     </i>
                 </el-input>
@@ -148,14 +157,10 @@ export default {
                 this.formData.lateFee = 1;
             }
             let newx = Number(this.formData.lateFee);
-            if (newx >= 1) {
-                if (fu === '-') {
-                    if (newx <= 1) {
-                        this.formData.lateFee = 1;
-                    } else {
-                        this.formData.lateFee = newx - 1;
-                    }
-                } else if (fu === '+' && this.formData.lateFee < 10) {
+            if (newx >= 0) {
+                if (fu == '-') {
+                    this.formData.lateFee = newx - 1;
+                } else if (fu == '+') {
                     this.formData.lateFee = newx + 1;
                 }
             }
@@ -245,6 +250,10 @@ export default {
             line-height: 15px;
             .button {
                 cursor: pointer;
+                &.no-drop {
+                    cursor: no-drop;
+                    background: #dcdfe6;
+                }
             }
             .up {
                 position: absolute;

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

@@ -32,7 +32,7 @@
                     <span v-if="scope.row.chargeMode === 4">单价*用量</span>
                 </template>
                 <template slot-scope="scope" slot="chargePrice">
-                    <template v-if="scope.row.chargePriceLadder !== 'null' || scope.row.chargePriceLadder !== null">
+                    <!-- <template v-if="scope.row.chargePriceLadder !== 'null' || scope.row.chargePriceLadder !== null">
                         <div v-for="(item, index) in JSON.parse(scope.row.chargePriceLadder)" :key="index">
                             <div>
                                 <span v-if="item.ladder === 1">一 阶价格：{{ item.price }}</span>
@@ -43,8 +43,8 @@
                                 <span v-else>{{ scope.row.chargePrice }}</span>
                             </div>
                         </div>
-                    </template>
-                    <div v-else>{{ scope.row.chargePrice }}</div>
+                    </template> -->
+                    <div >{{ scope.row.chargePrice }}</div>
                 </template>
                 <template slot-scope="scope" slot="opt">
                     <div class="opt">

operationSupport/src/views/payService/statisticalReport/chargeStatistics.vue

@@ -16,7 +16,7 @@
                 :clearable="false"
             ></el-date-picker>
 
-            <el-button type="primary" class="search-btn" @click="mixins_search" icon="el-icon-search">查询 </el-button>
+            <el-button type="primary" class="search-btn" @click="initSearchAll" icon="el-icon-search">查询 </el-button>
             <div class="search-icon">
                 <el-tooltip class="item" effect="light" placement="bottom" content="导出">
                     <i class="zoniot_font zoniot-icon-daochu2" @click="exportExcel"></i>
@@ -96,7 +96,7 @@ export default {
         }).then(() => {
             this.initSearchData(thisDay);
             this.mixins_dataUrl = '/sc-charge/charge/report/page';
-            this.mixins_search();
+            this.initSearchAll();
         });
     },
     mounted() {},
@@ -130,18 +130,13 @@ export default {
                     }
                 ];
                 if (val.length) {
-                    let arr = [{ label: '总收费', val: val[0].totalAmount }];
                     val[0].details.map((item, index) => {
-                        arr.push({ label: this.typeName(item), val: item.amount });
                         this.cols.splice(5 + index, 0, {
                             label: this.typeName(item),
                             prop: 'type' + index,
                             slot: 'type' + index
                         });
                     });
-                    this.blockArr = arr;
-                } else {
-                    this.blockArr = [];
                 }
             }
         }
@@ -154,6 +149,10 @@ export default {
                 endTime: time
             };
         },
+        initSearchAll() {
+            this.mixins_search();
+            this.getTopTable();
+        },
         typeName(item) {
             let name = '';
             switch (item.chargeType) {
@@ -176,7 +175,7 @@ export default {
                     name = item.chargeName;
                     break;
             }
-            return name
+            return name;
         },
         exportExcel() {
             this.__exportExcel('/sc-charge/charge/report/export/excel', this.mixins_query);
@@ -188,7 +187,7 @@ export default {
             }
             this.mixins_query.startTime = arr[0];
             this.mixins_query.endTime = arr[1];
-            this.mixins_search();
+            this.initSearchAll();
         },
         getorgTree(resolve) {
             this.$http
@@ -202,11 +201,26 @@ export default {
 
                 .catch(function () {});
         },
+        getTopTable() {
+            this.$http.post('/sc-charge/charge/report/total', this.mixins_query).then(({ data, status, msg }) => {
+                if (status == 0) {
+                    if (!!data && data.details.length) {
+                        let arr = [{ label: '总收费', val: data.totalAmount }];
+                        data.details.map((item, index) => {
+                            arr.push({ label: this.typeName(item), val: item.amount });
+                        });
+                        this.blockArr = arr;
+                    } else {
+                        this.blockArr = [];
+                    }
+                }
+            });
+        },
         communityChange(e) {
             this.communityArr.find((item) => {
                 if (item.id == e) {
                     this.thisObjCommunit = item;
-                    this.mixins_search();
+                    this.initSearchAll();
                 }
             });
         },

operationSupport/src/views/payService/statisticalReport/waterChargeDetails.vue

@@ -166,7 +166,6 @@ export default {
             this.mixins_search();
         },
         getSun(type) {
-            debugger;
             this.$http
                 .post('/sc-charge/payment/record/sum/amount', {
                     accountType: 2,