sale-client 4.2.132 → 4.2.133

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:31567/', 'http://192.168.50.67:31567/']
+const [ serverRul, localUrl ] = ['http://113.219.4.57:31467/', 'http://113.219.4.57:31467/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -51,10 +51,10 @@ var devConfig = {
         target: 'http://localhost:8080'
       },
       '/api/af-revenue': {
-        pathRewrite: {
-          '/api/af-revenue': '/af-revenue'
-        },
-        target: "http://localhost:8080"
+        // pathRewrite: {
+        //   '/api/af-revenue': '/af-revenue'
+        // },
+        target: serverRul
       },
       '/api': {
         target: serverRul

package/package.json

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

package/src/filiale/jinhuang/ChargeOper.vue

@@ -21,6 +21,7 @@ import Vue from 'vue'
 
 let getNewmetermsg = async function (self, row) {
   self.cardInfo = undefined
+  self._isFromMeterChange = true
   if (row.f_userfiles_id && row.f_userfiles_id.length > 0) {
     // 获取用户信息
     let getUser = await self.$resetpost('api/af-revenue/sql/sale_getUser', {
@@ -201,18 +202,34 @@ let getBtnsGen = async function (self) {
         }
       })
     }
+    if (self._isFromMeterChange) {
+      self.operBtns = self.operBtns.filter(btn => btn.name !== '换表')
+      self._isFromMeterChange = false
+    }
     if (self.operBtns.length > 0) {
-      if (self.$parent.activeBusiness) {
+      if (self.$parent && self.$parent.activeBusiness) {
         const targetBtn = self.operBtns.find(btn => btn.name === self.$parent.activeBusiness)
         if (targetBtn) {
           self.$nextTick(() => {
             self.business(targetBtn)
           })
+        } else {
+          self.isBusiness = true
+          self.$nextTick(() => {
+            if (self.$refs.route) {
+              self.$refs.route.init(self.operBtns[0].value.routeName, {row: self.data, cardData: self.cardInfo, writeError: getWriteError.data})
+              self.styleChange(self.operBtns[0].name)
+            }
+          })
         }
       } else {
         self.isBusiness = true
-        self.$refs.route.init(self.operBtns[0].value.routeName, {row: self.data, cardData: self.cardInfo, writeError: getWriteError.data})
-        self.styleChange(self.operBtns[0].name)
+        self.$nextTick(() => {
+          if (self.$refs.route) {
+            self.$refs.route.init(self.operBtns[0].value.routeName, {row: self.data, cardData: self.cardInfo, writeError: getWriteError.data})
+            self.styleChange(self.operBtns[0].name)
+          }
+        })
       }
     }
   }
@@ -246,7 +263,7 @@ export default {
       // this.styleChange(btn.name)
       // this.isBusiness = true
       // this.$refs.route.init(btn.value.routeName, {row: this.data, cardData: this.cardInfo})
-      if (this.$refs.route.cards.length > 0) {
+      if (this.$refs.route && this.$refs.route.cards && this.$refs.route.cards.length > 0) {
         if (this.$refs.route.cards[0].title == '增值服务管理') {
           this.$showMessage('切换页面后,当前页面数据会丢失,是否切换?', ['confirm', 'cancel']).then(res => {
             if (res == 'cancel') {
@@ -264,6 +281,13 @@ export default {
           this.isBusiness = true
           this.$refs.route.init(btn.value.routeName, {row: this.data, cardData: this.cardInfo})
         }
+      } else {
+        // 处理按钮样式
+        this.styleChange(btn.name)
+        this.isBusiness = true
+        if (this.$refs.route) {
+          this.$refs.route.init(btn.value.routeName, {row: this.data, cardData: this.cardInfo})
+        }
       }
     },