sale-client 4.3.62 → 4.3.64

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": "4.3.62",
3
+ "version": "4.3.64",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -110,31 +110,26 @@ export default {
110
110
  if (this.row.f_ins_stop_date && this.row.f_ins_stop_date > Util.toStandardTimeString()) {
111
111
  this.model.f_ins_start_date = this.row.f_ins_stop_date
112
112
  } else {
113
- this.model.f_ins_start_date = Util.toStandardTimeString()
113
+ // 获取明天 00:00:00 的标准时间
114
+ let tomorrow = new Date()
115
+ tomorrow.setDate(tomorrow.getDate() + 1)
116
+ let year = tomorrow.getFullYear()
117
+ let month = (tomorrow.getMonth() + 1).toString().padStart(2, '0')
118
+ let date = tomorrow.getDate().toString().padStart(2, '0')
119
+ // 固定时间 00:00:00
120
+ let nextDayTime = `${year}-${month}-${date} 00:00:00`
121
+ this.model.f_ins_start_date = nextDayTime
114
122
  }
115
123
  },
116
124
  watch: {
117
125
  'model.f_ins_start_date' (val) {
118
126
  if (val && this.model.f_salecount) {
119
127
  let tx = new Date(val)
120
- let tmp = {
121
- year: tx.getFullYear(),
122
- month: tx.getMonth() + 1,
123
- day: tx.getDate()
124
- }
125
- let tmpdate = new Date((tmp.year + (this.model.f_salecount - 0)) + '-' + (tmp.month < 10 ? '0' + tmp.month : tmp.month) + '-' + (tmp.day < 10 ? '0' + tmp.day : tmp.day))
126
- let date
127
- if (tmp.month < (tmpdate.getMonth() + 1)) {
128
- date = new Date(tmpdate.getTime() - 24 * 60 * 60 * 1000 * 2)
129
- } else {
130
- date = new Date(tmpdate.getTime() - 24 * 60 * 60 * 1000)
131
- }
132
- let jt = {
133
- year: date.getFullYear(),
134
- month: date.getMonth() + 1,
135
- day: date.getDate()
136
- }
137
- this.model.f_expiration_date = jt.year + '-' + (jt.month < 10 ? '0' + jt.month : jt.month) + '-' + (jt.day < 10 ? '0' + jt.day : jt.day)
128
+ // 核心:年份 +1,保持月日不变,时间 00:00:00
129
+ let nextYear = tx.getFullYear() + this.model.f_salecount
130
+ let month = (tx.getMonth() + 1).toString().padStart(2, '0')
131
+ let day = tx.getDate().toString().padStart(2, '0')
132
+ this.model.f_expiration_date = `${nextYear}-${month}-${day} 00:00:00`
138
133
  }
139
134
  },
140
135
  'model.f_money' (val) {
@@ -148,24 +143,11 @@ export default {
148
143
  this.f_salecount.dctest = false
149
144
  } else if (val && this.model.f_ins_start_date) {
150
145
  let tx = new Date(this.model.f_ins_start_date)
151
- let tmp = {
152
- year: tx.getFullYear(),
153
- month: tx.getMonth() + 1,
154
- day: tx.getDate()
155
- }
156
- let tmpdate = new Date((tmp.year + (val - 0)) + '-' + (tmp.month < 10 ? '0' + tmp.month : tmp.month) + '-' + (tmp.day < 10 ? '0' + tmp.day : tmp.day))
157
- let date
158
- if (tmp.month < (tmpdate.getMonth() + 1)) {
159
- date = new Date(tmpdate.getTime() - 24 * 60 * 60 * 1000 * 2)
160
- } else {
161
- date = new Date(tmpdate.getTime() - 24 * 60 * 60 * 1000)
162
- }
163
- let jt = {
164
- year: date.getFullYear(),
165
- month: date.getMonth() + 1,
166
- day: date.getDate()
167
- }
168
- this.model.f_expiration_date = jt.year + '-' + (jt.month < 10 ? '0' + jt.month : jt.month) + '-' + (jt.day < 10 ? '0' + jt.day : jt.day)
146
+ let nextYear = tx.getFullYear() + Number(val)
147
+ let month = (tx.getMonth() + 1).toString().padStart(2, '0')
148
+ let day = tx.getDate().toString().padStart(2, '0')
149
+ // 结束日期 = 下一年同一天 00:00:00
150
+ this.model.f_expiration_date = `${nextYear}-${month}-${day} 00:00:00`
169
151
  this.f_salecount.dctest = true
170
152
  } else {
171
153
  this.f_salecount.dctest = true
@@ -266,6 +266,8 @@
266
266
  name = 'garbageChargesCancel'
267
267
  } else if (type === '加成气费收费') {
268
268
  name = 'gasChargeCancel'
269
+ } else if (type === '保险收费') {
270
+ name = 'cancelInsurance'
269
271
  } else {
270
272
  return
271
273
  }
File without changes
File without changes
@@ -1,2 +0,0 @@
1
- #Wed May 13 15:19:48 CST 2026
2
- gradle.version=5.2.1
File without changes