sale-client 3.6.199 → 3.6.200

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [ serverRul, localUrl ] = ['http://121.36.106.17:8400/', 'http://121.36.106.17:8400/']
+const [ serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://127.0.0.1:8080/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.199",
+  "version": "3.6.200",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/filiale/alashan/EticketManage.vue

@@ -1,26 +1,26 @@
 <template>
   <tab-button v-ref:list>
     <tabs header="开票记录">
-      <e-ticket-record-list></e-ticket-record-list>
+      <e-ticket-record-list-query-v4></e-ticket-record-list-query-v4>
     </tabs>
 <!--    <tabs header="物联网表结算">-->
-<!--      <e-ticket-open-iot></e-ticket-open-iot>-->
+<!--      <e-ticket-open-iot-query-v4></e-ticket-open-iot-query-v4>-->
 <!--    </tabs>-->
 <!--    <tabs header="卡表结算">-->
-<!--      <e-ticket-open-card></e-ticket-open-card>-->
+<!--      <e-ticket-open-card-query-v4></e-ticket-open-card-query-v4>-->
 <!--    </tabs>-->
-<!--    <tabs header="抄表结算">-->
-<!--      <e-ticket-open-hand></e-ticket-open-hand>-->
+<!--    <tabs header="机表抄表结算">-->
+<!--      <e-ticket-open-hand-query-v4></e-ticket-open-hand-query-v4>-->
 <!--    </tabs>-->
     <tabs header="自定义开票">
-      <cust-query-eticket></cust-query-eticket>
+      <cust-query-eticket-query-v4></cust-query-eticket-query-v4>
     </tabs>
   </tab-button>
 </template>
 
 <script>
-import TabButton from '../../components/revenue/comprehen/common/TabButton'
-import Tabs from '../../components/revenue/comprehen/common/Tabs'
+import TabButton from '../../components/revenue/comprehen/SpecialUser/common/TabButton'
+import Tabs from '../../components/revenue/comprehen/SpecialUser/common/Tabs'
 export default {
   name: 'eticket',
   title: '发票管理',

package/src/filiale/alashan/sale.js

@@ -17,4 +17,6 @@ export default function () {
   Vue.component('e-ticket-manage', (resolve) => { require(['./EticketManage'], resolve) })
   // 自定义开票
   Vue.component('cust-query-eticket', (resolve) => { require(['./CustQueryEticket'], resolve) })
+  // 电子发票管理 对接v4 新的表结构
+  Vue.component('e-ticket-manage-query-v4', (resolve) => { require(['./EticketManage'], resolve) })
 }

package/src/filiale/wenxi/CardMeterCenter.vue

@@ -235,6 +235,7 @@
 </template>
 <script>
   import {HttpResetClass} from 'vue-client'
+  import CardService from './CardService'
 
   /**
    *综合业务
@@ -332,7 +333,7 @@
       self.model.payments = self.paymentModel
       // 加入扫码盒付款码支付流水号
       self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
-      let res = await self.$CardService.sellgas(self.model, self.row)
+      let res = await CardService.sellgas(self.model, self.row)
       let localeSustainMoney = window.localStorage.getItem('sustainMoney')
       if (localeSustainMoney != null) {
         localeSustainMoney = (localeSustainMoney - 0) + (self.model.f_collection - 0)

package/src/filiale/wenxi/CardService.js

@@ -1,5 +1,6 @@
 import Vue from 'vue'
 import co from 'co'
+import {HttpResetClass} from 'vue-client'
 
 let CardService = {
   install (Vue, options) {
@@ -36,6 +37,9 @@ let CardService = {
       f_privilege_gas = model.f_privilege_gas
     }
     let param = {
+      f_alias: row.f_alias,
+      garbage_number: model.garbage_number,
+      garbage_money: model.garbage_money,
       f_serial_id: model.f_serial_id,
       f_userinfo_id: row.f_userinfo_id,
       f_serial_number: f_serial_number,
@@ -289,6 +293,7 @@ let CardService = {
       f_privilege_gas = model.f_privilege_gas
     }
     let param = {
+      f_alias: row.f_alias,
       garbage_number: model.garbage_number,
       garbage_money: model.garbage_money,
       f_serial_id: model.f_serial_id,
@@ -855,6 +860,20 @@ let sendCardSaleGasGen = async function (model, row) {
       // 存库
       result = await Vue.resetpost('rs/logic/sale_sendCardSaleGas_logic', {data: model}, {resolveMsg: null, rejectMsg: '发卡售气存库失败'})
       console.log('发卡售气存库返回', result)
+      try {
+        // 获取写卡金额/气量
+        let res = await new HttpResetClass().load('POST', 'rs/sql/saleSingleTable', {
+          data: {
+            items: '*',
+            tablename: 't_sellinggas',
+            orderitem: 'id',
+            condition: ` id = '${result.data.id}'`
+          }
+        }, {resolveMsg: null, rejectMsg: null})
+        model.f_write_money = res.data[0].f_preamount
+      } catch (e) {
+        console.log(e)
+      }
       // 写卡
       let cardParams = await getParamGen(result.data.cardnumber, row.f_alias, row.f_user_id, row.f_userfiles_id)
 
@@ -1802,6 +1821,19 @@ let sellgasGen = async function (model, row) {
       }
       // 存库
       result = await Vue.resetpost('rs/logic/sale_cardCharge_logic', {data: model}, {resolveMsg: null, rejectMsg: '卡表收费存库失败'})
+      try {
+        // 获取写卡金额/气量
+        let res = await new HttpResetClass().load('POST', 'rs/sql/saleSingleTable', {
+          data: {
+            items: '*',
+            tablename: 't_sellinggas',
+            orderitem: 'id',
+            condition: ` id = '${result.data.id}'`
+          }
+        }, {resolveMsg: null, rejectMsg: null})
+        model.f_write_money = res.data[0].f_preamount
+      } catch (e) {
+      }
       // 获取气价和售气情况参数
       let cardParams = await getParamGen(cardid, row.f_alias, row.f_user_id, row.f_userfiles_id)
       console.log('写卡次数和获取的写卡参数...', row.cardInfo.Times, cardParams)

package/src/filiale/wenxi/ShowCardSellGas.vue

@@ -274,6 +274,7 @@
  */
 
 import {HttpResetClass} from 'vue-client'
+import CardService from './CardService'
 
 let preamountGen = async function (self) {
   let calFee = ((self.model.f_preamount - 0)).toFixed(4)
@@ -355,7 +356,7 @@ let initCardGen = async function (self) {
     self.model.payments = self.paymentModel
     // 加入扫码盒付款码支付流水号
     self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
-    let res = await self.$CardService.initCard(self.model, self.row, self.cardallot)
+    let res = await CardService.initCard(self.model, self.row, self.cardallot)
     let localeSustainMoney = window.localStorage.getItem('sustainMoney')
     if (localeSustainMoney != null) {
       localeSustainMoney = (localeSustainMoney - 0) + (self.model.f_collection - 0)

package/src/filiale/yuncheng/ChangeMeter.vue

@@ -362,12 +362,12 @@ let getPrice = async function (self) {
     f_price_type: self.row.f_price_type,
     filter: self.$login.f.orgid
   }
-  let rs = self.$GetSaleParam.getPrice(params)
-  rs.forEach((val) => {
-    if (val.label == self.row.f_price_name) {
-      self.newinfo.pricename = [val.value]
-    }
-  })
+  // let rs = self.$GetSaleParam.getPrice(params)
+  // rs.forEach((val) => {
+  //   if (val.label == self.row.f_price_name) {
+  //     self.newinfo.pricename = [val.value]
+  //   }
+  // })
   self.initData()
 }
 export default {

package/src/main.js

@@ -3,8 +3,7 @@ import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
 import sale from './sale'
-// import wenxi from './filiale/rizhao/sale'
-import FilialeSale from './filiale/lixianV3/sale'
+import FilialeSale from './filiale/wenxi/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
 import VueClipboard from 'vue-clipboard2'
@@ -23,8 +22,7 @@ Vue.config.silent = true
 all()
 system(false)
 sale()
-// wenxi()
-// FilialeSale()
+FilialeSale()
 address()
 ldap()
 require('system-clients/src/styles/less/bootstrap.less')
@@ -33,4 +31,3 @@ new Vue({
   el: 'body',
   components: { App }
 })
-

package/src/plugins/CardService.js

@@ -851,7 +851,7 @@ let sendCardSaleGasGen = async function (model, row) {
       if (getCardNumber.data.cardNumber) {
         // 当卡的别名是泰鹏普通卡的时候卡号和表号一致
         console.log('开始验证是不是泰鹏普通卡')
-        if (row.f_alias && row.f_alias.includes('SmartCard_TP') && row.f_alias.includes('LiHengSystem')) {
+        if (row.f_alias && (row.f_alias.includes('SmartCard_TP') || row.f_alias.includes('LiHengSystem'))) {
           model.cardNumber = row.f_meternumber
         } else if (row.f_alias && row.f_alias.includes('LaiDeRF')) {
           model.cardNumber = row.f_card_id