sale-client 4.2.104 → 4.2.106

package/package.json

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

package/src/filiale/ronghao/HistoryHandQueryUser.vue

@@ -0,0 +1,363 @@
+<template >
+  <div class="flex" style="justify-content: space-between;">
+    <div @keyup.enter="search" style="">
+      <criteria-paged :model="model" v-ref:paged>
+        <criteria @condition-changed='$parent.search' partial='criteria' v-ref:criteria>
+          <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
+            <div class="row">
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body" title="归属日期" >开始时间</label>
+                <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_start_date"
+                            class="datepicker"
+                            condition="f_hand_date >= '{} 00:00:00' "
+                            placeholder="起始时间"
+                            style="width:60%"
+                            v-model="model.f_start_date"
+                ></datepicker>
+              </div>
+              <div class="col-sm-2 form-group" >
+                <label class="font_normal_body" title="归属日期">结束时间</label>
+                <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_end_date"
+                            class="datepicker"
+                            condition="f_hand_date <= '{} 23:59:59' "
+                            placeholder="结束时间"
+                            style="width:60%"
+                            v-model="model.f_end_date"
+                ></datepicker>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body" title="抄表状态">抄表状态</label>
+                <v-select :value.sync="model.f_meter_state" v-model='model.f_meter_state'
+                          style="width:60%"
+                          :options='$parent.$parent.meterstates' placeholder='抄表状态'
+                          close-on-select
+                          condition="f_meter_state = '{}'"></v-select>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body" title="表单状态">表单状态</label>
+                <v-select :value.sync="model.f_hand_state" v-model='model.f_hand_state'
+                          style="width:60%"
+                          :options='$parent.$parent.handstates' placeholder='表单状态'
+                          close-on-select
+                          condition="f_hand_state = '{}'"></v-select>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">气表类型</label>
+                <v-select :value.sync="model.f_meter_classify" v-model='model.f_meter_classify'
+                          style="width:60%"
+                          :options='$parent.$parent.meterType' placeholder='气表类型'
+                          close-on-select
+                          condition="f_meter_classify = '{}'"></v-select>
+              </div>
+
+              <div style="float: right">
+                <button @click="search()"  class="button_search" style="margin-right: 10px" v-el:cba>查询</button>
+                <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
+                              :field="$parent.$parent.fields" :header="$parent.$parent.other"
+                              sqlurl="api/af-revenue/logic/saleExport" :sql-name="$parent.$parent.sqlname" template-name='抄表查询导出'
+                              :choose-col="true"  ref="salehandplanExport"></export-excel>
+
+                <print-data :defaultfield="$parent.$parent.defaultfield" :field="$parent.$parent.fields" :is-selected="true" :model="$parent.$parent.printModel"
+                            @print-data="$parent.$parent.print()"
+                            :starthead="$parent.$parent.starthead"
+                            titletable="预存气费打印明细"
+                ></print-data>
+              </div>
+            </div>
+
+
+          </div>
+
+        </criteria>
+        <data-grid :model="model" class="list_area table_sy" class="list_area table_sy" partial='list' v-ref:grid>
+          <template partial='head'>
+            <tr>
+
+              <th v-show="false"><nobr>抄表月份</nobr></th>
+              <th v-show="false"><nobr>用气周期</nobr></th>
+              <th><nobr>抄表日期</nobr></th>
+              <th><nobr>录入日期</nobr></th>
+              <th><nobr>上期底数</nobr></th>
+              <th><nobr>本期底数</nobr></th>
+              <th><nobr>{{$parent.$parent.$parent.row.f_meter_type.includes('物联网表') ? $parent.$parent.$parent.row.f_collection_type == '按气量' ? '上期余量' :'上期余额' : '上期余额' }}</nobr></th>
+              <th><nobr>用气量</nobr></th>
+              <th><nobr>用气金额 </nobr></th>
+              <th><nobr>{{$parent.$parent.$parent.row.f_meter_type.includes('物联网表') ? $parent.$parent.$parent.row.f_collection_type == '按气量' ? '本期余量' :'本期余额' : '本期余额' }}</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>
+            </tr>
+          </template>
+          <template partial='body' partial='list' v-ref:grid>
+            <tr>
+              <td style="text-align:center" v-show="false">{{row.f_hand_date.substring(0,7)}}</td>
+              <th v-show="false"><nobr >{{row.datas}}</nobr></th>
+              <td style="text-align:center">{{row.f_hand_date}}</td>
+              <td style="text-align:center">{{row.f_input_date}}</td>
+              <td style="text-align:center">{{row.f_last_tablebase}}</td>
+              <td style="text-align:center">{{row.f_tablebase}}</td>
+              <td style="text-align:center">{{row.f_balance}}</td>
+              <td style="text-align:center">{{row.f_oughtamount}}</td>
+              <td style="text-align:center">{{row.f_oughtfee}}</td>
+              <td style="text-align:center">{{row.f_curbalance}}</td>
+              <td style="text-align:center">{{row.f_meter_classify}}</td>
+              <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_inputtor}}</td>
+              <td style="text-align:center">{{row.f_input_person}}</td>
+            </tr>
+          </template>
+          <template partial='foot'></template>
+        </data-grid>
+      </criteria-paged>
+
+    </div>
+    <table class="table-hover">
+      <tr class="table-bordered" style="position: relative">
+        <td
+          style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
+          汇总信息
+        </td>
+        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+          用气量合计:&emsp;{{model.sums.f_oughtamount}}
+        </td>
+        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+          用气金额合计:&emsp;{{model.sums.f_oughtfee}}
+        </td>
+      </tr>
+    </table>
+  </div>
+
+</template>
+
+<script>
+import {HttpResetClass, PagedList} from 'vue-client'
+
+export default {
+  title: '抄表',
+  data () {
+    return {
+      condition: '1=1',
+      model: new PagedList('api/af-revenue/sql/sale_HistoryHandplanQuery', 20, {f_user_id: this.row.f_user_id}, {
+        f_oughtfee: 0,
+        f_oughtamount: 0
+      }),
+      show: false,
+      f_calculation: '',
+      lists: [],
+      meterstates: this.$appdata.getParam('抄表状态') ? [{
+        label: '全部',
+        value: ''
+      }, ...this.$appdata.getParam('抄表状态')] : [],
+      handstates: this.$appdata.getParam('表单状态') ? [{
+        label: '全部',
+        value: ''
+      }, ...this.$appdata.getParam('表单状态')] : [],
+      meterType: this.$appdata.getParam('气表类型'),
+      // 控制单选
+      radio: [],
+      // 选中的页
+      all: [],
+      // row数据
+      rowsdata: [],
+      sqlname: 'sale_HistoryHandplanQuery',
+      searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userinfo_id',
+      starthead: '',
+      fields: {
+        'f_userinfo_code': '用户编号',
+        'f_user_name': '姓名',
+        'f_last_tablebase': '上期底数',
+        'f_tablebase': '本期底数',
+        'f_balance': '上期余额',
+        'f_curbalance': '本期余额',
+        'f_oughtamount': '用气量',
+        'f_oughtfee': '用气金额',
+        'f_inputtor': '抄表员',
+        'f_input_date': '抄表日期',
+        'f_hand_date': '录入时间'},
+      defaultfield: [
+         'f_last_tablebase', 'f_last_tablebase', 'f_oughtamount', 'f_oughtfee'
+      ],
+      fooinfo: [
+        '单位',
+        '收款人'
+      ],
+      printModel: {
+        rows: []
+      },
+      other: [],
+      footer: [],
+      // 合计数据
+      sumsmodel: {}
+    }
+  },
+  props: ['row'],
+  ready () {
+    this.$refs.paged.$refs.criteria.model.f_hand_state = ['有效']
+    this.f_calculation = this.row.f_calculation
+    this.$refs.paged.$refs.criteria.search()
+    this.sumsmodel= this.$refs.paged.$refs.grid.model.sums
+    for (let i in this.all) {
+      this.money += i.f_oughtamount
+      this.gas += i.f_oughtfee
+    }
+  },
+  methods: {
+    getotherfooter () {
+      // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
+      // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
+      this.other = []
+      this.footer = []
+      // let exportdata = this.getCondition;
+      let otherInData = []
+      otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`)
+      let footerData = [], exportfield = this.fields
+      footerData.push('合计')
+      let self = this
+      for (var field in self.sumsmodel) {
+        footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`)
+      }
+      this.footer.push(footerData)
+      this.other.push(otherInData)
+    },
+    // 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)
+    // },
+    async search () {
+      this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}'`
+      this.model.search(this.condition, this.model)
+      let http = new HttpResetClass()
+      let res = await http.load('POST', 'api/af-revenue/sql/sale_HistoryHandplanQuery', {
+        data: {
+          f_user_id: this.row.f_user_id,
+          condition: this.condition
+        }
+      }, {resolveMsg: null, rejectMsg: null})
+      this.printModel.rows = res.data
+
+      this.starthead = '用户编号:' + this.row.f_userinfo_code + '&emsp;&emsp;用户姓名:' + this.row.f_user_name + '&emsp;&emsp;用户地址:' + this.row.f_address
+    },
+    // 多选框初始化
+    selectInit () {
+      this.rowsdata = []
+      this.all = []
+      this.radio = []
+    },
+    print () {
+      console.log('====================================')
+      console.log('print')
+      console.log(this.printModel)
+      this.selectInit()
+    },
+    select () {
+      let index = this.model.pageIndex - 1
+      if (!this.radio[index]) {
+        this.radio.$set(index, [])
+      }
+      if (this.all[index]) {
+        // 数据
+        this.rowsdata[index] = Object.assign([], this.model.rows)
+        // 勾选
+        for (var i = 0; i < this.model.rows.length; i++) {
+          this.radio[index].$set(i, true)
+        }
+      } else {
+        // 数据
+        this.rowsdata[index] = []
+        // 不勾选
+        for (var i = 0; i < this.model.rows.length; i++) {
+          this.radio[index].$set(i, false)
+        }
+      }
+      let z = 0
+      for (let i = 0; i < this.all.length; i++) {
+        for (let j = 0; this.rowsdata[i] && j < this.rowsdata[i].length; j++) {
+          this.printModel.rows[z++] = this.rowsdata[i][j]
+        }
+      }
+    },
+    selectOne (event, row, i) {
+      let index = this.model.pageIndex - 1
+      if (!this.rowsdata[index]) {
+        this.rowsdata[index] = []
+      }
+      if (!this.radio[index]) {
+        this.radio.$set(index, [])
+      }
+      if (event.target.checked) {
+        // 数据
+        this.rowsdata[index][i] = row
+        // 勾选
+        this.radio[index].$set(i, true)
+        // 判断是否全部选中
+        var allState = true
+        if (this.model.rows.length != this.radio[index].length) {
+          allState = false
+        }
+        for (var state of this.radio[index]) {
+          if (!state) {
+            allState = false
+          }
+        }
+        if (allState) {
+          this.all.$set(index, true)
+        } else {
+          this.all.$set(index, false)
+        }
+      } else {
+        // 数据
+        this.rowsdata[index][i] = []
+        // 不勾选
+        this.radio[index].$set(i, false)
+        // 任意取消一个则全选状态设为false
+        this.all.$set(index, false)
+      }
+      let z = 0
+      this.printModel.rows = []
+      for (let i = 0; i < this.all.length; i++) {
+        for (let j = 0; this.rowsdata[i] && j < this.rowsdata[i].length; j++) {
+          if (this.rowsdata[i][j] && this.rowsdata[i][j].f_user_id) {
+            this.printModel.rows[z++] = this.rowsdata[i][j]
+          }
+        }
+      }
+    }
+  },
+  computed: {
+    whetherpaies () {
+      return [
+        {label: '全部', value: ''},
+        {label: '已缴费', value: '是'},
+        {label: '未缴费', value: '否'}
+      ]
+    },
+    ischecked () {
+      return function (index, i) {
+        if (!this.radio[index]) {
+          return false
+        }
+        return this.radio[index][i]
+      }
+    },
+    getCondition () {
+      return {
+        condition: this.condition
+      }
+    }
+  },
+  watch: {
+    sumsmodel: {
+      handler: function (val) {
+        this.getotherfooter()
+      },
+      deep: true
+    }
+  }
+}
+</script>
+

package/src/filiale/ronghao/UserInfoDetailManageNew.vue

@@ -38,6 +38,9 @@
         <saletab header="抄表记录" v-if="newWebHand && !row.f_meter_type.includes('卡表')&&permission('抄表记录')">
           <web-hand-query-user  :row="row" v-if="show == '抄表记录'" @deal-msg="dealMsg"></web-hand-query-user>
         </saletab>
+        <saletab header="历史抄表记录" v-if="permission('抄表记录')">
+          <history-hand-query-user :row="row" v-if="show == '历史抄表记录'" @deal-msg="dealMsg"></history-hand-query-user>
+        </saletab>
         <saletab header="补卡查询" v-if="row.f_meter_type.includes('卡表')&&permission('补卡查询')">
           <fill-card-query-user :row="row" v-if="show == '补卡查询'" @deal-msg="dealMsg"></fill-card-query-user>
         </saletab>
@@ -127,6 +130,7 @@
   import RecordQueryUser from '../../components/common/userinfo_detail/ic_detail/RecordQueryUser'
   import TransferQueryUser from '../../components/common/userinfo_detail/ic_detail/TransferQueryUser'
   import CardHandRecord from '../../components/common/userinfo_detail/ic_detail/CardHandRecord'
+  import HistoryHandQueryUser from './HistoryHandQueryUser'
   import AutomaticPurse from '../../components/common/userinfo_detail/ic_detail/AutomaticPurse'
   import Repurchase from '../../components/common/userinfo_detail/ic_detail/Repurchase'
   import MachineRecordQuery from '../../components/common/userinfo_detail/ic_detail/MachineRecordQuery'
@@ -164,6 +168,7 @@ export default {
       WebAutomaticPurse,
       WebChargeQueryUser,
       WebHandQueryUser,
+      HistoryHandQueryUser,
       Repurchase,
       ChangeMeterQueryUser,
       ChargeQueryUser,

package/src/filiale/xihu/CardService.js

@@ -194,9 +194,24 @@ let CardService = {
       f_zones: Vue.$login.f.zones,
       f_comments: model.f_comments
     }
+    if (row.f_alias == 'LaiDeUDP') {
+      param.f_total_gas = (row.f_total_gas - 0) + (model.f_pregas - 0)
+      param.f_total_fee = (row.f_total_fee - 0) + (model.f_preamount - 0)
+    } else {
+      if (row.f_remanent_type === 1) {
+        param.f_total_gas = (row.f_total_gas - 0) + (model.f_pregas - 0)
+        param.f_total_fee = (row.f_total_fee - 0) + (model.f_preamount - 0)
+      } else {
+        if ((model.f_pregas - 0) > (model.f_fill_gas - 0)) {
+          param.f_total_gas = (row.f_total_gas - 0) + ((model.f_pregas - 0) - (model.f_fill_gas - 0))
+          param.f_total_fee = (row.f_total_fee - 0) + (model.f_preamount - 0)
+        } else {
+          param.f_total_gas = (row.f_total_gas - 0)
+          param.f_total_fee = (row.f_total_fee - 0)
+        }
+      }
+    }
 
-    param.f_total_gas = (row.f_total_gas - 0) + (model.f_pregas - 0)
-    param.f_total_fee = (row.f_total_fee - 0) + (model.f_preamount - 0)
     // console.log(row, model)
     param.f_write_totalgas = (row.f_write_totalgas - 0) + (model.f_pregas - 0)
     param.f_write_totalfee = (row.f_write_totalfee - 0) + (model.f_preamount - 0)

package/src/filiale/yangchun/OtherChargeNew.vue

@@ -9,7 +9,7 @@
           <div style="margin-top:10px;" v-for="(index, row) in model.otherdetail">
             <div class="row">
               <div class="col-sm-4" :class="[$v.brandspec.required ? 'select-error' : '']">
-                <label for="f_brand_spec" class="font_normal_body " title="参数名称：品名及规格">{{brandType}}</label>
+                <label for="f_brand_spec" class="font_normal_body " title="参数名称：电脑端其他收费录入">{{brandType}}</label>
                 <input type="text" class="input_search" style="width: 60%" v-show="false"
                        v-model="$refs.brandspec.selectedItems" v-validate:brandspec='{required: true }'>
                 <v-select id="f_brand_spec"
@@ -349,7 +349,7 @@ export default {
       f_typenumber: '',
       typeNameList: [],
       typenumberList: [],
-      brandspec: this.$appdata.getParam('品名及规格'),
+      brandspec: this.$appdata.getParam('电脑端其他收费录入'),
       brandType: this.$appdata.getSingleValue('其他收费类型') ? this.$appdata.getSingleValue('其他收费类型') : '收费类型',
       printInvoiceType: this.$appdata.getSingleValue('电子票打印类型') ? this.$appdata.getSingleValue('电子票打印类型') : '电子发票',
       printstyle: this.$appdata.getParam('打印格式'),

package/src/filiale/yangchun/StairPrice.vue

@@ -0,0 +1,76 @@
+<template>
+  <div class="auto">
+    <table  class="table table-condensed" style="margin-top:15px; margin-left:5%; width:90%;text-algin:center;">
+      <thead>
+        <tr>
+          <th style="text-align:center"><nobr>操作</nobr></th>
+          <th style="text-align:center"><nobr>阶梯数</nobr></th>
+          <th style="text-align:center"><nobr>气量上限</nobr></th>
+          <th style="text-align:center"><nobr>单价</nobr></th>
+          <th style="text-align:center"><nobr>人口增量</nobr></th>
+          <th style="text-align:center" v-if="isheat == '1'"><nobr>采暖增量</nobr></th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr v-for="row in stairmodel">
+          <td><nobr>
+            <button class="glyphicon glyphicon-minus btn-danger" @click.stop="delGas($index)"></button>&nbsp;&nbsp;&nbsp;
+            <button class="glyphicon glyphicon-plus btn-success" @click.stop="addGas()"></button>
+          </nobr></td>
+          <td v-if='!row.f_price_name' style="text-align:center">{{$index+1}}</td>
+          <td v-if='row.f_price_name' style="text-align:center">{{row.f_price_name}}</td>
+          <td style="text-align:center">
+            <input class="input_search" style="width: 100px" type="number" v-model="row.f_gas" :disabled="isDisable"
+            placeholder="气量">
+          </td>
+          <td style="text-align:center">
+            <input class="input_search" style="width: 100px" type="number" v-model="row.f_price" :disabled="isDisable"
+            placeholder="单价">
+          </td>
+          <td style="text-align:center">
+            <input class="input_search" style="width: 100px" type="number" v-model="row.f_add_gas" :disabled="isDisable"
+             placeholder="人口增量">
+          </td>
+          <td style="text-align:center" v-if="isheat == '1'">
+            <input class="input_search" style="width: 100px" type="number" v-model="row.f_add_gas_heat" :disabled="isDisable"
+                   placeholder="采暖增量">
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+
+</template>
+<script>
+/**
+*阶梯气价管理组件
+*/
+export default {
+  data () {
+    return {
+    }
+  },
+  props: ['stairmodel', 'isDisable', 'isheat'],
+  watch: {
+    'stairmodel' (val) {
+      // val.push({})
+    }
+  },
+  methods: {
+    addGas () {
+      this.stairmodel.push({
+        f_add_gas: 0,
+        f_add_gas_heat: 0
+      })
+    },
+    delGas (index) {
+      if (this.stairmodel.length > 1) {
+        this.stairmodel.splice(index, 1)
+      }
+    }
+  }
+}
+</script>
+<style>
+input { outline:none; }
+</style>

package/src/filiale/yangchun/sale.js

@@ -108,4 +108,6 @@ export default function () {
 // 表具查看
   Vue.component('new-meter-list', (resolve) => { require(['./NewMeterList'], resolve) })
   Vue.component('user-base-info-new', (resolve) => { require(['./UserBaseInfoNew'], resolve) })
+  // 阶梯气价
+  Vue.component('stair-price', (resolve) => { require(['./StairPrice'], resolve) })
 }