sale-client 3.6.218 → 3.6.220

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [ serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/']
+const [ serverRul, localUrl ] = ['http://120.46.92.69:8700/', 'http://120.46.92.69:8700/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.218",
+  "version": "3.6.220",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/filiale/qianneng/revenue/machineHandManage/machineHand.vue

@@ -826,7 +826,7 @@ export default {
       filiale: '',
       condition2: '',
       area: [],
-      webhand: this.$appdata.getSingleValue('新抄表'),
+      webhand: this.$appdata.getSingleValue('新抄表') ? this.$appdata.getSingleValue('新抄表') : '',
       inputtouPerson: [],
       meters: [{label: '全部', value: ''}, {label: '机表', value: '机表'}, {label: '物联网表', value: '物联网表'}],
       resultstate: this.$appdata.getParam('抄表结果状态'),
@@ -1022,7 +1022,7 @@ export default {
         userfilesid: this.danhu.info.f_userfiles_id
       }
       console.log('下发参数：', param)
-      if (this.danhu.info.f_meter_classify === '物联网表' && this.webhand === '1') {
+      if (this.danhu.info.f_meter_classify === '物联网表' && this.webhand) {
         param.f_meter_base = this.danhu.f_tablebase
         param.f_hand_date = this.downModel.downDate
         param.f_userfiles_id = param.userfilesid

package/src/filiale/wenxi/CardService.js

@@ -847,8 +847,10 @@ let sendCardSaleGasGen = async function (model, row) {
       if (getCardNumber.data.cardNumber) {
         // 当卡的别名是泰鹏普通卡的时候卡号和表号一致
         console.log('开始验证是不是泰鹏普通卡')
-        if (row.f_alias && (row.f_alias.includes('SmartCard_TP') || row.f_alias.includes('LiHengSystem'))) {
+        if (row.f_alias && row.f_alias.includes('SmartCard_TP')) {
           model.cardNumber = row.f_meternumber
+        } else if (row.f_alias && row.f_alias.includes('LiHengSystem')) {
+          model.cardNumber = row.f_meternumber.padStart(8, "0")
         } else if (row.f_alias && row.f_alias.includes('LaiDeRF')) {
           model.cardNumber = row.f_card_id
         } else {

package/src/filiale/yuncheng/machineHandAudit.vue

@@ -592,7 +592,8 @@
               sqlName: 'getAuditMachineHand',
               condition: this.excelCondition,
               data: {
-                condition: this.excelCondition
+                condition: this.excelCondition,
+                orderitem : ' id desc '
               },
               f_audit_person: this.$login.f.name
             }

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/tongchuan/sale'
+import FilialeSale from './filiale/yuncheng/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
 import VueClipboard from 'vue-clipboard2'