From c713cf49b139d816d6979e3fcbe90da985f4b5cd Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 29 十二月 2023 12:52:07 +0800
Subject: [PATCH] 按钮删除
---
src/views/product/workbench/workReportCard.vue | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/views/product/workbench/workReportCard.vue b/src/views/product/workbench/workReportCard.vue
index 25a2921..7f02663 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>
@@ -126,10 +126,10 @@
<!-- <el-button class="tracking-out-revoke-btn" type="primary" icon="tracking-btn-out"
:disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="!editShow" >浜ょ彮
</el-button> -->
- <el-button class="submit-out-btn" type="primary"
+ <!-- <el-button class="submit-out-btn" type="primary"
:disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="!editShow" @click="submitList()"
:loading="submitLoading">鎻愪氦
- </el-button>
+ </el-button> -->
<el-button class="batch-out-del-btn" type="primary"
:disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="!editShow" @click="deleteList()">鍒犻櫎
</el-button>
@@ -170,10 +170,10 @@
</el-table-column>
<el-table-column label="闆朵欢鍚嶇О" prop="partName" align="center" :show-overflow-tooltip="true">
</el-table-column>
- <el-table-column label="搴忓垪鍙�" prop="outBatchNo" align="center" width="120" :show-overflow-tooltip="true">
+ <el-table-column label="鎵规鍙�" prop="outBatchNo" align="center" width="120" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input :id="'idReport_' + +scope.$index" :ref="'reference_' + scope.$index" v-if="scope.row.isEdit"
- v-model="scope.row.outBatchNo" placeholder="搴忓垪鍙�"></el-input>
+ v-model="scope.row.outBatchNo" placeholder="鎵规鍙�"></el-input>
<template v-if="!scope.row.isEdit">{{
scope.row.outBatchNo
}}</template>
@@ -256,7 +256,7 @@
}}</template>
</template>
</el-table-column>
- <el-table-column label="WDR鍙�" prop="wdr" align="center" width="100">
+ <!-- <el-table-column label="WDR鍙�" prop="wdr" align="center" width="100">
<template slot-scope="scope">
<el-input :id="'idReport_' + +scope.$index" :ref="'reference_' + scope.$index" v-if="scope.row.isEdit"
v-model="scope.row.wdr" placeholder="WDR鍙�"></el-input>
@@ -264,7 +264,7 @@
scope.row.wdr
}}</template>
</template>
- </el-table-column>
+ </el-table-column> -->
<!-- <el-table-column label="鍒嗘鎻忚堪" prop="segmentDesc" align="center">
<template slot-scope="scope">
<el-input
@@ -288,8 +288,8 @@
}}</template>
</template>
</el-table-column>
- <el-table-column label="IFS鎵规鍙�" prop="ifsBatchNo" align="center" width="120">
- <!-- <template slot="header" slot-scope="scope">
+ <!-- <el-table-column label="IFS鎵规鍙�" prop="ifsBatchNo" align="center" width="120">
+ <template slot="header" slot-scope="scope">
<div style="line-height: 14px;">IFS鎵规鍙�</div>
<div class="th" @click.stop>
<template>
@@ -305,8 +305,8 @@
<template v-if="!scope.row.isIfsBatchNoEdit">{{
scope.row.ifsBatchNo
}}</template>
- </template> -->
- </el-table-column>
+ </template>
+ </el-table-column> -->
<el-table-column label="澶囨敞" prop="remark" align="center">
<template slot-scope="scope">
<el-input :id="'idReport_' + +scope.$index" :ref="'reference_' + scope.$index" v-if="scope.row.isEdit"
@@ -443,7 +443,7 @@
<shiftProductoutFormDialog :currshowlist.sync="showShiftProductForm" :productList="productList"
:parentInfo="parentInfo" :currentDutyRecord="currentDutyRecord" :personBoardList="personBoardList"
@refreshProductOutputList="refreshProductOutputList" />
- <workReportFeed v-if="searchFeed" ref="searchFeed" @refreshFeedsForDel="refreshFeedsForDel"></workReportFeed>
+ <workReportFeed v-if="searchFeed" ref="searchFeed" @refreshTable="getBatchReport(5)" @refreshFeedsForDel="refreshFeedsForDel"></workReportFeed>
<productOutFormDialog :currshowlist.sync="showProductForm" :productList="productList" :parentInfo="parentInfo"
:currentDutyRecord="currentDutyRecord" :personBoardList="personBoardList"
@@ -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