sale-client 3.4.179-2 → 3.4.181

package/build/dev-server.js

@@ -1,160 +1,160 @@
-var express = require('express')
-var webpack = require('webpack')
-var config = require('./webpack.dev.conf')
-var proxyMiddleware = require('http-proxy-middleware')
-// var httpProxy = require('http-proxy')
-
-var app = express()
-var compiler = webpack(config)
-// var proxy = httpProxy.createProxyServer()
-
-// Define HTTP proxies to your custom API backend
-// https://github.com/chimurai/http-proxy-middleware
-var bendi = 'http://121.36.106.17:8400/',bendi1 = 'http://121.36.106.17:8400/'
-// 公司测试服务
-var fuwu = 'http://121.36.106.17:8400'
-//铜川正式
-//  var fuwu = 'http://61.134.55.234:9999/'
-//铜川测试
-// var fuwu = 'http://61.134.55.234:9999/'
-// var fuwu = 'http://60.222.250.39:8300/'
-//韶关
-// var fuwu = 'http://119.146.1.106:8300/'
-// 巩义测试服务
-// var fuwu = 'http://192.168.0.227:8400'
-// 燎原测试服务
-// var fuwu = 'http://121.41.19.238:8400  '
-// var fuwu = 'http://121.41.19.238:9001/'
-
-// var fuwu = 'http://139.214.92.34:8301/'
-
-var proxyTable = {
-  '/rs/logic/saleExport': {
-    target: fuwu
-  },
-  '/rs/logic/saleGetExportProgress': {
-    target: fuwu
-  },
-  '/files': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getLogin': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getInitData': {
-    target: fuwu
-  },
-  '/rs/logic/getSaleInitData': {
-    target: fuwu
-  },
-  '/invoice':{
-    target: fuwu
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target: fuwu
-  },
-  '/rs/path/getParams': {
-    target: fuwu
-  },
-  '/rs/data': {
-    target: fuwu
-  },
-  '/rs/license': {
-    target: fuwu
-  },
-  '/rs/db': {
-    target: fuwu
-  },
-  '/excel': {
-    target: fuwu
-  },
-  '/rs/config': {
-    target: fuwu
-  },
-  '/rs/sql/getLicenseById': {
-    target: fuwu
-  },
-  '/rs/sql/manage_getarealist': {
-    target: fuwu
-  },
-  '/rs/sql/manage_getstreetlist': {
-    target: fuwu
-  },
-  '/rs/report': {
-    target: 'http://121.36.106.17:8400/'
-  },
-  '/rs/vue': {
-    target: fuwu
-  },
-  '/webmeter': {
-    target: 'http://192.168.50.4:8450'
-  },
-  '/rs': {
-    // target: 'http://192.168.30.63:8081/'
-    // target: 'http://121.36.106.17:8400/'
-    target: fuwu
-  }
-}
-
-var devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: config.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
-})
-
-var hotMiddleware = require('webpack-hot-middleware')(compiler)
-// force page reload when html-webpack-plugin template changes
-compiler.plugin('compilation', function (compilation) {
-  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
-    hotMiddleware.publish({action: 'reload'})
-    cb()
-  })
-})
-
-// proxy api requests
-Object.keys(proxyTable).forEach(function (context) {
-  var options = proxyTable[context]
-  if (typeof options === 'string') {
-    options = {target: options}
-  }
-  app.use(proxyMiddleware(context, options))
-})
-
-// handle fallback for HTML5 history API
-app.use(require('connect-history-api-fallback')())
-// app.use(function (req, res, next) {
-//   res.header('Access-Control-Allow-Origin', '*')
-//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
-//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
-//   res.header('X-Powered-By', '3,2,1')
-//   res.header('Access-Control-Allow-Credentials', 'true')
-//   res.header('Content-Type', 'application/json;charset=utf-8')
-//   next()
-// })
-
-// serve webpack bundle output
-app.use(devMiddleware)
-
-// enable hot-reload and state-preserving
-// compilation error display
-app.use(hotMiddleware)
-
-// serve pure static assets
-app.use('/static', express.static('./static'))
-
-module.exports = app.listen(8089, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8089')
-})
+var express = require('express')
+var webpack = require('webpack')
+var config = require('./webpack.dev.conf')
+var proxyMiddleware = require('http-proxy-middleware')
+// var httpProxy = require('http-proxy')
+
+var app = express()
+var compiler = webpack(config)
+// var proxy = httpProxy.createProxyServer()
+
+// Define HTTP proxies to your custom API backend
+// https://github.com/chimurai/http-proxy-middleware
+var bendi = 'http://121.36.106.17:8400/',bendi1 = 'http://121.36.106.17:8400/'
+// 公司测试服务
+var fuwu = 'http://121.36.106.17:8400/'
+//铜川正式
+//  var fuwu = 'http://61.134.55.234:9999/'
+//铜川测试
+// var fuwu = 'http://61.134.55.234:9999/'
+// var fuwu = 'http://60.222.250.39:8300/'
+//韶关
+// var fuwu = 'http://119.146.1.106:8300/'
+// 巩义测试服务
+// var fuwu = 'http://192.168.0.227:8400'
+// 燎原测试服务
+// var fuwu = 'http://121.41.19.238:8400  '
+// var fuwu = 'http://121.41.19.238:9001/'
+
+// var fuwu = 'http://139.214.92.34:8301/'
+
+var proxyTable = {
+  '/rs/logic/saleExport': {
+    target: fuwu
+  },
+  '/rs/logic/saleGetExportProgress': {
+    target: fuwu
+  },
+  '/files': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getLogin': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getInitData': {
+    target: fuwu
+  },
+  '/rs/logic/getSaleInitData': {
+    target: fuwu
+  },
+  '/invoice':{
+    target: fuwu
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: fuwu
+  },
+  '/rs/path/getParams': {
+    target: fuwu
+  },
+  '/rs/data': {
+    target: fuwu
+  },
+  '/rs/license': {
+    target: fuwu
+  },
+  '/rs/db': {
+    target: fuwu
+  },
+  '/excel': {
+    target: fuwu
+  },
+  '/rs/config': {
+    target: fuwu
+  },
+  '/rs/sql/getLicenseById': {
+    target: fuwu
+  },
+  '/rs/sql/manage_getarealist': {
+    target: fuwu
+  },
+  '/rs/sql/manage_getstreetlist': {
+    target: fuwu
+  },
+  '/rs/report': {
+    target: 'http://121.36.106.17:8400/'
+  },
+  '/rs/vue': {
+    target: fuwu
+  },
+  '/webmeter': {
+    target: 'http://192.168.50.4:8450'
+  },
+  '/rs': {
+    // target: 'http://192.168.30.63:8081/'
+    target: 'http://121.36.106.17:8400/'
+    // target:fuwu
+  }
+}
+
+var devMiddleware = require('webpack-dev-middleware')(compiler, {
+  publicPath: config.output.publicPath,
+  stats: {
+    colors: true,
+    chunks: false
+  }
+})
+
+var hotMiddleware = require('webpack-hot-middleware')(compiler)
+// force page reload when html-webpack-plugin template changes
+compiler.plugin('compilation', function (compilation) {
+  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
+    hotMiddleware.publish({action: 'reload'})
+    cb()
+  })
+})
+
+// proxy api requests
+Object.keys(proxyTable).forEach(function (context) {
+  var options = proxyTable[context]
+  if (typeof options === 'string') {
+    options = {target: options}
+  }
+  app.use(proxyMiddleware(context, options))
+})
+
+// handle fallback for HTML5 history API
+app.use(require('connect-history-api-fallback')())
+// app.use(function (req, res, next) {
+//   res.header('Access-Control-Allow-Origin', '*')
+//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
+//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
+//   res.header('X-Powered-By', '3,2,1')
+//   res.header('Access-Control-Allow-Credentials', 'true')
+//   res.header('Content-Type', 'application/json;charset=utf-8')
+//   next()
+// })
+
+// serve webpack bundle output
+app.use(devMiddleware)
+
+// enable hot-reload and state-preserving
+// compilation error display
+app.use(hotMiddleware)
+
+// serve pure static assets
+app.use('/static', express.static('./static'))
+
+module.exports = app.listen(8089, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8089')
+})

package/package.json

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

package/src/components/FilesManage/MeterinfoTest.vue

@@ -101,7 +101,7 @@
           </div>
           <div class="col-sm-4 form-group" v-show="row.gasbrand.length > 0 && row.gasbrand[0].f_meter_type == '物联网表' && row.gasbrand[0].f_hascard == '是'">
             <label class="font_normal_body" title="开户方式">开户方式</label>
-            <v-select :value.sync="row.f_open_way" :options='openWay' value-single placeholder='开户方式' close-on-select v-if="row.f_userfiles_id"
+            <v-select :value.sync="row.f_open_way" :options='openWay' value-single placeholder='开户方式' close-on-select v-if="row.f_userfiles_id && row.f_open_way"
                       search v-model='row.f_open_way' :disabled="true"></v-select>
             <v-select :value.sync="row.f_open_way" :options='openWay' value-single placeholder='开户方式' close-on-select v-else
                       search v-model='row.f_open_way' :disabled="false"></v-select>

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

@@ -265,6 +265,7 @@
       self.model.f_collection = (self.model.f_collection - 0) + (val.f_collection - 0)
       ids.push(val.id)
     })
+    self.model.f_collection = self.model.f_collection.toFixed(2) - 0
     ids = self.$login.convertToIn(ids)
     self.model.f_print = [res.data[0].f_bill_style]
     self.model.f_payment = [res.data[0].f_payment]

package/src/components/charge/gasloss/gasLossOperate.vue

@@ -165,7 +165,7 @@
       if (true) {
         if (self.model.f_print != '电子发票') {
           if (self.config.hasBillManage) {
-            self.model.id = resid
+            self.model.id = resid.data
             self.model.f_bill_type = '其他费用'
             self.model.f_bill_style = self.model.f_print[0]
             self.print = true

package/src/filiale/rizhao/ChargeRecordQuery.vue

@@ -0,0 +1,100 @@
+<template>
+    <div style="height:100%">
+      <data-grid :model="model" class="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><nobr>收款</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' >
+          <tr >
+            <td style="text-align:center;white-space:nowrap;">{{$index+1}}</td>
+
+            <td style="text-align:center;white-space:nowrap;">{{row.gas}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.fee}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.f_payment}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.f_balance}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.f_collection}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.f_curbalance}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.type}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.f_operate_date}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.f_user_name}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.f_operator}}</td>
+            <td style="text-align:left;white-space:nowrap;">{{row.note}}{{row.f_write_card}}</td>
+          </tr>
+        </template>
+      </data-grid>
+      <modal :show.sync="cardCental" v-ref:modal backdrop="false">
+        <header slot="modal-header" class="modal-header">
+          <h4 class="modal-title">温馨提示</h4>
+        </header>
+        <article slot="modal-body" class="modal-body">
+          <div class="form-group">
+           <p> 当日此用户已经进行过一次购气,若卡上无气,请先进行补卡(未过表),之后掉气补气即可</p>
+          </div>
+        </article>
+        <footer slot="modal-footer" class="modal-footer">
+          <button  type="button" class="btn btn-success" @click='cancel()'>确认
+          </button>
+        </footer>
+      </modal>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass} from 'vue-client'
+
+  export default {
+    title: '操作查询',
+    data () {
+      return {
+        model: {rows: []},
+        cardCental:false
+      }
+    },
+    props: ['searchdata'],
+    ready () {
+      this.getsalerecord()
+    },
+    methods: {
+      cancel(){
+          this.cardCental = false;
+      },
+      async getsalerecord () {
+        let http = new HttpResetClass()
+        // this.condition = `1=1 and f_user_id = '${this.searchdata.f_user_id}'`
+        this.condition = `1=1 and f_userfiles_id = '${this.searchdata.f_userfiles_id}'`
+        let record = await http.load('POST', 'rs/sql/sale_RecordQuery', {data: {condition: this.condition}}, {
+          rejectMsg: '流水查询出错！！',
+          resolveMsg: null
+        })
+        this.model.rows = record.data
+        if(this.model.rows.length>0 && ( this.model.rows[0].type== '发卡售气' ||  this.model.rows[0].type== '卡表收费' ) ){
+          let checkdata = this.model.rows[0].operate_date.substr(0,10)
+          let nowdate = new Date();
+          let pdate = nowdate.getFullYear()+'-'+(nowdate.getMonth()<10? '0'+nowdate.getMonth()+1 : nowdate.getMonth()+1) +'-'+(nowdate.getDate()<10? '0'+nowdate.getDate() : nowdate.getDate());
+          if(new Date(checkdata).getTime() == new Date(pdate).getTime()){
+            this.cardCental = true;
+          }
+        }
+      }
+    },
+    watch: {
+      'searchdata' () {
+        this.getsalerecord()
+      }
+    }
+  }
+</script>

package/src/filiale/rizhao/sale.js

@@ -16,6 +16,8 @@ let specialComp = {
   // 用户综合信息
   'file-user-general-info': (resolve) => { require(['./UserGeneralInfoTest'], resolve) },
   // 表具设备信息test
-  'file-user-device-info': (resolve) => { require(['./UserDeviceInfoTest'], resolve) }
+  'file-user-device-info': (resolve) => { require(['./UserDeviceInfoTest'], resolve) },
+  // 收费页面的流水查询
+  'meter-charge-record-query': (resolve) => { require(['./ChargeRecordQuery'], resolve) }
 }
 exports.specialComp = specialComp

package/src/filiale/shaoguan/Message/MessageList.vue

@@ -64,9 +64,9 @@
             </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">用户编号</label>
-              <input  type="text" class="form-control" v-model="model.f_userinfo_code" placeholder='用户编号' v-filter v-figure_filter
-                      condition="f_userinfo_code = '{}'" v-next-el='yhxm' style="width: 60%"
-                      :size="model.f_userinfo_code ? model.f_userinfo_id.length  : 4">
+              <input  type="text" class="form-control" v-model="model.code" placeholder='用户编号' v-filter v-figure_filter
+                      condition="code = '{}'" v-next-el='yhxm' style="width: 60%"
+                      :size="model.code ? model.f_userinfo_id.length  : 4">
             </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">用户姓名</label>
@@ -146,7 +146,7 @@
           </td>
           <td style="text-align:center"><nobr>{{$index+1}}</nobr></td>
           <td style="text-align:center"><nobr>{{row.f_userinfo_id}}|{{row.f_user_name}}|{{row.f_user_phone}}</nobr></td>
-          <td style="text-align:center"><nobr>{{row.f_userinfo_code}}</nobr></td>
+          <td style="text-align:center"><nobr>{{row.code}}</nobr></td>
           <td style="text-align:center"><nobr>{{row.f_phone}}</nobr></td>
           <td style="text-align:center"><nobr>{{row.f_send_type}}</nobr></td>
           <td style="text-align:center;width: 20px" :title="row.f_content"><nobr>{{row.f_content.substr(0,20)}}</nobr></td>
@@ -231,7 +231,7 @@ export default {
       sendType: [{label: '全部', value: ''}, ...this.$appdata.getParam('发送状态')],
       getsendType: this.$appdata.getParam('短信类型'),
       replyType: this.$appdata.getParam('评价级别'),
-      bodydata: ['f_user_name', 'f_userinfo_code', 'f_phone', 'f_send_type', 'f_content', 'f_send', 'f_sendtime', 'f_statedetail', 'f_reply_type', 'f_reply_content', 'f_reply_content'],
+      bodydata: ['f_user_name', 'code', 'f_phone', 'f_send_type', 'f_content', 'f_send', 'f_sendtime', 'f_statedetail', 'f_reply_type', 'f_reply_content', 'f_reply_content'],
       header: ['用户姓名', '用户编号', '电话号码', '短信类型', '短信内容', '发送状态', '发送时间', '状态报告', '评价级别', '回执状态', '评价内容'],
       showFile: false,
       progressBar:'0%'