manage-client 3.1.47 → 3.1.50

package/src/components/sale/businessquery/AccountQuery/PreGasList.vue

@@ -48,7 +48,7 @@
                                 :footer="$parent.$parent.footer"
                                 :header="$parent.$parent.other"
                                 sqlurl="rs/logic/exportfile"
-                                sql-name="getPreGasList"
+                                sql-name="getPreGasListNew"
                                 template-name='气费预收款情况导出'
                                 :choose-col="true"></export-excel>
                   <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
@@ -175,7 +175,7 @@
 </template>
 
 <script>
-  import {PagedList} from 'vue-client'
+import {HttpResetClass, PagedList} from 'vue-client'
   import defaultPrint from '../../config/DefaultPrint'
   import exportConfig from '../../config/exportConfig'
 
@@ -197,7 +197,7 @@
         config: {
           defaultPrint: ['f_wechat_pay', 'f_bank_pay', 'f_pre_deduct_money']
         },
-        model: new PagedList('rs/sql/getPreGasList', 20,{startDate: 'this.model.startDate', endDate: 'this.model.endDate'},{
+        model: new PagedList('rs/sql/getPreGasListNew', 20,{startDate: 'this.model.startDate', endDate: 'this.model.endDate'},{
           f_last_balance:0,
           f_wechat_pay:0,
           f_money_pay:0,
@@ -255,8 +255,15 @@
 
       selfSearch(args) {
         args.condition = `${args.condition}` + this.orgCondtionStr
-        this.model.search(args.condition, args.model)
-        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+        new HttpResetClass().load('POST','rs/logic/getPreGasListNewLogic',
+          {
+            condition:args.condition,
+            startDate:args.model.startDate,
+            endDate:args.model.endDate
+          }).then(res =>{
+          this.model.search(args.condition, args.model)
+          this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+        })
       },
       clear() {
         //清空部门和人员
@@ -341,7 +348,7 @@
       }
     },
     computed: {
-      getCondition() {
+       getCondition() {
           return {
             startDate: this.$refs.paged.$refs.cri.model.startDate,
             endDate: this.$refs.paged.$refs.cri.model.endDate,

package/src/components/sale/businessquery/AccountQuery/SellingGasList.vue

@@ -48,7 +48,7 @@
                                 :footer="$parent.$parent.footer"
                                 :header="$parent.$parent.other"
                                 sqlurl="rs/logic/exportfile"
-                                sql-name="getSellinggasList"
+                                sql-name="getSellinggasListNew"
                                 template-name='气费收款情况导出'
                                 :choose-col="true"></export-excel>
                   <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
@@ -179,7 +179,7 @@
 </template>
 
 <script>
-  import {PagedList} from 'vue-client'
+import {HttpResetClass, PagedList} from 'vue-client'
   import defaultPrint from '../../config/DefaultPrint'
   import exportConfig from '../../config/exportConfig'
 
@@ -200,7 +200,7 @@
           defaultPrint: ['f_account', 'f_pre_pay', 'f_month']
         },
         footer:[],
-        model: new PagedList('rs/sql/getSellinggasList', 20,{startDate: 'this.model.startDate', endDate: 'this.model.endDate'},{
+        model: new PagedList('rs/sql/getSellinggasListNew', 20,{startDate: 'this.model.startDate', endDate: 'this.model.endDate'},{
           f_last_balance:0,
           f_account:0,
           f_wechat_pay:0,
@@ -259,8 +259,15 @@
 
       selfSearch(args) {
         args.condition = `${args.condition}` + this.orgCondtionStr
-        this.model.search(args.condition, args.model)
-        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+        new HttpResetClass().load('POST','rs/logic/getSellinggasListNewLogic',
+          {
+            condition:args.condition,
+            startDate:args.model.startDate,
+            endDate:args.model.endDate
+          }).then(res =>{
+          this.model.search(args.condition, args.model)
+          this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+        })
       },
       clear() {
         //清空部门和人员

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

@@ -67,6 +67,9 @@
     <tabs header="气价变更查询" v-if="permission('气价变更查询')">
       <price-change v-if="show.includes('气价变更查询')" @deal-msg="dealMsg" :data="data"></price-change>
     </tabs>
+    <tabs header="扎帐查询" v-if="permission('扎帐查询')">
+      <prick-bill-query v-if="show.includes('扎帐查询')" @deal-msg="dealMsg" :data="data"></prick-bill-query>
+    </tabs>
     <!--      <tabs header="资源操作记录查询" v-if="permission('资源操作记录查询')">-->
     <!--        <resource-operating-query v-if="show == '资源操作记录查询'" @deal-msg="dealMsg" :data="data"></resource-operating-query>-->
     <!--      </tabs>-->

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

@@ -177,7 +177,7 @@
                 <nobr>{{row.f_real_amount}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_total_gas}}</nobr>
+                <nobr>{{row.totalgas}}</nobr>
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_yuliang}}</nobr>

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

@@ -1,135 +1,135 @@
-<template>
-  <tab-button v-ref:list :active="-1">
-    <tabs header="欠费查询" v-if="permission('欠费查询')">
-      <arrears-query v-if="show.includes('欠费查询')"></arrears-query>
-    </tabs>
-    <tabs header="非收费业务查询" v-if="permission('非收费业务查询')">
-      <no-business-query v-if="show.includes('非收费业务查询')"  @deal-msg="dealMsg"></no-business-query>
-    </tabs>
-    <tabs header="小区综合查询" v-if="permission('小区综合查询')">
-      <area-general-query v-if="show.includes('小区综合查询')"  @deal-msg="dealMsg"></area-general-query>
-    </tabs>
-    <tabs header="小区汇总（机表）" v-if="permission('小区汇总（机表）')">
-      <residential-query v-if="show.includes('小区汇总（机表）')"  @deal-msg="dealMsg"></residential-query>
-    </tabs>
-    <tabs header="小区欠费汇总（机表）" v-if="permission('小区欠费汇总（机表）')">
-      <residential-query v-if="show.includes('小区欠费汇总（机表）')"  @deal-msg="dealMsg"></residential-query>
-    </tabs>
-    <tabs header="收费员汇总表" v-if="permission('收费员汇总表')">
-      <sell-people-query v-if="show.includes('收费员汇总表')" @deal-msg="dealMsg"></sell-people-query>
-    </tabs>
-    <tabs header="分公司汇总表" v-if="permission('分公司汇总表')">
-      <sell-orgname-query v-if="show.includes('分公司汇总表')"  @deal-msg="dealMsg"></sell-orgname-query>
-    </tabs>
-    <tabs header="抄表员统计" v-if="permission('抄表员统计')">
-      <hand-people-query v-if="show.includes('抄表员统计')"  @deal-msg="dealMsg"></hand-people-query>
-    </tabs>
-    <!--<tabs header="开户查询" v-if="permission('开户查询')">-->
-      <!--<new-account-query v-if="show == '开户查询'"  @deal-msg="dealMsg"></new-account-query>-->
-    <!--</tabs>-->
-    <tabs header="用气查询" v-if="permission('用气查询')">
-      <fmygas-query v-if="show.includes('用气查询')"  @deal-msg="dealMsg"></fmygas-query>
-    </tabs>
-    <tabs header="气费回收率" v-if="permission('气费回收率')">
-      <hand-rate-query v-if="show.includes('气费回收率')"  @deal-msg="dealMsg"></hand-rate-query>
-    </tabs>
-    <tabs header="收费抄表" v-if="permission('收费抄表')">
-      <selling-hand v-if="show.includes('收费抄表')" @deal-msg="dealMsg"></selling-hand>
-    </tabs>
-    <tabs header="月用气状况" v-if="permission('月用气状况')">
-      <month-gas-query v-if="show.includes('月用气状况')"  @deal-msg="dealMsg"></month-gas-query>
-    </tabs>
-    <tabs header="用户余额分析" v-if="permission('用户余额分析')">
-      <user-sell-head-detail v-if="show.includes('用户余额分析')" @deal-msg="dealMsg"></user-sell-head-detail>
-    </tabs>
-    <!--<tabs header="年度月份用量分析" v-if="permission('年度月份用量分析')">-->
-      <!--<year-gas-query v-if="show == '年度月份用量分析'"  @deal-msg="dealMsg"></year-gas-query>-->
-    <!--</tabs>-->
-    <!--<tabs header="余额统计查询" v-if="permission('余额统计查询')">-->
-      <!--<balance-query v-if="show == '余额统计查询'"  @deal-msg="dealMsg"></balance-query>-->
-    <!--</tabs>-->
-    <tabs header="用户余额表" v-if="permission('用户余额表')">
-      <balance-table v-if="show.includes('用户余额表')"  @deal-msg="dealMsg"></balance-table>
-    </tabs>
-    <tabs header="抄表册统计" v-if="permission('抄表册统计')">
-      <hand-book-query v-if="show.includes('抄表册统计')"  @deal-msg="dealMsg"></hand-book-query>
-    </tabs>
-    <tabs header="用气性质抄表率统计" v-if="permission('用气性质抄表率统计')">
-      <hand-gas-properties-query v-if="show.includes('用气性质抄表率统计')"  @deal-msg="dealMsg"></hand-gas-properties-query>
-    </tabs>
-    <tabs header="每月应收汇总统计" v-if="permission('每月应收汇总统计')">
-      <hand-gas-query v-if="show.includes('每月应收汇总统计')"  @deal-msg="dealMsg"></hand-gas-query>
-    </tabs>
-    <tabs header="小区缴费汇总(机表)" v-if="permission('小区缴费汇总(机表)')">
-      <community-paymen v-if="show.includes('小区缴费汇总(机表)')"  @deal-msg="dealMsg"></community-paymen>
-    </tabs>
-    <tabs header="预存明细查询" v-if="permission('预存明细查询')">
-      <deposit-detail v-if="show.includes('预存明细查询')" @deal-msg="dealMsg"></deposit-detail>
-    </tabs>
-    <tabs header="小区用户分布统计" v-if="permission('小区用户分布统计')">
-      <plot-summary-query v-if="show.includes('小区用户分布统计')"  @deal-msg="dealMsg"></plot-summary-query>
-    </tabs>
-    <tabs header="用户用气收费情况" v-if="permission('用户用气收费情况')">
-      <usergas v-if="show.includes('用户用气收费情况')"  @deal-msg="dealMsg"></usergas>
-    </tabs>
-    <tabs header="卡表用户结余明细" v-if="permission('卡表用户结余明细')">
-      <yonghu-jieyu v-if="show.includes('卡表用户结余明细')"  @deal-msg="dealMsg"></yonghu-jieyu>
-    </tabs>
-    <tabs header="应收实收明细" v-if="permission('应收实收明细')">
-      <ying-shou-ming-xi v-if="show.includes('应收实收明细')"  @deal-msg="dealMsg"></ying-shou-ming-xi>
-    </tabs>
-    <tabs header="操作员日结列表" v-if="permission('操作员日结列表')">
-      <proceeds-oper v-if="show.includes('操作员日结列表')"  @deal-msg="dealMsg"></proceeds-oper>
-    </tabs>
-  </tab-button>
-
-</template>
-
-<script>
-  import TabButton from '../common/TabButton'
-  import Tabs from '../common/Tabs'
-  import ArrearsQuery from './ArrearsQuery'
-
-
-  export default {
-    title: '汇总查询',
-    data () {
-      return {
-        f_start_date: '',
-        f_end_date: '',
-        listpage: true,
-        width: {
-          left: '100%',
-          right: '0%'
-        },
-        // searchNumber:'',
-        rowData: {},
-        show: []
-      }
-    },
-    components: {Tabs, TabButton, ArrearsQuery},
-    methods: {
-      permission (name) {
-        if (this.$login.r.find(value => value == '综合查询')) {
-          if (!this.$login.r.find(value => value == name)) {
-            return false
-          }
-        }
-        return true
-      },
-      cancel (obj) {
-        this.listpage = true
-      },
-      dealMsg(obj) {
-        this.rowData = obj
-        this.listpage = false
-        console.log(obj.model)
-        this.f_start_date = obj.model.startDate
-        this.f_end_date = obj.model.endDate
-      }
-    }
-  }
-</script>
-
-<style scoped>
-</style>
+<template>
+  <tab-button v-ref:list :active="-1">
+    <tabs header="欠费查询" v-if="permission('欠费查询')">
+      <arrears-query v-if="show.includes('欠费查询')"></arrears-query>
+    </tabs>
+    <tabs header="非收费业务查询" v-if="permission('非收费业务查询')">
+      <no-business-query v-if="show.includes('非收费业务查询')"  @deal-msg="dealMsg"></no-business-query>
+    </tabs>
+    <tabs header="小区综合查询" v-if="permission('小区综合查询')">
+      <area-general-query v-if="show.includes('小区综合查询')"  @deal-msg="dealMsg"></area-general-query>
+    </tabs>
+    <tabs header="小区汇总（机表）" v-if="permission('小区汇总（机表）')">
+      <residential-query v-if="show.includes('小区汇总（机表）')"  @deal-msg="dealMsg"></residential-query>
+    </tabs>
+    <tabs header="小区欠费汇总（机表）" v-if="permission('小区欠费汇总（机表）')">
+      <residential-query v-if="show.includes('小区欠费汇总（机表）')"  @deal-msg="dealMsg"></residential-query>
+    </tabs>
+    <tabs header="收费员汇总表" v-if="permission('收费员汇总表')">
+      <sell-people-query v-if="show.includes('收费员汇总表')" @deal-msg="dealMsg"></sell-people-query>
+    </tabs>
+    <tabs header="分公司汇总表" v-if="permission('分公司汇总表')">
+      <sell-orgname-query v-if="show.includes('分公司汇总表')"  @deal-msg="dealMsg"></sell-orgname-query>
+    </tabs>
+    <tabs header="抄表员统计" v-if="permission('抄表员统计')">
+      <hand-people-query v-if="show.includes('抄表员统计')"  @deal-msg="dealMsg"></hand-people-query>
+    </tabs>
+    <!--<tabs header="开户查询" v-if="permission('开户查询')">-->
+      <!--<new-account-query v-if="show == '开户查询'"  @deal-msg="dealMsg"></new-account-query>-->
+    <!--</tabs>-->
+    <tabs header="用气查询" v-if="permission('用气查询')">
+      <fmygas-query v-if="show.includes('用气查询')"  @deal-msg="dealMsg"></fmygas-query>
+    </tabs>
+    <tabs header="气费回收率" v-if="permission('气费回收率')">
+      <hand-rate-query v-if="show.includes('气费回收率')"  @deal-msg="dealMsg"></hand-rate-query>
+    </tabs>
+    <tabs header="收费抄表" v-if="permission('收费抄表')">
+      <selling-hand v-if="show.includes('收费抄表')" @deal-msg="dealMsg"></selling-hand>
+    </tabs>
+    <tabs header="月用气状况" v-if="permission('月用气状况')">
+      <month-gas-query v-if="show.includes('月用气状况')"  @deal-msg="dealMsg"></month-gas-query>
+    </tabs>
+    <tabs header="用户余额分析" v-if="permission('用户余额分析')">
+      <user-sell-head-detail v-if="show.includes('用户余额分析')" @deal-msg="dealMsg"></user-sell-head-detail>
+    </tabs>
+    <!--<tabs header="年度月份用量分析" v-if="permission('年度月份用量分析')">-->
+      <!--<year-gas-query v-if="show == '年度月份用量分析'"  @deal-msg="dealMsg"></year-gas-query>-->
+    <!--</tabs>-->
+    <!--<tabs header="余额统计查询" v-if="permission('余额统计查询')">-->
+      <!--<balance-query v-if="show == '余额统计查询'"  @deal-msg="dealMsg"></balance-query>-->
+    <!--</tabs>-->
+    <tabs header="用户余额表" v-if="permission('用户余额表')">
+      <balance-table v-if="show.includes('用户余额表')"  @deal-msg="dealMsg"></balance-table>
+    </tabs>
+    <tabs header="抄表册统计" v-if="permission('抄表册统计')">
+      <hand-book-query v-if="show.includes('抄表册统计')"  @deal-msg="dealMsg"></hand-book-query>
+    </tabs>
+    <tabs header="用气性质抄表率统计" v-if="permission('用气性质抄表率统计')">
+      <hand-gas-properties-query v-if="show.includes('用气性质抄表率统计')"  @deal-msg="dealMsg"></hand-gas-properties-query>
+    </tabs>
+    <tabs header="每月应收汇总统计" v-if="permission('每月应收汇总统计')">
+      <hand-gas-query v-if="show.includes('每月应收汇总统计')"  @deal-msg="dealMsg"></hand-gas-query>
+    </tabs>
+    <tabs header="小区缴费汇总(机表)" v-if="permission('小区缴费汇总(机表)')">
+      <community-paymen v-if="show.includes('小区缴费汇总(机表)')"  @deal-msg="dealMsg"></community-paymen>
+    </tabs>
+    <tabs header="预存明细查询" v-if="permission('预存明细查询')">
+      <deposit-detail v-if="show.includes('预存明细查询')" @deal-msg="dealMsg"></deposit-detail>
+    </tabs>
+    <tabs header="小区用户分布统计" v-if="permission('小区用户分布统计')">
+      <plot-summary-query v-if="show.includes('小区用户分布统计')"  @deal-msg="dealMsg"></plot-summary-query>
+    </tabs>
+    <tabs header="用户用气收费情况" v-if="permission('用户用气收费情况')">
+      <usergas v-if="show.includes('用户用气收费情况')"  @deal-msg="dealMsg"></usergas>
+    </tabs>
+    <tabs header="卡表用户结余明细" v-if="permission('卡表用户结余明细')">
+      <yonghu-jieyu v-if="show.includes('卡表用户结余明细')"  @deal-msg="dealMsg"></yonghu-jieyu>
+    </tabs>
+    <tabs header="应收实收明细" v-if="permission('应收实收明细')">
+      <ying-shou-ming-xi v-if="show.includes('应收实收明细')"  @deal-msg="dealMsg"></ying-shou-ming-xi>
+    </tabs>
+    <tabs header="操作员日结列表" v-if="permission('操作员日结列表')">
+      <proceeds-oper v-if="show.includes('操作员日结列表')"  @deal-msg="dealMsg"></proceeds-oper>
+    </tabs>
+  </tab-button>
+
+</template>
+
+<script>
+  import TabButton from '../common/TabButton'
+  import Tabs from '../common/Tabs'
+  import ArrearsQuery from './ArrearsQuery'
+
+
+  export default {
+    title: '汇总查询',
+    data () {
+      return {
+        f_start_date: '',
+        f_end_date: '',
+        listpage: true,
+        width: {
+          left: '100%',
+          right: '0%'
+        },
+        // searchNumber:'',
+        rowData: {},
+        show: []
+      }
+    },
+    components: {Tabs, TabButton, ArrearsQuery},
+    methods: {
+      permission (name) {
+        if (this.$login.r.find(value => value == '综合查询')) {
+          if (!this.$login.r.find(value => value == name)) {
+            return false
+          }
+        }
+        return true
+      },
+      cancel (obj) {
+        this.listpage = true
+      },
+      dealMsg(obj) {
+        this.rowData = obj
+        this.listpage = false
+        console.log(obj.model)
+        this.f_start_date = obj.model.startDate
+        this.f_end_date = obj.model.endDate
+      }
+    }
+  }
+</script>
+
+<style scoped>
+</style>