From 0c60341966c08192588e140bbd2db97a9163189d Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 11 五月 2023 17:34:44 +0800
Subject: [PATCH] 1.生产进度报表提交
---
src/views/kb/cgdd.vue | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/views/kb/cgdd.vue b/src/views/kb/cgdd.vue
index d4edfc6..3c2803b 100644
--- a/src/views/kb/cgdd.vue
+++ b/src/views/kb/cgdd.vue
@@ -147,7 +147,7 @@
width="104"
>
<template slot-scope="{row}">
- <div v-if="new Date(row.voucherdate.substring(0,10)).getTime()<new Date('2023-05-01').getTime()">
+ <div v-if="(new Date(row.voucherdate.substring(0,10)).getTime()<new Date('2023-05-06').getTime())">
{{parseFloat(row.quantity)}}
</div>
<div v-else>0</div>
@@ -158,7 +158,7 @@
width="104"
>
<template slot-scope="{row}">
- <div v-if="new Date(row.voucherdate.substring(0,10)).getTime()<new Date('2023-05-01').getTime()">
+ <div v-if="(new Date(row.voucherdate.substring(0,10)).getTime()<new Date('2023-05-06').getTime())">
0
</div>
<div v-else>{{parseFloat(row.quantity - row.quantity1)}}</div>
@@ -180,11 +180,9 @@
width="139"
>
<template slot-scope="{row}">
- <div v-if="parseFloat(row.warning)<0" style="color: red">{{
- Math.abs(parseFloat(row.warning))
- }}
- </div>
- <div v-else-if="row.warning===null||row.warning===''||row.warning>=0">0</div>
+
+ <div v-if="row.warning===null||row.warning===''||row.warning>=0||(new Date(row.voucherdate.substring(0,10)).getTime()<new Date('2023-05-06').getTime())">0</div>
+ <div v-else-if="parseFloat(row.warning)<0" style="color: red">{{ Math.abs(parseFloat(row.warning)) }}</div>
<!-- <div v-else-if="parseFloat(row.warning)>3">{{ row.warning }}</div>-->
<!-- <div v-else-if="parseFloat(row.warning)>0&&parseFloat(row.warning)<=3" style="color:yellow;">-->
<!-- {{ row.warning }}-->
--
Gitblit v1.9.3