sale-client 3.5.192 → 3.5.194

package/build/dev-server.js

@@ -1,67 +1,73 @@
-const express = require('express')
-const webpack = require('webpack')
-const config = require('./webpack.dev.conf')
-const proxyMiddleware = require('http-proxy-middleware')
-const app = express()
-const compiler = webpack(config)
-
-// 自己改了这里不要提交 来回覆盖挺麻烦的
-const [local, server] = ['http://127.0.0.1:8080', 'http://192.168.50.4:8400']
-const port = 8089
-
-const proxyTable = {
-  '/text': {
-    target: local
-  },
-  '/files': {
-    target: server
-  },
-  '/excel': {
-    target: server
-  },
-  '/webmeter': {
-    target: server
-  },
-  '/rs/logic': {
-    target: server
-  },
-  '/rs': {
-    target: server
-  }
-}
-
-const devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: config.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
-})
-
-const hotMiddleware = require('webpack-hot-middleware')(compiler)
-compiler.plugin('compilation', function (compilation) {
-  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
-    hotMiddleware.publish({action: 'reload'})
-    cb()
-  })
-})
-
-Object.keys(proxyTable).forEach(function (context) {
-  let options = proxyTable[context]
-  if (typeof options === 'string') {
-    options = {target: options}
-  }
-  app.use(proxyMiddleware(context, options))
-})
-app.use(require('connect-history-api-fallback')())
-app.use(devMiddleware)
-app.use(hotMiddleware)
-app.use('/static', express.static('./static'))
-
-module.exports = app.listen(port, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:' + port)
-})
+const express = require('express')
+const webpack = require('webpack')
+const config = require('./webpack.dev.conf')
+const proxyMiddleware = require('http-proxy-middleware')
+const app = express()
+const compiler = webpack(config)
+
+// 自己改了这里不要提交 来回覆盖挺麻烦的
+const [local, server] = ['http://127.0.0.1:8080', 'http://192.168.50.4:8400']
+const port = 8089
+
+const proxyTable = {
+  '/text': {
+    target: local,
+    // changeOrigin: true //https请求需要加
+  },
+  '/files': {
+    target: server,
+    // changeOrigin: true
+  },
+  '/excel': {
+    target: server,
+    // changeOrigin: true
+  },
+  '/webmeter': {
+    target: server,
+    // changeOrigin: true
+  },
+  '/rs/logic': {
+    target: server,
+    // changeOrigin: true
+  },
+  '/rs': {
+    target: server,
+    // changeOrigin: true
+  }
+}
+
+const devMiddleware = require('webpack-dev-middleware')(compiler, {
+  publicPath: config.output.publicPath,
+  stats: {
+    colors: true,
+    chunks: false
+  }
+})
+
+const hotMiddleware = require('webpack-hot-middleware')(compiler)
+compiler.plugin('compilation', function (compilation) {
+  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
+    hotMiddleware.publish({action: 'reload'})
+    cb()
+  })
+})
+
+Object.keys(proxyTable).forEach(function (context) {
+  let options = proxyTable[context]
+  if (typeof options === 'string') {
+    options = {target: options}
+  }
+  app.use(proxyMiddleware(context, options))
+})
+app.use(require('connect-history-api-fallback')())
+app.use(devMiddleware)
+app.use(hotMiddleware)
+app.use('/static', express.static('./static'))
+
+module.exports = app.listen(port, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:' + port)
+})

package/package.json

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

package/src/components/charge/business/CardMeterCenter.vue

@@ -491,7 +491,7 @@
         serialShow: false,
         resid: [],  // 存放新增的f_files表中id
         config: {
-          calculatePreByCollection: true, // 可以更具收款来反向计算预购
+          calculatePreByCollection: false, // 可以更具收款来反向计算预购
           notShowFormula: false, // 不显示计算公式,默认显示
           autoCollection: true, // 自动填写收款
           showupload: true, // 显示上传

package/src/components/charge/business/ShowCardSellGas.vue

@@ -463,7 +463,7 @@ export default {
       resid: [],
       config: {
         notShowFormula: false, // 不显示计算公式,默认显示
-        calculatePreByCollection: true, // 可以更具收款来反向计算预购
+        calculatePreByCollection: false, // 可以更具收款来反向计算预购
         showupload: true,  // 默认不显示上传附件
         hasPrint: false,  // 默认打票
         floor: true,  // 是否取整收费

package/src/components/common/userinfo_detail/UserInfoDetailManageNew.vue

@@ -9,21 +9,30 @@
         <saletab header="机表流水查询" v-if="permission('机表流水查询')&&row.f_meter_type.includes('机表')">
           <machine-record-query :row="row" v-if="show == '机表流水查询'" @deal-msg="dealMsg"></machine-record-query>
         </saletab>
-        <saletab header="收费查询" v-if="permission('收费查询')">
+        <saletab header="收费查询" v-if="!newWebHand && permission('收费查询')">
+          <charge-query-user  :row="row" v-if="show == '收费查询'" @deal-msg="dealMsg"></charge-query-user>
+        </saletab>
+        <saletab header="收费查询" v-if="newWebHand && permission('收费查询')">
           <charge-query-user  :row="row" v-if="show == '收费查询'" @deal-msg="dealMsg"></charge-query-user>
         </saletab>
         <saletab header="累购查询" v-if="permission('累购查询')">
           <Repurchase  :row="row" v-if="show == '累购查询'" @deal-msg="dealMsg"></Repurchase>
         </saletab>
-        <saletab header="下账查询" v-if="row.f_meter_type.includes('物联网表')&&permission('自动下账查询')">
+        <saletab header="下账查询" v-if="!newWebHand && row.f_meter_type.includes('物联网表')&&permission('自动下账查询')">
           <automatic-purse  :row="row"   @deal-msg="dealMsg"></automatic-purse>
         </saletab>
+        <saletab header="下账查询" v-if="newWebHand && row.f_meter_type.includes('物联网表')&&permission('自动下账查询')">
+          <web-automatic-purse  :row="row"   @deal-msg="dealMsg"></web-automatic-purse>
+        </saletab>
         <saletab header="抄表记录" v-if="row.f_meter_type.includes('卡表')&&permission('抄表记录')">
           <card-hand-record :row="row" v-if="show == '抄表记录'" @deal-msg="dealMsg"></card-hand-record>
         </saletab>
-        <saletab header="抄表记录" v-if="!row.f_meter_type.includes('卡表')&&permission('抄表记录')">
+        <saletab header="抄表记录" v-if="!newWebHand && !row.f_meter_type.includes('卡表')&&permission('抄表记录')">
           <hand-query-user  :row="row" v-if="show == '抄表记录'" @deal-msg="dealMsg"></hand-query-user>
         </saletab>
+        <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="row.f_meter_type.includes('卡表')&&permission('补卡查询')">
           <fill-card-query-user :row="row" v-if="show == '补卡查询'" @deal-msg="dealMsg"></fill-card-query-user>
         </saletab>
@@ -92,6 +101,10 @@
   import AutomaticPurse from './ic_detail/AutomaticPurse'
   import Repurchase from './ic_detail/Repurchase'
   import MachineRecordQuery from './ic_detail/MachineRecordQuery'
+  import WebAutomaticPurse from './ic_detail/WebAutomaticPurse'
+  import WebChargeQueryUser from './ic_detail/WebChargeQueryUser'
+  import WebHandQueryUser from './ic_detail/WebHandQueryUser'
+
   // 导入物联网相关查询
   import QueryInstruct from './iot_detail/QueryInstruct'
   import QueryHistoryInstruct from './iot_detail/QueryHistoryInstruct'
@@ -109,6 +122,9 @@ export default {
       PriceAdjustmentQueryUser,
       PriceChangeQueryUser,
       AutomaticPurse,
+      WebAutomaticPurse,
+      WebChargeQueryUser,
+      WebHandQueryUser,
       Repurchase,
       ChangeMeterQueryUser,
       ChargeQueryUser,
@@ -132,6 +148,7 @@ export default {
       return {
         row: null,
         name: '自动下账查询',
+        newWebHand: this.$appdata.getSingleValue('新抄表'),
         show: ''
       }
     },

package/src/components/common/userinfo_detail/ic_detail/ChargeQueryUser.vue

@@ -173,7 +173,7 @@ let reprintGen = function * (self, row) {
         reissue_show: false,
         reissue_data: null,
         condition: '1=1',
-        model: new PagedList('rs/sql/sale_ChargeQuery', 20, {}, {
+        model: new PagedList('rs/sql/sale_ChargeQuery', 20, {f_user_id: this.row.f_user_id}, {
           f_preamount: 0,
           f_pregas: 0,
           f_oughtfee: 0,
@@ -227,6 +227,7 @@ let reprintGen = function * (self, row) {
     props: ['row'],
     ready () {
       this.$refs.paged.$refs.criteria.model.f_state = ['有效']
+      this.$refs.paged.$refs.criteria.model.f_user_id = this.row.f_user_id
       this.$refs.paged.$refs.criteria.search()
     },
     methods: {
@@ -237,7 +238,8 @@ let reprintGen = function * (self, row) {
         let http = new HttpResetClass()
         let res = await http.load('POST', 'rs/sql/sale_ChargeQuery', {
           data: {
-            condition: this.condition
+            condition: this.condition,
+            f_user_id: this.row.f_user_id
           }
         }, {resolveMsg: null, rejectMsg: null})
         this.printModel.rows = res.data

package/src/components/common/userinfo_detail/ic_detail/WebAutomaticPurse.vue

@@ -0,0 +1,297 @@
+<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" width="100%">
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">开始时间</label>
+                <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_start_date"
+                            class="datepicker"
+                            condition="f_operate_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" >结束时间</label>
+                <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_end_date"
+                            class="datepicker"
+                            condition="f_operate_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">缴费状态</label>
+                <v-select :value.sync="model.f_state" v-model='model.f_state'
+                          style="width:60%"
+                          :options='$parent.$parent.jiaofeistates' placeholder='缴费状态'
+                          close-on-select
+                          condition="s.f_state = '{}'"></v-select>
+              </div>
+
+              <div style="float: right">
+                <button @click="search()" class="button_search" style="margin-right: 10px" v-el:cba>查询</button>
+                <print-data :defaultfield="$parent.$parent.defaultfield" :field="$parent.$parent.fields" :is-selected="true" :model="$parent.$parent.printModel"
+                            @print-data="$parent.$parent.print()" print-name="购气流水"></print-data>
+              </div>
+            </div>
+          </div>
+
+
+        </criteria>
+        <data-grid :model="model" class="list_area table_sy" partial='list' v-ref:grid>
+          <template partial='head'>
+            <tr>
+              <th><nobr>缴费日期</nobr></th>
+              <th><nobr>缴费时间</nobr></th>
+              <!--              <th><nobr>表号</nobr></th>-->
+              <th><nobr>上期指数</nobr></th>
+              <th><nobr>本期指数</nobr></th>
+              <th>使用方量</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">{{row.f_operate_date.substring(0,10)}}</td>
+              <td style="text-align:center">{{row.f_operate_date.substring(11,19)}}</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_pregas}}</td>
+              <td style="text-align:center">{{row.f_price}}</td>
+              <td style="text-align:center">{{row.f_preamount}}</td>
+              <td style="text-align:center">{{row.f_meterBalanceAmt}}</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_pregas}}
+        </td>
+        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+          金额合计:&emsp;{{model.sums.f_preamount}}
+        </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 = self.getBillUrl(row.type)
+
+      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 () {
+      return {
+        reissue_show: false,
+        reissue_data: null,
+        condition: '1=1',
+        model: new PagedList(`${this.row.f_meter_type === '物联网表'?'rs/sql/sale_WebAutomaticPurse':'rs/sql/sale_AutomaticPurse'}`, 20, {}, {
+          f_preamount: 0,
+          f_pregas: 0
+        }),
+        show: false,
+        list: [],
+        jiaofeistates: this.$appdata.getParam('缴费状态') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('缴费状态')] : [],
+        // 控制单选
+        radio: [],
+        // 选中的页
+        all: [],
+        // row数据
+        rowsdata: [],
+        fields: {'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_preamount': '购气金额', 'f_pregas': '购气量', 'f_operate_date,': '缴费时间', 'f_operator': '操作员', 'f_comments': '备注'},
+        defaultfield: [
+          'f_userinfo_code', 'f_user_name', 'f_preamount', 'f_pregas', 'f_operate_date', 'f_operator', 'f_comments'
+        ],
+        printModel: {
+          rows: []
+        }
+      }
+    },
+    props: ['row'],
+    ready () {
+      this.$refs.paged.$refs.criteria.model.f_state = ['有效']
+    },
+    methods: {
+      async search () {
+        console.log('aaa:', this.$refs.paged.$refs.criteria.condition)
+        this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_user_id = '${this.row.f_user_id}' and f_orgid = '${this.$login.f.orgid}'`
+        this.model.search(this.condition, this.model)
+        let http = new HttpResetClass()
+        let res = await http.load('POST', `${this.row.f_meter_type === '物联网表'?'rs/sql/sale_WebAutomaticPurse':'rs/sql/sale_AutomaticPurse'}`, {
+          data: {
+            condition: this.condition
+          }
+        }, {resolveMsg: null, rejectMsg: null})
+        this.printModel.rows = res.data
+      },
+      // 多选框初始化
+      selectInit () {
+        this.rowsdata = []
+        this.all = []
+        this.radio = []
+      },
+      reissueSucc () {
+        this.reissue_show = false
+        this.$dispatch('refresh')
+      },
+      reissueOper () {
+        this.reissue_data = null
+        this.reissue_show = false
+      },
+      getBillUrl (type) {
+        let name = ''
+        // 根据type数据 选择调用的Logic
+        if (type === '机表收费') {
+          name = 'rs/report/machine_bill'
+        } else if (type === '物联网收费') {
+          name = 'rs/report/iot_bill'
+        } else if (type === '超用收费') {
+          name = 'rs/report/overuse_bill'
+        } else if (type === '其他收费') {
+          name = 'rs/report/otherCharge_bill'
+        } else if (type === '发卡售气') {
+          name = 'rs/report/sendCard_bill'
+        } else if (type === '卡表收费') {
+          name = 'rs/report/card_bill'
+        }
+        return name
+      },
+      report (row) {
+        let reprint = reprintGen(this, row)
+        return co(reprint)
+      },
+      print () {
+        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: {
+      ischecked () {
+        return function (index, i) {
+          if (!this.radio[index]) {
+            return false
+          }
+          return this.radio[index][i]
+        }
+      }
+    }
+  }
+</script>
+