From 0a3b4bac16a4cf49deaddc6b4f3a2aeee90e9061 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 21 五月 2024 16:33:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/product/workbench/workReportCard.vue | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/views/product/workbench/workReportCard.vue b/src/views/product/workbench/workReportCard.vue
index 6b121ae..fcf2a04 100644
--- a/src/views/product/workbench/workReportCard.vue
+++ b/src/views/product/workbench/workReportCard.vue
@@ -44,10 +44,10 @@
@click="addShiftProductOut()"
>浜ょ彮浜у嚭
</el-button> -->
- <el-button class="batch-out-btn" type="primary"
+ <!-- <el-button class="batch-out-btn" type="primary"
:disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="!editShow"
@click="addBatchProductOut()">姹囨姤浜у嚭
- </el-button>
+ </el-button> -->
<!-- <div class="print-button-class">
<el-button type="danger" class="print-btn" @click="batchPrint()"
>澶ф爣绛炬墦鍗�
@@ -114,9 +114,9 @@
@change="labelTabChange4"
></el-checkbox>
</div> -->
- <el-button class="change-shift-out-btn" type="primary"
+ <!-- <el-button class="change-shift-out-btn" type="primary"
:disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="!editShow" @click="editList()">缂栬緫
- </el-button>
+ </el-button> -->
<el-button class="batch-out-del-btn" type="primary"
:disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="editShow" @click="cancelSaveList()">鍙栨秷
</el-button>
@@ -2749,7 +2749,6 @@
},
createLodopPrintIze(data) {
const currYearAndMonth = getYearAndMonth()
- console.log(data)
const qr = {
part_no: data.partNo,
lot_batch_no: data.ifsBatchNo,
@@ -2890,7 +2889,6 @@
this.LODOP.PRINT()
},
createLodopPrint(data) {
- console.log(data)
const qr = {
part_no: data.partNo,
lot_batch_no: data.ifsBatchNo,
@@ -3075,7 +3073,6 @@
},
saveList() {
const list = JSON.parse(JSON.stringify(this.productOutputList))
- console.log(`output->list`, list)
const data = []
list.forEach((el) => {
if (el.isEdit) {
--
Gitblit v1.9.3