From 75e035a10a0faeff6b2ec4b9fcbf98d1536274f2 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 07 十二月 2023 10:57:15 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/product/workbench/workReportCard.vue | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/views/product/workbench/workReportCard.vue b/src/views/product/workbench/workReportCard.vue
index c423b47..d6c3704 100644
--- a/src/views/product/workbench/workReportCard.vue
+++ b/src/views/product/workbench/workReportCard.vue
@@ -126,7 +126,7 @@
<!-- <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>
@@ -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"
@@ -3246,7 +3246,7 @@
// 鍒锋柊浜у嚭璁板綍
// this.$emit('refreshProductOutput')
} else if (refreshType === 5) {
- // 鎻愪氦鎶ュ憡鍚庯紝鍒锋柊
+ // 鎻愪氦鎶ュ憡鍚庯紝鍒�
// 鍒锋柊宸ュ崟鍒楄〃
this.$emit('refreshOperateTasks')
// 鍒锋柊浜у嚭璁板綍
@@ -3270,7 +3270,9 @@
this.options = res.data.data
if (this.options.length > 1) {
this.dialogVisible = true
- } else {
+ // } else if(this.options.length == 0){
+ // this.$message.error('宸ヤ綔绔欐湭缁戝畾鍚堟牸搴撲綅')
+ } else {
this.locationIdValue = this.options[0].id
this.submitListApi()
}
--
Gitblit v1.9.3