sale-client 3.6.95 → 3.6.97

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://113.219.193.157:8100/', 'http://113.219.193.157:8100/']
 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.95",
+  "version": "3.6.97",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

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

@@ -366,7 +366,7 @@
               return
             }
           } else {
-            if (this.authArr.includes('冲正权限') && !this.$login.f.rolesnames.includes('管理员')) {
+            if (this.authArr.includes('冲正权限')) {
               if (this.config.cancleother) {
                 if (row.f_operator != this.$login.f.name) {
                   this.$showAlert('不能撤销不是自己进行的操作', 'warning', 1500)

package/src/components/revenue/machineHandManage/machineHand.vue

@@ -1109,7 +1109,7 @@
         if (this.danhu.f_tablebase < 0) {
           this.$showAlert(`底数不能小于0，请注意!`, 'warning', 2000)
           return
-        } else if (this.danhu.f_tablebase.toString().split(".")[1].length>3) {
+        } else if (this.danhu.f_tablebase.toString().split('.').length > 1 && this.danhu.f_tablebase.toString().split('.')[1].length > 3) {
           this.$showAlert(`底数最多只能输入小数点后3位，请注意!`, 'warning', 2000)
           return
         } else if (this.danhu.f_tablebase < this.danhu.info.f_tablebase && !this.danhu.info.f_capacity) {
@@ -1474,7 +1474,7 @@
             row.state = '失败'
             Vue.set(row, 'error', '底数不能小于0')
             this.speckText('底数不能小于0，请注意!')
-          } else if (row.f_tablebase.toString().split(".")[1].length>3) {
+          } else if (row.f_tablebase.toString().split('.')[1].length > 3) {
             row.state = '失败'
             Vue.set(row, 'error', '底数最多只能输入小数点后3位')
             this.speckText('底数最多只能输入小数点后3位，请注意!')
@@ -1575,7 +1575,7 @@
           f_userinfo_id: row.f_userinfo_id,
           f_adjustment_volume: row.f_adjustment_volume ? row.f_adjustment_volume : 0
         }
-        this.$resetpost('rs/logic/sale_commonEnter', {data: param}, {resolveMsg: null, rejectMsg: null,newly:true}).then((res) => {
+        this.$resetpost('rs/logic/sale_commonEnter', {data: param}, {resolveMsg: null, rejectMsg: null, newly: true}).then((res) => {
           row.f_meter_state = res.data.f_meter_state
           row.f_whether_pay = res.data.f_whether_pay
           row.f_oughtfee = res.data.f_oughtfee
@@ -1591,7 +1591,7 @@
             f_input_date = ` ,f_input_date = '${row.f_input_date}'`
           }
           let sqldata = `update t_handplan set f_result_state = '${f_result_state}' ${f_input_date} where id = '${row.id}'`
-          this.$resetpost('rs/logic/runSQL', {data: {sql: sqldata}}, {resolveMsg: null, rejectMsg: '业务单号保存失败',newly:true})
+          this.$resetpost('rs/logic/runSQL', {data: {sql: sqldata}}, {resolveMsg: null, rejectMsg: '业务单号保存失败', newly: true})
           //   }).catch((error) => {
           //   row.state = '失败'
           //  Vue.set(row, 'error', JSON.stringify(error))