sale-client 3.5.28 → 3.5.29

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://39.108.82.124:8400/', bendi1 = 'http://121.36.106.17:8400/'
+// 公司测试服务
+var fuwu = 'http://39.108.82.124: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: fuwu
+  },
+  '/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.28",
+  "version": "3.5.29",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/revenue/cardHandManage/cardDown.vue

@@ -426,8 +426,8 @@ let readyGen = async function (self) {
 let downGen = function* (type, condition, data, self) {
   self.condition = condition
   self.msg = '确认下发计划'
-  let getUnhand = yield Vue.resetpost('rs/sql/getUnhand', {data: {startDate: self.startDate,
-    condition: self.condition}}, {resolveMsg: null, rejectMsg: '获取待审核数据异常!!'})
+  // let getUnhand = yield Vue.resetpost('rs/sql/getUnhand', {data: {startDate: self.startDate,
+  //   condition: self.condition}}, {resolveMsg: null, rejectMsg: '获取待审核数据异常!!'})
   // if (type === 'single') {
   //   getUnhand = yield Vue.resetpost('rs/sql/getUnhand', {
   //     data: {
@@ -461,19 +461,19 @@ let downGen = function* (type, condition, data, self) {
   //   console.log('========================================================================================')
   //   self.unhandplan.push(temp)
   // }
-  for (let i = 0; i < getUnhand.data.length; i++) {
-    let temp = {
-      id: getUnhand.data[i].id,
-      f_user_id: getUnhand.data[i].f_user_id,
-      f_userfiles_id: getUnhand.data[i].f_userfiles_id
-    }
-    self.unhandplan.push(temp)
-  }
-  if (getUnhand.data.length > 0) {
-    self.msg = self.msg + `, 警告: 之前有 ${getUnhand.data.length} 条待审核数据`
-  } else {
-    self.unhandplan = []
-  }
+  // for (let i = 0; i < getUnhand.data.length; i++) {
+  //   let temp = {
+  //     id: getUnhand.data[i].id,
+  //     f_user_id: getUnhand.data[i].f_user_id,
+  //     f_userfiles_id: getUnhand.data[i].f_userfiles_id
+  //   }
+  //   self.unhandplan.push(temp)
+  // }
+  // if (getUnhand.data.length > 0) {
+  //   self.msg = self.msg + `, 警告: 之前有 ${getUnhand.data.length} 条待审核数据`
+  // } else {
+  //   self.unhandplan = []
+  // }
   // console.log('1111111:',self.msg)
   self.show = true
 }

package/src/components/revenue/invoiceuse/InvoiceEntry.vue

@@ -1,7 +1,7 @@
 <template>
   <div id='InvoiceEntry' class="flex-row binary">
     <div class="binary-left" v-if="sellgas">
-      <charge-list v-ref:charge_list></charge-list>
+      <invoice-charge-list v-ref:charge_list></invoice-charge-list>
     </div>
     <div class="binary-right" v-if="sellgas">
       <information-input v-if="InformationInputShow"></information-input>
@@ -13,14 +13,13 @@
 </template>
 
 <script>
-  import ChargeList from './ChargeList'
   import InformationInput from './InformationInput'
   import InvoiceInformationInput from './InvoiceInformationInput'
 
   export default {
     name: 'InvoiceEntry',
     props: ['sellgas'],
-    components: {InformationInput, ChargeList, InvoiceInformationInput},
+    components: {InformationInput, InvoiceInformationInput},
     title: '发票信息录入',
     data () {
       return {

package/src/components/webMeter/paramSave/ParamSet.vue

@@ -4,7 +4,7 @@
       <criteria :model='model' partial='criteria' v-ref:criteria @condition-changed='$parent.selfSearch'>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
-            <div class="col-sm-3">
+            <div class="col-sm-2">
               <label class="font_normal_body" >气表协议类型</label>
               <v-select style="width:60%" title="气表协议类型"
                         placeholder='气表协议类型'
@@ -15,7 +15,7 @@
                         close-on-select
                         :value-single="true" v-ref:brand>  </v-select>
             </div>
-            <div class="col-sm-3">
+            <div class="col-sm-2">
               <label class="font_normal_body">气表品牌</label>
               <v-select
                 placeholder='气表品牌'
@@ -26,7 +26,7 @@
                 condition="f_gasbrand_id = '{}'"
                 close-on-select></v-select>
             </div>
-            <div class="col-sm-3 form-group">
+            <div class="col-sm-2 form-group">
               <label class="font_normal_body">气表型号</label>
               <v-select :value.sync="model.f_meter_style"
                         v-model="model.f_meter_style"
@@ -34,7 +34,7 @@
                         condition="f_gasmodel_id = '{}'"
                         close-on-select></v-select>
             </div>
-            <div class="col-sm-3 ">
+            <div class="col-sm-2 ">
               <label class="font_normal_body">客户编号</label>
               <input @keyup.enter="search" style="width:60%" type="text" class="input_search "
                      v-model="model.f_userinfo_code"
@@ -52,7 +52,7 @@
             </div>
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
-            <div class="col-sm-3 ">
+            <div class="col-sm-2 ">
               <label class="font_normal_body">表&emsp;号&emsp;</label>
               <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
                      v-model="model.f_meternumber"
@@ -60,7 +60,7 @@
                      condition="f_meternumber like '%{}%'"
               >
             </div>
-            <div class="col-sm-3 ">
+            <div class="col-sm-2 ">
               <label class="font_normal_body">客户姓名</label>
               <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
                      v-model="model.f_user_name"
@@ -68,7 +68,7 @@
                      condition="f_user_name like '%{}%'"
               >
             </div>
-            <div class="col-sm-3 ">
+            <div class="col-sm-2 ">
               <label class="font_normal_body">小&emsp;区&emsp;</label>
               <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
                      v-model="model.f_residential_area"
@@ -76,7 +76,7 @@
                      condition="f_residential_area like '%{}%'"
               >
             </div>
-            <div class="col-sm-3">
+            <div class="col-sm-2">
               <label class="font_normal_body">用户类型</label>
               <v-select
                 placeholder='用户类型'
@@ -89,7 +89,7 @@
               </v-select>
             </div>
 
-            <div class="col-sm-3">
+            <div class="col-sm-2">
               <label class="font_normal_body">用气性质</label>
               <v-select
                 placeholder='用气性质'
@@ -104,14 +104,14 @@
           </div>
         </div>
       </criteria>
-      <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
+      <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy" :optional="true">
         <template partial='head'>
           <tr>
-            <th style="text-align:center">
-              <nobr>全选</nobr>
-              <input @keyup.enter="search" style="width:60%" type="checkbox" v-model='checked1'
-                     @click="$parent.$parent.$parent.checkedALL()">
-            </th>
+<!--            <th style="text-align:center">-->
+<!--              <nobr>全选</nobr>-->
+<!--              <input @keyup.enter="search" style="width:60%" type="checkbox" v-model='checked1'-->
+<!--                     @click="$parent.$parent.$parent.checkedALL()">-->
+<!--            </th>-->
             <!--<th >操作</th>-->
             <th style="text-align:center">
               <nobr>客户编号</nobr>
@@ -150,11 +150,8 @@
 
           </tr>
         </template>
-        <template partial='body' partial='list' v-ref:grid>
+        <template partial='body'>
           <tr>
-            <td style="text-align:center">
-              <input @keyup.enter="search" style="width:60%" type="checkbox" name="opertioninput"
-                     @click="$parent.$parent.$parent.checked(row)"></td>
             <!--<td>-->
             <!--<button type="button" name="button" class="btn btn-link" v-if="row.f_user_state === '正常'"-->
             <!--@click.stop="$parent.$parent.$parent.paramSet(row)">参数设置-->
@@ -354,8 +351,10 @@ export default {
     },
     showParam () {
       this.conditionMsg = ''
-      if (!this.user) {
+      if (this.$refs.paged.$refs.grid.getRowData().length === 0) {
         this.user = []
+      } else {
+        this.user = this.$refs.paged.$refs.grid.getRowData()
       }
       if (this.user.length === 0) {
         this.$showMessage('是否要设置查询出来的所有表参数', ['confirm', 'cancel']).then((res) => {
@@ -400,19 +399,19 @@ export default {
     closeParam () {
       // this.$refs.form.row={}
       this.showParame = !this.showParame
-      if (this.isCheckAll) {
-        this.map.clear()
-        this.user = []
-      }
-      this.isCheckAll = false
+      // if (this.isCheckAll) {
+      this.map.clear()
+      this.user = []
+      // }
+      // this.isCheckAll = false
     },
     clear () {
       this.$refs.form.paramtype = ''
-      this.isCheckAll = false
+      // this.isCheckAll = false
       this.showParame = false
       this.map.clear()
       this.user = []
-      this.unCheckAll()
+      // this.unCheckAll()
       this.search()
     },
     selfSearch (args) {
@@ -422,14 +421,14 @@ export default {
         this.condition = args.condition
         this.model.search(args.condition, args.model)
       }
-      this.isCheckAll = false
+      // this.isCheckAll = false
     },
     showparam (setable) {
       this.setable = setable
       if (!setable) {
         this.map.clear()
         this.user = []
-        this.isCheckAll = false
+        // this.isCheckAll = false
       }
     },
     search () {
@@ -467,42 +466,42 @@ export default {
     getRes (obj) {
       this.orgcondition = obj
     },
-    unCheckAll () {
-      let box = document.getElementsByName('opertioninput')
-      for (var i = 0; i < box.length; i++) {
-        box[i].checked = false
-      }
-    },
-    checkedALL () {
-      this.checked1 = !this.checked1
-      let box = document.getElementsByName('opertioninput')
-      for (var i = 0; i < box.length; i++) {
-        box[i].checked = this.checked1
-      }
-    },
-    checked (val) {
-      let userid = val.f_userfiles_id
-      if (this.map.has(userid)) {
-        this.map.delete(userid)
-        /* 遍历数组，然后根据选中的状态获取对应的下标，然后进行删除 */
-        for (let i = 0; i < this.user.length; i++) {
-          if (val.f_userfiles_id === this.user[i].f_userfiles_id) {
-            this.user.splice(i, 1)
-          }
-        }
-      } else {
-        this.user.push(val)
-        this.map.set(userid, {
-          id: null,
-          f_user_id: userid,
-          f_alias: val.f_alias,
-          f_userinfo_id: val.f_userinfo_id,
-          f_orgname: val.f_orgname,
-          f_orgid: val.f_orgid,
-          f_meternumber: val.f_meternumber
-        })
-      }
-    },
+    // unCheckAll () {
+    //   let box = document.getElementsByName('opertioninput')
+    //   for (var i = 0; i < box.length; i++) {
+    //     box[i].checked = false
+    //   }
+    // },
+    // checkedALL () {
+    //   this.checked1 = !this.checked1
+    //   let box = document.getElementsByName('opertioninput')
+    //   for (var i = 0; i < box.length; i++) {
+    //     box[i].checked = this.checked1
+    //   }
+    // },
+    // checked (val) {
+    //   let userid = val.f_userfiles_id
+    //   if (this.map.has(userid)) {
+    //     this.map.delete(userid)
+    //     /* 遍历数组，然后根据选中的状态获取对应的下标，然后进行删除 */
+    //     for (let i = 0; i < this.user.length; i++) {
+    //       if (val.f_userfiles_id === this.user[i].f_userfiles_id) {
+    //         this.user.splice(i, 1)
+    //       }
+    //     }
+    //   } else {
+    //     this.user.push(val)
+    //     this.map.set(userid, {
+    //       id: null,
+    //       f_user_id: userid,
+    //       f_alias: val.f_alias,
+    //       f_userinfo_id: val.f_userinfo_id,
+    //       f_orgname: val.f_orgname,
+    //       f_orgid: val.f_orgid,
+    //       f_meternumber: val.f_meternumber
+    //     })
+    //   }
+    // },
     showModal (val) {
       this.val1 = val
       this.isShowUserException = true
@@ -559,16 +558,16 @@ export default {
         this.$refs.paged.$refs.criteria.model.f_gasbrand_id = val[0]
         this.search()
       }
-    },
-    'checked1' (val) {
-      if (val) {
-        this.user = this.model.rows
-        this.mapset(this.model.rows)
-      } else {
-        this.map.clear()
-        this.user = []
-      }
     }
+    // 'checked1' (val) {
+    //   if (val) {
+    //     this.user = this.model.rows
+    //     this.mapset(this.model.rows)
+    //   } else {
+    //     this.map.clear()
+    //     this.user = []
+    //   }
+    // }
   }
 }
 </script>

package/src/filiale/fugu/MeterinfoTest.vue

@@ -324,9 +324,9 @@
             &ensp;<span class="glyphicon glyphicon-map-marker" @click="openModal" ></span>
           </div>
           <div class="col-sm-4 form-group" v-if="config.overduesetShow">
-            <label class="font_normal_body">滞纳金规则</label>
+            <label class="font_normal_body">违约金规则</label>
             <v-select :value.sync="row.f_overdue_set" v-model="row.f_overdue_set"
-                      :options='overdueset' placeholder='滞纳金规则'
+                      :options='overdueset' placeholder='违约金规则'
                       close-on-select></v-select>
           </div>
 

package/src/filiale/gongyi/charge/business/machine/MachineCharge.vue

@@ -148,7 +148,7 @@
           this.model.f_collection = this.config.floor ? Math.floor(this.model.f_totalcost - 0) : this.model.f_totalcost
         }
       },
-      // 获取欠费里面有滞纳金的最大的一笔欠费的角标
+      // 获取欠费里面有违约金的最大的一笔欠费的角标
       getMaxIndex (val) {
         if (val.findIndex((item) => { return item.f_oughtfee < 0 }) !== -1) {
           return val.findIndex((item) => { return item.f_oughtfee < 0 })

package/src/filiale/gongyi/charge/business/machine/MachineMeterCenter.vue

@@ -35,7 +35,7 @@
             <input class="input_search" style="width:60%"  type="number" v-model="newOverdue"
                    v-scale="[newOverdue,2]" placeholder="违约金"
                    disabled>
-            <!--<button type="button" name="button" class="btn btn-link" @click="modefiy()" v-if="authArr.includes('滞纳金修改')">修改</button>-->
+            <!--<button type="button" name="button" class="btn btn-link" @click="modefiy()" v-if="authArr.includes('违约金修改')">修改</button>-->
           </div>
         </div>
         <div class="row" style="padding-top: 0.5em;" >
@@ -134,7 +134,7 @@
     <!--<modal :show.sync="showOverdueModal" v-ref:modal backdrop="false">-->
     <!--<header slot="modal-header" class="modal-header">-->
     <!--<button type="button" class="close" @click="closeOverdue"><span>&times;</span></button>-->
-    <!--<h4 class="modal-title">修改滞纳金</h4>-->
+    <!--<h4 class="modal-title">修改违约金</h4>-->
     <!--</header>-->
     <!--<article slot="modal-body" class="modal-body">-->
     <!--<validator name='m'>-->
@@ -300,7 +300,7 @@ let asyncMachineMeterCenter = async function (self) {
         validateOk: false,
         handid: '',
         showOverdueModal: false,
-        editOverdue: this.$login.r.includes('滞纳金修改'),
+        editOverdue: this.$login.r.includes('违约金修改'),
         paytype: [],
         printstyle: this.$appdata.getParam('打印格式') ? this.$appdata.getParam('打印格式') : [],
         privilegeList: [{label: '无优惠', value: '0'}],

package/src/filiale/gongyi/charge/business/machine/OweDetailList.vue

@@ -4,7 +4,7 @@
     <modal :show.sync="show" v-ref:modal large backdrop="false">
 
       <header slot="modal-header" class="modal-header" style="text-align: center">
-        <h4 class="modal-title">滞纳金详情</h4>
+        <h4 class="modal-title">违约金详情</h4>
       </header>
       <article slot="modal-body" class="modal-body">
         <data-grid :model="row" partial='list' v-ref:grid>
@@ -12,9 +12,9 @@
             <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>
             </tr>
           </template>
           <template partial='body'>

package/src/filiale/gongyi/charge/business/machine/OweList.vue

@@ -87,7 +87,7 @@
               <td>{{row.day1}}</td>
               <td>{{row.day2}}</td>
               <td v-if="row.overdue > 0">
-                <button class="btn btn-info" @click="$parent.$parent.showOweDetail(row.overdueDetail)">滞纳金详情</button>
+                <button class="btn btn-info" @click="$parent.$parent.showOweDetail(row.overdueDetail)">违约金详情</button>
               </td>
             </tr>
           </template>
@@ -129,7 +129,7 @@
         pages: [],
         selectAll: true,
         isDetail: false,
-        // 滞纳金详情
+        // 违约金详情
         overdueDetail: {rows: []},
         selectedRows: 0// 初始化选中的行数
       }

package/src/filiale/gongyi/revenue/comprehen/ovdue/Overduetax.vue

@@ -41,8 +41,8 @@
               <th>本期指数</th>
               <th>抄表日期</th>
               <th>欠费金额</th>
-              <th>滞纳天数</th>
-              <th>滞纳金金额</th>
+              <th>违约天数</th>
+              <th>违约金金额</th>
               <th>减免金额</th>
               <th>减免后金额</th>
               <th>操作</th>
@@ -59,12 +59,12 @@
             <td style="text-align: center;">{{row.f_oughtfee}}</td>
             <td style="text-align: center;">{{row.overduedays}}</td>
             <td style="text-align: center;">{{row.f_overdue}}</td>
-            <!--根据滞纳金金额是否显示减免金额输入框-->
+            <!--根据违约金金额是否显示减免金额输入框-->
             <div class="form-group" style="margin-bottom:0px;display: contents;"
                  :class="{'has-error has-feedback': row.error}"
                  v-if="row.overdue>0">
               <!--根据减免金额显示输入框 @blur="$parent.$parent.$parent.beforenter(row)"-->
-              <input title="滞纳金减免" type="text" class="input_search" v-model="row.f_remission_late_fee_vue"
+              <input title="违约金减免" type="text" class="input_search" v-model="row.f_remission_late_fee_vue"
                      @blur="$parent.$parent.$parent.beforenter(row)"
                      v-next-el="{id: $index+1}" :id="$index"
                      style="width: 100px;padding: 6px;"
@@ -90,7 +90,7 @@
 
 <script>
   /**
-   * 巩义滞纳金减免页面
+   * 巩义违约金减免页面
    */
   import Vue from 'vue'
   import {DataModel, HttpResetClass} from 'vue-client'
@@ -98,7 +98,7 @@
 
   export default {
     components: {OverduetaxPrintBill},
-    title: '滞纳金减免',
+    title: '违约金减免',
     data () {
       return {
         curorgid: [this.$login.f.orgid],
@@ -162,7 +162,7 @@
           return
         }
         if (row.f_remission_late_fee_vue > row.overdue) {
-          this.$showMessage('减免金额不能大于滞纳金')
+          this.$showMessage('减免金额不能大于违约金')
           row.f_remission_late_fee_vue = ''
           return
         }
@@ -188,7 +188,7 @@
           // f_end_date: row.f_end_date,
           f_userinfo_code: row.f_userinfo_code
         }
-        let res = await http.load('POST', 'rs/logic/overDueTaxun', handplan, {resolveMsg: null, rejectMsg: '减免滞纳金出错'})
+        let res = await http.load('POST', 'rs/logic/overDueTaxun', handplan, {resolveMsg: null, rejectMsg: '减免违约金出错'})
         this.$refs.paged.$refs.cri.search()
       }
     },

package/src/filiale/gongyi/revenue/comprehen/ovdue/OverduetaxPrintBill.vue

@@ -2,7 +2,7 @@
   <div class="auto form-horizontal">
     <modal :show.sync="show" large backdrop="false">
       <header slot="modal-header" class="modal-header">
-        <h3 style="color:black" class="modal-title">滞纳金减免单</h3>
+        <h3 style="color:black" class="modal-title">违约金减免单</h3>
       </header>
       <article slot="modal-body" class="modal-body">
         <validator name='v'>

package/src/filiale/gongyi/sale.js

@@ -16,7 +16,7 @@ let specialComp = {
   'gongyi-chargeManage': (resolve) => { require(['./charge/ChargeManage'], resolve) },
   'change-meter': (resolve) => { require(['./revenue/changemeter/ChangeMeter'], resolve) },
   'card-hand': (resolve) => { require(['./HandManager/CardHand'], resolve) },
-  // 滞纳金减免页面
+  // 违约金减免页面
   'overdue_tax': (resolve) => { require(['./revenue/comprehen/ovdue/Overduetax'], resolve) },
   // 机表收费
   'machine-meter-center': (resolve) => { require(['./charge/business/machine/MachineMeterCenter'], resolve) },

package/src/filiale/guangxi/OtherGas.vue

@@ -171,7 +171,7 @@ let otherGasGen = async function (self) {
   } else {
     try {
         // 写卡操作
-      let cardParams = await self.$resetpost('rs/logic/stairCard', {data: {f_card_id: cardId + '', f_alias: self.row.f_alias, f_user_id: self.row.f_user_id}}, {resolveMsg: null, rejectMsg: '获取写卡参数失败'})
+      let cardParams = await self.$resetpost('rs/logic/stairCard', {data: {f_card_id: cardId + '', f_alias: self.row.f_alias, f_userfiles_id: self.row.f_userfiles_id, f_user_id: self.row.f_user_id}}, {resolveMsg: null, rejectMsg: '获取写卡参数失败'})
 
         // 获取写卡参数
       let params = self.getWriteCard(cardParams, self.row, data)

package/src/filiale/jinjiang/MachineMeterCenter.vue

@@ -300,7 +300,7 @@ let asyncMachineMeterCenter = async function (self) {
         validateOk: false,
         handid: '',
         showOverdueModal: false,
-        editOverdue: this.$login.r.includes('滞纳金修改'),
+        editOverdue: this.$login.r.includes('违约金修改'),
         paytype: [],
         printstyle: this.$appdata.getParam('打印格式') ? this.$appdata.getParam('打印格式') : [],
         privilegeList: [{label: '无优惠', value: '0'}],

package/src/filiale/liaoyuan/Overduetax.vue

@@ -122,7 +122,7 @@
             <td style="text-align: center;">{{row.overduedays}}</td>
             <td style="text-align: center;">{{row.f_oughtfee}}</td>
             <td style="text-align: center;">{{ row.overdue}}</td>
-            <!--根据滞纳金金额是否显示减免金额输入框-->
+            <!--根据违约金金额是否显示减免金额输入框-->
             <div class="form-group" style="margin-bottom:0px;display: contents;" :class="{'has-error has-feedback': row.error}"
                  v-if="row.overdue>0">
               <!--根据减免金额显示输入框 @blur="$parent.$parent.$parent.beforenter(row)"-->
@@ -228,7 +228,7 @@
 
 <script>
   /**
-   *滞纳金减免页面
+   *违约金减免页面
    */
   import Vue from 'vue'
   import {PagedList, HttpResetClass} from 'vue-client'
@@ -466,7 +466,7 @@
       },
       // 点击批量减免确定触发
       create (row) {
-        // 批量减免金额不能大于选择的滞纳金大于金额
+        // 批量减免金额不能大于选择的违约金大于金额
         this.arrshow = false
         // 组织数据
         let batch = {
@@ -549,7 +549,7 @@
           this.$showAlert('减免金额不能为空', 'warning', 2000)
           return
         }
-        // 批量减免金额不能大于选择的滞纳金大于金额
+        // 批量减免金额不能大于选择的违约金大于金额
         if (parseInt(this.batchtaxs) > parseInt(this.$refs.paged.$refs.cri.model.overdue_be)) {
           this.$showAlert('违约金不能大于总金额！！', 'warning', 2000)
 
@@ -726,7 +726,7 @@
           days: parseInt(this.section_f_end_data.replace(/\-/, '').replace(/\-/, '')) - parseInt(this.section_f_start_data.replace(/\-/, '').replace(/\-/, '')),
           handplan_id: this.newHandplanId
         }
-        // 获取减免滞纳金
+        // 获取减免违约金
         this.$resetpost('rs/sql/getLatefee_money', {data: temp}, {
           resolveMsg: null,
           rejectMsg: '获取违约金违约金减免金额失败'

package/src/filiale/liaoyuan/sale.js

@@ -27,7 +27,7 @@ let specialComp = {
   'basic-living': (resolve) => { require(['./BasicLiving'], resolve) },
   // 付款码支付组件
   'bill-message': (resolve) => { require(['./billMessage'], resolve) },
-  // 滞纳金减免页面
+  // 违约金减免页面
   'overdue_tax': (resolve) => { require(['./Overduetax'], resolve) },
   // 调价补差
   'price-adjustment': (resolve) => { require(['./PriceAdjustment'], resolve) },

package/src/filiale/macheng/MachineMeterCenter.vue

@@ -301,7 +301,7 @@ let asyncMachineMeterCenter = async function (self) {
         validateOk: false,
         handid: '',
         showOverdueModal: false,
-        editOverdue: this.$login.r.includes('滞纳金修改'),
+        editOverdue: this.$login.r.includes('违约金修改'),
         paytype: [],
         printstyle: this.$appdata.getParam('打印格式') ? this.$appdata.getParam('打印格式') : [],
         privilegeList: [{label: '无优惠', value: '0'}],

package/src/filiale/meihekou/MachineCharge.vue

@@ -137,7 +137,7 @@
           this.$parent.$parent.$parent.$refs.info.data.f_new_balance= -(this.model.f_preamount-0)
         }
       },
-      // 获取欠费里面有滞纳金的最大的一笔欠费的角标
+      // 获取欠费里面有违约金的最大的一笔欠费的角标
       getMaxIndex (val) {
         if (val.findIndex((item) => { return item.f_oughtfee < 0 }) !== -1) {
           return val.findIndex((item) => { return item.f_oughtfee < 0 })

package/src/filiale/qianneng/FilesManage/MeterinfoTest.vue

@@ -338,9 +338,9 @@
             &ensp;<span class="glyphicon glyphicon-map-marker" @click="openModal" ></span>
           </div>
           <div class="col-sm-4 form-group" v-if="config.overduesetShow">
-            <label class="font_normal_body">滞纳金规则</label>
+            <label class="font_normal_body">违约金规则</label>
             <v-select :value.sync="row.f_overdue_set" v-model="row.f_overdue_set"
-                      :options='overdueset' placeholder='滞纳金规则'
+                      :options='overdueset' placeholder='违约金规则'
                       close-on-select></v-select>
           </div>
 

package/src/filiale/qianneng/MachineCharge.vue

@@ -140,7 +140,7 @@
         }
         this.model.f_collection = this.model.f_collection < 0 ? 0 : this.model.f_collection
       },
-      // 获取欠费里面有滞纳金的最大的一笔欠费的角标
+      // 获取欠费里面有违约金的最大的一笔欠费的角标
       getMaxIndex (val) {
         if (val.findIndex((item) => { return item.f_oughtfee < 0 }) !== -1) {
           return val.findIndex((item) => { return item.f_oughtfee < 0 })

package/src/filiale/qianneng/machine/ArrearsQuery.vue

@@ -332,7 +332,7 @@
                   <nobr>应交气费</nobr>
                 </th>
                 <th>
-                  <nobr>滞纳金</nobr>
+                  <nobr>违约金</nobr>
                 </th>
                 <th>
                   <nobr>附加费</nobr>
@@ -484,7 +484,7 @@
               气费金额合计:&emsp;{{sumsmodel.f_oughtfee_new}}
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              滞纳金合计:&emsp;{{sumsmodel.overdue}}
+              违约金合计:&emsp;{{sumsmodel.overdue}}
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               附加费合计:&emsp;{{sumsmodel.f_garbage_fee}}
@@ -909,7 +909,7 @@
           'f_user_phone': '客户电话','f_rent_phone': '备用电话','f_inputtor': '抄表员','f_book_name': '抄表册','f_user_type': '客户类型',
           'f_gasproperties': '用气性质', 'f_comments': '备注', 'c': '欠费期数', 'f_hand_date': '欠费区间', 'f_oughtamount': '用气量',
           'f_oughtfee': '用气金额','f_operate_date': '缴费时间', 'f_debt_money': '已交金额', 'f_oughtfee_new': '应交气费',
-          'overdue': '滞纳金', 'f_garbage_fee': '附加费','f_last_tablebase': '上期抄表底数','f_tablebase': '本期抄表底数','f_balance': '上期余额',
+          'overdue': '违约金', 'f_garbage_fee': '附加费','f_last_tablebase': '上期抄表底数','f_tablebase': '本期抄表底数','f_balance': '上期余额',
           'f_oughtfee_all': '合计欠费金额','f_oughtfee_col': '实际欠费金额','f_cost_type':'缴费方式'
         }
       },

package/src/filiale/qianneng/machine/MachineMeterCenter.vue

@@ -35,7 +35,7 @@
             <input class="input_search" style="width:60%"  type="number" v-model="newOverdue"
                    v-scale="[newOverdue,2]" placeholder="违约金"
                    disabled>
-            <!--<button type="button" name="button" class="btn btn-link" @click="modefiy()" v-if="authArr.includes('滞纳金修改')">修改</button>-->
+            <!--<button type="button" name="button" class="btn btn-link" @click="modefiy()" v-if="authArr.includes('违约金修改')">修改</button>-->
           </div>
         </div>
         <div class="row" style="padding-top: 0.5em;" >
@@ -150,7 +150,7 @@
     <!--<modal :show.sync="showOverdueModal" v-ref:modal backdrop="false">-->
     <!--<header slot="modal-header" class="modal-header">-->
     <!--<button type="button" class="close" @click="closeOverdue"><span>&times;</span></button>-->
-    <!--<h4 class="modal-title">修改滞纳金</h4>-->
+    <!--<h4 class="modal-title">修改违约金</h4>-->
     <!--</header>-->
     <!--<article slot="modal-body" class="modal-body">-->
     <!--<validator name='m'>-->
@@ -332,7 +332,7 @@ let asyncMachineMeterCenter = async function (self) {
         handid: '',
         showOverdueModal: false,
         jurisdiction: this.$login.r,
-        editOverdue: this.$login.r.includes('滞纳金修改'),
+        editOverdue: this.$login.r.includes('违约金修改'),
         paytype: [],
         printstyle: this.$appdata.getParam('打印格式') ? this.$appdata.getParam('打印格式') : [],
         privilegeList: [{label: '无优惠', value: '0'}],

package/src/filiale/rizhao/ChargeQueryUser.vue

@@ -64,7 +64,7 @@
               <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>

package/src/filiale/rizhao/MeterinfoTest.vue

@@ -324,9 +324,9 @@
             &ensp;<span class="glyphicon glyphicon-map-marker" @click="openModal" ></span>
           </div>
           <div class="col-sm-4 form-group" v-if="config.overduesetShow">
-            <label class="font_normal_body">滞纳金规则</label>
+            <label class="font_normal_body">违约金规则</label>
             <v-select :value.sync="row.f_overdue_set" v-model="row.f_overdue_set"
-                      :options='overdueset' placeholder='滞纳金规则'
+                      :options='overdueset' placeholder='违约金规则'
                       close-on-select></v-select>
           </div>
 

package/src/filiale/rongchuang/handListMaintain.vue

@@ -282,10 +282,10 @@
           </div>
           <div class="row">
             <div class="col-sm-2">
-              <label class="font_normal_body">滞纳金开始日期</label>
+              <label class="font_normal_body">违约金开始日期</label>
             </div>
             <div class="col-sm-3">
-              <datepicker placeholder="滞纳金开始日期"
+              <datepicker placeholder="违约金开始日期"
                           v-model="updatemodel.f_start_date"
                           :value.sync="updatemodel.f_start_date"
                           :format="'yyyy-MM-dd 00:00:00'"

package/src/filiale/shanggao/MeterinfoTest.vue

@@ -323,9 +323,9 @@
             <input type="text" style="width:60%" v-model="row.f_comments" class="input_search" placeholder="备注"/>
           </div>
           <div class="col-sm-4 form-group" v-if="config.overduesetShow">
-            <label class="font_normal_body">滞纳金规则</label>
+            <label class="font_normal_body">违约金规则</label>
             <v-select :value.sync="row.f_overdue_set" v-model="row.f_overdue_set"
-                      :options='overdueset' placeholder='滞纳金规则'
+                      :options='overdueset' placeholder='违约金规则'
                       close-on-select></v-select>
           </div>
 

package/src/filiale/shaoguan/MachineMeterCenter.vue

@@ -35,7 +35,7 @@
             <input class="input_search" style="width:60%"  type="number" v-model="newOverdue"
                    v-scale="[newOverdue,2]" placeholder="违约金"
                    disabled>
-            <!--<button type="button" name="button" class="btn btn-link" @click="modefiy()" v-if="authArr.includes('滞纳金修改')">修改</button>-->
+            <!--<button type="button" name="button" class="btn btn-link" @click="modefiy()" v-if="authArr.includes('违约金修改')">修改</button>-->
           </div>
         </div>
         <div class="row" style="padding-top: 0.5em;" >
@@ -136,7 +136,7 @@
     <!--<modal :show.sync="showOverdueModal" v-ref:modal backdrop="false">-->
     <!--<header slot="modal-header" class="modal-header">-->
     <!--<button type="button" class="close" @click="closeOverdue"><span>&times;</span></button>-->
-    <!--<h4 class="modal-title">修改滞纳金</h4>-->
+    <!--<h4 class="modal-title">修改违约金</h4>-->
     <!--</header>-->
     <!--<article slot="modal-body" class="modal-body">-->
     <!--<validator name='m'>-->
@@ -303,7 +303,7 @@ let asyncMachineMeterCenter = async function (self) {
         validateOk: false,
         handid: '',
         showOverdueModal: false,
-        editOverdue: this.$login.r.includes('滞纳金修改'),
+        editOverdue: this.$login.r.includes('违约金修改'),
         paytype: [],
         printstyle: this.$appdata.getParam('打印格式') ? this.$appdata.getParam('打印格式') : [],
         privilegeList: [{label: '无优惠', value: '0'}],

package/src/filiale/wuhai/MeterinfoTest.vue

@@ -307,9 +307,9 @@
             &ensp;<span class="glyphicon glyphicon-map-marker" @click="openModal" ></span>
           </div>
           <div class="col-sm-4 form-group" v-if="config.overduesetShow">
-            <label class="font_normal_body">滞纳金规则</label>
+            <label class="font_normal_body">违约金规则</label>
             <v-select :value.sync="row.f_overdue_set" v-model="row.f_overdue_set"
-                      :options='overdueset' placeholder='滞纳金规则'
+                      :options='overdueset' placeholder='违约金规则'
                       close-on-select></v-select>
           </div>
 

package/src/filiale/zhongyi/MeterinfoTest.vue

@@ -331,9 +331,9 @@
             &ensp;<span class="glyphicon glyphicon-map-marker" @click="openModal" ></span>
           </div>
           <div class="col-sm-4 form-group" v-if="config.overduesetShow">
-            <label class="font_normal_body">滞纳金规则</label>
+            <label class="font_normal_body">违约金规则</label>
             <v-select :value.sync="row.f_overdue_set" v-model="row.f_overdue_set"
-                      :options='overdueset' placeholder='滞纳金规则'
+                      :options='overdueset' placeholder='违约金规则'
                       close-on-select></v-select>
           </div>
 

package/src/sale.js

@@ -348,7 +348,7 @@ export default function (filiale) {
   Vue.component('meterbook-user', (resolve) => { require(['./components/revenue/HandManager/MeterBookUser'], resolve) })
   // 抄表册新增用户管理
   Vue.component('meterbook-entry', (resolve) => { require(['./components/revenue/HandManager/meterbookEntry'], resolve) })
-  // 滞纳金生成规则（f_end_date规则）
+  // 违约金生成规则（f_end_date规则）
   Vue.component('overdue-set', (resolve) => { require(['./components/revenue/HandManager/OverdueSet'], resolve) })
   Vue.component('overdue-set-list', (resolve) => { require(['./components/revenue/HandManager/OverdueSetList'], resolve) })
   Vue.component('overdue-set-user', (resolve) => { require(['./components/revenue/HandManager/OverdueSetUser'], resolve) })
@@ -809,10 +809,13 @@ export default function (filiale) {
   // 档案合并
   Vue.component('file-merge-info-new', (resolve) => { require(['./components/FilesManageNew/FileMergeInfo'], resolve) })
 
-  // 发票导入领用
+  // 发票录入
   Vue.component('invoice-use', (resolve) => { require(['./components/revenue/invoiceuse/InvoiceUse'], resolve) })
   // 发票信息录入
   Vue.component('invoice-entry', (resolve) => { require(['./components/revenue/invoiceuse/InvoiceEntry'], resolve) })
+  // 选择收费记录
+  Vue.component('invoice-charge-list', (resolve) => { require(['./components/revenue/invoiceuse/InvoiceChargeList'], resolve) })
+
   // 信息录入
   Vue.component('invoice-info-entry', (resolve) => { require(['./components/revenue/invoiceuse/InvoiceInfoEntry'], resolve) })
   // 商品信息录入
@@ -866,7 +869,7 @@ export default function (filiale) {
 
   // 自报表数审核
   Vue.component('meter-read-audit', (resolve) => { require(['./components/revenue/comprehen/handAudit/MeterReadAudit'], resolve) })
-  // 滞纳金减免页面
+  // 违约金减免页面
   Vue.component('overdue_tax', (resolve) => { require(['./components/revenue/comprehen/ovdue/Overduetax'], resolve) })
   // 气费减免
   Vue.component('gas-fee-reduction', (resolve) => { require(['./components/revenue/comprehen/Exemption/GasFeeReduction'], resolve) })