sale-client 3.7.46 → 3.7.47-ly
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/.gradle/5.2.1/fileChanges/last-build.bin +0 -0
- package/.gradle/5.2.1/fileHashes/fileHashes.lock +0 -0
- package/.gradle/5.2.1/gc.properties +0 -0
- package/.gradle/8.10/checksums/checksums.lock +0 -0
- package/.gradle/8.10/dependencies-accessors/gc.properties +0 -0
- package/.gradle/8.10/executionHistory/executionHistory.bin +0 -0
- package/.gradle/8.10/executionHistory/executionHistory.lock +0 -0
- package/.gradle/8.10/fileChanges/last-build.bin +0 -0
- package/.gradle/8.10/fileHashes/fileHashes.bin +0 -0
- package/.gradle/8.10/fileHashes/fileHashes.lock +0 -0
- package/.gradle/8.10/gc.properties +0 -0
- package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
- package/.gradle/buildOutputCleanup/cache.properties +2 -0
- package/.gradle/file-system.probe +0 -0
- package/.gradle/vcs-1/gc.properties +0 -0
- package/build/dev-server.js +126 -126
- package/package.json +1 -1
- package/src/filiale/liaoyuan/FileManage/MeterinfoTest.vue +1 -1
- package/src/plugins/GetSaleParams.js +5 -5
|
Binary file
|
|
Binary file
|
|
File without changes
|
|
Binary file
|
|
File without changes
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
File without changes
|
|
Binary file
|
|
Binary file
|
|
File without changes
|
package/build/dev-server.js
CHANGED
|
@@ -1,126 +1,126 @@
|
|
|
1
|
-
var path = require('path')
|
|
2
|
-
var checkVersion = require('./versionCheck.js')
|
|
3
|
-
checkVersion()
|
|
4
|
-
const [ serverRul, localUrl, v4Url ] = ['http://
|
|
5
|
-
var merge = require('webpack-merge')
|
|
6
|
-
var baseConfig = require('./webpack.dev.conf')
|
|
7
|
-
var devConfig = {
|
|
8
|
-
devServer: {
|
|
9
|
-
contentBase: path.join(__dirname, 'src'),
|
|
10
|
-
hot: true,
|
|
11
|
-
publicPath: baseConfig.output.publicPath,
|
|
12
|
-
historyApiFallback: true,
|
|
13
|
-
host: '127.0.0.1',
|
|
14
|
-
port: 8089,
|
|
15
|
-
open: false,
|
|
16
|
-
stats: {
|
|
17
|
-
colors: false, // 配置控制台输出彩色日志
|
|
18
|
-
chunks: false, // 不输出构建 chunk 信息
|
|
19
|
-
children: false // 不输出子模块构建信息
|
|
20
|
-
},
|
|
21
|
-
proxy: {
|
|
22
|
-
|
|
23
|
-
'/rs/file': {
|
|
24
|
-
pathRewrite: {
|
|
25
|
-
'^/rs/file/': '/api/af-revenue/file/'
|
|
26
|
-
},
|
|
27
|
-
target: serverRul
|
|
28
|
-
},
|
|
29
|
-
'/api': {
|
|
30
|
-
target: v4Url
|
|
31
|
-
},
|
|
32
|
-
'/sketch': {
|
|
33
|
-
target: serverRul,
|
|
34
|
-
changeOrigin: true
|
|
35
|
-
},
|
|
36
|
-
'/invoice/rs/logic/getInvoice': {
|
|
37
|
-
target: serverRul
|
|
38
|
-
},
|
|
39
|
-
// '/rs/sql/filemanage_getUserfies':{
|
|
40
|
-
// target: 'http://127.0.0.1:8080/'
|
|
41
|
-
// },
|
|
42
|
-
// '/rs/logic/importNetworkValve':{
|
|
43
|
-
// target: 'http://127.0.0.1:8080/'
|
|
44
|
-
// },
|
|
45
|
-
'/webapps': {
|
|
46
|
-
target: serverRul
|
|
47
|
-
},
|
|
48
|
-
'/rs/sql/singleTable': {
|
|
49
|
-
target: localUrl
|
|
50
|
-
},
|
|
51
|
-
'/invoice': {
|
|
52
|
-
// pathRewrite: {
|
|
53
|
-
// '/invoice/rs/logic': '/logic'
|
|
54
|
-
// },
|
|
55
|
-
target: serverRul
|
|
56
|
-
},
|
|
57
|
-
'/rs/batchSettlement': {
|
|
58
|
-
target: localUrl
|
|
59
|
-
},
|
|
60
|
-
|
|
61
|
-
// 查找资源服务数据
|
|
62
|
-
'/rs/search': {
|
|
63
|
-
target: serverRul
|
|
64
|
-
},
|
|
65
|
-
// 查找资源服务数据
|
|
66
|
-
'/rs/logic/getLogin': {
|
|
67
|
-
target: serverRul
|
|
68
|
-
},
|
|
69
|
-
// 查找资源服务数据
|
|
70
|
-
'/rs/logic/getInitData': {
|
|
71
|
-
target: serverRul
|
|
72
|
-
},
|
|
73
|
-
'/rs/logic/getSaleInitData': {
|
|
74
|
-
target: localUrl
|
|
75
|
-
},
|
|
76
|
-
// 用户登录服务地址
|
|
77
|
-
'/rs/user': {
|
|
78
|
-
target: serverRul
|
|
79
|
-
},
|
|
80
|
-
'/rs/path': {
|
|
81
|
-
target: serverRul
|
|
82
|
-
},
|
|
83
|
-
'/rs/data': {
|
|
84
|
-
target: serverRul
|
|
85
|
-
},
|
|
86
|
-
'/rs/license': {
|
|
87
|
-
target: serverRul
|
|
88
|
-
},
|
|
89
|
-
'/rs/db': {
|
|
90
|
-
target: serverRul
|
|
91
|
-
},
|
|
92
|
-
'/excel': {
|
|
93
|
-
target: serverRul
|
|
94
|
-
},
|
|
95
|
-
'/rs/config': {
|
|
96
|
-
target: serverRul
|
|
97
|
-
},
|
|
98
|
-
'/rs/report': {
|
|
99
|
-
target: serverRul
|
|
100
|
-
},
|
|
101
|
-
'/rs/vue': {
|
|
102
|
-
target: serverRul
|
|
103
|
-
},
|
|
104
|
-
'/rs/logic/webHandReverse': {
|
|
105
|
-
target: 'http://localhost:8085'
|
|
106
|
-
},
|
|
107
|
-
'/rs/logic': {
|
|
108
|
-
target: localUrl
|
|
109
|
-
},
|
|
110
|
-
'/rs/entity': {
|
|
111
|
-
target: localUrl
|
|
112
|
-
},
|
|
113
|
-
'/rs/sql': {
|
|
114
|
-
target: localUrl
|
|
115
|
-
},
|
|
116
|
-
'/webmeter': {
|
|
117
|
-
target: serverRul
|
|
118
|
-
},
|
|
119
|
-
'/rs': {
|
|
120
|
-
target: serverRul
|
|
121
|
-
// changeOrigin: true
|
|
122
|
-
}
|
|
123
|
-
}
|
|
124
|
-
}
|
|
125
|
-
}
|
|
126
|
-
module.exports = merge(baseConfig, devConfig)
|
|
1
|
+
var path = require('path')
|
|
2
|
+
var checkVersion = require('./versionCheck.js')
|
|
3
|
+
checkVersion()
|
|
4
|
+
const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.67:30785/', 'http://localhost:8080/', 'http://192.168.50.67:30785']
|
|
5
|
+
var merge = require('webpack-merge')
|
|
6
|
+
var baseConfig = require('./webpack.dev.conf')
|
|
7
|
+
var devConfig = {
|
|
8
|
+
devServer: {
|
|
9
|
+
contentBase: path.join(__dirname, 'src'),
|
|
10
|
+
hot: true,
|
|
11
|
+
publicPath: baseConfig.output.publicPath,
|
|
12
|
+
historyApiFallback: true,
|
|
13
|
+
host: '127.0.0.1',
|
|
14
|
+
port: 8089,
|
|
15
|
+
open: false,
|
|
16
|
+
stats: {
|
|
17
|
+
colors: false, // 配置控制台输出彩色日志
|
|
18
|
+
chunks: false, // 不输出构建 chunk 信息
|
|
19
|
+
children: false // 不输出子模块构建信息
|
|
20
|
+
},
|
|
21
|
+
proxy: {
|
|
22
|
+
|
|
23
|
+
'/rs/file': {
|
|
24
|
+
pathRewrite: {
|
|
25
|
+
'^/rs/file/': '/api/af-revenue/file/'
|
|
26
|
+
},
|
|
27
|
+
target: serverRul
|
|
28
|
+
},
|
|
29
|
+
'/api': {
|
|
30
|
+
target: v4Url
|
|
31
|
+
},
|
|
32
|
+
'/sketch': {
|
|
33
|
+
target: serverRul,
|
|
34
|
+
changeOrigin: true
|
|
35
|
+
},
|
|
36
|
+
'/invoice/rs/logic/getInvoice': {
|
|
37
|
+
target: serverRul
|
|
38
|
+
},
|
|
39
|
+
// '/rs/sql/filemanage_getUserfies':{
|
|
40
|
+
// target: 'http://127.0.0.1:8080/'
|
|
41
|
+
// },
|
|
42
|
+
// '/rs/logic/importNetworkValve':{
|
|
43
|
+
// target: 'http://127.0.0.1:8080/'
|
|
44
|
+
// },
|
|
45
|
+
'/webapps': {
|
|
46
|
+
target: serverRul
|
|
47
|
+
},
|
|
48
|
+
'/rs/sql/singleTable': {
|
|
49
|
+
target: localUrl
|
|
50
|
+
},
|
|
51
|
+
'/invoice': {
|
|
52
|
+
// pathRewrite: {
|
|
53
|
+
// '/invoice/rs/logic': '/logic'
|
|
54
|
+
// },
|
|
55
|
+
target: serverRul
|
|
56
|
+
},
|
|
57
|
+
'/rs/batchSettlement': {
|
|
58
|
+
target: localUrl
|
|
59
|
+
},
|
|
60
|
+
|
|
61
|
+
// 查找资源服务数据
|
|
62
|
+
'/rs/search': {
|
|
63
|
+
target: serverRul
|
|
64
|
+
},
|
|
65
|
+
// 查找资源服务数据
|
|
66
|
+
'/rs/logic/getLogin': {
|
|
67
|
+
target: serverRul
|
|
68
|
+
},
|
|
69
|
+
// 查找资源服务数据
|
|
70
|
+
'/rs/logic/getInitData': {
|
|
71
|
+
target: serverRul
|
|
72
|
+
},
|
|
73
|
+
'/rs/logic/getSaleInitData': {
|
|
74
|
+
target: localUrl
|
|
75
|
+
},
|
|
76
|
+
// 用户登录服务地址
|
|
77
|
+
'/rs/user': {
|
|
78
|
+
target: serverRul
|
|
79
|
+
},
|
|
80
|
+
'/rs/path': {
|
|
81
|
+
target: serverRul
|
|
82
|
+
},
|
|
83
|
+
'/rs/data': {
|
|
84
|
+
target: serverRul
|
|
85
|
+
},
|
|
86
|
+
'/rs/license': {
|
|
87
|
+
target: serverRul
|
|
88
|
+
},
|
|
89
|
+
'/rs/db': {
|
|
90
|
+
target: serverRul
|
|
91
|
+
},
|
|
92
|
+
'/excel': {
|
|
93
|
+
target: serverRul
|
|
94
|
+
},
|
|
95
|
+
'/rs/config': {
|
|
96
|
+
target: serverRul
|
|
97
|
+
},
|
|
98
|
+
'/rs/report': {
|
|
99
|
+
target: serverRul
|
|
100
|
+
},
|
|
101
|
+
'/rs/vue': {
|
|
102
|
+
target: serverRul
|
|
103
|
+
},
|
|
104
|
+
'/rs/logic/webHandReverse': {
|
|
105
|
+
target: 'http://localhost:8085'
|
|
106
|
+
},
|
|
107
|
+
'/rs/logic': {
|
|
108
|
+
target: localUrl
|
|
109
|
+
},
|
|
110
|
+
'/rs/entity': {
|
|
111
|
+
target: localUrl
|
|
112
|
+
},
|
|
113
|
+
'/rs/sql': {
|
|
114
|
+
target: localUrl
|
|
115
|
+
},
|
|
116
|
+
'/webmeter': {
|
|
117
|
+
target: serverRul
|
|
118
|
+
},
|
|
119
|
+
'/rs': {
|
|
120
|
+
target: serverRul
|
|
121
|
+
// changeOrigin: true
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
module.exports = merge(baseConfig, devConfig)
|
package/package.json
CHANGED
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
<input type="text" v-show="false" v-model="$refs.model.selectedItems"
|
|
38
38
|
v-validate:model='{required: true }'>
|
|
39
39
|
<v-select :value.sync="row.gasmodel" :options='row.gasbrand[0].gasmodel' placeholder='气表型号'
|
|
40
|
-
close-on-select :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('气表型号') == false && controlledArray.includes('气表型号') ==
|
|
40
|
+
close-on-select :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('气表型号') == false && controlledArray.includes('气表型号') == true)"
|
|
41
41
|
v-model='row.gasmodel' :disabled='row.gasbrand.length === 0 ' v-ref:model></v-select>
|
|
42
42
|
</div>
|
|
43
43
|
<div class="col-sm-4 form-group" :class="[$m.name.required ? 'has-error' : '']">
|
|
@@ -21,8 +21,8 @@ let GetSaleParam = {
|
|
|
21
21
|
inputtors: [],
|
|
22
22
|
async initinputtor () {
|
|
23
23
|
let res = await Vue.resetpost('rs/sql/sale_getAlluserRes?pageNo=1&pageSize=999999', {data: {
|
|
24
|
-
|
|
25
|
-
|
|
24
|
+
condition: ' 1=1'
|
|
25
|
+
}}, {resolveMsg: null, rejectMsg: '获取用户出错！！！'})
|
|
26
26
|
console.log('resdata:', res.data)
|
|
27
27
|
if (res.data) {
|
|
28
28
|
GetSaleParam.inputtors = res.data
|
|
@@ -115,7 +115,7 @@ let GetSaleParam = {
|
|
|
115
115
|
getPriceByOrgNoLow (filialeid) {
|
|
116
116
|
let result = []
|
|
117
117
|
GetSaleParam.prices.forEach((item) => {
|
|
118
|
-
if (item.f_state === '有效' && filialeid == item.f_filialeid && item.f_islow_income
|
|
118
|
+
if (item.f_state === '有效' && filialeid == item.f_filialeid && (item.f_islow_income == null || item.f_islow_income == 0)) {
|
|
119
119
|
let value = {
|
|
120
120
|
label: item.f_price_name,
|
|
121
121
|
value: item
|
|
@@ -247,7 +247,7 @@ let GetSaleParam = {
|
|
|
247
247
|
if (item.f_state === '有效' && object.f_user_type === item.f_user_type &&
|
|
248
248
|
object.f_gasproperties === item.f_gasproperties &&
|
|
249
249
|
object.f_price_type === item.f_price_type &&
|
|
250
|
-
object.filter == item.f_filialeid && item.f_islow_income
|
|
250
|
+
object.filter == item.f_filialeid && (item.f_islow_income == null || item.f_islow_income == 0)) {
|
|
251
251
|
let value = {
|
|
252
252
|
label: item.f_price_name,
|
|
253
253
|
value: item
|
|
@@ -257,7 +257,7 @@ let GetSaleParam = {
|
|
|
257
257
|
})
|
|
258
258
|
} else {
|
|
259
259
|
GetSaleParam.prices.forEach((item) => {
|
|
260
|
-
if (item.f_state === '有效' && object.f_user_type === item.f_user_type && object.f_gasproperties === item.f_gasproperties && object.f_price_type === item.f_price_type && item.f_islow_income
|
|
260
|
+
if (item.f_state === '有效' && object.f_user_type === item.f_user_type && object.f_gasproperties === item.f_gasproperties && object.f_price_type === item.f_price_type && (item.f_islow_income == null || item.f_islow_income == 0)) {
|
|
261
261
|
let value = {
|
|
262
262
|
label: item.f_price_name,
|
|
263
263
|
value: item
|