manage-client 3.2.93 → 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/sale/config/exportConfig.js

@@ -356,12 +356,12 @@ export default{
   },
   transferConfig: {
     'f_userinfo_code': '客户编号', 'f_newuser_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_address': '客户地址',
-    'f_user_name': '原客户名称', 'f_newuser_phone': '新客户电话', 'f_user_phone': '原客户电话', 'f_transfer_fees': '过户费', 'f_operate_date': '过户日期',
+    'f_user_name': '新客户名称', 'f_newuser_phone': '新客户电话', 'f_user_phone': '原客户电话', 'f_transfer_fees': '过户费', 'f_operate_date': '过户日期',
     'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司'
   },
   transferPrintConfig: {
     'f_userinfo_code': '客户编号', 'f_newuser_name': '客户名称', 'f_address': '客户地址',
-    'f_user_name': '原客户名称', 'f_newuser_phone': '新客户电话', 'f_user_phone': '原客户电话', 'f_transfer_fees': '过户费', 'f_operate_date': '过户日期'
+    'f_user_name': '新客户名称', 'f_newuser_phone': '新客户电话', 'f_user_phone': '原客户电话', 'f_transfer_fees': '过户费', 'f_operate_date': '过户日期'
   },
   fillgasConfig: {
     'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_user_type': '客户类型', 'f_user_phone': '客户电话', 'f_address': '客户地址',

package/src/components/webmeter/WebmeterQuery.vue

@@ -46,11 +46,11 @@
     methods: {
       permission (name) {
         // 保留是为了后面可能也会和综合查询一样加权限
-        // if (this.$login.r.find(value => value == '物联查询')) {
-        //   if (!this.$login.r.find(value => value == name)) {
-        //     return false
-        //   }
-        // }
+        if (this.$login.r.find(value => value === '物联查询')) {
+          if (!this.$login.r.find(value => value === name)) {
+            return false
+          }
+        }
         return true
       }
     }

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修改
       }