verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 51 Releases Wiki Activity

Default username property
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Joan Sanchez 2023-04-18 13:16:25 +02:00
parent 1d7c1f8d41
commit 90b38d02a0
2 changed files with 44 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
print/templates/reports/expedition-pallet-label/expedition-pallet-label.html
View File

@ -1,41 +1,46 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<body>
<table class="mainTable"> <body>
<tbody> <table class="mainTable">
<tr> <tbody>
<td id="truck" class="ellipsize">{{labelData.truck || '---'}}</td> <tr>
</tr> <td id="truck" class="ellipsize">{{labelData.truck || '---'}}</td>
<tr> </tr>
<td> <tr>
<div v-html="getBarcode(labelData.palletFk)" id="barcode"></div> <td>
<table v-for="labelData in labelsData" class="zoneTable"> <div v-html="getBarcode(labelData.palletFk)" id="barcode"></div>
<thead> <table v-for="labelData in labelsData" class="zoneTable">
<tr v-if="!labelData.isMatch" id="black"> <thead>
<td id="routeFk" class="ellipsize">{{labelData.routeFk}}</td> <tr v-if="!labelData.isMatch" id="black">
<td id="zone" class="ellipsize">{{labelData.zone || '---'}}</td> <td id="routeFk" class="ellipsize">{{labelData.routeFk}}</td>
<td id="labels" class="ellipsize">{{labelData.labels}}</td> <td id="zone" class="ellipsize">{{labelData.zone || '---'}}</td>
</tr> <td id="labels" class="ellipsize">{{labelData.labels}}</td>
<tr v-else> </tr>
<td id="routeFk" class="ellipsize">{{labelData.routeFk}}</td> <tr v-else>
<td id="zone" class="ellipsize">{{labelData.zone || '---'}}</td> <td id="routeFk" class="ellipsize">{{labelData.routeFk}}</td>
<td id="labels" class="ellipsize">{{labelData.labels || '--'}}</td> <td id="zone" class="ellipsize">{{labelData.zone || '---'}}</td>
</tr> <td id="labels" class="ellipsize">{{labelData.labels || '--'}}</td>
</thead> </tr>
</table> </thead>
</td> </table>
</tr> </td>
<tr> </tr>
<td> <tr>
<img :src="QR" id="QR"/> <td>
<div id="right"> <img :src="QR" id="QR" />
<div id="additionalInfo" class="ellipsize"><b>Pallet: </b>{{id}}</div> <div id="right">
<div id="additionalInfo" class="ellipsize"><b>User: </b> {{username ? username.name : '---'}}</div> <div id="additionalInfo" class="ellipsize"><b>Pallet: </b>{{id}}</div>
<div id="additionalInfo" class="ellipsize"><b>Day: </b>{{labelData.dayName.toUpperCase() || '---'}}</div> <div id="additionalInfo" class="ellipsize"><b>User: </b>
{{ (username ? username.name : '---')}}
</div> </div>
</td> <div id="additionalInfo" class="ellipsize"><b>Day: </b>{{labelData.dayName.toUpperCase() ||
</tr> '---'}}</div>
</tbody> </div>
</table> </td>
</body> </tr>
</tbody>
</table>
</body>
</html> </html>

1
print/templates/reports/expedition-pallet-label/expedition-pallet-label.js
View File

@ -18,6 +18,7 @@ module.exports = {
} }
}, },
async serverPrefetch() { async serverPrefetch() {
this.username = null;
this.labelsData = await this.rawSqlFromDef('labelData', this.id); this.labelsData = await this.rawSqlFromDef('labelData', this.id);
if (this.userFk) this.username = await this.findOneFromDef('username', this.userFk); if (this.userFk) this.username = await this.findOneFromDef('username', this.userFk);
this.labelData = this.labelsData[0]; this.labelData = this.labelsData[0];