manage-client 3.2.80 → 3.2.83

package/src/filiale/qianneng/OtherChargeQuery.vue

@@ -228,6 +228,12 @@
                 <th>
                   <nobr>收款</nobr>
                 </th>
+                <th>
+                  <nobr>支出</nobr>
+                </th>
+                <th>
+                  <nobr>收入</nobr>
+                </th>
                 <th>
                   <nobr>付款方式</nobr>
                 </th>
@@ -304,6 +310,12 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_money}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_newbalance}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_newcurbalance}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_payment}}</nobr>
               </td>
@@ -382,7 +394,7 @@
 <script>
   import {PagedList} from 'vue-client'
   import defaultPrint from '../../components/sale/config/DefaultPrint'
-  import exportConfig from '../../components/sale/config/exportConfig'
+  import exportConfig from './exportConfig'
   import OtherChargeDetailQuery from "./OtherChargeDetailQuery";
 
   let readySomething = async function (self) {

package/src/filiale/qianneng/exportConfig.js

@@ -30,6 +30,40 @@ export default{
     'f_balance': '上期余额',
     'f_oughtfee_all': '合计欠费',
     'f_comments': '备注'
+  },
+  chargeConfig: {
+    'id': '收费编号', 'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_user_name': '客户名称', 'f_user_phone': '客户电话', 'f_address': '客户地址', 'f_zones': '片区', 'f_user_type': '客户类型',
+    'f_gasproperties': '用气性质', 'f_meternumber': '表号', 'f_meter_brand': '气表品牌', 'f_times': '购气次数',
+    'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_pregas': '气量', 'fee': '金额', 'f_preamount': '燃气费', 'f_collection': '收款', 'f_privilege_money': '优惠金额', 'f_balance': '上期结余', 'f_newbalance': '支出', 'f_newcurbalance': '收入',
+    'f_curbalance': '本期结余', 'f_type': '收费类型', 'f_payment': '付款方式', 'f_bank_type': '支付渠道', 'f_state': '状态', 'f_operate_date': '收费日期', 'f_serial_id': '流水号',
+    'f_delaypay': '滞纳金', 'f_comments': '备注', 'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司',
+    'f_yucun': '预存金额', 'f_card_id': '卡号', 'f_stairamount1': '一阶气量', 'f_stair1price': '一阶单价', 'f_stair1fee': '一阶气费',
+    'f_stair2amount': '二阶气量', 'f_stair2price': '二阶单价', 'f_stair2fee': '二阶气费',
+    'f_stair3amount': '三阶气量', 'f_stair3price': '三阶单价', 'f_stair3fee': '三阶气费', 'f_inputtor': '抄表员'
+  },
+  handplanConfig: {
+    'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_address': '客户地址', 'f_zones': '片区', 'phone': '客户手机', 'f_meternumber': '表号', 'ym_data': '数据年月',
+    'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_oughtamount': '用气量', 'overdue': '滞纳金', 'f_oughtfee': '用气金额', 'f_debt_money': '已交金额',
+    'f_actual_arrears': '欠费金额', 'f_balance': '上期余额', 'f_curbalance': '本期余额', 'f_newbalance': '支出', 'f_newcurbalance': '收入',
+    'f_accounts_state': '下账状态', 'f_operate_date': '收费时间', 'f_inputtor': '抄表员', 'f_book_slice_area': '表册片区',
+    'f_hand_date': '下发日期', 'f_input_date': '录入日期', 'f_audit_date': '审核日期','f_meter_state': '抄表状态', 'f_hand_state': '记录状态',
+    'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司', 'f_surplus_gas': '剩余气量', 'f_haircut_gas': '扣减气量',
+    'f_stair1amount': '一阶气量', 'f_stair1price': '一阶单价', 'f_stair1fee': '一阶气费',
+    'f_stair2amount': '二阶气量', 'f_stair2price': '二阶单价', 'f_stair2fee': '二阶气费',
+    'f_stair3amount': '三阶气量', 'f_stair3price': '三阶单价', 'f_stair3fee': '三阶气费', 'f_rest_date': '所属年月'
+  },
+  batchBankConfig2: {
+    'f_userinfo_code': '客户编号', 'f_userinfo_id': '用户编号', 'phone': '客户电话', 'f_user_name': '客户姓名', 'f_address': '客户地址',
+    'f_bank_accopen': '银行户名', 'f_bank_pay_number': '缴费编号', 'f_bank_account': '银行开户账号', 'f_paper_account': '开户行及账号',
+    'f_bank_name': '银行名称', 'f_oughtfee': '欠费金额'
+  },
+  otherchargeConfig: {
+    'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_user_name': '客户名称', 'f_address': '客户地址', 'f_user_phone': '客户电话', 'f_meter_classify': '气表类型',
+    'f_meter_brand': '气表品牌', 'f_bill_number': '收据票号', 'f_brand_spec': '收费类型', 'f_typename': '品名规格',
+    'f_typenumber': '型号', 'f_unitprice': '单价', 'f_number': '数量',
+    'f_money': '收款',  'f_newbalance': '支出', 'f_newcurbalance': '收入','f_payment': '付款方式', 'f_state': '状态',
+    'f_operate_date': '收费日期', 'f_service_person': '服务人员', 'f_comments': '备注',
+    'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司'
   }
 }
 

package/src/filiale/qianneng/sale.js

@@ -1,7 +1,9 @@
 // 分公司特殊组件页面注册
 let specialComp = {
   'other-charge-query': (resolve) => { require(['./OtherChargeQuery'], resolve) },
-  'arrears-query': (resolve) => { require(['./ArrearsQuery'], resolve) }
+  'arrears-query': (resolve) => { require(['./ArrearsQuery'], resolve) },
+  'charge-query': (resolve) => { require(['./ChargeQuery'], resolve) },
+  'handplan-query': (resolve) => { require(['./HandplanQuery'], resolve) }
 }
 exports.specialComp = specialComp
 

package/src/saleManage.js

@@ -270,6 +270,7 @@ export default function (filiale) {
   Vue.component('balance-table', (resolve) => {
     require(['./components/sale/businessquery/BalanceTable.vue'], resolve)
   })
+  //发折查询
   Vue.component('sendbook-query', (resolve) => {
     require(['./components/sale/businessquery/SendbookQuery.vue'], resolve)
   })
@@ -431,6 +432,10 @@ export default function (filiale) {
   Vue.component('year-by-user-print', (resolve) => {
     require(['./components/sale/report/aode/widget/YearByUserPrint'], resolve)
   })
+  //气费阶梯明细
+  Vue.component('selling-charge-price', (resolve) => {
+    require(['./components/sale/businessquery/sellingChargePrice'], resolve)
+  })
 
   // 收费类型日售气量报表
   Vue.component('pricetype-gas-money', (resolve) => {
@@ -521,13 +526,12 @@ export default function (filiale) {
   Vue.component('gas-reimbursement-rate',(resolve) => { require(['./components/sale/businessquery/AccountQuery/GasReimbursementRate'], resolve)})
   //可疑用户查询
   Vue.component('suspicious-user-query',(resolve) => { require(['./components/sale/businessquery/SuspiciousUserQuery'], resolve)})
-
   //销售量分类
   Vue.component('sales-gas-classification',(resolve) => { require(['./components/sale/businessquery/SalesGasClassification'], resolve)})
 
   //气价变更查询
   Vue.component('price-change',(resolve) => { require(['./components/sale/businessquery/PriceChange'], resolve)})
-
+  //维护记录查询
   Vue.component('infooperate-record',(resolve) => { require(['./components/sale/businessquery/InfoOperateRecord'], resolve)})
 
   Vue.component('iot-state-query',(resolve) => { require(['./components/sale/businessquery/iotStateSearch/iotStateQuery.vue'], resolve)})
@@ -537,6 +541,10 @@ export default function (filiale) {
 
   // 操作员结账列表
   Vue.component('proceeds-oper',(resolve) =>{ require(['./components/sale/businessquery/ProceedsOper'], resolve)})
+  // 抄表情况记录表
+  Vue.component('handplan-info',(resolve) =>{ require(['./components/sale/businessquery/handplan-info'], resolve)})
+  // 未抄表用户报表
+  Vue.component('unhand-business',(resolve) =>{ require(['./components/sale/businessquery/UnhandBusiness'], resolve)})
   // 分公司选择新组件,默认全选
   Vue.component('res-select-new', (resolve) => { require(['./filiale/tongchuan/ResSelectNew'], resolve)})
   // 分公司特殊页面注册替换