refs #5144 manejado que el usuario sea NULL
gitea/salix/pipeline/head There was a failure building this commit
Details
gitea/salix/pipeline/head There was a failure building this commit
Details
This commit is contained in:
parent
32c5ced55b
commit
d1dc9eb3e0
|
@ -0,0 +1 @@
|
||||||
|
ALTER TABLE `vn`.`printQueueArgs` MODIFY COLUMN value varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NULL;
|
|
@ -11,8 +11,7 @@ module.exports = Self => {
|
||||||
http: {source: 'path'}
|
http: {source: 'path'}
|
||||||
}, {
|
}, {
|
||||||
arg: 'userFk',
|
arg: 'userFk',
|
||||||
type: 'number',
|
type: 'any',
|
||||||
required: true,
|
|
||||||
description: 'The user id'
|
description: 'The user id'
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
<img :src="QR" id="QR"/>
|
<img :src="QR" id="QR"/>
|
||||||
<div id="right">
|
<div id="right">
|
||||||
<div id="additionalInfo" class="ellipsize"><b>Pallet: </b>{{id}}</div>
|
<div id="additionalInfo" class="ellipsize"><b>Pallet: </b>{{id}}</div>
|
||||||
<div id="additionalInfo" class="ellipsize"><b>User: </b> {{username.name || '---'}}</div>
|
<div id="additionalInfo" class="ellipsize"><b>User: </b> {{username?.name || '---'}}</div>
|
||||||
<div id="additionalInfo" class="ellipsize"><b>Day: </b>{{labelData.dayName.toUpperCase() || '---'}}</div>
|
<div id="additionalInfo" class="ellipsize"><b>Day: </b>{{labelData.dayName.toUpperCase() || '---'}}</div>
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
|
@ -38,4 +38,4 @@
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
@ -14,13 +14,12 @@ module.exports = {
|
||||||
},
|
},
|
||||||
userFk: {
|
userFk: {
|
||||||
type: Number,
|
type: Number,
|
||||||
required: true,
|
|
||||||
description: 'The user id'
|
description: 'The user id'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
async serverPrefetch() {
|
async serverPrefetch() {
|
||||||
this.labelsData = await this.rawSqlFromDef('labelData', this.id);
|
this.labelsData = await this.rawSqlFromDef('labelData', this.id);
|
||||||
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];
|
||||||
this.checkMainEntity(this.labelData);
|
this.checkMainEntity(this.labelData);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue