From 6098f630d190c3ba51a3749716ccc8ada2b450c8 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期一, 20 十一月 2023 11:32:41 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/product/workbench/workReportCard.vue | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/views/product/workbench/workReportCard.vue b/src/views/product/workbench/workReportCard.vue
index be4d807..7f40381 100644
--- a/src/views/product/workbench/workReportCard.vue
+++ b/src/views/product/workbench/workReportCard.vue
@@ -13,9 +13,9 @@
<div class="product-out-header-left">
<div style="height:28px;line-height:28px;">
<el-divider class="pane-divider" direction="vertical"></el-divider><span
- style="font-size:14px;font-weight:bold">浜у嚭</span>
+ style="font-size:14px;font-weight:bold;">浜у嚭 </span>
<el-tooltip effect="dark" content="鍒锋柊鍒楄〃" placement="top">
- <el-button class="step-refresh-btn" icon="el-icon-refresh" type="info" circle
+ <el-button size="small" class="step-refresh-btn" icon="el-icon-refresh" type="info" circle
@click="getBatchReport(5)"></el-button>
</el-tooltip>
</div>
@@ -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>
@@ -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