From 12ef895481038a7bec06a2c6cb47748a6353e848 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 11 五月 2023 17:35:04 +0800
Subject: [PATCH] 1.生产进度报表提交
---
src/views/kb/zhkbc.vue | 174 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 143 insertions(+), 31 deletions(-)
diff --git a/src/views/kb/zhkbc.vue b/src/views/kb/zhkbc.vue
index 2a19c79..0db554e 100644
--- a/src/views/kb/zhkbc.vue
+++ b/src/views/kb/zhkbc.vue
@@ -3,7 +3,7 @@
<div class="kb_dashboard">
<div class="kb_header">
<div class="flex_c_c kb_header_text">
- 涓嬫枡杞﹂棿鐪嬫澘
+ {{ ShopArr[0] == 21 ? '涓嬫枡閲戝伐鐪嬫澘' : ShopArr[0] == 22 ? '閲戝伐杞﹂棿鐪嬫澘' : ShopArr[0] == 23 ? '鎶涘厜杞﹂棿鐪嬫澘' : '瑁呴厤杞﹂棿鐪嬫澘' }}
</div>
<div class="kb_headerPic" />
<div class="kb_headTime">
@@ -24,6 +24,21 @@
<!-- <svg-icon icon-class="sccx" />-->
浜х嚎鍔犲伐涓换鍔�
<div style="margin-left: 30px">{{ number1 }} 鍗�</div>
+ <div style="display: flex;margin-left: 25px;">
+
+ <div class="circle" style="background-color: rgb(255 255 255)" />
+ <div style="margin-left: 10px">鏈紑濮�</div>
+
+ <!-- <div class="circle" style="margin-left: 10px;background-color: blue;" />-->
+ <!-- <div style="margin-left: 10px">寮�宸�</div>-->
+
+ <div class="circleYellow" style="margin-left: 10px" />
+ <div style="margin-left: 10px">鎵ц涓�</div>
+
+ <div class="circle" style="margin-left: 10px" />
+ <div style="margin-left: 10px">瀹屽伐</div>
+
+ </div>
</div>
<div class="kb_left_top kb_pd10">
@@ -76,13 +91,13 @@
class="kb_block03_02_content flex_c_c"
>
<div class="flex_c_c content01">
+ <!-- <div-->
+ <!-- v-if="it.status==='START'&&(parseFloat(it.ngqty)===0||it.ngqty==='')&&(parseFloat(it.goodqty)===0||it.goodqty==='')"-->
+ <!-- class="circle"-->
+ <!-- style="background-color: blue;"-->
+ <!-- />-->
<div
- v-if="it.status==='START'&&(parseFloat(it.ngqty)===0||it.ngqty==='')&&(parseFloat(it.goodqty)===0||it.goodqty==='')"
- class="circle"
- style="background-color: blue;"
- />
- <div
- v-else-if="it.status==='ALLO'&&(parseFloat(it.ngqty)===0||it.ngqty==='')&&(parseFloat(it.goodqty)===0||it.goodqty==='')"
+ v-if="it.status==='ALLO'&&(parseFloat(it.ngqty)===0||it.ngqty==='')&&(parseFloat(it.goodqty)===0||it.goodqty==='')"
class="circle"
style="background-color: rgb(255 255 255)"
/>
@@ -163,7 +178,7 @@
<el-table-column
prop="partname"
label="浜у搧鍚嶇О"
- width="150"
+ width="295"
>
<template slot-scope="{row}">
<div v-if="row.partname" class="ellipsis">{{ row.partname }}</div>
@@ -195,20 +210,20 @@
label="瀹屽伐鏁伴噺"
width="85"
/>
- <el-table-column
- prop="ng_qty"
- label="涓嶈壇鏁伴噺"
- width="85"
- />
- <el-table-column
- prop="wcl"
- label="瀹屾垚鐜�"
- width="60"
- >
- <template slot-scope="{row}">
- <div>{{ parseFloat((row.good_qty * 100 / row.plan_qty).toFixed(2)) }}%</div>
- </template>
- </el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="ng_qty"-->
+ <!-- label="涓嶈壇鏁伴噺"-->
+ <!-- width="85"-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="wcl"-->
+ <!-- label="瀹屾垚鐜�"-->
+ <!-- width="60"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div>{{ parseFloat((row.good_qty * 100 / row.plan_qty).toFixed(2)) }}%</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column
prop="planstartdate"
label="棰勮寮�濮�"
@@ -458,12 +473,55 @@
getShopSearchLine() {
let length, count
LineSearchTopLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
- this.lineContent = res.data
+ this.lineContent = res.data // 璋冪敤鎺ュ彛杩斿洖鐨勬暟鎹�
+ this.number1 = this.lineContent.length // 浜х嚎鍔犲伐涓换鍔� 鍗曟暟
+
+ const newData = []
+ if (this.lineContent.length > 0) {
+ this.lineContent.forEach(item => {
+ if (item.children.length > 5) {
+ newData.push({
+ workcode: item.workcode,
+ partname: item.partname,
+ partnumber: item.partnumber,
+ partspec: item.partspec,
+ qty: item.qty,
+ saleordercode: item.saleordercode,
+ uom: item.uom,
+ children: item.children.slice(0, 5)
+ })
+
+ newData.push({
+ workcode: item.workcode,
+ partname: item.partname,
+ partnumber: item.partnumber,
+ partspec: item.partspec,
+ qty: item.qty,
+ saleordercode: item.saleordercode,
+ uom: item.uom,
+ children: item.children.slice(5, 8)
+ })
+ } else {
+ newData.push({
+ workcode: item.workcode,
+ partname: item.partname,
+ partnumber: item.partnumber,
+ partspec: item.partspec,
+ qty: item.qty,
+ saleordercode: item.saleordercode,
+ uom: item.uom,
+ children: item.children
+ })
+ }
+ })
+
+ console.log(newData.length, 9777)
+ }
+
+ this.lineContent = newData
length = this.lineContent.length
count = Math.ceil(length / 3) // 闇�瑕佽疆鎾殑缁勬暟 3涓负涓�缁�
this.lineContent3 = this.lineContent.slice(0, 3)
-
- this.number1 = this.lineContent.length
})
let start = 0
@@ -471,17 +529,60 @@
if (Math.floor(start / 3) === count && count !== 0) {
start = 0
LineSearchTopLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
- this.lineContent = res.data
+ this.lineContent = res.data // 璋冪敤鎺ュ彛杩斿洖鐨勬暟鎹�
+ this.number1 = this.lineContent.length // 浜х嚎鍔犲伐涓换鍔� 鍗曟暟
+
+ const newData = []
+ if (this.lineContent.length > 0) {
+ this.lineContent.forEach(item => {
+ if (item.children.length > 5) {
+ newData.push({
+ workcode: item.workcode,
+ partname: item.partname,
+ partnumber: item.partnumber,
+ partspec: item.partspec,
+ qty: item.qty,
+ saleordercode: item.saleordercode,
+ uom: item.uom,
+ children: item.children.slice(0, 5)
+ }
+ )
+
+ newData.push({
+ workcode: item.workcode,
+ partname: item.partname,
+ partnumber: item.partnumber,
+ partspec: item.partspec,
+ qty: item.qty,
+ saleordercode: item.saleordercode,
+ uom: item.uom,
+ children: item.children.slice(5, 8)
+ })
+ } else {
+ newData.push({
+ workcode: item.workcode,
+ partname: item.partname,
+ partnumber: item.partnumber,
+ partspec: item.partspec,
+ qty: item.qty,
+ saleordercode: item.saleordercode,
+ uom: item.uom,
+ children: item.children
+ })
+ }
+ })
+ }
+
+ this.lineContent = newData
length = this.lineContent.length
count = Math.ceil(length / 3) // 闇�瑕佽疆鎾殑缁勬暟 3涓负涓�缁�
this.lineContent3 = this.lineContent.slice(0, 3)
-
- this.number1 = this.lineContent.length
})
} else if (count === 0) {
clearInterval(this.ShopSearchLineTask)
this.getShopSearchLine()
}
+
this.lineContent3 = this.lineContent.slice(start, start + 3)
start = start + 3
}, 1000 * 3)
@@ -512,7 +613,7 @@
}
})
}
- }, this.tableData.length <= 10 ? 1000 * 3 : 100)
+ }, this.tableData.length <= 10 ? 1000 * 15 : 100)
})
},
// 褰撴棩瀹屽伐浜у搧鏁伴噺鎺掕
@@ -533,13 +634,13 @@
LineSearchTopRightData({ shopcode: this.ShopArr.join(',') }).then(res => {
this.tableDataRank = res.data
- if (this.tableDataRank.length > 9) {
+ if (this.tableDataRank.length > 10) {
clearInterval(this.TableDataRankRollTask)
this.getTableDataRankRoll()
}
})
}
- }, this.tableDataRank.length <= 9 ? 1000 * 3 : 100)
+ }, this.tableDataRank.length <= 10 ? 1000 * 3 : 100)
})
},
// 鑾峰彇echarts
@@ -840,4 +941,15 @@
background-color: rgb(255 255 0);
border-radius: 50%;
}
+
+::v-deep .el-table__body-wrapper{
+ overflow: hidden !important;
+}
+
+.circle {
+ width: 26px;
+ height: 26px;
+ background-color: #00ff8b;
+ border-radius: 50%;
+}
</style>
--
Gitblit v1.9.3