sale-client 4.2.60 → 4.2.62
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 +68 -68
- package/package.json +1 -1
- package/src/filiale/jinhong/CardMeterCenterInner.vue +2 -3
- package/src/filiale/ruihua/FilesManage/MeterinfoTest.vue +8 -8
- package/src/filiale/yangchun/FilesManage/UserGeneralInfoTest.vue +837 -837
- package/src/filiale/yangchun/MeterinfoTest.vue +1212 -1206
- package/src/main.js +1 -1
- package/.gradle/5.2.1/executionHistory/executionHistory.bin +0 -0
- package/.gradle/5.2.1/executionHistory/executionHistory.lock +0 -0
- package/.gradle/5.2.1/fileChanges/last-build.bin +0 -0
- package/.gradle/5.2.1/fileContent/fileContent.lock +0 -0
- package/.gradle/5.2.1/fileHashes/fileHashes.bin +0 -0
- package/.gradle/5.2.1/fileHashes/fileHashes.lock +0 -0
- package/.gradle/5.2.1/gc.properties +0 -0
- package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
- package/.gradle/buildOutputCleanup/cache.properties +0 -2
- package/.gradle/buildOutputCleanup/outputFiles.bin +0 -0
- package/.gradle/vcs-1/gc.properties +0 -0
- package/build/libs/SaleClient-V3-3.1.1-11.jar +0 -0
- package/build/tmp/jar/MANIFEST.MF +0 -2
package/build/dev-server.js
CHANGED
|
@@ -1,68 +1,68 @@
|
|
|
1
|
-
var path = require('path')
|
|
2
|
-
var checkVersion = require('./versionCheck.js')
|
|
3
|
-
checkVersion()
|
|
4
|
-
const [ serverRul, localUrl ] = ['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
|
-
// '/api/af-revenue/batchdeduction/all': {
|
|
23
|
-
// pathRewrite: {
|
|
24
|
-
// '/api/af-revenue/batchdeduction/all': '/batchdeduction/all'
|
|
25
|
-
// },
|
|
26
|
-
// target: localUrl
|
|
27
|
-
// },
|
|
28
|
-
// '/api/af-revenue/logic': {
|
|
29
|
-
// pathRewrite: {
|
|
30
|
-
// '/api/af-revenue/logic': '/logic'
|
|
31
|
-
// },
|
|
32
|
-
// target: localUrl
|
|
33
|
-
// },
|
|
34
|
-
// '/api/af-revenue/file': {
|
|
35
|
-
// // pathRewrite: {
|
|
36
|
-
// // '/api/af-revenue/file': '/file'
|
|
37
|
-
// // },
|
|
38
|
-
// target: localUrl
|
|
39
|
-
// },
|
|
40
|
-
// '/weixin2/rs':{
|
|
41
|
-
//
|
|
42
|
-
// target: 'http://410663id1ia4.vicp.fun'
|
|
43
|
-
// },
|
|
44
|
-
// '/api/af-revenue/sql': {
|
|
45
|
-
// pathRewrite: {
|
|
46
|
-
// '/api/af-revenue/sql': '/sql'
|
|
47
|
-
// },
|
|
48
|
-
// target: localUrl
|
|
49
|
-
// },
|
|
50
|
-
'/rs/pay': {
|
|
51
|
-
target: 'http://localhost:8080'
|
|
52
|
-
},
|
|
53
|
-
'/api/af-revenue': {
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
},
|
|
59
|
-
'/api': {
|
|
60
|
-
target: serverRul
|
|
61
|
-
},
|
|
62
|
-
'/rs': {
|
|
63
|
-
target: serverRul
|
|
64
|
-
}
|
|
65
|
-
}
|
|
66
|
-
}
|
|
67
|
-
}
|
|
68
|
-
module.exports = merge(baseConfig, devConfig)
|
|
1
|
+
var path = require('path')
|
|
2
|
+
var checkVersion = require('./versionCheck.js')
|
|
3
|
+
checkVersion()
|
|
4
|
+
const [ serverRul, localUrl ] = ['http://121.36.106.17:31467/', 'http://121.36.106.17:31467/']
|
|
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
|
+
// '/api/af-revenue/batchdeduction/all': {
|
|
23
|
+
// pathRewrite: {
|
|
24
|
+
// '/api/af-revenue/batchdeduction/all': '/batchdeduction/all'
|
|
25
|
+
// },
|
|
26
|
+
// target: localUrl
|
|
27
|
+
// },
|
|
28
|
+
// '/api/af-revenue/logic': {
|
|
29
|
+
// pathRewrite: {
|
|
30
|
+
// '/api/af-revenue/logic': '/logic'
|
|
31
|
+
// },
|
|
32
|
+
// target: localUrl
|
|
33
|
+
// },
|
|
34
|
+
// '/api/af-revenue/file': {
|
|
35
|
+
// // pathRewrite: {
|
|
36
|
+
// // '/api/af-revenue/file': '/file'
|
|
37
|
+
// // },
|
|
38
|
+
// target: localUrl
|
|
39
|
+
// },
|
|
40
|
+
// '/weixin2/rs':{
|
|
41
|
+
//
|
|
42
|
+
// target: 'http://410663id1ia4.vicp.fun'
|
|
43
|
+
// },
|
|
44
|
+
// '/api/af-revenue/sql': {
|
|
45
|
+
// pathRewrite: {
|
|
46
|
+
// '/api/af-revenue/sql': '/sql'
|
|
47
|
+
// },
|
|
48
|
+
// target: localUrl
|
|
49
|
+
// },
|
|
50
|
+
'/rs/pay': {
|
|
51
|
+
target: 'http://localhost:8080'
|
|
52
|
+
},
|
|
53
|
+
// '/api/af-revenue': {
|
|
54
|
+
// pathRewrite: {
|
|
55
|
+
// '/api/af-revenue': '/af-revenue'
|
|
56
|
+
// },
|
|
57
|
+
// target: "http://localhost:8080"
|
|
58
|
+
// },
|
|
59
|
+
'/api': {
|
|
60
|
+
target: serverRul
|
|
61
|
+
},
|
|
62
|
+
'/rs': {
|
|
63
|
+
target: serverRul
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
module.exports = merge(baseConfig, devConfig)
|
package/package.json
CHANGED
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
<div class="col-sm-4" v-if="row.f_collection_type == '按气量'"
|
|
18
18
|
:class="[$v.f_pregas.required || $v.f_pregas.dctest? 'has-error' : 'has-success']">
|
|
19
19
|
<label for="f_pregas" class=" font_normal_body">*预购气量</label>
|
|
20
|
-
<input class="input_search" style="width:60%" type="number"
|
|
20
|
+
<input class="input_search" style="width:60%" type="number"
|
|
21
21
|
@blur="pregas()" v-model="model.f_pregas" v-el:fpregas
|
|
22
22
|
v-validate:f_pregas='{required: true, dctest: [maxgas, "<=" ]}' placeholder="预购气量"
|
|
23
23
|
v-scale="[model.f_pregas, row.f_gas_decimal||4 ]"
|
|
@@ -28,14 +28,13 @@
|
|
|
28
28
|
<input class="input_search" style="width:60%" type="number" v-el:fpregas
|
|
29
29
|
@keyup.enter="pregas('enter')" @blur="pregas()" v-model="model.f_pregas" placeholder="预购气量"
|
|
30
30
|
v-scale="[model.f_pregas, row.f_gas_decimal||4 ]"
|
|
31
|
-
v-next-el='fcollection'
|
|
31
|
+
v-next-el='fcollection' />
|
|
32
32
|
</div>
|
|
33
33
|
<div class="col-sm-4"
|
|
34
34
|
:class="[$v.f_preamount.required || $v.f_preamount.dctest || model.f_preamount === 0 ? 'has-error' : 'has-success']">
|
|
35
35
|
<label for="f_pregas" class=" font_normal_body">*预购金额</label>
|
|
36
36
|
<input class="input_search" style="width:60%" type="number"
|
|
37
37
|
@blur="preamount()" v-model="model.f_preamount"
|
|
38
|
-
:disabled="config.calculatePreByCollection"
|
|
39
38
|
v-scale="[model.f_preamount, row.f_fee_decimal||4 ]"
|
|
40
39
|
v-validate:f_preamount='{required: true, dctest: [maxmoney, "<=" ]}' placeholder="预购金额">
|
|
41
40
|
</div><!--
|
|
@@ -22,18 +22,18 @@
|
|
|
22
22
|
v-model='row.gasmodel' :disabled="row.gasbrand.length === 0" v-ref:model></v-select>
|
|
23
23
|
</div>
|
|
24
24
|
|
|
25
|
-
<div class="col-sm-4 form-group"
|
|
25
|
+
<div class="col-sm-4 form-group" :class="[$m.f_meternumber.required ? 'has-error' : '']">
|
|
26
26
|
<label for="f_meternumber" class="font_normal_body"> 表  号</label>
|
|
27
27
|
<input type="text" class="input_search" style="width:60%" v-model="row.f_meternumber"
|
|
28
28
|
@blur="meternumberValidate()" placeholder='表号' v-validate:f_meternumber='{required: true }'
|
|
29
|
-
v-next-el="{id: 'metertitles'}" :disabled="meterNumberDisabled && meterChangeDisabled">
|
|
30
|
-
</div>
|
|
31
|
-
<div class="col-sm-4 form-group" v-else>
|
|
32
|
-
<label for="f_meternumber" class="font_normal_body"> 表  号</label>
|
|
33
|
-
<input type="text" class="input_search" style="width:60%" v-model="row.f_meternumber"
|
|
34
|
-
@blur="meternumberValidate()" placeholder='表号'
|
|
35
|
-
v-next-el="{id: 'metertitles'}">
|
|
29
|
+
v-next-el="{id: 'metertitles'}" :disabled="isiot&&(meterNumberDisabled && meterChangeDisabled)">
|
|
36
30
|
</div>
|
|
31
|
+
<!-- <div class="col-sm-4 form-group" v-else>-->
|
|
32
|
+
<!-- <label for="f_meternumber" class="font_normal_body"> 表  号</label>-->
|
|
33
|
+
<!-- <input type="text" class="input_search" style="width:60%" v-model="row.f_meternumber"-->
|
|
34
|
+
<!-- @blur="meternumberValidate()" placeholder='表号'-->
|
|
35
|
+
<!-- v-next-el="{id: 'metertitles'}">-->
|
|
36
|
+
<!-- </div>-->
|
|
37
37
|
<div class="col-sm-4 form-group" :class="[$m.f_defendcard.required ? 'has-error' : '']"
|
|
38
38
|
v-show="(formconfig && formconfig.f_defendcard && formconfig.f_defendcard.required) || !onlyshowmust"
|
|
39
39
|
v-if="getConfigShowItem('f_defendcard',false)">
|