7658-devToTest_2428 #2663

Merged
alexm merged 251 commits from 7658-devToTest_2428 into test 2024-07-02 07:20:13 +00:00
2 changed files with 5 additions and 1 deletions
Showing only changes of commit 7bf55c6815 - Show all commits

View File

@ -74,7 +74,7 @@
<td colspan="2">
<div class="cell">
<span class="lbl">Control</span>
06 / 11
{{`${weekNum} / ${dayNum}`}}
</div>
</td>
<td>

View File

@ -1,6 +1,7 @@
const vnReport = require('../../../core/mixins/vn-report.js');
const {DOMImplementation, XMLSerializer} = require('xmldom');
const jsBarcode = require('jsbarcode');
const moment = require('moment');
module.exports = {
name: 'entry-label',
@ -8,6 +9,9 @@ module.exports = {
async serverPrefetch() {
this.buys = await this.rawSqlFromDef('entry', [this.id]);
this.maxLabelNum = Math.max(...this.buys.map(buy => buy.labelNum));
const date = new Date();
this.weekNum = moment(date).isoWeek();
this.dayNum = moment(date).day();
},
methods: {
getBarcode(id) {