朱园亮 / erp-mobile · Commits

Commit 5ca6268ca4275eeeee022f4ca1e9859698f2cd64

Authored by gesilong
2 parents a03fc8e1 0e4a8a37

Merge branch 'cjerp-1.0_20260116' into test_cjerp

Inline Side-by-side
Showing 7 changed files with 36 additions and 50 deletions
... ... @@ -243,12 +243,10 @@ export default {
243 243 const m = Number(parts[1])
244 244 const d = Number(parts[2])
245 245 if (!y || !m || !d) return ''
246   - const dt = new Date(y, m - 1, d)
247   - dt.setDate(dt.getDate() + 1)
248   - const yy = dt.getFullYear()
249   - const mm = String(dt.getMonth() + 1).padStart(2, '0')
250   - const dd = String(dt.getDate() - 1).padStart(2, '0')
251   - return `${yy}/${mm}/${dd}`
  246 + const yy = y
  247 + const mm = String(m).padStart(2, '0')
  248 + const dd = String(d).padStart(2, '0')
  249 + return `${yy}-${mm}-${dd}`
252 250 }
253 251 },
254 252 watch: {
... ...
... ... @@ -258,20 +258,18 @@ export default {
258 258 }))
259 259 },
260 260 minDeliveryDate() {
261   - const s = this.deliveryDate
262   - if (!s) return ''
263   - const parts = String(s).split('-')
264   - const y = Number(parts[0])
265   - const m = Number(parts[1])
266   - const d = Number(parts[2])
267   - if (!y || !m || !d) return ''
268   - const dt = new Date(y, m - 1, d)
269   - dt.setDate(dt.getDate() + 1)
270   - const yy = dt.getFullYear()
271   - const mm = String(dt.getMonth() + 1).padStart(2, '0')
272   - const dd = String(dt.getDate() - 1).padStart(2, '0')
273   - return `${yy}/${mm}/${dd}`
274   - }
  261 + const s = this.deliveryDate
  262 + if (!s) return ''
  263 + const parts = String(s).split('-')
  264 + const y = Number(parts[0])
  265 + const m = Number(parts[1])
  266 + const d = Number(parts[2])
  267 + if (!y || !m || !d) return ''
  268 + const yy = y
  269 + const mm = String(m).padStart(2, '0')
  270 + const dd = String(d).padStart(2, '0')
  271 + return `${yy}-${mm}-${dd}`
  272 + }
275 273 },
276 274 methods: {
277 275 defaultItem() {
... ...
... ... @@ -239,12 +239,10 @@ export default {
239 239 const m = Number(parts[1])
240 240 const d = Number(parts[2])
241 241 if (!y || !m || !d) return ''
242   - const dt = new Date(y, m - 1, d)
243   - dt.setDate(dt.getDate() + 1)
244   - const yy = dt.getFullYear()
245   - const mm = String(dt.getMonth() + 1).padStart(2, '0')
246   - const dd = String(dt.getDate() - 1).padStart(2, '0')
247   - return `${yy}/${mm}/${dd}`
  242 + const yy = y
  243 + const mm = String(m).padStart(2, '0')
  244 + const dd = String(d).padStart(2, '0')
  245 + return `${yy}-${mm}-${dd}`
248 246 }
249 247 },
250 248 watch: {
... ...
... ... @@ -283,12 +283,10 @@ export default {
283 283 const m = Number(parts[1])
284 284 const d = Number(parts[2])
285 285 if (!y || !m || !d) return ''
286   - const dt = new Date(y, m - 1, d)
287   - dt.setDate(dt.getDate() + 1)
288   - const yy = dt.getFullYear()
289   - const mm = String(dt.getMonth() + 1).padStart(2, '0')
290   - const dd = String(dt.getDate() - 1).padStart(2, '0')
291   - return `${yy}/${mm}/${dd}`
  286 + const yy = y
  287 + const mm = String(m).padStart(2, '0')
  288 + const dd = String(d).padStart(2, '0')
  289 + return `${yy}-${mm}-${dd}`
292 290 }
293 291 },
294 292 watch: {
... ...
... ... @@ -238,12 +238,10 @@ export default {
238 238 const m = Number(parts[1])
239 239 const d = Number(parts[2])
240 240 if (!y || !m || !d) return ''
241   - const dt = new Date(y, m - 1, d)
242   - dt.setDate(dt.getDate() + 1)
243   - const yy = dt.getFullYear()
244   - const mm = String(dt.getMonth() + 1).padStart(2, '0')
245   - const dd = String(dt.getDate() - 1).padStart(2, '0')
246   - return `${yy}/${mm}/${dd}`
  241 + const yy = y
  242 + const mm = String(m).padStart(2, '0')
  243 + const dd = String(d).padStart(2, '0')
  244 + return `${yy}-${mm}-${dd}`
247 245 }
248 246 },
249 247 watch: {
... ...
... ... @@ -239,12 +239,10 @@ export default {
239 239 const m = Number(parts[1])
240 240 const d = Number(parts[2])
241 241 if (!y || !m || !d) return ''
242   - const dt = new Date(y, m - 1, d)
243   - dt.setDate(dt.getDate() + 1)
244   - const yy = dt.getFullYear()
245   - const mm = String(dt.getMonth() + 1).padStart(2, '0')
246   - const dd = String(dt.getDate() - 1).padStart(2, '0')
247   - return `${yy}/${mm}/${dd}`
  242 + const yy = y
  243 + const mm = String(m).padStart(2, '0')
  244 + const dd = String(d).padStart(2, '0')
  245 + return `${yy}-${mm}-${dd}`
248 246 }
249 247 },
250 248 watch: {
... ...
... ... @@ -238,12 +238,10 @@ export default {
238 238 const m = Number(parts[1])
239 239 const d = Number(parts[2])
240 240 if (!y || !m || !d) return ''
241   - const dt = new Date(y, m - 1, d)
242   - dt.setDate(dt.getDate() + 1)
243   - const yy = dt.getFullYear()
244   - const mm = String(dt.getMonth() + 1).padStart(2, '0')
245   - const dd = String(dt.getDate() - 1).padStart(2, '0')
246   - return `${yy}/${mm}/${dd}`
  241 + const yy = y
  242 + const mm = String(m).padStart(2, '0')
  243 + const dd = String(d).padStart(2, '0')
  244 + return `${yy}-${mm}-${dd}`
247 245 }
248 246 },
249 247 watch: {
... ...