sale-client 3.5.91 → 3.5.93

package/build/dev-server.js

@@ -1,167 +1,167 @@
-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://127.0.0.1:8080', bendi1 = 'http://121.36.106.17:8400/'
-// 公司测试服务
-var fuwu = 'http://192.168.50.4: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
-  },
-  '/rs/logic/getWarningMsg': {
-    target: 'http://localhost:8080/'
-  },
-  '/rs/file': {
-    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://127.0.0.1:8080', bendi1 = 'http://121.36.106.17:8400/'
+// 公司测试服务
+var fuwu = 'http://192.168.50.4: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
+  },
+  // '/rs/logic/getWarningMsg': {
+  //   // target: 'http://localhost:8080/'
+  // },
+  '/rs/file': {
+    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.5.91",
+  "version": "3.5.93",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/chargeBatch/BatchCharge.vue

@@ -95,6 +95,8 @@
 </template>
 
 <script>
+import {HttpResetClass} from "vue-client";
+
 let asyncMachineMeterCenter = async function (self) {
   await self.$getConfig(self, 'BatchCharge')
   self.data.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
@@ -108,6 +110,9 @@ export default {
   title: '团体缴费',
   data () {
     return {
+      // 请求对象(批量导入,查询进度使用)
+      HttpReset: new HttpResetClass(),
+      timer: null,
       config: {
         showupload: true, // 显示上传
         hasPrint: true,  // 默认打票
@@ -131,6 +136,10 @@ export default {
     }
   },
   props: ['data', 'owe', 'civill'],
+  beforeDestroy () {
+    // 销毁定时器
+    if (this.timer) clearInterval(this.timer)
+  },
   ready () {
     this.paycodefocus()
     if (!this.$login.r.includes('免交充值付款')) {
@@ -218,7 +227,9 @@ export default {
       })
     },
     async machineChargeGen () {
+      let uuid = this.$login.guid()
       let param = {
+        uuid: uuid,
         chargeUser: [],
         f_serial_id: this.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no,
         f_balance: this.data.f_balance,
@@ -248,29 +259,45 @@ export default {
       if (this.civill) {
         param = Object.assign(this.civill, param)
       }
-      let res = await this.$resetpost('rs/logic/batchPayment', {data: param}, {resolveMsg: '团体收费成功', rejectMsg: '团体收费失败'})
-      if (this.config.hasPrint) {
-        if (this.data.f_print.indexOf('电子发票') == -1) {
-          console.log('this.config.hasBillManage', this.config.hasBillManage)
-          if (this.config.hasBillManage) {
-              // 启用发票管理，获取票据管理中的票号并存储记录
-            this.row.id = res.data.id
-            this.row.f_bill_type = '物联网收费'
-            this.row.f_bill_style = this.model.f_print[0]
-            this.print = true
+      try {
+        await this.$resetpost('rs/logic/batchPayment', {data: param}, {resolveMsg: null, rejectMsg: null}, 1000)
+      } catch (e) {}
+      this.$showMessage(`正在批量处理中, 请耐心等待...`, [])
+      // 启动定时器定时查询处理结果
+      this.timer = setInterval(async () => {
+        let res = await this.HttpReset.load('POST', 'rs/logic/getBatchOperaPro', {data: {uuid: uuid}}, {resolveMsg: null, rejectMsg: null})
+        if (res.data.msg || res.data.error) {
+          clearInterval(this.timer)
+          this.$closeMessage()
+          if (res.data.error) {
+            this.$showAlert(`${res.data.error}`, 'danger')
+            return
+          }
+          await this.$showMessage(res.data.msg)
+          if (this.config.hasPrint) {
+            if (this.data.f_print.indexOf('电子发票') == -1) {
+              console.log('this.config.hasBillManage', this.config.hasBillManage)
+              if (this.config.hasBillManage) {
+                // 启用发票管理，获取票据管理中的票号并存储记录
+                this.row.id = res.data.id
+                this.row.f_bill_type = '物联网收费'
+                this.row.f_bill_style = this.model.f_print[0]
+                this.print = true
+              } else {
+                this.data.id = res.data.id
+                this.print = true
+              }
+            } else if (this.config.printType === '国税发票') {
+              // TODO
+            } else if (this.model.f_print[0] === '电子发票') {
+              this.eticket_show = true
+              await this.$refs.eticketbill.openETicket([res.data.id], this.row, this.invoice_show_gas, this.invoice_is_pax, '物联网收费')
+            }
           } else {
-            this.data.id = res.data.id
-            this.print = true
+            this.clean()
           }
-        } else if (this.config.printType === '国税发票') {
-            // TODO
-        } else if (this.model.f_print[0] === '电子发票') {
-          this.eticket_show = true
-          await this.$refs.eticketbill.openETicket([res.data.id], this.row, this.invoice_show_gas, this.invoice_is_pax, '物联网收费')
         }
-      } else {
-        this.clean()
-      }
+      }, 5000)
     },
     clean () {
       this.$dispatch('success')

package/src/components/revenue/comprehen/StairPrice/GasPriceList.vue

@@ -136,7 +136,7 @@
             <td style="text-align:center"><nobr>{{row.f_value}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_filiale_name}}</nobr></td>
             <td style="text-align:center"><button @click.stop="$parent.$parent.$parent.operate(row.f_price_id,row.f_price_name,row.f_filialeid)" class="btn btn-link"><b>{{row.usercount}}</b></button></td>
-            <td style="text-align:center">{{row.f_state === '待审核' ? '待审核' : '使用中'}}</td>
+            <td style="text-align:center">{{row.f_price_state}}</td>
             <td style="text-align:center" v-if="$parent.$parent.$parent.config.audit">
               <button :disabled="$login.r.includes('气价审核')" @click.stop="$parent.$parent.$parent.passPrice(row)"
                       class="btn btn-link" v-if="row.f_state === '待审核'">通过

package/src/filiale/gehua/IOTMeterCenter.vue

@@ -294,7 +294,7 @@
       // 加入扫码盒付款码支付流水号
       param.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no ? self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no : ''
       param.f_serial_id = self.$refs.mispospay.misposReturnData.f_out_trade_no ? self.$refs.paymentcode.misposReturnData.f_out_trade_no : ''
-      let res = await self.$resetpost('rs/logic/sale_IOTCharge_logic', {data: param}, {
+      let res = await self.$resetpost('/mispos/rs/logic/sale_IOTCharge_logic', {data: param}, {
         resolveMsg: '物联网收费成功！！',
         rejectMsg: '物联网收费出错!!!'
       })

package/src/filiale/tongchuan/TransferRecords.vue

@@ -0,0 +1,236 @@
+<template>
+  <div class="flex-column">
+    <div class="span" style="">
+      <validator name='v'>
+        <form novalidate class="form-horizontal">
+          <div class="row" style="margin-top:10px;">
+            <div class="col-sm-4">
+              <label for="f_newuser_name" id="label" class="font_normal_body">转出方编号</label>
+              <input class="input_search" style="width:60%" type="text" title="转出方编号" v-model="model.out_userinfo_code"
+                  readonly   placeholder="用户姓名">
+            </div>
+            <div class="col-sm-4">
+            <label for="f_newuser_name" id="label" class="font_normal_body">转出方姓名</label>
+              <input class="input_search" style="width:60%" type="text" title="转出方姓名" v-model="model.out_user_name"
+                  readonly   placeholder="用户姓名">
+            </div>
+          </div>
+          <div class="row" style="margin-top:10px;">
+            <div class="col-sm-4" title="回车搜索传出方信息" :class="[$v.in_userinfo_code.required ? 'has-error' : 'has-success']">
+              <label for="f_newuser_name" id="label" class="font_normal_body">转&emsp;入&emsp;方</label>
+              <input class="input_search" style="width:60%" type="text" title="回车搜索转入方信息" v-model="model.in_userinfo_code"
+                     v-validate:in_userinfo_code='{required: true }'  @keydown.enter="searchByCode"  placeholder="转出方编号，按下回车进行查询">
+            </div>
+            <div class="col-sm-4" :class="[$v.in_user_name.required ? 'has-error' : 'has-success']">
+              <label for="f_newuser_name" id="label" class="font_normal_body">转入方姓名</label>
+              <input class="input_search" style="width:60%" type="text" title="转入方姓名" v-model="model.in_user_name"
+                     v-validate:in_user_name='{required: true }' readonly  placeholder="转入方姓名">
+            </div>
+          </div>
+          <div class="row" style="margin-top:10px;">
+            <div class="col-sm-12" :class="[$v.f_comments.required ? 'has-error' : 'has-success']">
+              <label id="label" for="f_comments" class="font_normal_body">&nbsp;备&emsp;&emsp;注</label>
+              <input class="input_search" style="width:87%" v-model="model.f_comments"
+                     v-validate:f_comments='{required: true }'
+                     placeholder="备注"/>
+            </div>
+          </div>
+        </form>
+        <div style="text-align:right;height:auto;">
+          <button class="button_search" @click="notarize = true" :disabled='!$v.valid'>
+            确认
+          </button>
+          <button class="button_clear" @click="clear()">
+            取消
+          </button>
+        </div>
+        <upload :blodid="blodid" v-if="config.showupload" isremark="true" fusetype="用户记录转移管理"></upload>
+      </validator>
+    </div>
+    <modal v-if="notarize" :show.sync="notarize" width="100%" title="信息确认" v-ref:modal large backdrop="false">
+      <article slot="modal-body" class="modal-body" style="text-align: center">
+          <strong>此操作具有一定的风险性，需要您再次确认转出方用户信息，请输入转入方用户编号</strong>
+        <div class="row">
+          <div class="col-sm-6 col-sm-offset-3">
+            <label for="f_newuser_name" id="label" class="font_normal_body">再次确认用户编号</label>
+            <input class="input_search" style="width:60%" type="text" title="用户编号" v-model="notarize_userinfo_code"
+                      placeholder="用户编号">
+          </div>
+        </div>
+        <!--<div class="row" v-if="row.f_meter_type== '物联网表'||row.f_meter_type== '机表' || row.f_meter_type == '金额卡表'">-->
+          <!--<div class="col-sm-6 col-sm-offset-3">-->
+            <!--<label for="f_auto_operate" id="f_auto_operate" class="font_normal_body">自动生成补费扣费</label>-->
+            <!--<v-select :value.sync="model.f_auto_operate" v-model='model.f_auto_operate'-->
+                      <!--style="width:60%"-->
+                      <!--:options='autoOperate' placeholder='是否自动生成补费扣费'-->
+                      <!--close-on-select-->
+                      <!--condition="f_state = '{}'"></v-select>-->
+          <!--</div>-->
+        <!--</div>-->
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button class="button_search" @click="confirm()" :disabled='!notarize_userinfo_code'>
+          确认
+        </button>
+        <button class="button_clear" @click="notarize = false">
+          取消
+        </button>
+      </footer>
+    </modal>
+  </div>
+</template>
+<script>
+
+import {HttpResetClass} from 'vue-client'
+
+let asyncTransferManage = async function (self) {
+  // await self.$getConfig(self, 'TransferRecord')
+}
+
+export default {
+  title: '过户管理',
+  props: ['row', 'records'],
+  data () {
+    return {
+      // 附件上传必须
+      blodid: '',
+      notarize: false,
+      notarize_userinfo_code: '',
+      config: {
+        showupload: true,
+        tableNames: [
+          {
+            table: 't_sellinggas',
+            name: '收费记录',
+            checked: true,
+            disabled: true
+          }, {
+            table: 't_chargeprice',
+            name: '划价记录',
+            checked: true,
+            disabled: true
+          }, {
+            table: 't_record',
+            name: '记录',
+            checked: true,
+            disabled: true
+          }]
+      },
+      model: {
+        table_name: [],
+        in_userinfo_id: '',
+        in_userfiles_id: '',
+        in_userinfo_code: '',
+        in_user_id: '',
+        out_userinfo_id: '',
+        out_userfiles_id: '',
+        out_user_id: '',
+        // f_auto_operate: '否',
+        out_userinfo_code: '',
+        in_user_name: '',
+        out_user_name: '',
+        f_orgid: '',
+        f_orgname: '',
+        f_depid: '',
+        f_depname: '',
+        f_operatorid: '',
+        f_operator: '',
+        f_comments: ''
+      },
+      autoOperate: [{ label: '是', value: '是' }, { label: '否', value: '否' }]
+    }
+  },
+  ready () {
+    this.blodid = this.row.f_userinfo_id
+    Object.assign(this.model, {
+      out_userinfo_id: this.row.f_userinfo_id,
+      out_userinfo_code: this.row.f_userinfo_code,
+      out_userfiles_id: this.row.f_userfiles_id,
+      out_user_id: this.row.f_user_id,
+      out_user_name: this.row.f_user_name,
+      f_operator: this.$login.f.name,
+      f_operatorid: this.$login.f.id,
+      f_orgid: this.$login.f.orgid,
+      f_orgname: this.$login.f.orgs,
+      f_depid: this.$login.f.depids,
+      f_depname: this.$login.f.deps
+    })
+    asyncTransferManage(this)
+  },
+  methods: {
+    confirm () {
+      // 首先验证用户
+      new HttpResetClass().load('post', 'rs/sql/sale_getUser',
+        {
+          data: {
+            condition: `f_userinfo_code = '${this.notarize_userinfo_code}'`,
+            orderitem: ` f_userinfo_code Desc`
+          }
+        },
+        {resolveMsg: null, rejectMsg: '查找用户出错'}).then(
+        res => {
+          if (res.data.length === 0) {
+            this.$showAlert('验证信息有误，请重新输入用户编号进行查询并谨慎核对！！！', 'warning', 2000)
+          } else if (this.model.in_user_id !== res.data[0].f_user_id || this.model.in_userinfo_id !== res.data[0].f_userinfo_id || this.model.in_userfiles_id !== res.data[0].f_userfiles_id) {
+            this.$showAlert('验证信息有误，请重新输入用户编号进行查询并谨慎核对！！！', 'warning', 2000)
+            this.model.in_user_name = undefined
+          } else {
+            this.model.table_name = this.config.tableNames.map(item => item.table)
+            // this.model.f_auto_operate = this.model.f_auto_operate[0]
+            new HttpResetClass().load('post', 'rs/logic/transferRecords',
+              {
+                model: this.model,
+                records: this.records
+              },
+              {resolveMsg: null, rejectMsg: '转移记录出错'}).then(
+              res => {
+                this.$showAlert('操作成功', 'success', 2000)
+                this.clear()
+              }
+            )
+          }
+        }
+      )
+    },
+    clear () {
+      this.$dispatch('refresh')
+    },
+    searchByCode () {
+      if (this.model.in_userinfo_code === this.model.out_userinfo_code) {
+        this.$showAlert('转出方转入方信息不能一致，请谨慎核对！！！', 'warning', 2000)
+        return
+      }
+      new HttpResetClass().load('post', 'rs/sql/sale_getUser',
+        {
+          data: {
+            condition: `f_userinfo_code = '${this.model.in_userinfo_code}'`,
+            orderitem: ` f_userinfo_code Desc`
+          }
+        },
+        {resolveMsg: null, rejectMsg: '查找用户出错'}).then(
+          res => {
+            if (res.data.length > 0) {
+              Object.assign(this.model, {
+                in_userinfo_code: res.data[0].f_userinfo_code,
+                in_user_id: res.data[0].f_user_id,
+                in_userinfo_id: res.data[0].f_userinfo_id,
+                in_userfiles_id: res.data[0].f_userfiles_id,
+                in_user_name: res.data[0].f_user_name
+              })
+            } else {
+              this.$showAlert('查无用户信息，请谨慎核对！！！', 'warning', 2000)
+              this.model.in_user_name = undefined
+            }
+          }
+      )
+    }
+  },
+  events: {}
+}
+</script>
+
+<style scoped>
+#label {
+  margin-top: 5px;
+}
+</style>

package/src/filiale/tongchuan/common/userinfo_detail/UserInfoDetailManageNew.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="binary flex" >
-    <div class="row binary-left flex" style="width:99%;height:98%;margin-bottom:0px">
+    <div class="col-12 binary-left flex" style="width:99%;height:98%;margin-bottom:0px">
       <div class="auto"><user-base-info-new :row="row"  @cancel-main="cancel"></user-base-info-new></div>
       <saletabbut  v-if="row" v-ref:list style="height:72%;margin-top: 1%">
         <saletab header="流水查询" v-if="permission('流水查询')">

package/src/filiale/tongchuan/common/userinfo_detail/ic_detail/ChargeQueryUser.vue

@@ -139,7 +139,7 @@
     <modal v-if="transfer" :show.sync="transfer" v-ref:modal backdrop="false">
       <header slot="modal-header" class="modal-header" style="display: none">
       </header>
-      <article slot="modal-body" class="modal-body" style="padding:4rem 20px;">
+      <article slot="modal-body" class="modal-body" style="padding:4rem 20px;height:700px;">
         <transfer-records :row="row" :records="records" @refresh="transfer = false"></transfer-records>
       </article>
       <footer slot="modal-footer" class="modal-footer" style="display:none"> </footer>

package/src/filiale/tongchuan/sale.js

@@ -112,6 +112,8 @@ let specialComp = {
 
   // 发票信息提示框
   'eticket-modal': (resolve) => { require(['./bill/EticketModal'], resolve) },
-  'card-meter-center': (resolve) => { require(['./CardMeterCenter'], resolve) }
+  'card-meter-center': (resolve) => { require(['./CardMeterCenter'], resolve) },
+  // 过户
+  'transfer-records':(resolve) => { require(['./TransferRecords'], resolve) }
 }
 exports.specialComp = specialComp

package/src/plugins/CardService.js

@@ -605,8 +605,8 @@ let sendCardSaleGasGenremanent = async function (model, row) {
       }
       // 判断是否是累购表
       if (row.f_support_purchase === '是') {
-        params.ljgql = (row.f_write_totalgas - 0) + (model.f_pregas - 0) + (model.f_fill_gas - 0)
-        params.ljgqje = (row.f_write_totalfee - 0) + (model.f_preamount - 0) + (model.f_fill_money - 0)
+        params.ljgql = (row.f_write_totalgas - 0) + (model.f_pregas - 0)
+        params.ljgqje = (row.f_write_totalfee - 0) + (model.f_preamount - 0)
       }
       params = Object.assign({}, Vue.CommonService.writeCardParams(cardParams), params)
       console.log('换表发卡写卡参数', params)