From 6c2e00278c1194b46eb9153ca4166af868bb15ef Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 06 五月 2023 08:00:02 +0800
Subject: [PATCH] 1.看板调整2.上云路由整合
---
src/views/kb/ckgl.vue | 106 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 72 insertions(+), 34 deletions(-)
diff --git a/src/views/kb/ckgl.vue b/src/views/kb/ckgl.vue
index 93e8b0f..dae1235 100644
--- a/src/views/kb/ckgl.vue
+++ b/src/views/kb/ckgl.vue
@@ -3,14 +3,14 @@
<div class="kb_dashboard">
<!-- 鏄熺┖鑳屾櫙-->
- <div ref="starsRef" class="stars">
- <div v-for="(item, index) in starsCount" :key="index" class="star" />
- </div>
+ <!-- <div ref="starsRef" class="stars">-->
+ <!-- <div v-for="(item, index) in starsCount" :key="index" class="star" />-->
+ <!-- </div>-->
<div class="kb_header">
<div class="flex_c_c kb_header_text">
<div id="topBarLeft" style="width:600px;height:100%" />
- 浠撳簱绠＄悊鏁板瓧鍖栫湅鏉�
+ 浠撳簱绠＄悊鐪嬫澘
<div id="topBarRight" style="width:600px;height:100%;transform:rotate(180deg);" />
</div>
<div class="kb_headTime">
@@ -37,7 +37,7 @@
<el-table-column
prop="voucherdate"
label="鍗曟嵁鏃ユ湡"
- width="131"
+ width="156"
>
<template slot-scope="{row}">
<div v-if="row.voucherdate" class="ellipsis">{{ row.voucherdate.substring(0, 10) }}</div>
@@ -47,7 +47,7 @@
<el-table-column
prop="wo"
label="鍗曟嵁缂栧彿"
- width="189"
+ width="214"
>
<template slot-scope="{row}">
<div class="ellipsis">{{ row.wo }}</div>
@@ -56,26 +56,26 @@
<el-table-column
prop="wkshp_name"
label="鐢熶骇杞﹂棿"
- width="105"
+ width="130"
>
<template slot-scope="{row}">
<div class="ellipsis">{{ row.wkshp_name }}</div>
</template>
</el-table-column>
- <el-table-column
- prop="saleOrderCode"
- label="閿�鍞鍗曞彿"
- width="200"
- >
- <template slot-scope="{row}">
- <div v-if="row.saleOrderCode" class="ellipsis">{{ row.saleOrderCode }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
+<!-- <el-table-column-->
+<!-- prop="saleOrderCode"-->
+<!-- label="閿�鍞鍗曞彿"-->
+<!-- width="200"-->
+<!-- >-->
+<!-- <template slot-scope="{row}">-->
+<!-- <div v-if="row.saleOrderCode" class="ellipsis">{{ row.saleOrderCode }}</div>-->
+<!-- <div v-else>/</div>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
<el-table-column
prop="materiel_code"
label="浜у搧缂栧彿"
- width="136"
+ width="161"
>
<template slot-scope="{row}">
<div class="ellipsis">{{ row.materiel_code }}</div>
@@ -103,7 +103,7 @@
<el-table-column
prop="stck_name"
label="棰勫叆浠撳簱"
- width="100"
+ width="125"
>
<template slot-scope="{row}">
<div v-if="row.stck_name" class="ellipsis">{{ row.stck_name }}</div>
@@ -113,17 +113,30 @@
<el-table-column
prop="quantity"
label="鏁伴噺"
- width="63"
+ width="88"
/>
<el-table-column
prop="totalStockInQuantity"
label="宸插叆搴撴暟閲�"
- width="100"
+ width="125"
>
<template slot-scope="{row}">
-<!-- <div v-if="row.totalStockInQuantity">{{ row.totalStockInQuantity }}</div>-->
- <div v-if="row.quantity">{{ Math.round(row.quantity*0.8) }}</div>
- <div v-else>0</div>
+ <!-- <div v-if="row.totalStockInQuantity">{{ row.totalStockInQuantity }}</div>-->
+ <!-- <!– <div v-if="row.quantity">{{ Math.round(row.quantity*0.8) }}</div>–>-->
+ <!-- <div v-else>0</div>-->
+
+ <div v-if=" new Date(row.voucherdate.substring(0, 10)).getTime()<new Date(fun_date(-7)).getTime()">
+ {{ row.quantity }}
+ </div>
+ <div
+ v-else-if="(new Date(row.voucherdate.substring(0, 10)).getTime()<new Date(fun_date(-3)).getTime())&&
+ (new Date(row.voucherdate.substring(0, 10)).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-->
@@ -144,7 +157,7 @@
<el-table-column
prop="preFinishDate"
label="棰勮鍏ュ簱"
- width="140"
+ width="165"
>
<template slot-scope="{row}">
<div v-if="row.preFinishDate">{{ row.preFinishDate.substring(0, 10) }}</div>
@@ -191,7 +204,7 @@
<el-table-column
prop="customename"
label="瀹㈡埛"
- width="388"
+ width="300"
>
<template slot-scope="{row}">
<div v-if="row.customename" class="ellipsis">{{ row.customename }}</div>
@@ -226,7 +239,7 @@
<el-table-column
prop="materiel_name"
label="浜у搧鍚嶇О"
- width="200"
+ width="288"
>
<template slot-scope="{row}">
<div v-if="row.materiel_name" class="ellipsis">{{ row.materiel_name }}</div>
@@ -257,9 +270,21 @@
width="120"
>
<template slot-scope="{row}">
-<!-- <div v-if="row.saleOutQuantity" class="ellipsis">{{ row.saleOutQuantity }}</div>-->
- <div v-if="row.quantity" class="ellipsis">{{ Math.round(row.quantity*0.8) }}</div>
- <div v-else>0</div>
+ <!-- <div v-if="row.saleOutQuantity" class="ellipsis">{{ row.saleOutQuantity }}</div>-->
+ <!-- <!– <div v-if="row.quantity" class="ellipsis">{{ Math.round(row.quantity*0.8) }}</div>–>-->
+ <!-- <div v-else>0</div>-->
+ <div v-if=" new Date(row.voucherdate.substring(0, 10)).getTime()<new Date(fun_date(-7)).getTime()">
+ {{ row.quantity }}
+ </div>
+ <div
+ v-else-if="(new Date(row.voucherdate.substring(0, 10)).getTime()<new Date(fun_date(-3)).getTime())&&
+ (new Date(row.voucherdate.substring(0, 10)).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-->
@@ -373,10 +398,18 @@
this.getWareHouseTopLeftData()
this.getWareHouseTopBottomData()
this.getEcharts()
- this.setStarsRef()
+ // this.setStarsRef()
},
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 => {
@@ -399,6 +432,7 @@
getWareHouseTopLeftData() {
WareHouseTopLeftData().then(res => {
this.tableDataTop = res.data
+
// this.number1 = this.tableDataTop.length
const divData = this.$refs.tableDataTopRef.bodyWrapper
// 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
@@ -412,20 +446,22 @@
divData.scrollTop = 0
WareHouseTopLeftData().then(res => {
this.tableDataTop = res.data
+
// this.number1 = this.tableDataTop.length
- if (this.tableDataTop.length > 9) {
+ if (this.tableDataTop.length > 10) {
clearInterval(this.tableTopTask)
this.getWareHouseTopLeftData()
}
})
}
- }, this.tableDataTop.length <= 9 ? 1000 * 3 : 100)
+ }, this.tableDataTop.length <= 10 ? 1000 * 15 : 100)
})
},
// 鑾峰彇宸︿笅table鏁版嵁
getWareHouseTopBottomData() {
WareHouseTopBottomData().then(res => {
this.tableDataBottom = res.data
+
this.number2 = this.tableDataBottom.length
const divData = this.$refs.tableDataBottomRef.bodyWrapper
// 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
@@ -440,6 +476,7 @@
divData.scrollTop = 0
WareHouseTopBottomData().then(res => {
this.tableDataBottom = res.data
+
this.number2 = this.tableDataBottom.length
if (this.tableDataBottom.length > 10) {
clearInterval(this.tableBottomTask)
@@ -447,7 +484,7 @@
}
})
}
- }, this.tableDataBottom.length <= 10 ? 1000 * 3 : 100)
+ }, this.tableDataBottom.length <= 10 ? 1000 * 15 : 100)
})
},
@@ -510,6 +547,7 @@
fontSize: '18px'
}
}
+
}
}
</script>
--
Gitblit v1.9.3