sale-client 3.6.145 → 3.6.147

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [ serverRul, localUrl ] = ['https://qnjtkf.cn:7401/', 'https://qnjtkf.cn:7401/']
+const [ serverRul, localUrl ] = ['http://121.36.60.63:8300/', 'http://121.36.60.63:8300/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -20,6 +20,9 @@ var devConfig = {
       '/rs/file': {
         target: serverRul
       },
+      '/webapps': {
+        target: serverRul
+      },
       '/rs/sql/singleTable': {
         target: serverRul
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.145",
+  "version": "3.6.147",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -24,6 +24,7 @@
     "qrcodejs2": "0.0.2",
     "vue": "^1.0.17",
     "webpack-dev-server": "^2.11.5",
+    "vue-client": "1.24.113",
     "yarn": "^1.22.10"
   },
   "devDependencies": {
@@ -91,7 +92,6 @@
     "style-loader": "^0.20.3",
     "system-clients": "3.2.61",
     "url-loader": "^0.5.7",
-    "vue-client": "1.24.101",
     "vue-clipboard2": "0.3.1",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",

package/src/components/FilesManage/FileUserFiles.vue

@@ -648,16 +648,7 @@ let loadParamGem = async function (self) {
       },
       downloadFiles(){
         let downurl='rs/downloadfile/file?filename=批量建档导出Excel模板';
-        this.$resetget(downurl,{}).then(res=>{
-          var link = document.createElement('a');
-          link.target="_blank"
-          link.href =downurl ;
-          link.setAttribute("download", "批量建档导出Excel模板.xlsx"); //指定下载后的文件名，防跳转
-          document.body.appendChild(link);
-          link.click();
-        })
-
-
+        this.$downFile(downurl,'批量建档导出Excel模板.xlsx')
       },
       /**
        * 退出用户详细信息页面

package/src/components/FilesManage/MeterinfoTest.vue

@@ -353,9 +353,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/components/FilesManageNew/FileUserFiles.vue

@@ -428,14 +428,7 @@ let loadParamGem = async function (self) {
       methods: {
         downloadFiles(){
           let downurl='rs/downloadfile/file?filename=预备户批量建档导入Excel模板';
-          this.$resetget(downurl,{}).then(res=>{
-            var link = document.createElement('a');
-            link.target="_blank"
-            link.href =downurl ;
-            link.setAttribute("download", "预备户批量建档导入Excel模板.xlsx"); //指定下载后的文件名，防跳转
-            document.body.appendChild(link);
-            link.click();
-          })
+          this.$downFile(downurl,'预备户批量建档导入Excel模板.xlsx')
         },
         close () {
           this.printflag = false

package/src/components/SellGasCharge/MeterChargeforUser/ChargeUserCenter.vue

@@ -57,9 +57,9 @@
         </div>
         <div class="form-group">
           <div class="col-sm-6 form-input-group">
-            <label for="f_overdue" class="control-label col-sm-3">滞纳金:</label>
+            <label for="f_overdue" class="control-label col-sm-3">违约金:</label>
             <!-- <span class="col-sm-2 form-control-static">{{model.f_totalcost}}</span> -->
-            <input class="form-control col-sm-3"  type="number" v-model="model.f_overdue" placeholder="滞纳金" disabled>
+            <input class="form-control col-sm-3"  type="number" v-model="model.f_overdue" placeholder="违约金" disabled>
           </div>
           <div class="col-sm-6 form-input-group">
             <label for="f_totalcost" class=" col-sm-3 control-label">应收金额:</label>
@@ -166,7 +166,7 @@
     computed: {
       'curbalance' () {
         let account = 0
-        // 判断是否有滞纳金,第一笔没有滞纳金，说明所有欠费都没有滞纳金
+        // 判断是否有违约金,第一笔没有违约金，说明所有欠费都没有违约金
         if (this.model.rows.length === 0 || this.model.rows.length > 0 && this.model.rows.overdue <= 0) {
           account = (this.model.f_collection - 0) + this.model.f_balance
         } else {

package/src/components/WechatManage/OutLets.vue

@@ -373,12 +373,12 @@
       },
       confirm () {
         this.data.f_overdue = this.newOverdue
-        console.log(this.data.f_overdue, this.data.f_last_overdue, '滞纳金')
-        // 未滞纳金修改添加，将修改的值，原因添加到this.data.logicmodel中
+        console.log(this.data.f_overdue, this.data.f_last_overdue, '违约金')
+        // 未违约金修改添加，将修改的值，原因添加到this.data.logicmodel中
         // 如果有变更原因说明有变更
         if (this.f_cause && this.f_cause.length > 0) {
-          this.data.f_paydelaypay = this.f_paydelaypay // 应缴滞纳金
-          this.data.f_delaypay = this.f_delaypay // 实缴滞纳金
+          this.data.f_paydelaypay = this.f_paydelaypay // 应缴违约金
+          this.data.f_delaypay = this.f_delaypay // 实缴违约金
           this.data.f_cause = this.f_cause // 变更原因
         }
         this.$showMessage(`确定对用户${this.row.f_user_name}进行机表缴费吗？`, ['confirm', 'cancel']).then((res) => {
@@ -406,10 +406,10 @@
         this.clean()
       },
       changeOverdue (val, reason) {
-        this.$set('f_paydelaypay', this.newOverdue) // 应交滞纳金
-        this.newOverdue = val // 实缴滞纳金
-        this.$set('f_delaypay', this.newOverdue) // 实缴滞纳金
-        this.$set('f_cause', this.reason) // 实缴滞纳金
+        this.$set('f_paydelaypay', this.newOverdue) // 应交违约金
+        this.newOverdue = val // 实缴违约金
+        this.$set('f_delaypay', this.newOverdue) // 实缴违约金
+        this.$set('f_cause', this.reason) // 实缴违约金
         this.calOverdue()
       },
       updateConfirm () {

package/src/components/archives/UserfilesList.vue

@@ -190,14 +190,7 @@ export default {
   methods: {
     downloadFiles () {
       let downurl = 'rs/downloadfile/file?filename=团缴用户导入模板'
-      this.$resetget(downurl, {}).then(res => {
-        var link = document.createElement('a')
-        link.target = '_blank'
-        link.href = downurl
-        link.setAttribute('download', '团缴用户导入模板.xlsx')
-        document.body.appendChild(link)
-        link.click()
-      })
+      this.$downFile(downurl,'团缴用户导入模板.xlsx')
     },
     clickupshow () {
       this.upshow = !this.upshow

package/src/components/charge/business/depositCharge/DepositCharge.vue

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

package/src/components/charge/business/machine/MachineCharge.vue

@@ -143,7 +143,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/components/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;" >
@@ -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'>-->
@@ -336,7 +336,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/components/charge/business/machine/MachineMeterPartCenter.vue

@@ -35,7 +35,7 @@
             <input class="input_search" style="width:60%"  type="number" v-model="newOverdue"
                    v-scale="[newOverdue,2]" placeholder="违约金" @blur="calOverdue()"
                    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;">
@@ -107,7 +107,7 @@
     <modal :show.sync="showOverdueModal" v-ref:modal backdrop="false">
       <header slot="modal-header" class="modal-header">
         <button type="button" class="close" @click="close"><span>&times;</span></button>
-        <h4 class="modal-title">修改滞纳金</h4>
+        <h4 class="modal-title">修改违约金</h4>
       </header>
       <article slot="modal-body" class="modal-body">
         <div class="form-group">
@@ -241,7 +241,7 @@
         otherprice: '',
         handid: '',
         showOverdueModal: false,
-        editOverdue: this.$login.r.includes('滞纳金修改'),
+        editOverdue: this.$login.r.includes('违约金修改'),
         paytype: this.$appdata.getParam('付款方式') ? this.$appdata.getParam('付款方式') : [],
         printstyle: this.$appdata.getParam('打印格式') ? this.$appdata.getParam('打印格式') : []
       }
@@ -314,12 +314,12 @@
       },
       confirm () {
         this.data.f_overdue = this.newOverdue
-        console.log(this.data.f_overdue, this.data.f_last_overdue, '滞纳金')
-        // 未滞纳金修改添加，将修改的值，原因添加到this.data.logicmodel中
+        console.log(this.data.f_overdue, this.data.f_last_overdue, '违约金')
+        // 未违约金修改添加，将修改的值，原因添加到this.data.logicmodel中
         // 如果有变更原因说明有变更
         if (this.f_cause && this.f_cause.length > 0) {
-          this.data.f_paydelaypay = this.f_paydelaypay // 应缴滞纳金
-          this.data.f_delaypay = this.f_delaypay // 实缴滞纳金
+          this.data.f_paydelaypay = this.f_paydelaypay // 应缴违约金
+          this.data.f_delaypay = this.f_delaypay // 实缴违约金
           this.data.f_cause = this.f_cause // 变更原因
         }
         if (this.data.f_collection <= 0) {
@@ -354,10 +354,10 @@
         this.clean()
       },
       changeOverdue (val, reason) {
-        this.$set('f_paydelaypay', this.newOverdue) // 应交滞纳金
-        this.newOverdue = val // 实缴滞纳金
-        this.$set('f_delaypay', this.newOverdue) // 实缴滞纳金
-        this.$set('f_cause', this.reason) // 实缴滞纳金
+        this.$set('f_paydelaypay', this.newOverdue) // 应交违约金
+        this.newOverdue = val // 实缴违约金
+        this.$set('f_delaypay', this.newOverdue) // 实缴违约金
+        this.$set('f_cause', this.reason) // 实缴违约金
         this.calOverdue()
       }
     },

package/src/components/charge/business/machine/MachinePartCharge.vue

@@ -114,7 +114,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/components/chargeBatch/BatchChargeDetail.vue

@@ -18,7 +18,7 @@
         <span class = "col-sm-2" style="text-align:left">{{model.f_preamount}}</span>
       </div>
       <div class="row">
-        <label class = "col-sm-4">滞纳金额:</label>
+        <label class = "col-sm-4">违约金额:</label>
         <span class = "col-sm-2" style="text-align:left">{{model.f_delaypay}}</span>
         <label class = "col-sm-4">实收金额:</label>
         <span class = "col-sm-2" style="text-align:left">{{model.f_collection}}</span>

package/src/components/chargeBatch/ChargeGroupList.vue

@@ -192,7 +192,7 @@ export default {
           'f_oughtfee': '用气金额',
           'f_debt_money': '已交金额',
           'f_oughtfee_new': '应交气费',
-          'overdue': '滞纳金',
+          'overdue': '违约金',
           'f_oughtfee_all': '合计欠费'
         }
       },

package/src/components/chargeBatch/OweRecordQuery.vue

@@ -16,7 +16,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>
           </tr>
         </template>

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

@@ -90,7 +90,7 @@
                 <nobr>气费金额</nobr>
               </th>
               <th>
-                <nobr>滞纳金</nobr>
+                <nobr>违约金</nobr>
               </th>
               <th>
                 <nobr>减免金额</nobr>
@@ -479,7 +479,7 @@ export default {
           'f_pregas': '气量',
           'f_price': '气价',
           'f_preamount': '气费金额',
-          'f_delaypay': '滞纳金',
+          'f_delaypay': '违约金',
           'f_jianmian': '减免金额',
           'f_balance': '上期结余',
           'f_oughtfee': '应交金额',
@@ -501,7 +501,7 @@ export default {
           'f_pregas': '气量',
           'f_price': '气价',
           'f_preamount': '气费金额',
-          'f_delaypay': '滞纳金',
+          'f_delaypay': '违约金',
           'f_jianmian': '减免金额',
           'f_balance': '上期结余',
           'f_collection': '实收金额',

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

@@ -218,7 +218,7 @@
           'f_qianfei_fee': '欠费金额合计',
           'f_detailprice': '结算明细',
           'datas': '用气周期',
-          'money1': '滞纳金',
+          'money1': '违约金',
           'price1': '单价',
           'f_oughtfee1': '应交金额',
           'f_inputtor': '抄表员',

package/src/components/common/userinfo_detail/ic_detail/WebChargeQueryUser.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 v-if="!$parent.$parent.$parent.isIot">应交金额</nobr></th>

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

@@ -203,7 +203,7 @@
           'f_oughtfee': '用气金额',
           'f_detailprice': '结算明细',
           'datas': '用气周期',
-          'money1': '滞纳金',
+          'money1': '违约金',
           'price1': '单价',
           'f_oughtfee1': '应交金额',
           'f_inputtor': '抄表员',

package/src/components/revenue/Common/PaymentCode.vue

@@ -43,7 +43,8 @@
         // 定时器
         timer: null,
         // 收费成功id
-        sellinggasId: null
+        sellinggasId: null,
+        canPayment: this.$appdata.getSingleValue('微信支付付款方式') ? this.$appdata.getSingleValue('微信支付付款方式') : '微信支付',
       }
     },
     created () {
@@ -56,7 +57,7 @@
         return new Promise((resolve) => {
           this.paycoderesolve = resolve
           // 如果是付款码支付则显示界面扫用户付款码收钱
-          if (this.payment.toString().indexOf('&') !== -1) {
+          if (this.canPayment.indexOf(this.payment.toString()) !== -1 || this.payment.toString().indexOf('&') !== -1) {
             this.paymentCodeShow = true
             this.paycodefocus()
           } else {

package/src/components/revenue/HandManager/OverdueSet.vue

@@ -12,12 +12,12 @@
 </template>
 <script>
   /**
-   *滞纳金规则管理组件
+   *违约金规则管理组件
    */
 
 
   export default {
-    title: '滞纳金规则',
+    title: '违约金规则',
     data () {
       return {
         isdetail:false,

package/src/components/revenue/HandManager/OverdueSetList.vue

@@ -85,7 +85,7 @@
   <modal v-if="show" :show.sync="show" style="height: auto">
     <header slot="modal-header" class="modal-header">
       <button type="button" class="close" @click="show=!show"><span>&times;</span></button>
-      <h4 class="modal-title">新增滞纳金规则</h4>
+      <h4 class="modal-title">新增违约金规则</h4>
     </header>
     <article slot="modal-body" class="modal-body">
       <div class="row">
@@ -115,7 +115,7 @@
   <modal v-if="updateshow" :show.sync="updateshow" style="height: auto">
     <header slot="modal-header" class="modal-header">
       <button type="button" class="close" @click="updateshow=!updateshow"><span>&times;</span></button>
-      <h4 class="modal-title">新增滞纳金规则</h4>
+      <h4 class="modal-title">新增违约金规则</h4>
     </header>
     <article slot="modal-body" class="modal-body">
       <div class="row">
@@ -159,7 +159,7 @@
   }
 
   export default {
-    title: '滞纳金规则',
+    title: '违约金规则',
     data () {
       return {
         model: new PagedList('rs/sql/getOverdueSet', 30, {items: '"*"', tablename: '"t_overdue_set"', orderitem: '"f_operate_date  desc"'}),

package/src/components/revenue/HandManager/OverdueSetUser.vue

@@ -54,7 +54,7 @@
   import {HttpResetClass, PagedList} from 'vue-client'
 
   export default {
-    title: '滞纳金规则使用人',
+    title: '违约金规则使用人',
     data () {
       return {
         model: new PagedList('rs/sql/sale_getFiles', 20, {})

package/src/components/revenue/bank/bankOffer.vue

@@ -48,7 +48,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>
@@ -192,7 +192,7 @@
         return {condition: `${this.$refs.paged.$refs.cri.condition} and f_cost_type = '银行代扣' and f_filialeids like '${this.filialeCodeStr}%'`}
       },
       getfield () {
-        return {'f_userinfo_id': '用户号', 'f_userinfo_code': '客户编号', 'f_user_id': '表编号', 'f_user_name': '用户姓名', 'f_user_phone': '用户电话', 'f_user_type': '用户类型', 'f_address': '用户地址', 'f_balance': '账户结余', 'overdue': '滞纳金', 'f_oughtamount': '应交气量', 'f_oughtfee': '应交气费', 'qianfei': '应交总额', 'f_bank_name': '银行名称', 'f_bank_accopen': '银行账户', 'f_bank_account': '银行账号', 'f_bank_idnumber': '银行证件号', 'f_outlets': '营业网点'}
+        return {'f_userinfo_id': '用户号', 'f_userinfo_code': '客户编号', 'f_user_id': '表编号', 'f_user_name': '用户姓名', 'f_user_phone': '用户电话', 'f_user_type': '用户类型', 'f_address': '用户地址', 'f_balance': '账户结余', 'overdue': '违约金', 'f_oughtamount': '应交气量', 'f_oughtfee': '应交气费', 'qianfei': '应交总额', 'f_bank_name': '银行名称', 'f_bank_accopen': '银行账户', 'f_bank_account': '银行账号', 'f_bank_idnumber': '银行证件号', 'f_outlets': '营业网点'}
       }
     }
   }

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

@@ -498,14 +498,7 @@ export default {
   methods: {
     downloadFiles () {
       let downurl = 'rs/downloadfile/file?filename=卡表批量抄表导入模板'
-      this.$resetget(downurl, {}).then(res => {
-        var link = document.createElement('a')
-        link.target = '_blank'
-        link.href = downurl
-        link.setAttribute('download', '卡表批量抄表导入模板.xlsx')
-        document.body.appendChild(link)
-        link.click()
-      })
+      this.$downFile(downurl,'卡表批量抄表导入模板.xlsx')
     },
     hidden () {
       this.criteriaShow = !this.criteriaShow

package/src/components/revenue/changeInsurance/InsuranceList.vue

@@ -160,14 +160,7 @@
     methods: {
       downloadFiles(){
         let downurl='rs/downloadfile/file?filename=批量保险收费导入Excel模板';
-        this.$resetget(downurl,{}).then(res=>{
-          var link = document.createElement('a');
-          link.target="_blank"
-          link.href =downurl ;
-          link.setAttribute("download", "批量保险收费导入Excel模板.xlsx"); //指定下载后的文件名，防跳转
-          document.body.appendChild(link);
-          link.click();
-        })
+        this.$downFile(downurl,'批量保险收费导入Excel模板.xlsx')
       },
       search () {
         this.$refs.paged.$refs.criteria.search()

package/src/components/revenue/comprehen/ComprehenOperation/RefundManage/RefundManage.vue

@@ -32,7 +32,7 @@
                  <th>应交金额</th>
                  <!-- <th>账户余额</th>
                  <th>欠费金额</th> -->
-                 <th>滞纳金</th>
+                 <th>违约金</th>
               </tr>
             </template>
             <template partial='body'>

package/src/components/revenue/comprehen/Maintenance/hand/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/components/revenue/comprehen/Message/TemplateMessage.vue

@@ -51,9 +51,9 @@ export default {
     return {
       smsids: [],
       templateMessage: [
-          {title: '参数示例', content: '客户编号 : @[客户编号] , 表编号 : @[表编号] , 用户姓名 : @[用户姓名] , 用户电话 : @[用户电话] , 用户类型 : @[用户类型] , 缴费方式 : @[缴费方式] , 用户地址 : @[用户地址] , 表类型 : @[表类型] , 表品牌 : @[表品牌] , 应交气量 : @[应交气量] , 应交气费 : @[应交气费] , 滞纳金 : @[滞纳金] , 欠费总额 : @[欠费总额] , 账户结余 : @[账户结余]'},
+          {title: '参数示例', content: '客户编号 : @[客户编号] , 表编号 : @[表编号] , 用户姓名 : @[用户姓名] , 用户电话 : @[用户电话] , 用户类型 : @[用户类型] , 缴费方式 : @[缴费方式] , 用户地址 : @[用户地址] , 表类型 : @[表类型] , 表品牌 : @[表品牌] , 应交气量 : @[应交气量] , 应交气费 : @[应交气费] , 违约金 : @[违约金] , 欠费总额 : @[欠费总额] , 账户结余 : @[账户结余]'},
           {title: '欠费模板1', content: '尊敬的用户您好，你当前账户余额为：@[账户结余]，请及时缴费，谢谢合作！'},
-          {title: '欠费模板2', content: '尊敬的客户：您当前帐户余额为@[账户结余]（不包含滞纳金），用户地址：@[用户地址]，户名：@[用户姓名]，请您及时缴纳气费，谢谢合作！'}
+          {title: '欠费模板2', content: '尊敬的客户：您当前帐户余额为@[账户结余]（不包含违约金），用户地址：@[用户地址]，户名：@[用户姓名]，请您及时缴纳气费，谢谢合作！'}
       ]
     }
   },

package/src/components/revenue/comprehen/Message/UserDefinedMessageNew.vue

@@ -37,7 +37,7 @@
           "f_oughtamount":	"用气量",
           "f_oughtfee":	"用气金额",
           "f_debt_money":	"已交金额"
-          "overdue":"滞纳金",
+          "overdue":"违约金",
           "f_last_tablebase":"上期表底数",
           "f_balance":"本期账户余额",
           "f_oughtfee_all":"合计欠费金额"}
@@ -68,14 +68,7 @@ export default {
   methods: {
     downloadFiles(){
       let downurl='rs/downloadfile/file?filename=短信说明';
-      this.$resetget(downurl,{}).then(res=>{
-        var link = document.createElement('a');
-        link.target="_blank"
-        link.href =downurl ;
-        link.setAttribute("download", "短信说明.xlsx"); //指定下载后的文件名，防跳转
-        document.body.appendChild(link);
-        link.click();
-      })
+      this.$downFile(downurl,'短信说明.xlsx')
     },
     cancel  () {
       this.model.f_user_defined = ''

package/src/components/revenue/comprehen/batch/batchEditFiles.vue

@@ -91,7 +91,7 @@
         <div class="col-sm-6">
           <label class="font_normal_body">滞纳规则</label>
           <v-select :value.sync="model.f_overdue_set" v-model="model.f_overdue_set"
-                    :options='overdueset' placeholder='滞纳金规则'
+                    :options='overdueset' placeholder='违约金规则'
                     close-on-select></v-select>
         </div>
       </div>

package/src/components/revenue/comprehen/batch/batchEditManage.vue

@@ -43,7 +43,7 @@
             'f_changetube_date': '改管日期',
             'f_usestate': '使用状态',
             'f_comments': '备注',
-            'f_overdue_set': '滞纳金规则'
+            'f_overdue_set': '违约金规则'
           }
         }
       }

package/src/components/revenue/comprehen/closeaccount/Closeaccount.vue

@@ -94,7 +94,7 @@
 
 <script>
   /**
-   *滞纳金减免页面
+   *违约金减免页面
    */
   import Vue from 'vue'
   import {PagedList, HttpResetClass} from 'vue-client'

package/src/components/revenue/comprehen/closeaccount/battchcancelaudit.vue

@@ -216,7 +216,7 @@
 
 <script>
   /**
-   *滞纳金减免页面
+   *违约金减免页面
    */
   import Vue from 'vue'
   import {PagedList, HttpResetClass} from 'vue-client'

package/src/components/revenue/comprehen/common/ImportExcel.vue

@@ -53,14 +53,7 @@ export default {
   methods: {
     downloadFiles () {
       let downurl = 'rs/downloadfile/file?filename=' + this.templateName
-      this.$resetget(downurl, {}).then(res => {
-        var link = document.createElement('a')
-        link.target = '_blank'
-        link.href = downurl
-        link.setAttribute('download', this.templateName + '.xlsx') // 指定下载后的文件名，防跳转
-        document.body.appendChild(link)
-        link.click()
-      })
+      this.$downFile(downurl,this.templateName + '.xlsx')
     },
     createInfoForFile () {
       this.batchShow = true