From 7b5549dd6115d42eda331916fdb38ac806169c9b Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 13 五月 2024 10:35:46 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before into master
---
src/views/product/workbench/workReportCard.vue | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/views/product/workbench/workReportCard.vue b/src/views/product/workbench/workReportCard.vue
index f31dab9..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>
@@ -456,8 +456,8 @@
<div>
<iframe id="frame" style="width:2480px;overflow:hidden;margin-top: 200px;" :src="jimusrc"></iframe>
</div>
- <el-dialog title="浜у嚭鍚堟牸搴撲綅" :visible.sync="dialogVisible" width="30%">
- <span>鍚堟牸搴撲綅锛�</span>
+ <el-dialog title="浜у嚭鏀惧叆绾胯竟浠撳簱浣�" :visible.sync="dialogVisible" width="30%">
+ <span>绉诲叆绾胯竟浠撳簱浣嶏細</span>
<el-select v-model="locationIdValue" placeholder="璇烽�夋嫨">
<el-option v-for="item in options" :key="item.index" :label="`${item.locNo}+${item.locName}`" :value="item.id">
</el-option>
@@ -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) {
@@ -3266,7 +3263,10 @@
this.$message.error('鏈�澶氬彧鑳介�夋嫨1鏉¤褰曡繘琛屾彁浜わ紒')
return false
} else {
- qualifiedLocation(this.multipleSelection[0].workstationId).then(res => {
+ qualifiedLocation({
+ workstationId: this.multipleSelection[0].workstationId,
+ operationTaskId: this.currOperateTask.id
+ }).then(res => {
this.options = res.data.data
if (this.options.length > 1) {
this.dialogVisible = true
--
Gitblit v1.9.3