sale-client 3.6.31 → 3.6.33
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 +85 -85
- package/package.json +1 -1
- package/src/components/charge/business/ShowCardSellGas.vue +1 -1
- package/src/components/chargeNew/BookBill.vue +18 -6
- package/src/filiale/shexian/HighMeterCard.vue +1068 -0
- package/src/filiale/shexian/UploadIdCard.vue +543 -0
- package/src/filiale/shexian/sale.js +21 -17
- package/src/filiale/yuansheng/ShowCardSellGas.vue +1 -1
package/build/dev-server.js
CHANGED
|
@@ -1,85 +1,85 @@
|
|
|
1
|
-
var path = require('path')
|
|
2
|
-
const [localUrl, serverRul] = ['
|
|
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
|
-
host: '127.0.0.1',
|
|
12
|
-
port: 8089,
|
|
13
|
-
open: true,
|
|
14
|
-
stats: {
|
|
15
|
-
colors: false, // 配置控制台输出彩色日志
|
|
16
|
-
chunks: false, // 不输出构建 chunk 信息
|
|
17
|
-
children: false // 不输出子模块构建信息
|
|
18
|
-
},
|
|
19
|
-
proxy: {
|
|
20
|
-
'/rs/file': {
|
|
21
|
-
target: serverRul
|
|
22
|
-
},
|
|
23
|
-
'/invoice': {
|
|
24
|
-
target: serverRul
|
|
25
|
-
},
|
|
26
|
-
// 查找资源服务数据
|
|
27
|
-
'/rs/search': {
|
|
28
|
-
target: serverRul
|
|
29
|
-
},
|
|
30
|
-
// 查找资源服务数据
|
|
31
|
-
'/rs/logic/getLogin': {
|
|
32
|
-
target: serverRul
|
|
33
|
-
},
|
|
34
|
-
// 查找资源服务数据
|
|
35
|
-
'/rs/logic/getInitData': {
|
|
36
|
-
target: serverRul
|
|
37
|
-
},
|
|
38
|
-
'/rs/logic/getSaleInitData': {
|
|
39
|
-
target: serverRul
|
|
40
|
-
},
|
|
41
|
-
// 用户登录服务地址
|
|
42
|
-
'/rs/user': {
|
|
43
|
-
target: serverRul
|
|
44
|
-
},
|
|
45
|
-
'/rs/path': {
|
|
46
|
-
target: serverRul
|
|
47
|
-
},
|
|
48
|
-
'/rs/data': {
|
|
49
|
-
target: serverRul
|
|
50
|
-
},
|
|
51
|
-
'/rs/license': {
|
|
52
|
-
target: serverRul
|
|
53
|
-
},
|
|
54
|
-
'/rs/db': {
|
|
55
|
-
target: serverRul
|
|
56
|
-
},
|
|
57
|
-
'/excel': {
|
|
58
|
-
target: serverRul
|
|
59
|
-
},
|
|
60
|
-
'/rs/config': {
|
|
61
|
-
target: serverRul
|
|
62
|
-
},
|
|
63
|
-
'/rs/report': {
|
|
64
|
-
target: serverRul
|
|
65
|
-
},
|
|
66
|
-
'/rs/vue': {
|
|
67
|
-
target: serverRul
|
|
68
|
-
},
|
|
69
|
-
'/rs/logic': {
|
|
70
|
-
target: localUrl
|
|
71
|
-
},
|
|
72
|
-
'/rs/sql': {
|
|
73
|
-
target: localUrl
|
|
74
|
-
},
|
|
75
|
-
'/webmeter': {
|
|
76
|
-
target: serverRul
|
|
77
|
-
},
|
|
78
|
-
'/rs': {
|
|
79
|
-
target: serverRul
|
|
80
|
-
// changeOrigin: true
|
|
81
|
-
}
|
|
82
|
-
}
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
module.exports = merge(baseConfig, devConfig)
|
|
1
|
+
var path = require('path')
|
|
2
|
+
const [localUrl, serverRul] = ['https://qnjtkf.cn:8400/', 'https://qnjtkf.cn: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
|
+
host: '127.0.0.1',
|
|
12
|
+
port: 8089,
|
|
13
|
+
open: true,
|
|
14
|
+
stats: {
|
|
15
|
+
colors: false, // 配置控制台输出彩色日志
|
|
16
|
+
chunks: false, // 不输出构建 chunk 信息
|
|
17
|
+
children: false // 不输出子模块构建信息
|
|
18
|
+
},
|
|
19
|
+
proxy: {
|
|
20
|
+
'/rs/file': {
|
|
21
|
+
target: serverRul
|
|
22
|
+
},
|
|
23
|
+
'/invoice': {
|
|
24
|
+
target: serverRul
|
|
25
|
+
},
|
|
26
|
+
// 查找资源服务数据
|
|
27
|
+
'/rs/search': {
|
|
28
|
+
target: serverRul
|
|
29
|
+
},
|
|
30
|
+
// 查找资源服务数据
|
|
31
|
+
'/rs/logic/getLogin': {
|
|
32
|
+
target: serverRul
|
|
33
|
+
},
|
|
34
|
+
// 查找资源服务数据
|
|
35
|
+
'/rs/logic/getInitData': {
|
|
36
|
+
target: serverRul
|
|
37
|
+
},
|
|
38
|
+
'/rs/logic/getSaleInitData': {
|
|
39
|
+
target: serverRul
|
|
40
|
+
},
|
|
41
|
+
// 用户登录服务地址
|
|
42
|
+
'/rs/user': {
|
|
43
|
+
target: serverRul
|
|
44
|
+
},
|
|
45
|
+
'/rs/path': {
|
|
46
|
+
target: serverRul
|
|
47
|
+
},
|
|
48
|
+
'/rs/data': {
|
|
49
|
+
target: serverRul
|
|
50
|
+
},
|
|
51
|
+
'/rs/license': {
|
|
52
|
+
target: serverRul
|
|
53
|
+
},
|
|
54
|
+
'/rs/db': {
|
|
55
|
+
target: serverRul
|
|
56
|
+
},
|
|
57
|
+
'/excel': {
|
|
58
|
+
target: serverRul
|
|
59
|
+
},
|
|
60
|
+
'/rs/config': {
|
|
61
|
+
target: serverRul
|
|
62
|
+
},
|
|
63
|
+
'/rs/report': {
|
|
64
|
+
target: serverRul
|
|
65
|
+
},
|
|
66
|
+
'/rs/vue': {
|
|
67
|
+
target: serverRul
|
|
68
|
+
},
|
|
69
|
+
'/rs/logic': {
|
|
70
|
+
target: localUrl
|
|
71
|
+
},
|
|
72
|
+
'/rs/sql': {
|
|
73
|
+
target: localUrl
|
|
74
|
+
},
|
|
75
|
+
'/webmeter': {
|
|
76
|
+
target: serverRul
|
|
77
|
+
},
|
|
78
|
+
'/rs': {
|
|
79
|
+
target: serverRul
|
|
80
|
+
// changeOrigin: true
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
module.exports = merge(baseConfig, devConfig)
|
package/package.json
CHANGED
|
@@ -265,7 +265,7 @@
|
|
|
265
265
|
<payment-code v-ref:paymentcode :payment="model.f_payment" :row="row"
|
|
266
266
|
:money="model.f_after_discount"></payment-code>
|
|
267
267
|
</div>
|
|
268
|
-
<upload v-if="config.showupload" isremark="true" fusetype="发卡售气"></upload>
|
|
268
|
+
<upload v-if="config.showupload" :blodid="blodid" isremark="true" fusetype="发卡售气"></upload>
|
|
269
269
|
</template>
|
|
270
270
|
<script>
|
|
271
271
|
/**
|
|
@@ -30,10 +30,14 @@
|
|
|
30
30
|
self.data.content.f_zzhh = `'${self.data.f_zzhh}'`
|
|
31
31
|
self.bill = new DataModel(self.url, self.data.content)
|
|
32
32
|
console.log(self.bill.url)
|
|
33
|
-
|
|
33
|
+
let height = self.zzheight - 0.0
|
|
34
|
+
let spacing = self.zzspacing - 0.0
|
|
35
|
+
let pageRow = self.zzpageRow - 0
|
|
36
|
+
let marginTop = self.zzmarginTop - 0
|
|
37
|
+
var hh = self.data.f_zzhh
|
|
34
38
|
if (hh != -1) {
|
|
35
|
-
var top =
|
|
36
|
-
if (hh >
|
|
39
|
+
var top = marginTop + (hh - 1) * height
|
|
40
|
+
if (hh > pageRow) { top = top + spacing }
|
|
37
41
|
self.top = `${top}mm`
|
|
38
42
|
}
|
|
39
43
|
await self.bill.search()
|
|
@@ -44,7 +48,11 @@
|
|
|
44
48
|
data () {
|
|
45
49
|
return {
|
|
46
50
|
top: '5mm',
|
|
47
|
-
bill: {}
|
|
51
|
+
bill: {},
|
|
52
|
+
zzheight: this.$appdata.getSingleValue('折子行高') ? this.$appdata.getSingleValue('折子行高') : 4.5,
|
|
53
|
+
zzspacing: this.$appdata.getSingleValue('折子中间间距') ? this.$appdata.getSingleValue('折子中间间距') : 23,
|
|
54
|
+
zzpageRow: this.$appdata.getSingleValue('每页折子行数') ? this.$appdata.getSingleValue('每页折子行数') : 23,
|
|
55
|
+
zzmarginTop: this.$appdata.getSingleValue('折子上边距') ? this.$appdata.getSingleValue('折子上边距') : 11
|
|
48
56
|
}
|
|
49
57
|
},
|
|
50
58
|
props: ['show', 'url', 'data'],
|
|
@@ -64,10 +72,14 @@
|
|
|
64
72
|
},
|
|
65
73
|
async print () {
|
|
66
74
|
try {
|
|
75
|
+
let height = this.zzheight - 0.0
|
|
76
|
+
let spacing = this.zzspacing - 0.0
|
|
77
|
+
let pageRow = this.zzpageRow - 0
|
|
78
|
+
let marginTop = this.zzmarginTop - 0
|
|
67
79
|
var hh = this.data.f_zzhh
|
|
68
80
|
if (hh != -1) {
|
|
69
|
-
var top =
|
|
70
|
-
if (hh >
|
|
81
|
+
var top = marginTop + (hh - 1) * height
|
|
82
|
+
if (hh > pageRow) { top = top + spacing }
|
|
71
83
|
this.top = `${top}mm`
|
|
72
84
|
}
|
|
73
85
|
await this.$resetpost('rs/logic/editBook', {
|