From 67da82f0b0c24df5f19bbfcfec63801d9ae902d8 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 16:22:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/product/workbench/workReportCard.vue | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/src/views/product/workbench/workReportCard.vue b/src/views/product/workbench/workReportCard.vue
index 7f40381..6b121ae 100644
--- a/src/views/product/workbench/workReportCard.vue
+++ b/src/views/product/workbench/workReportCard.vue
@@ -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>
@@ -3266,12 +3266,15 @@
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
- } else if(this.options.length == 0){
- this.$message.error('宸ヤ綔绔欐湭缁戝畾鍚堟牸搴撲綅')
+ // } else if(this.options.length == 0){
+ // this.$message.error('宸ヤ綔绔欐湭缁戝畾鍚堟牸搴撲綅')
} else {
this.locationIdValue = this.options[0].id
this.submitListApi()
--
Gitblit v1.9.3