|
@@ -417,7 +417,7 @@
|
|
</div>
|
|
</div>
|
|
<div class="count-item">
|
|
<div class="count-item">
|
|
<div class="count-title">
|
|
<div class="count-title">
|
|
- <span>合计筒重:</span>
|
|
|
|
|
|
+ <span>合计筒数:</span>
|
|
</div>
|
|
</div>
|
|
<div class="count-value">
|
|
<div class="count-value">
|
|
<span>{{ count.sumCanisterNum }}</span>
|
|
<span>{{ count.sumCanisterNum }}</span>
|
|
@@ -987,6 +987,11 @@ export default {
|
|
payLoad.id = rowData.id;
|
|
payLoad.id = rowData.id;
|
|
}
|
|
}
|
|
let tempApiFun = productCodeList;
|
|
let tempApiFun = productCodeList;
|
|
|
|
+ if (this.excuteType == 3) {
|
|
|
|
+ //补码
|
|
|
|
+ this.printConfirmHandler(this.tableData[0].id);
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
let res = await tempApiFun(payLoad);
|
|
let res = await tempApiFun(payLoad);
|
|
let msg = this.isEdit ? "编辑" : "新增";
|
|
let msg = this.isEdit ? "编辑" : "新增";
|
|
if (res.code == 200) {
|
|
if (res.code == 200) {
|
|
@@ -1115,7 +1120,7 @@ export default {
|
|
} = this.currentRow;
|
|
} = this.currentRow;
|
|
let directionOfTwistLabel = this.dict.type.direction_of_twist.find(
|
|
let directionOfTwistLabel = this.dict.type.direction_of_twist.find(
|
|
(item) => item.value == directionOfTwist
|
|
(item) => item.value == directionOfTwist
|
|
- ).label;
|
|
|
|
|
|
+ )?.label;
|
|
let res = await getQrCode();
|
|
let res = await getQrCode();
|
|
let qrCode = "";
|
|
let qrCode = "";
|
|
if (res.code == 200) {
|
|
if (res.code == 200) {
|
|
@@ -1383,6 +1388,7 @@ export default {
|
|
initProductData() {
|
|
initProductData() {
|
|
this.batchNum = this.form.lotNum;
|
|
this.batchNum = this.form.lotNum;
|
|
this.batchNumChange();
|
|
this.batchNumChange();
|
|
|
|
+ console.log(this.batchTableData);
|
|
if (this.batchTableData.length) {
|
|
if (this.batchTableData.length) {
|
|
let {
|
|
let {
|
|
machineTool,
|
|
machineTool,
|
|
@@ -1406,11 +1412,15 @@ export default {
|
|
directionOfTwist,
|
|
directionOfTwist,
|
|
productId,
|
|
productId,
|
|
} = this.batchTableData[0];
|
|
} = this.batchTableData[0];
|
|
|
|
+ let directionOfTwistLabel = this.dict.type.direction_of_twist.find(
|
|
|
|
+ (item) => item.value == directionOfTwist
|
|
|
|
+ )?.label;
|
|
Object.assign(this.tableData[0], {
|
|
Object.assign(this.tableData[0], {
|
|
productName, //品种
|
|
productName, //品种
|
|
productSpecifications, //规格
|
|
productSpecifications, //规格
|
|
productColor, //色号
|
|
productColor, //色号
|
|
directionOfTwist, //捻向
|
|
directionOfTwist, //捻向
|
|
|
|
+ directionOfTwistLabel,
|
|
});
|
|
});
|
|
}
|
|
}
|
|
},
|
|
},
|