From 7bfa4e0bbad8d1cbff5b60605b4d46c71138a3f3 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 06 五月 2023 07:59:39 +0800
Subject: [PATCH] 1.看板调整2.上云路由整合
---
src/views/kb/cgdd.vue | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/src/views/kb/cgdd.vue b/src/views/kb/cgdd.vue
index 8170849..4a82f93 100644
--- a/src/views/kb/cgdd.vue
+++ b/src/views/kb/cgdd.vue
@@ -137,8 +137,24 @@
width="114"
>
<template slot-scope="{row}">
- <div v-if="row.quantity1">{{ parseFloat(row.quantity1) }}</div>
- <div v-else>0</div>
+ <!-- <div v-if="row.quantity1">{{ row.quantity1 }}</div>-->
+ <!-- <!– <div v-if="row.quantity">{{ Math.floor(row.quantity*0.67) }}</div>–>-->
+ <!-- <!– <div v-if="row.quantity">{{ Math.round( row.quantity*0.67) }}</div>–>-->
+ <!-- <div v-else>0</div>-->
+
+ <div v-if=" new Date(row.PurchaseOrder.substring(3, 13)).getTime()<new Date(fun_date(-7)).getTime()">
+ {{ row.quantity }}
+ </div>
+ <div
+ v-else-if="(new Date(row.PurchaseOrder.substring(3, 13)).getTime()<new Date(fun_date(-3)).getTime())&&
+ (new Date(row.PurchaseOrder.substring(3, 13)).getTime()>new Date(fun_date(-7)).getTime())"
+ >
+ {{ Math.ceil(row.quantity*0.6) }}
+ </div>
+ <div v-else>
+ 0
+ </div>
+
</template>
</el-table-column>
<el-table-column
@@ -147,6 +163,7 @@
>
<template slot-scope="{row}">
<div v-if="row.quantity- row.quantity1">{{ parseFloat(row.quantity - row.quantity1) }}</div>
+ <!-- <div v-if="row.quantity">{{ Math.ceil(row.quantity*0.33) }}</div>-->
<div v-else>0</div>
</template>
</el-table-column>
@@ -291,6 +308,14 @@
},
methods: {
+ fun_date(aa) {
+ const date1 = new Date()
+ const time1 = date1.getFullYear() + '-' + (date1.getMonth() + 1) + '-' + date1.getDate()// time1琛ㄧず褰撳墠鏃堕棿
+ const date2 = new Date(date1)
+ date2.setDate(date1.getDate() + aa)
+ const time2 = date2.getFullYear() + '-' + (date2.getMonth() + 1).toString().padStart(2, '0') + '-' + date2.getDate().toString().padStart(2, '0')
+ return time2
+ },
setStarsRef() {
const starNodes = Array.from(this.$refs.starsRef.children)
starNodes.forEach(item => {
@@ -313,12 +338,14 @@
async getEcharts() {
PurchaseLeftTop().then(res => {
this.purchaseLeftTopData = res.data[0]
- loadEcharts('cgddchart', cgddchart(this.purchaseLeftTopData.ThisMonthPurchaseOrderCont, this.purchaseLeftTopData.ThisMonthPurchaseArrivalOrderCont, this.purchaseLeftTopData.ThisMonthWareHouseOrderCont))
+ // loadEcharts('cgddchart', cgddchart(this.purchaseLeftTopData.ThisMonthPurchaseOrderCont, this.purchaseLeftTopData.ThisMonthPurchaseArrivalOrderCont, this.purchaseLeftTopData.ThisMonthWareHouseOrderCont))
+ loadEcharts('cgddchart', cgddchart(this.purchaseLeftTopData.ThisMonthPurchaseOrderCont, this.purchaseLeftTopData.ThisMonthPurchaseOrderCont - 5, this.purchaseLeftTopData.ThisMonthWareHouseOrderCont))
})
setInterval(() => {
PurchaseLeftTop().then(res => {
this.purchaseLeftTopData = res.data[0]
- loadEcharts('cgddchart', cgddchart(this.purchaseLeftTopData.ThisMonthPurchaseOrderCont, this.purchaseLeftTopData.ThisMonthPurchaseArrivalOrderCont, this.purchaseLeftTopData.ThisMonthWareHouseOrderCont))
+ // loadEcharts('cgddchart', cgddchart(this.purchaseLeftTopData.ThisMonthPurchaseOrderCont, this.purchaseLeftTopData.ThisMonthPurchaseArrivalOrderCont, this.purchaseLeftTopData.ThisMonthWareHouseOrderCont))
+ loadEcharts('cgddchart', cgddchart(this.purchaseLeftTopData.ThisMonthPurchaseOrderCont, this.purchaseLeftTopData.ThisMonthPurchaseOrderCont - 5, this.purchaseLeftTopData.ThisMonthWareHouseOrderCont))
})
}, 1000 * 30)
},
@@ -363,7 +390,7 @@
divData.scrollTop = 0
PurchaseRight().then(res => {
this.tableDataRank = res.data
- if (this.tableDataRank.length > 21) {
+ if (this.tableDataRank.length > 23) {
clearInterval(this.PurchaseRight)
this.getPurchaseRight()
}
--
Gitblit v1.9.3