update 0913

This commit is contained in:
lb 2023-09-13 10:32:41 +08:00
parent 71851b65e0
commit 1bd826b21c
5 changed files with 33 additions and 12 deletions

View File

@ -785,14 +785,16 @@ export default {
})
.then(async () => {
const batchPrint = async function* () {
for (const { id } of this.tableSelectedIds) {
yield { id: id, result: await this.printOnce(id) };
for (const item of this.tableSelectedIds) {
if (typeof item == "object" && "id" in item) {
yield { id: item.id, result: await this.printOnce(item.id) };
} else {
yield { id: item, result: await this.printOnce(item) }; // item id
}
}
};
for await (const { id } of batchPrint.call(this)) {
//console.log("...", id);
// send successful request
await this.$http({
url: "/pms/pallet/print",
method: "post",
@ -808,7 +810,7 @@ export default {
this.getList();
})
.catch((err) => {
this.$message.error(`批量打印出错: ${err}`);
// this.$message.error(`: ${err}`);
});
case "报工":
//console.log("ids:", this.tableSelectedIds);

View File

@ -499,8 +499,8 @@
clearable
:disabled="mode.includes('detail')"
v-bind="{ placeholder: '选择贴纸板' }">
<el-option label="" value="0"></el-option>
<el-option label="" value="1"></el-option>
<el-option label="不贴" value="0"></el-option>
<el-option label="" value="1"></el-option>
</el-select>
</el-form-item>
</el-col>
@ -600,6 +600,7 @@ export default {
customerId: null,
shortDesc: null,
remark: null,
paperboard: null
},
visible: false,
requestList: [

View File

@ -492,8 +492,8 @@
clearable
:disabled="mode.includes('detail')"
v-bind="{ placeholder: '选择贴纸板' }">
<el-option label="" value="0"></el-option>
<el-option label="" value="1"></el-option>
<el-option label="不贴" value="0"></el-option>
<el-option label="" value="1"></el-option>
</el-select>
</el-form-item>
</el-col>

View File

@ -576,8 +576,8 @@ export default function () {
prop: 'paperboard',
select: true,
options: [
{ label: '不', value: '0' },
{ label: '', value: '1' },
{ label: '不', value: '0' },
{ label: '', value: '1' },
]
},
],

View File

@ -11,6 +11,7 @@ export default function () {
{ prop: "name", label: "砖型名称" },
{ prop: "code", label: "砖型编码" },
{ prop: "externalCode", label: "砖型ID" },
{ prop: "tag", label: "码砖宽度" },
{ prop: "line", label: "中心线颜色", filter: dictFilter("line") },
{ prop: "tequipmentTechCode1", label: "压制工艺", subcomponent: techBox },
{ prop: "tequipmentTechCode2", label: "检测工艺", subcomponent: techBox },
@ -151,8 +152,25 @@ export default function () {
elparams: null,
},
],
[
{ input: true, label: "备注", prop: "remark", elparams: { placeholder: "备注" } },
{
input: true,
label: "码砖宽度",
prop: "tag",
elparams: { placeholder: "请输入码砖宽度" },
rules: [
{ required: true, message: "必填项不能为空", trigger: "blur" },
{
type: "number",
message: "请输入正确的数字类型",
trigger: "blur",
transform: (val) => !val.includes('-') && Number(val),
},
],
},
],
[{ textarea: true, label: "描述", prop: "description", elparams: { placeholder: "描述" } }],
[{ input: true, label: "备注", prop: "remark", elparams: { placeholder: "备注" } }],
],
operations: [
{ name: "add", label: "保存", type: "primary", permission: "pms:shape:save", showOnEdit: false },