sale-client 3.6.198 → 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.198",
+  "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/qianneng/revenue/common/ic_detail/HandQueryUser.vue

@@ -49,6 +49,14 @@
                           close-on-select
                           condition="f_hand_state = '{}'"></v-select>
               </div>
+              <div class="col-sm-2 form-group" v-if="$parent.$parent.row.f_meter_type == '机表'">
+                <label class="font_normal_body" title="下账状态">下账状态</label>
+                <v-select :value.sync="model.f_accounts_state" v-model='model.f_accounts_state'
+                          style="width:60%"
+                          :options='$parent.$parent.accountsstates' placeholder='下账状态'
+                          close-on-select
+                          condition="f_accounts_state = '{}'"></v-select>
+              </div>
 
               <div style="float: right">
                 <button @click="search()"  class="button_search" style="margin-right: 10px" v-el:cba>查询</button>
@@ -88,8 +96,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 v-if="$parent.$parent.$parent.row.f_meter_type == '机表'"><nobr>操作</nobr></th>
             </tr>
           </template>
           <template partial='body' partial='list' v-ref:grid>
@@ -114,8 +124,13 @@
               <td style="text-align:center">{{row.f_meter_state}}</td>
               <td style="text-align:center">{{row.f_result_state?row.f_result_state:''}}</td>
               <td style="text-align:center">{{row.f_hand_state}}</td>
+              <td style="text-align:center">{{row.f_accounts_state}}</td>
               <td style="text-align:center">{{row.f_inputtor}}</td>
             <td style="text-align:center">{{row.f_input_person}}</td>
+            <td style="text-align:center" v-if="$parent.$parent.$parent.row.f_meter_type == '机表'">
+              <button @click.stop="$parent.$parent.$parent.report(row)" class="btn btn-link" name="button" type="button"
+                      v-if="row.f_accounts_state==='自动下账' && row.f_hand_state === '有效'">打印扣费单</button>
+            </td>
             </tr>
           </template>
           <template partial='foot'></template>
@@ -155,13 +170,38 @@
         </td>
       </tr>
     </table>
+    <reissue-bill :data="reissue_data" :show.sync="reissue_show" @cancel="reissueOper()" @reissue-success="reissueSucc()" v-if="reissue_show"></reissue-bill>
   </div>
 
 </template>
 
 <script>
   import {HttpResetClass, PagedList} from 'vue-client'
+  import co from "co";
+  let reprintGen = function * (self, row) {
+    try {
+      let reissueData = {}
+      reissueData = Object.assign({}, reissueData, row)
 
+      reissueData.f_bill_type = row.type
+      reissueData.f_bill_style = '普通收据'
+      reissueData.f_operator = self.$login.f.name
+      reissueData.f_operatorid = self.$login.f.id
+      reissueData.f_orgid = self.$login.f.orgid
+      reissueData.f_orgname = self.$login.f.orgs
+      reissueData.f_depid = self.$login.f.depids
+      reissueData.f_depname = self.$login.f.deps
+      reissueData.billUrl = 'rs/report/machine_charging_bill'
+
+      self.reissue_data = reissueData
+      self.reissue_show = true
+    } catch (error) {
+      if (error.status) {
+        self.$warn(`加载数据出错, ${JSON.stringify(error)}`, 'CardList')
+      }
+      throw error
+    }
+  }
   export default {
     title: '抄表',
     data () {
@@ -177,6 +217,8 @@
           f_stair3amount: 0,
           f_stair3fee: 0
         }),
+        reissue_show: false,
+        reissue_data: null,
         show: false,
         lists: [],
         meterstates: this.$appdata.getParam('抄表状态') ? [{
@@ -187,6 +229,7 @@
           label: '全部',
           value: ''
         }, ...this.$appdata.getParam('表单状态')] : [],
+        accountsstates: [{label: '全部', value: ''}, {label: '自动下账', value: '自动下账'}, {label: '缴费清欠', value: '缴费清欠'}],
         // 控制单选
         radio: [],
         // 选中的页
@@ -232,6 +275,18 @@
       }
     },
     methods: {
+      reissueSucc () {
+        this.reissue_show = false
+        this.$dispatch('refresh')
+      },
+      reissueOper () {
+        this.reissue_data = null
+        this.reissue_show = false
+      },
+      report (row) {
+        let reprint = reprintGen(this, row)
+        return co(reprint)
+      },
       // search() {
       //   this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_user_id = '${this.row.f_user_id}'`
       //   this.model.search(this.condition, this.model)

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)