manage-client 3.2.96 → 3.2.97-1

package/src/components/sale/businessquery/MoveMeterQuery.vue

@@ -211,7 +211,7 @@
               orderFields: {
                 f_operate_date: 'no'
               },
-                model: new PagedList('rs/sql/movemeterQuery', 20, {orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}),
+                model: new PagedList('rs/sql/movemeterQuery', 20, {orderitem: this.orderitem?`${this.orderitem}`: " 'f_operate_date desc ' "}),
                 criteriaShow: false,
                 // headData: ["客户编号", "客户名称", "操作人", "操作日期", "启用状态", "停用原因", "其他停用原因", "同步状态"],
                 // bodyData: ["f_userinfo_id", "f_user_name", "f_operator", "f_operate_date", "f_state", "f_comments", "f_othereason", "f_sendsuccess"],

package/src/components/sale/businessquery/PrivilegeQuery.vue

@@ -191,7 +191,7 @@
         data: {},
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/privilegeQuery', 20,{startDate: 'this.model.startDate', endDate: 'this.model.endDate',orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"},{
+        model: new PagedList('rs/sql/privilegeQuery', 20,{startDate: 'this.model.startDate', endDate: 'this.model.endDate',orderitem: this.orderitem?`${this.orderitem}`: " 'f_operate_date desc '"},{
           f_privilege_gas:0,
           f_privilege_money:0
         }),

package/src/components/webmeter/WebmeterQuery.vue

@@ -1,61 +1,61 @@
-<template>
-  <tab-button class="foot_tabset" :active="-1">
-    <tabs header="指令查询" v-if="permission('指令查询')">
-      <instruct-manage v-if="show.includes('指令查询')"></instruct-manage>
-    </tabs>
-    <tabs header="上报查询" v-if="permission('上报查询')">
-      <report-list v-if="show.includes('上报查询')"></report-list>
-    </tabs>
-    <tabs header="结算查询" v-if="permission('结算查询')">
-      <report-data-query v-if="show.includes('结算查询')"></report-data-query>
-    </tabs>
-    <tabs header="缴费查询" v-if="permission('缴费查询')">
-      <recharge-instruct-query v-if="show.includes('缴费查询')"></recharge-instruct-query>
-    </tabs>
-    <tabs header="异常查询" v-if="permission('异常查询')">
-      <meter-exception-list v-if="show.includes('异常查询')"></meter-exception-list>
-    </tabs>
-    <tabs header="用户失联" v-if="permission('用户失联')">
-      <user-lost-contact-analysis v-if="show.includes('用户失联')"></user-lost-contact-analysis>
-    </tabs>
-    <tabs header="失联查询" v-if="permission('失联查询')">
-      <lost-contact-analysis-list v-if="show.includes('失联查询')"></lost-contact-analysis-list>
-    </tabs>
-    <tabs header="用气查询" v-if="permission('用气查询')">
-      <use-gas-statistics v-if="show.includes('用气查询')"></use-gas-statistics>
-    </tabs>
-    <tabs header="未用气查询" v-if="permission('未用气查询')">
-      <get-no-meteread-query v-if="show.includes('未用气查询')"></get-no-meteread-query>
-    </tabs>
-  </tab-button>
-
-</template>
-
-<script>
-  import TabButton from '../sale/common/TabButton'
-  import Tabs from '../sale/common/Tabs'
-
-  export default {
-    title: '物联查询',
-    data () {
-      return {
-        show: []
-      }
-    },
-    components: {Tabs, TabButton},
-    methods: {
-      permission (name) {
-        // 保留是为了后面可能也会和综合查询一样加权限
-        if (this.$login.r.find(value => value === '物联查询')) {
-          if (!this.$login.r.find(value => value === name)) {
-            return false
-          }
-        }
-        return true
-      }
-    }
-  }
-</script>
-
-<style scoped>
-</style>
+<template>
+  <tab-button class="foot_tabset" :active="-1">
+    <tabs header="指令查询" v-if="permission('指令查询')">
+      <instruct-manage v-if="show.includes('指令查询')"></instruct-manage>
+    </tabs>
+    <tabs header="上报查询" v-if="permission('上报查询')">
+      <report-list v-if="show.includes('上报查询')"></report-list>
+    </tabs>
+    <tabs header="结算查询" v-if="permission('结算查询')">
+      <report-data-query v-if="show.includes('结算查询')"></report-data-query>
+    </tabs>
+    <tabs header="缴费查询" v-if="permission('缴费查询')">
+      <recharge-instruct-query v-if="show.includes('缴费查询')"></recharge-instruct-query>
+    </tabs>
+    <tabs header="异常查询" v-if="permission('异常查询')">
+      <meter-exception-list v-if="show.includes('异常查询')"></meter-exception-list>
+    </tabs>
+    <tabs header="用户失联" v-if="permission('用户失联')">
+      <user-lost-contact-analysis v-if="show.includes('用户失联')"></user-lost-contact-analysis>
+    </tabs>
+    <tabs header="失联查询" v-if="permission('失联查询')">
+      <lost-contact-analysis-list v-if="show.includes('失联查询')"></lost-contact-analysis-list>
+    </tabs>
+    <tabs header="用气查询" v-if="permission('用气查询')">
+      <use-gas-statistics v-if="show.includes('用气查询')"></use-gas-statistics>
+    </tabs>
+    <tabs header="未用气查询" v-if="permission('未用气查询')">
+      <get-no-meteread-query v-if="show.includes('未用气查询')"></get-no-meteread-query>
+    </tabs>
+  </tab-button>
+
+</template>
+
+<script>
+  import TabButton from '../sale/common/TabButton'
+  import Tabs from '../sale/common/Tabs'
+
+  export default {
+    title: '物联查询',
+    data () {
+      return {
+        show: []
+      }
+    },
+    components: {Tabs, TabButton},
+    methods: {
+      permission (name) {
+        // 保留是为了后面可能也会和综合查询一样加权限
+        if (this.$login.r.find(value => value === '物联查询')) {
+          if (!this.$login.r.find(value => value === name)) {
+            return false
+          }
+        }
+        return true
+      }
+    }
+  }
+</script>
+
+<style scoped>
+</style>

package/src/components/webmeter/gasStatistics/GasStatistics.vue

@@ -166,6 +166,10 @@
                 <th><nobr>表描述</nobr></th>
                 <th><nobr>气价名称</nobr></th>
 
+                <th><nobr>一阶气价</nobr></th>
+                <th><nobr>二阶气价</nobr></th>
+                <th><nobr>三阶气价</nobr></th>
+
                 <th><nobr>用气性质</nobr></th>
                 <th><nobr>期初余额</nobr></th>
                 <th><nobr>起方</nobr></th>
@@ -193,6 +197,11 @@
                 <th style="text-align:center"><nobr>{{row.f_meter_classify}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_meter_title}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_price_name}}</nobr></th>
+
+                <th style="text-align:center"><nobr>{{row.f_stair1price}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_stair2price}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_stair3price}}</nobr></th>
+
                 <th style="text-align:center"><nobr>{{row.f_gasproperties}}</nobr></th>
 
 
@@ -227,6 +236,24 @@
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               期间充值金额:&emsp;{{sumsmodel.f_collection}}
             </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              一阶气量合计:&emsp;{{sumsmodel.f_stairamount1}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              一阶气费合计:&emsp;{{sumsmodel.f_stair1fee}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              二阶气量合计:&emsp;{{sumsmodel.f_stairamount2}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              二阶气费合计:&emsp;{{sumsmodel.f_stair2fee}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              三阶气量合计:&emsp;{{sumsmodel.f_stairamount3}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              三阶气费合计:&emsp;{{sumsmodel.f_stair3fee}}
+            </td>
           </tr>
         </table>
       </div>
@@ -277,7 +304,13 @@
         },{
           f_oughtamount: 0,
           f_oughtfee: 0,
-          f_collection:0
+          f_collection:0,
+          f_stairamount1:0,
+          f_stair1fee:0,
+          f_stairamount2:0,
+          f_stair2fee:0,
+          f_stairamount3:0,
+          f_stair3fee:0
         }),
         showbottomsum:false  //页面下方是否有合计: 默认为false, 在watch修改
       }