sale-client 3.5.233 → 3.5.235
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/dev-server.js +81 -81
- package/package.json +1 -1
- package/src/components/charge/ChargeOper.vue +2 -3
- package/src/components/chargeNew/ChargeOper.vue +1 -1
- package/src/filiale/gaomi/components/charge/ChargeOper.vue +2 -2
- package/src/filiale/guangxi/ChargeOper.vue +2 -2
- package/src/filiale/kelai/ChargeOper.vue +2 -2
- package/src/filiale/macheng/ChargeOper.vue +2 -2
- package/src/filiale/meihekou/ChargeOper.vue +1 -1
- package/src/filiale/qianneng/revenue/ChargeOper.vue +1 -1
- package/src/filiale/shanggao/charge/ChargeOper.vue +1 -1
- package/src/filiale/shaoguan/charge/ChargeOper.vue +2 -2
- package/src/filiale/tongchuan/ChargeOper.vue +2 -2
- package/src/filiale/wenxi/FileUserFiles.vue +1007 -0
- package/src/filiale/wenxi/UserEssentialInfoTest.vue +13 -3
- package/src/filiale/wenxi/UserGeneralInfoTest.vue +2 -2
- package/src/filiale/wenxi/sale.js +1 -0
- package/src/filiale/yuansheng/CardMeterCenter.vue +2 -3
- package/src/filiale/yuansheng/IOTMeterCenter.vue +2 -3
- package/src/filiale/yuansheng/MeterinfoTest.vue +4 -5
- package/src/filiale/yuansheng/ShowCardSellGas.vue +1 -1
- package/src/main.js +24 -24
- package/src/sale.js +3 -3
- package/src/saleRes.json +526 -0
package/build/dev-server.js
CHANGED
|
@@ -1,81 +1,81 @@
|
|
|
1
|
-
var path = require('path')
|
|
2
|
-
const [localUrl, serverRul] = ['http://
|
|
3
|
-
var merge = require('webpack-merge')
|
|
4
|
-
var baseConfig = require('./webpack.dev.conf')
|
|
5
|
-
var devConfig = {
|
|
6
|
-
devServer: {
|
|
7
|
-
contentBase: path.join(__dirname, 'src'),
|
|
8
|
-
hot: true,
|
|
9
|
-
publicPath: baseConfig.output.publicPath,
|
|
10
|
-
historyApiFallback: true,
|
|
11
|
-
port: 8089,
|
|
12
|
-
open: true,
|
|
13
|
-
stats: {
|
|
14
|
-
colors: false, // 配置控制台输出彩色日志
|
|
15
|
-
chunks: false, // 不输出构建 chunk 信息
|
|
16
|
-
children: false // 不输出子模块构建信息
|
|
17
|
-
},
|
|
18
|
-
proxy: {
|
|
19
|
-
'/rs/file': {
|
|
20
|
-
target: serverRul
|
|
21
|
-
},
|
|
22
|
-
// 查找资源服务数据
|
|
23
|
-
'/rs/search': {
|
|
24
|
-
target: serverRul
|
|
25
|
-
},
|
|
26
|
-
// 查找资源服务数据
|
|
27
|
-
'/rs/logic/getLogin': {
|
|
28
|
-
target: serverRul
|
|
29
|
-
},
|
|
30
|
-
// 查找资源服务数据
|
|
31
|
-
'/rs/logic/getInitData': {
|
|
32
|
-
target: serverRul
|
|
33
|
-
},
|
|
34
|
-
'/rs/logic/getSaleInitData': {
|
|
35
|
-
target: serverRul
|
|
36
|
-
},
|
|
37
|
-
// 用户登录服务地址
|
|
38
|
-
'/rs/user': {
|
|
39
|
-
target: serverRul
|
|
40
|
-
},
|
|
41
|
-
'/rs/path': {
|
|
42
|
-
target: serverRul
|
|
43
|
-
},
|
|
44
|
-
'/rs/data': {
|
|
45
|
-
target: serverRul
|
|
46
|
-
},
|
|
47
|
-
'/rs/license': {
|
|
48
|
-
target: serverRul
|
|
49
|
-
},
|
|
50
|
-
'/rs/db': {
|
|
51
|
-
target: serverRul
|
|
52
|
-
},
|
|
53
|
-
'/excel': {
|
|
54
|
-
target: serverRul
|
|
55
|
-
},
|
|
56
|
-
'/rs/config': {
|
|
57
|
-
target: serverRul
|
|
58
|
-
},
|
|
59
|
-
'/rs/report': {
|
|
60
|
-
target: serverRul
|
|
61
|
-
},
|
|
62
|
-
'/rs/vue': {
|
|
63
|
-
target: serverRul
|
|
64
|
-
},
|
|
65
|
-
'/rs/logic': {
|
|
66
|
-
target: localUrl
|
|
67
|
-
},
|
|
68
|
-
'/rs/sql': {
|
|
69
|
-
target: localUrl
|
|
70
|
-
},
|
|
71
|
-
'/webmeter': {
|
|
72
|
-
target: serverRul
|
|
73
|
-
},
|
|
74
|
-
'/rs': {
|
|
75
|
-
target: serverRul
|
|
76
|
-
// changeOrigin: true
|
|
77
|
-
}
|
|
78
|
-
}
|
|
79
|
-
}
|
|
80
|
-
}
|
|
81
|
-
module.exports = merge(baseConfig, devConfig)
|
|
1
|
+
var path = require('path')
|
|
2
|
+
const [localUrl, serverRul] = ['http://192.168.50.4:8400', 'http://192.168.50.4:8400']
|
|
3
|
+
var merge = require('webpack-merge')
|
|
4
|
+
var baseConfig = require('./webpack.dev.conf')
|
|
5
|
+
var devConfig = {
|
|
6
|
+
devServer: {
|
|
7
|
+
contentBase: path.join(__dirname, 'src'),
|
|
8
|
+
hot: true,
|
|
9
|
+
publicPath: baseConfig.output.publicPath,
|
|
10
|
+
historyApiFallback: true,
|
|
11
|
+
port: 8089,
|
|
12
|
+
open: true,
|
|
13
|
+
stats: {
|
|
14
|
+
colors: false, // 配置控制台输出彩色日志
|
|
15
|
+
chunks: false, // 不输出构建 chunk 信息
|
|
16
|
+
children: false // 不输出子模块构建信息
|
|
17
|
+
},
|
|
18
|
+
proxy: {
|
|
19
|
+
'/rs/file': {
|
|
20
|
+
target: serverRul
|
|
21
|
+
},
|
|
22
|
+
// 查找资源服务数据
|
|
23
|
+
'/rs/search': {
|
|
24
|
+
target: serverRul
|
|
25
|
+
},
|
|
26
|
+
// 查找资源服务数据
|
|
27
|
+
'/rs/logic/getLogin': {
|
|
28
|
+
target: serverRul
|
|
29
|
+
},
|
|
30
|
+
// 查找资源服务数据
|
|
31
|
+
'/rs/logic/getInitData': {
|
|
32
|
+
target: serverRul
|
|
33
|
+
},
|
|
34
|
+
'/rs/logic/getSaleInitData': {
|
|
35
|
+
target: serverRul
|
|
36
|
+
},
|
|
37
|
+
// 用户登录服务地址
|
|
38
|
+
'/rs/user': {
|
|
39
|
+
target: serverRul
|
|
40
|
+
},
|
|
41
|
+
'/rs/path': {
|
|
42
|
+
target: serverRul
|
|
43
|
+
},
|
|
44
|
+
'/rs/data': {
|
|
45
|
+
target: serverRul
|
|
46
|
+
},
|
|
47
|
+
'/rs/license': {
|
|
48
|
+
target: serverRul
|
|
49
|
+
},
|
|
50
|
+
'/rs/db': {
|
|
51
|
+
target: serverRul
|
|
52
|
+
},
|
|
53
|
+
'/excel': {
|
|
54
|
+
target: serverRul
|
|
55
|
+
},
|
|
56
|
+
'/rs/config': {
|
|
57
|
+
target: serverRul
|
|
58
|
+
},
|
|
59
|
+
'/rs/report': {
|
|
60
|
+
target: serverRul
|
|
61
|
+
},
|
|
62
|
+
'/rs/vue': {
|
|
63
|
+
target: serverRul
|
|
64
|
+
},
|
|
65
|
+
'/rs/logic': {
|
|
66
|
+
target: localUrl
|
|
67
|
+
},
|
|
68
|
+
'/rs/sql': {
|
|
69
|
+
target: localUrl
|
|
70
|
+
},
|
|
71
|
+
'/webmeter': {
|
|
72
|
+
target: serverRul
|
|
73
|
+
},
|
|
74
|
+
'/rs': {
|
|
75
|
+
target: serverRul
|
|
76
|
+
// changeOrigin: true
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
module.exports = merge(baseConfig, devConfig)
|
package/package.json
CHANGED
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
import {HttpResetClass} from 'vue-client'
|
|
20
20
|
|
|
21
21
|
let getNewmetermsg = async function (self, row) {
|
|
22
|
-
self.cardInfo =
|
|
22
|
+
self.cardInfo = undefined
|
|
23
23
|
if (row.f_userfiles_id && row.f_userfiles_id.length > 0) {
|
|
24
24
|
// 获取用户信息
|
|
25
25
|
let getUser = await self.$resetpost('rs/sql/sale_getUser', {
|
|
@@ -112,12 +112,11 @@ let getBtnsGen = async function (self) {
|
|
|
112
112
|
})
|
|
113
113
|
} else {
|
|
114
114
|
}
|
|
115
|
-
|
|
116
115
|
}
|
|
117
116
|
}
|
|
118
117
|
}
|
|
119
118
|
// 如果卡上有气,添加购气撤销按钮
|
|
120
|
-
if (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase === '是')) {
|
|
119
|
+
if (self.cardInfo && (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase === '是'))) {
|
|
121
120
|
self.temp.push({
|
|
122
121
|
name: '购气撤销',
|
|
123
122
|
value: {
|
|
@@ -99,7 +99,7 @@
|
|
|
99
99
|
}
|
|
100
100
|
}
|
|
101
101
|
// 如果卡上有气,添加购气撤销按钮
|
|
102
|
-
if (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase
|
|
102
|
+
if (self.cardInfo && (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase === '是'))) {
|
|
103
103
|
self.temp.push({name: '购气撤销',
|
|
104
104
|
value: {
|
|
105
105
|
'weight': 0,
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
<script>
|
|
13
13
|
import { HttpResetClass } from 'vue-client'
|
|
14
14
|
let getNewmetermsg = async function (self, row) {
|
|
15
|
-
self.cardInfo =
|
|
15
|
+
self.cardInfo = undefined
|
|
16
16
|
if (row.f_userfiles_id && row.f_userfiles_id.length > 0) {
|
|
17
17
|
// 获取用户信息
|
|
18
18
|
let getUser = await self.$resetpost('rs/sql/sale_getUser', {
|
|
@@ -92,7 +92,7 @@
|
|
|
92
92
|
}
|
|
93
93
|
}
|
|
94
94
|
// 如果卡上有气,添加购气撤销按钮
|
|
95
|
-
if (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase
|
|
95
|
+
if (self.cardInfo && (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase === '是'))) {
|
|
96
96
|
self.temp.push({name: '购气撤销',
|
|
97
97
|
value: {
|
|
98
98
|
'weight': 0,
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
<script>
|
|
14
14
|
import { HttpResetClass } from 'vue-client'
|
|
15
15
|
let getNewmetermsg = async function (self, row) {
|
|
16
|
-
self.cardInfo =
|
|
16
|
+
self.cardInfo = undefined
|
|
17
17
|
if (row.f_userfiles_id && row.f_userfiles_id.length > 0) {
|
|
18
18
|
// 获取用户信息
|
|
19
19
|
let getUser = await self.$resetpost('rs/sql/sale_getUser', {
|
|
@@ -107,7 +107,7 @@
|
|
|
107
107
|
}
|
|
108
108
|
}
|
|
109
109
|
// 如果卡上有气,添加购气撤销按钮
|
|
110
|
-
if (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase
|
|
110
|
+
if (self.cardInfo && (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase === '是'))) {
|
|
111
111
|
self.temp.push({name: '购气撤销',
|
|
112
112
|
value: {
|
|
113
113
|
'weight': 0,
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
<script>
|
|
14
14
|
import { HttpResetClass } from 'vue-client'
|
|
15
15
|
let getNewmetermsg = async function (self, row) {
|
|
16
|
-
self.cardInfo =
|
|
16
|
+
self.cardInfo = undefined
|
|
17
17
|
if (row.f_userfiles_id && row.f_userfiles_id.length > 0) {
|
|
18
18
|
// 获取用户信息
|
|
19
19
|
let getUser = await self.$resetpost('rs/sql/sale_getUser', {
|
|
@@ -110,7 +110,7 @@
|
|
|
110
110
|
}
|
|
111
111
|
}
|
|
112
112
|
// 如果卡上有气,添加购气撤销按钮
|
|
113
|
-
if (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase
|
|
113
|
+
if (self.cardInfo && (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase === '是'))) {
|
|
114
114
|
self.temp.push({name: '购气撤销',
|
|
115
115
|
value: {
|
|
116
116
|
'weight': 0,
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
<script>
|
|
13
13
|
import { HttpResetClass } from 'vue-client'
|
|
14
14
|
let getNewmetermsg = async function (self, row) {
|
|
15
|
-
self.cardInfo =
|
|
15
|
+
self.cardInfo = undefined
|
|
16
16
|
if (row.f_userfiles_id && row.f_userfiles_id.length > 0) {
|
|
17
17
|
// 获取用户信息
|
|
18
18
|
let getUser = await self.$resetpost('rs/sql/sale_getUser', {
|
|
@@ -92,7 +92,7 @@
|
|
|
92
92
|
}
|
|
93
93
|
}
|
|
94
94
|
// 如果卡上有气,添加购气撤销按钮
|
|
95
|
-
if (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase
|
|
95
|
+
if (self.cardInfo && (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase === '是'))) {
|
|
96
96
|
self.temp.push({name: '购气撤销',
|
|
97
97
|
value: {
|
|
98
98
|
'weight': 0,
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
<script>
|
|
13
13
|
import { HttpResetClass } from 'vue-client'
|
|
14
14
|
let getNewmetermsg = async function (self, row) {
|
|
15
|
-
self.cardInfo =
|
|
15
|
+
self.cardInfo = undefined
|
|
16
16
|
if (row.f_userfiles_id && row.f_userfiles_id.length > 0) {
|
|
17
17
|
// 获取用户信息
|
|
18
18
|
let getUser = await self.$resetpost('rs/sql/sale_getUser', {
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
import {HttpResetClass} from 'vue-client'
|
|
20
20
|
|
|
21
21
|
let getNewmetermsg = async function (self, row) {
|
|
22
|
-
self.cardInfo =
|
|
22
|
+
self.cardInfo = undefined
|
|
23
23
|
if (row.f_userfiles_id && row.f_userfiles_id.length > 0) {
|
|
24
24
|
// 获取用户信息
|
|
25
25
|
let getUser = await self.$resetpost('rs/sql/sale_getUser', {
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
import {HttpResetClass} from 'vue-client'
|
|
20
20
|
|
|
21
21
|
let getNewmetermsg = async function (self, row) {
|
|
22
|
-
self.cardInfo =
|
|
22
|
+
self.cardInfo = undefined
|
|
23
23
|
if (row.f_userfiles_id && row.f_userfiles_id.length > 0) {
|
|
24
24
|
// 获取用户信息
|
|
25
25
|
let getUser = await self.$resetpost('rs/sql/sale_getUser', {
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
<script>
|
|
13
13
|
import { HttpResetClass } from 'vue-client'
|
|
14
14
|
let getNewmetermsg = async function (self, row) {
|
|
15
|
-
self.cardInfo =
|
|
15
|
+
self.cardInfo = undefined
|
|
16
16
|
if (row.f_userfiles_id && row.f_userfiles_id.length > 0) {
|
|
17
17
|
// 获取用户信息
|
|
18
18
|
let getUser = await self.$resetpost('rs/sql/sale_getUser', {
|
|
@@ -92,7 +92,7 @@
|
|
|
92
92
|
}
|
|
93
93
|
}
|
|
94
94
|
// 如果卡上有气,添加购气撤销按钮
|
|
95
|
-
if (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase
|
|
95
|
+
if (self.cardInfo && (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase === '是'))) {
|
|
96
96
|
self.temp.push({name: '购气撤销',
|
|
97
97
|
value: {
|
|
98
98
|
'weight': 0,
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
<script>
|
|
13
13
|
import { HttpResetClass } from 'vue-client'
|
|
14
14
|
let getNewmetermsg = async function (self, row) {
|
|
15
|
-
self.cardInfo =
|
|
15
|
+
self.cardInfo = undefined
|
|
16
16
|
if (row.f_userfiles_id && row.f_userfiles_id.length > 0) {
|
|
17
17
|
// 获取用户信息
|
|
18
18
|
let getUser = await self.$resetpost('rs/sql/sale_getUser', {
|
|
@@ -98,7 +98,7 @@
|
|
|
98
98
|
}})
|
|
99
99
|
}
|
|
100
100
|
// 如果卡上有气,添加购气撤销按钮
|
|
101
|
-
if (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase
|
|
101
|
+
if (self.cardInfo && (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase === '是'))) {
|
|
102
102
|
self.temp.push({name: '购气撤销',
|
|
103
103
|
value: {
|
|
104
104
|
'weight': 0,
|