From 39b1149751c3685048c3489e222577536764e9af Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 20 十一月 2023 10:48:46 +0800
Subject: [PATCH] modified: src/views/product/workbench/batchproductout-form-new.vue modified: src/views/product/workbench/operation-task-pane.vue modified: src/views/product/workbench/workReportCard.vue
---
src/views/product/workbench/operation-task-pane.vue | 29 ++++++++++++++++++++---------
src/views/product/workbench/batchproductout-form-new.vue | 2 +-
src/views/product/workbench/workReportCard.vue | 4 ++--
3 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/src/views/product/workbench/batchproductout-form-new.vue b/src/views/product/workbench/batchproductout-form-new.vue
index 56aeb54..d9868e6 100644
--- a/src/views/product/workbench/batchproductout-form-new.vue
+++ b/src/views/product/workbench/batchproductout-form-new.vue
@@ -191,7 +191,7 @@
<el-input v-model="item.remark"></el-input>
</el-col>-->
<el-col :span="2" class="batch-product-out-form-body-col l-mes">
- <el-input v-model="item.mainRemark"></el-input>
+ <el-input v-model="item.remark"></el-input>
</el-col>
<el-col :span="1" class="batch-product-out-form-body-col">
<span
diff --git a/src/views/product/workbench/operation-task-pane.vue b/src/views/product/workbench/operation-task-pane.vue
index d559810..9a20dad 100644
--- a/src/views/product/workbench/operation-task-pane.vue
+++ b/src/views/product/workbench/operation-task-pane.vue
@@ -18,9 +18,17 @@
<img class="selectedImg" src="/img/workbench/icon_selected.png" />
<div class="header">
<div>宸ュ崟鍙凤細{{ item.taskNo }}</div>
- <div class="tag" :style="{ backgroundColor: getTagColor(item.planFinishDay) }">
- {{ getTagText(item.planFinishDay) }}
- </div>
+ <!-- <div class="tag" :style="{ backgroundColor: getTagColor(item.planFinishDay) }">
+ {{ getTagText(item.planFinishDay) }}
+ </div> -->
+ <el-alert
+ center
+ style="width: 80px;height:30px"
+ :title="getTagText(item.planFinishDay)"
+ :type="getTagColor(item.planFinishDay)"
+ effect="dark"
+ :closable="false">
+ </el-alert>
<!-- <div>璁″垝鍙凤細{{ item.mpsNo }}</div> -->
<div
:class="[
@@ -99,12 +107,12 @@
.tag{
width: 80px;
height: 30px;
+line-height: 30px;
border-radius:15% ;
text-align: center;
-text-size:8px;
+font-size:8px;
color:white;
align-content: 30px;
-
}
@@ -341,7 +349,7 @@
}
},
computed: {
- ...mapGetters(['permissions'])
+ ...mapGetters(['permissions']),
},
created() {
if (!this.defaultOperationId) {
@@ -382,14 +390,17 @@
const today = new Date();
const planDate = new Date(planFinishDay);
if (planDate < today) {
- return 'rgba( 255,0,0,1)'; // 瓒呮湡涓虹孩鑹�
+ //return 'rgba( 255,0,0,1)'; // 瓒呮湡涓虹孩鑹�
+ return 'error'; // 瓒呮湡涓虹孩鑹�
} else {
const timeDiff = planDate.getTime() - today.getTime();
const daysDiff = Math.ceil(timeDiff / (1000 * 3600 * 24));
if (daysDiff <= 3) {
- return 'rgba(255,204,62, 1)'; // 涓存湡涓洪粍鑹�
+ //return 'rgba(255,204,62, 1)'; // 涓存湡涓洪粍鑹�
+ return 'warning'; // 涓存湡涓洪粍鑹�
} else {
- return 'rgba(86,219, 25,1)'; // 姝ｅ父涓虹豢鑹�
+ //return 'rgba(86,219, 25,1)'; // 姝ｅ父涓虹豢鑹�
+ return 'success'; // 姝ｅ父涓虹豢鑹�
}
}
},
diff --git a/src/views/product/workbench/workReportCard.vue b/src/views/product/workbench/workReportCard.vue
index be4d807..c423b47 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>
--
Gitblit v1.9.3