sale-client 4.0.82 → 4.0.84

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl ] = ['http://192.168.50.67:31467/', 'http://localhost:9026/']
+const [ serverRul, localUrl ] = ['http://218.93.226.210:31467/', 'http://218.93.226.210:31467/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -23,13 +23,13 @@ var devConfig = {
         // pathRewrite: {
         //   '/api/af-revenue/logic': '/logic'
         // },
-        target: serverRul
+        target: localUrl
       },
       '/api/af-revenue/file': {
         // pathRewrite: {
         //   '/api/af-revenue/file': '/file'
         // },
-        target: serverRul
+        target: localUrl
       },
       '/weixin2/rs':{
         pathRewrite: {
@@ -41,7 +41,7 @@ var devConfig = {
         // pathRewrite: {
         //   '/api/af-revenue/sql': '/sql'
         // },
-        target: serverRul
+        target: localUrl
       },
       '/api': {
         target: serverRul

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "4.0.82",
+  "version": "4.0.84",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -23,7 +23,7 @@
     "less-loader": "^2.2.3",
     "qrcodejs2": "^0.0.2",
     "vue": "^1.0.17",
-    "vue-client": "1.25.19",
+    "vue-client": "1.25.21",
     "webpack-dev-server": "^2.11.5",
     "yarn": "^1.22.10"
   },

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

@@ -178,7 +178,7 @@
   /**
    * 发票补打
    */
-  let reprintGen = async function* (self, row) {
+  let reprintGen = async function (self, row) {
     try {
       row.billUrl = self.getBillUrl(row)
       if (!row.billUrl) {

package/src/filiale/liaoyuan/CardList.vue

@@ -177,7 +177,7 @@
   /**
    * 发票补打
    */
-  let reprintGen = async function* (self, row) {
+  let reprintGen = async function (self, row) {
     try {
       row.billUrl = self.getBillUrl(row)
       if (!row.billUrl) {

package/src/filiale/ronghao/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 === '过户'|| 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>
@@ -178,7 +178,7 @@
   /**
    * 发票补打
    */
-  let reprintGen = async function* (self, row) {
+  let reprintGen = async function (self, row) {
     try {
       row.billUrl = self.getBillUrl(row)
       if (!row.billUrl) {
@@ -193,6 +193,9 @@
       row.f_orgname = self.$login.f.orgs
       row.f_depid = self.$login.f.depids
       row.f_depname = self.$login.f.deps
+      if (row.type === '新增户档案') {
+        row.id = row.f_userinfo_id
+      }
       self.reissue_data = JSON.parse(JSON.stringify(row))
       if (row.type === '调价预存') {
         let id = await self.$resetpost('api/af-revenue/sql/singleTable_OrderBy', {
@@ -338,7 +341,7 @@
             }
           }
           if (row.type === '物联网收费' || row.type === '卡表赠气' || row.type === '物联网赠费' || row.type === '卡表赠费' || row.type === '物联网赠气') {
-            let table_name = this.$appdata.getSingleValue('新抄表')? 't_web_handplan' : 't_handplan'
+            let table_name = this.$appdata.getSingleValue('新抄表') ? 't_web_handplan' : 't_handplan'
             let getWebHand = await this.$SqlService.singleTable(table_name, `f_hand_state = '有效' and f_input_date > '${row.f_operate_date}' and f_userfiles_id = '${row.f_userfiles_id}'`)
             console.log('长度', getWebHand)
             if (getWebHand.data.length > 0) {
@@ -500,6 +503,8 @@
           name = 'api/af-revenue/report/icGiftFee'
         } else if (type === '卡表赠气') {
           name = 'api/af-revenue/report/icGiftGas'
+        } else if (type === '新增户档案') {
+          name = 'api/af-revenue/report/admissibility_bill'
         }
         return name
       },

package/src/filiale/ronghao/IOTRefund.vue

@@ -4,7 +4,7 @@
       <form novalidate class="form-horizontal">
         <div class="row">
           <div class="col-sm-4 form-group" :class="[$v.payment.required ? 'select-error' : '']">
-            <label class="font_normal_body" title="参数名称：退款方式">退款方式</label>
+            <label class="font_normal_body">退费类型</label>
              <input type="text" v-show="false" v-model="$refs.payment.selectedItems"  v-validate:payment='{required: true }'>
               <v-select v-model="f_payment"
                         placeholder='请选择'

package/src/filiale/ronghao/machineRefund.vue

@@ -4,7 +4,7 @@
             <form novalidate class="form-horizontal">
                 <div class="row">
                     <div class="col-sm-4 form-group">
-                        <label class="font_normal_body" title="参数名称：付款方式">收款方式</label>
+                        <label class="font_normal_body">退费类型</label>
 
                         <v-select v-model="f_payment"
                                   placeholder='请选择'

package/src/filiale/xinkang/base/rightview/CardList.vue

@@ -177,7 +177,7 @@
   /**
    * 发票补打
    */
-  let reprintGen = async function* (self, row) {
+  let reprintGen = async function(self, row) {
     try {
       row.billUrl = self.getBillUrl(row)
       if (!row.billUrl) {

package/src/filiale/yangchun/CardList.vue

@@ -178,7 +178,7 @@
   /**
    * 发票补打
    */
-  let reprintGen = async function* (self, row) {
+  let reprintGen = async function (self, row) {
     try {
       row.billUrl = self.getBillUrl(row)
       if (!row.billUrl) {

package/src/filiale/yuansheng/CardList.vue

@@ -178,7 +178,7 @@
   /**
    * 发票补打
    */
-  let reprintGen = async function* (self, row) {
+  let reprintGen = async function (self, row) {
     try {
       row.billUrl = self.getBillUrl(row)
       if (!row.billUrl) {

package/src/filiale/yuncheng/CardList.vue

@@ -178,7 +178,7 @@
   /**
    * 发票补打
    */
-  let reprintGen = async function* (self, row) {
+  let reprintGen = async function (self, row) {
     try {
       row.billUrl = self.getBillUrl(row)
       if (!row.billUrl) {

package/src/main.js

@@ -3,7 +3,7 @@ import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
 import sale from './sale'
-import FilialeSale from './filiale/ruihua/sale'
+import FilialeSale from './filiale/ronghao/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
 import VueClipboard from 'vue-clipboard2'

package/src/sale.js

@@ -145,7 +145,6 @@ export default function () {
 
   // 界面右边信息界面
   // 操作记录列表，可以切换查询用户列表的操作区域
-  Vue.component('card-list-new-bill', (resolve) => { require(['./components/newBill/CardList'], resolve) })
   Vue.component('card-list', (resolve) => { require(['./components/revenue/base/rightview/CardList'], resolve) })
 
   /** **************************业务组件******************************/
@@ -274,12 +273,10 @@ export default function () {
   Vue.component('show-card-sell-gas-web', (resolve) => { require(['./components/charge/business/ShowCardSellGasWeb'], resolve) })
   // 卡表收费
   Vue.component('card-meter-center', (resolve) => { require(['./components/charge/business/CardMeterCenter'], resolve) })
-  Vue.component('card-meter-center-new-bill', (resolve) => { require(['./components/newBill/CardMeterCenter'], resolve) })
   // 数码表收费
   Vue.component('digital-charge', (resolve) => { require(['./components/charge/business/DigitalCharge'], resolve) })
   // 无卡收费
   Vue.component('no-card-meter-center', (resolve) => { require(['./components/charge/business/NoCardMeterCenter'], resolve) })
-  Vue.component('no-card-meter-center-new-bill', (resolve) => { require(['./components/newBill/NoCardMeterCenter'], resolve) })
   // 维修收费
   Vue.component('repair-charge', (resolve) => { require(['./components/charge/business/RepairCharge'], resolve) })
   // 其他收费
@@ -303,7 +300,6 @@ export default function () {
   Vue.component('iot-open', (resolve) => { require(['./components/charge/business/IotOpen'], resolve) })
   // 物联网表收费
   Vue.component('iot-meter-center', (resolve) => { require(['./components/charge/business/IOTMeterCenter'], resolve) })
-  Vue.component('iot-meter-center-new-bill', (resolve) => { require(['./components/newBill/IOTMeterCenter'], resolve) })
   // 购气撤销
   Vue.component('card-meter-charge-cancel', (resolve) => { require(['./components/SellGasCharge/ChargeCancel/CardMeterChargeCancel'], resolve) })
   // 按户收费
@@ -407,7 +403,6 @@ export default function () {
   Vue.component('meter-message', (resolve) => { require(['./components/revenue/Common/MeterMessage'], resolve) })
   //   // 售气发票打印
   Vue.component('print-bill', (resolve) => { require(['./components/revenue/Common/PrintBill'], resolve) })
-  Vue.component('print-bill-new-bill', (resolve) => { require(['./components/newBill/PrintBill'], resolve) })
   // 点火单子打印
   Vue.component('user-flow-sheet', (resolve) => { require(['./components/revenue/Common/userFlowSheet'], resolve) })
   // 发票号验证
@@ -492,7 +487,6 @@ export default function () {
   Vue.component('sorting-query', (resolve) => { require(['./components/revenue/base/rightview/carddetail/SortingQuery'], resolve) })
   // 票据补打
   Vue.component('reissue-bill', (resolve) => { require(['./components/revenue/Common/ReissueBill'], resolve) })
-  Vue.component('reissue-bill-new-bill', (resolve) => { require(['./components/newBill/ReissueBill'], resolve) })
   // 补费扣费详情小组件
   Vue.component('replace-card-manageDetail', (resolve) => { require(['./components/revenue/base/rightview/carddetail/ReplaceCardManageDetail'], resolve) })
   // 物联网表收费详情小组件