sale-client 3.6.31 → 3.6.32

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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.6.31",
3
+ "version": "3.6.32",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -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
- var hh = self.data.f_zzhh
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 = 11 + (hh - 1) * 4.5
36
- if (hh > 12) { top = top + 23 }
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 = 11 + (hh - 1) * 4.5
70
- if (hh > 12) { top = top + 23 }
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', {