sale-client 3.5.19 → 3.5.22

package/build/dev-server.js

@@ -1,161 +1,161 @@
-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
-  },
-  '/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: bendi
-  }
-}
-
-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
+  },
+  '/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: bendi
+  }
+}
+
+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.19",
+  "version": "3.5.22",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/FilesManage/FileUserFiles.vue

@@ -42,6 +42,7 @@
                           class="form-group button-range">
                     <!--<button class="button_search button_spacing" style="width: 90px" @click="$parent.$parent.showFileInfo()">查看批量状态-->
                     <!--</button>-->
+                    <button class="button_search button_spacing" type="button" @click="$parent.$parent.goChargeManage()">去收费</button>
 
                     <button @click="search(), $parent.$parent.clean()" class="button_search button_spacing"
                             style="float: right">查询

package/src/components/FilesManage/MeterinfoTest.vue

@@ -43,7 +43,7 @@
             <input type="text" class="input_search" style="width:60%" v-show="false" v-model="$refs.brand.selectedItems"
                    v-validate:brand='{required: true }'>
             <v-select :value.sync="row.gasbrand" :options='meterbrands' placeholder='气表品牌' close-on-select
-                      search @change='brandChange' v-model='row.gasbrand' v-ref:brand></v-select>
+                      search @change='brandChange' v-model='row.gasbrand' :disabled="curuser.f_user_state != '预备'" v-ref:brand></v-select>
           </div>
           <div class="col-sm-4 form-group" :class="[$m.model.required ? 'has-error' : '']">
             <label for="gasmodel" class="font_normal_body">气表型号</label>
@@ -51,7 +51,7 @@
                    v-validate:model='{required: true }'>
             <v-select :value.sync="row.gasmodel" :options='row.gasbrand[0].gasmodel' placeholder='气表型号'
                       close-on-select
-                      v-model='row.gasmodel' :disabled='row.gasbrand.length === 0 ' v-ref:model></v-select>
+                      v-model='row.gasmodel' :disabled="row.gasbrand.length === 0 || curuser.f_user_state != '预备'" v-ref:model></v-select>
           </div>
           <div class="col-sm-4 form-group">
             <label for="f_meter_base" class="font_normal_body">&ensp;累购气量</label>
@@ -565,7 +565,7 @@
         templat: '' //  临时纬度
       }
     },
-    props: ['f_filialeid', 'meter', 'isdecimal', 'valid', 'f_userinfo_id','overdueset'],
+    props: ['f_filialeid', 'meter', 'isdecimal', 'valid', 'f_userinfo_id', 'overdueset', 'curuser'],
     async ready () {
       console.log('看看meter里面的数据', this.meter, this.row)
       this.row = Object.assign(this.row, this.meter, {})

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -17,7 +17,7 @@
       </div>
 
       <div style="height: auto;width: 100%">
-        <file-user-meter-info :meterinfo.sync="data.meterinfo" :f_filialeid="f_filialeid" :metervalid.sync="meterInfo" :overdueset="overdueset"
+        <file-user-meter-info :meterinfo.sync="data.meterinfo" :f_filialeid="f_filialeid" :metervalid.sync="meterInfo" :overdueset="overdueset" :curuser="row"
                          :f_userinfo_id="data.baseinfo.base.f_userinfo_id" :addressinfo="data.addressinfo" :baseinfo.sync="data.baseinfo.base" v-ref:meter></file-user-meter-info>
       </div>
 

package/src/components/FilesManage/UserMeterInfoTest.vue

@@ -9,7 +9,7 @@
         <button class="button_search" style="width: max-content" @click="showDevices($index, row)">用气设备信息</button>
         <button class="button_search" style="width: max-content" @click="showFire($index, row)">点火信息</button>
       </div>
-      <file-meter-info :meter="row" :f_filialeid="f_filialeid" :usertype="usertype" :gasproperties="gasproperties" :overdueset="overdueset" @self-valid='valida'
+      <file-meter-info :curuser="curuser" :meter="row" :f_filialeid="f_filialeid" :usertype="usertype" :gasproperties="gasproperties" :overdueset="overdueset" @self-valid='valida'
                   @delete-meter="deleteMeter($index)" :f_userinfo_id="f_userinfo_id"></file-meter-info>
       <file-user-fire-info @clearfire="clearfire(row)" :addressinfo="addressinfo" :fireinfo.sync="fireinfo" :show_fire.sync="show_fire"  :meter.sync="row"  :baseinfo.sync="baseinfo"
                            :userinfoid='data.baseinfo.base.f_userinfo_id'></file-user-fire-info>
@@ -55,7 +55,8 @@ export default {
       baseinfo:{},
       f_filialeid: {},
       f_userinfo_id: {},
-      overdueset:{}
+      overdueset:{},
+      curuser: {}
     },
     ready () {
       console.log('表具信息，，，，', this.meterinfo)

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

@@ -142,7 +142,7 @@
       </div>
       <div class="col-sm-4">
         <label class="font_normal_body_new">抄表册名</label>
-        <input class="input-underline" style="width:45%" :value="'['+row.f_book_code + '] '+ (row.f_book_name ? row.f_book_name:'')" readonly>
+        <input class="input-underline" style="width:45%" :value="(row.f_book_code!=null ? '['+row.f_book_code + '] ' : '') + (row.f_book_name!=null ? row.f_book_name:'')" readonly>
       </div>
       <div class="col-sm-4">
         <label class="font_normal_body_new">抄表册册序号</label>
@@ -317,7 +317,9 @@
         uuidA = s.join('');
         return uuidA;
       },
-      goChargeManage () {
+      async goChargeManage () {
+        await this.$copyText(this.row.f_userinfo_code)
+        this.$showAlert(`用户编号已复制到剪切板！`, 'success', 2000)
         this.$goto('charge-manage', {f: this.$login.f}, 'main')
       },
       openUser () {
@@ -383,7 +385,7 @@
     }
   }
 </script>
-<style scoped>
+<style scoped lang="less">
   .form-group-new > div {
     height: 3% !important;
 
@@ -412,4 +414,14 @@
     line-height: 30px;
   }
 
+  .col-sm-4,.col-sm-8{
+    display: flex;
+    align-items: center;
+    margin: 7px 0;
+
+    label{
+      line-height: unset;
+      margin-bottom: 0;
+    }
+  }
 </style>

package/src/components/revenue/base/leftview/meterinfodetail.vue

@@ -197,7 +197,8 @@
           f_remanent_gas: 0,
           f_position: '****',
           f_inputtor: '****',
-          f_jval: 0
+          f_jval: 0,
+          f_table_state: 0
         },
         model: null
       }

package/src/components/revenue/base/rightview/CardList.vue

@@ -71,7 +71,7 @@
                           row.type==='卡表收费撤销'||row.type==='物联网补费' || row.type==='物联网扣费'||row.type==='机表补费'||
                           row.type==='机表扣费'||row.type==='物联网补气'||row.type==='物联网扣气'||row.type==='气损收费' ||
                           row.type === '气表清零' || row.type === '掉气补气' || row.type === '其他补气'  || row.type === '清零补气' ||
-                          row.type === '换表补气') && row.type!=='新增户档案' && row.type!=='转气转出' && row.type!=='转气转入'">
+                          row.type === '换表补气' || row.type === '过户') && row.type!=='新增户档案' && row.type!=='转气转出' && row.type!=='转气转入'">
                   <button data-toggle="dropdown" style="border: 0px;background: none;" type="button"
                           v-if="row.f_user_state==='正常'||row.f_user_state==='预备'||row.type==='气损收费' ">
                     <span class="glyphicon glyphicon-th-list"></span>
@@ -232,7 +232,7 @@
 
         cancel_show: false,
         cancel_data: null,
-        criteriaShow:false,
+        criteriaShow: false,
         reissue_show: false,
         reissue_data: null,
         authArr: this.$login.r ? this.$login.r : []
@@ -389,7 +389,7 @@
         this.cancel_show = false
       },
       cancelSucc () {
-        console.log("-----------------------------撤销成功了，隐藏掉")
+        console.log('-----------------------------撤销成功了，隐藏掉')
         this.cancel_show = false
         this.$dispatch('refresh')
       },
@@ -411,13 +411,13 @@
         } else if (type === '换新表' || type === '气表清零') {
           name = 'rs/report/change_meter'
         } else if (type === '机表收费' || type === '机表收费撤销') {
-          if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')){
+          if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')) {
             name = 'rs/report/fmy_machine_bill'
           } else {
             name = 'rs/report/machine_bill'
           }
         } else if (type === '物联网收费' || type === '物联网收费撤销' || type === '物联网开户' || type === '物联网赠气') {
-          if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')){
+          if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')) {
             name = 'rs/report/fmy_iot_bill'
           } else {
             name = 'rs/report/iot_bill'
@@ -431,13 +431,13 @@
         } else if (type === '补卡') {
           name = 'rs/report/replace_sell'
         } else if (type === '发卡售气') {
-          if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')){
+          if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')) {
             name = 'rs/report/fmy_sendCard_bill'
           } else {
             name = 'rs/report/sendCard_bill'
           }
         } else if (type === '卡表收费' || type === '卡表收费撤销' || type === '卡表赠气' || type === '卡表收费撤销') {
-          if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')){
+          if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')) {
             name = 'rs/report/fmy_card_bill'
           } else {
             name = 'rs/report/card_bill'