From 1e9fa82cb2fe2c15f46bd1dd73f5c878c74b83b8 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 04 八月 2022 15:35:50 +0800
Subject: [PATCH] 1.系统多账号登录问题2.采购订单页面样式修改及数据渲染
---
src/views/kb/cgdd.vue | 531 +++++++++++++++++++++++++---------------------------------
1 files changed, 232 insertions(+), 299 deletions(-)
diff --git a/src/views/kb/cgdd.vue b/src/views/kb/cgdd.vue
index 7dc0191..6f1e00f 100644
--- a/src/views/kb/cgdd.vue
+++ b/src/views/kb/cgdd.vue
@@ -18,17 +18,17 @@
<div class="kb_left_top_block kb_pd10">
<div class="content01">
<div class="pic01" />
- <div class="number">12</div>
+ <div class="number">{{ purchaseLeftTopData.ThisMonthPurchaseArrivalOrderCont }}</div>
<div class="text">鏈湀閲囪喘鍗曟暟</div>
</div>
<div class="content01">
<div class="pic01" />
- <div class="number">90200</div>
+ <div class="number">{{ purchaseLeftTopData.ThisMonthPurchaseOrderCont }}</div>
<div class="text">鏈湀杩涜揣鍗曟暟</div>
</div>
<div class="content01">
<div class="pic01" />
- <div class="number">90200</div>
+ <div class="number">{{ purchaseLeftTopData.ThisMonthWareHouseOrderCont }}</div>
<div class="text">鏈湀鍏ュ簱鍗曟暟</div>
<!-- <div id="pie01" ref="pie01" class="pie01" />-->
<!-- <div class="text" style="margin-top: -10px">褰撴湀寤舵湡鍗犳瘮</div>-->
@@ -39,92 +39,114 @@
<!-- 2-->
<div class="kb_left_bottom kb_pd10">
<div class="kb_left_bottom_content">
- <div class="content_head">鎴戞槸鏍囬</div>
- <el-table
- :data="tableData"
- style="width: 100%;"
- :header-cell-style="headerCellStyle"
- :cell-style="cellStyle"
- height="610"
- >
- <el-table-column
- prop="xh"
- label="搴忓彿"
- width="53"
- />
- <el-table-column
- prop="jgzt"
- label="鍔犲伐鐘舵��"
- width="85"
- />
- <el-table-column
- prop="pfsj"
- label="娲惧彂鏃堕棿"
- width="86"
- />
- <el-table-column
- prop="xsddh"
- label="閿�鍞鍗曞彿"
- width="150"
- />
- <el-table-column
- prop="jgdh"
- label="鍔犲伐鍗曞彿"
- width="207"
- />
- <el-table-column
- prop="cpmc"
- label="浜у搧鍚嶇О"
- width="105"
- />
- <el-table-column
- prop="gg"
- label="瑙勬牸"
- width="60"
- />
- <el-table-column
- prop="dw"
- label="鍗曚綅"
- width="60"
- />
- <el-table-column
- prop="rwsl"
- label="浠诲姟鏁伴噺"
- width="90"
- />
- <el-table-column
- prop="wgsl"
- label="瀹屽伐鏁伴噺"
- width="90"
- />
- <el-table-column
- prop="blsl"
- label="涓嶈壇鏁伴噺"
- width="90"
- />
- <el-table-column
- prop="wcl"
- label="瀹屾垚鐜�"
- width="70"
- />
- <el-table-column
- prop="yjks"
- label="棰勮寮�濮�"
- width="86"
- />
- <el-table-column
- prop="yjjs"
- label="棰勮缁撴潫"
- width="86"
- />
- </el-table>
+ <div class="content_head">鎴戞槸鏍囬锛�</div>
+ <div class="content_body">
+ <el-table
+ ref="tableData"
+ :data="tableData"
+ style="width: 100%;"
+ :header-cell-style="headerCellStyle"
+ :cell-style="cellStyle"
+ height="588"
+ >
+ <!-- <el-table-column-->
+ <!-- prop="RowNum"-->
+ <!-- label="搴忓彿"-->
+ <!-- width="53"-->
+ <!-- />-->
+
+ <el-table-column
+ prop="PurchaseOrder"
+ label="閲囪喘璁㈠崟"
+ width="163"
+ />
+ <el-table-column
+ prop="suppername"
+ label="渚涘簲鍟�"
+ width="163"
+ />
+ <el-table-column
+ prop="username"
+ label="閲囪喘鍛�"
+ width="68"
+ />
+ <el-table-column
+ prop="partcode"
+ label="浜у搧缂栫爜"
+ width="84"
+ />
+ <el-table-column
+ prop="partname"
+ label="浜у搧鍚嶇О"
+ width="168"
+ />
+ <el-table-column
+ prop="partspec"
+ label="瑙勬牸鍨嬪彿"
+ width="84"
+ />
+ <el-table-column
+ prop="quantity"
+ label="璁㈠崟鏁伴噺"
+ width="84"
+ />
+ <el-table-column
+ prop="checktype"
+ label="妫�楠岀姸鎬�"
+ width="84"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.checktype===null">鏈楠�</div>
+ <div v-else>宸叉楠�</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="checkuser"
+ label="妫�楠屼汉鍛�"
+ width="84"
+ />
+ <el-table-column
+ prop="quantity1"
+ label="宸叉敹鏁伴噺"
+ width="84"
+ />
+ <el-table-column
+ label="鏈敹鏁伴噺"
+ width="84"
+ >
+ <template slot-scope="{row}">
+ <div>{{ parseFloat(row.quantity- row.quantity1) }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="acceptDate"
+ label="棰勮浜ゆ湡"
+ width="84"
+ >
+ <template slot-scope="{row}">
+ <div>{{ row.acceptDate.substring(5, 10) }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="warning"
+ label="寤舵湡澶╂暟"
+ width="84"
+ >
+ <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">0</div>
+ <div v-else>{{ row.warning }}</div>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
</div>
</div>
</div>
<div class="kb_right kb_pd10">
<div class="kb_right_top kb_pd10">
<div class="kb_right_top_content">
- <div class="content_head">渚涘簲鍟嗗欢鏈熶氦璐ф帓琛�</div>
+ <div class="content_head">渚涘簲鍟嗗欢鏈熶氦璐ф帓琛岋細</div>
<div class="content_body">
<el-table
ref="tableDataRank"
@@ -132,32 +154,37 @@
style="width: 100%;"
:header-cell-style="headerCellStyle"
:cell-style="cellStyle"
- height="888"
+ :row-class-name="tableRowClassName"
+ height="923"
>
<el-table-column
- prop="xh"
+ type="index"
label="搴忓彿"
- width="75"
- />
- <el-table-column
- prop="cj"
- label="杞﹂棿"
width="100"
+ >
+ <template slot-scope="{row}">
+ <div>NO.{{ row.index }}</div>
+ </template>
+ </el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="cj"-->
+ <!-- label="杞﹂棿"-->
+ <!-- width="100"-->
+ <!-- />-->
+ <el-table-column
+ prop="suppercode"
+ label="渚涘簲鍟嗙紪鐮�"
+ width="145"
/>
<el-table-column
- prop="cx"
- label="浜х嚎"
- width="120"
+ prop="suppername"
+ width="163"
+ label="渚涘簲鍟嗗悕绉�"
/>
<el-table-column
- prop="cp"
- width="138"
- label="浜у搧"
- />
- <el-table-column
- prop="sl"
+ prop="cont"
label="鏁伴噺"
- width="100"
+ width="125"
/>
</el-table>
</div>
@@ -172,8 +199,9 @@
<script>
import './kbCommon.css'
-import { loadEcharts, pie01 } from '@/utils/myEcharts'
+import { bar02, loadEcharts, pie01 } from '@/utils/myEcharts'
import * as echarts from 'echarts'
+import { PurchaseLeftBottom, PurchaseLeftTop, PurchaseRight } from '@/api/dzkb'
export default {
name: 'Index2',
@@ -181,178 +209,9 @@
return {
headTime: '',
- tableData: [
- {
- xh: 1,
- jgzt: '寮�濮�',
- pfsj: '07/29',
- xsddh: '202207290001',
- jgdh: 'MO-2022-07-29-0001',
- cpmc: '浜у搧鍚嶆祴璇�',
- gg: '@20',
- dw: 'PCS',
- rwsl: 2000,
- wgsl: 1900,
- blsl: 100,
- wcl: '99%',
- yjks: '07/21',
- yjjs: '07/29'
- },
- {
- xh: 2,
- jgzt: '寮�濮�',
- pfsj: '07/29',
- xsddh: '202207290001',
- jgdh: 'MO-2022-07-29-0001',
- cpmc: '浜у搧鍚嶆祴璇�',
- gg: '@20',
- dw: 'PCS',
- rwsl: 2000,
- wgsl: 1900,
- blsl: 100,
- wcl: '99%',
- yjks: '07/21',
- yjjs: '07/29'
- },
- {
- xh: 3,
- jgzt: '寮�濮�',
- pfsj: '07/29',
- xsddh: '202207290001',
- jgdh: 'MO-2022-07-29-0001',
- cpmc: '浜у搧鍚嶆祴璇�',
- gg: '@20',
- dw: 'PCS',
- rwsl: 2000,
- wgsl: 1900,
- blsl: 100,
- wcl: '99%',
- yjks: '07/21',
- yjjs: '07/29'
- },
- {
- xh: 4,
- jgzt: '寮�濮�',
- pfsj: '07/29',
- xsddh: '202207290001',
- jgdh: 'MO-2022-07-29-0001',
- cpmc: '浜у搧鍚嶆祴璇�',
- gg: '@20',
- dw: 'PCS',
- rwsl: 2000,
- wgsl: 1900,
- blsl: 100,
- wcl: '99%',
- yjks: '07/21',
- yjjs: '07/29'
- },
- {
- xh: 5,
- jgzt: '寮�濮�',
- pfsj: '07/29',
- xsddh: '202207290001',
- jgdh: 'MO-2022-07-29-0001',
- cpmc: '浜у搧鍚嶆祴璇�',
- gg: '@20',
- dw: 'PCS',
- rwsl: 2000,
- wgsl: 1900,
- blsl: 100,
- wcl: '99%',
- yjks: '07/21',
- yjjs: '07/29'
- },
- {
- xh: 6,
- jgzt: '寮�濮�',
- pfsj: '07/29',
- xsddh: '202207290001',
- jgdh: 'MO-2022-07-29-0001',
- cpmc: '浜у搧鍚嶆祴璇�',
- gg: '@20',
- dw: 'PCS',
- rwsl: 2000,
- wgsl: 1900,
- blsl: 100,
- wcl: '99%',
- yjks: '07/21',
- yjjs: '07/29'
- },
- {
- xh: 7,
- jgzt: '寮�濮�',
- pfsj: '07/29',
- xsddh: '202207290001',
- jgdh: 'MO-2022-07-29-0001',
- cpmc: '浜у搧鍚嶆祴璇�',
- gg: '@20',
- dw: 'PCS',
- rwsl: 2000,
- wgsl: 1900,
- blsl: 100,
- wcl: '99%',
- yjks: '07/21',
- yjjs: '07/29'
- },
- {
- xh: 8,
- jgzt: '寮�濮�',
- pfsj: '07/29',
- xsddh: '202207290001',
- jgdh: 'MO-2022-07-29-0001',
- cpmc: '浜у搧鍚嶆祴璇�',
- gg: '@20',
- dw: 'PCS',
- rwsl: 2000,
- wgsl: 1900,
- blsl: 100,
- wcl: '99%',
- yjks: '07/21',
- yjjs: '07/29'
- },
- {
- xh: 9,
- jgzt: '寮�濮�',
- pfsj: '07/29',
- xsddh: '202207290001',
- jgdh: 'MO-2022-07-29-0001',
- cpmc: '浜у搧鍚嶆祴璇�',
- gg: '@20',
- dw: 'PCS',
- rwsl: 2000,
- wgsl: 1900,
- blsl: 100,
- wcl: '99%',
- yjks: '07/21',
- yjjs: '07/29'
- },
- {
- xh: 10,
- jgzt: '寮�濮�',
- pfsj: '07/29',
- xsddh: '202207290001',
- jgdh: 'MO-2022-07-29-0001',
- cpmc: '浜у搧鍚嶆祴璇�',
- gg: '@20',
- dw: 'PCS',
- rwsl: 2000,
- wgsl: 1900,
- blsl: 100,
- wcl: '99%',
- yjks: '07/21',
- yjjs: '07/29'
- }
- ],
- tableDataRank: [// 鎺掕
- { xh: 'NO.1', cj: '閿傜數杞﹂棿', cx: '閿傜數1绾�', cp: 'F09閿傜數', sl: 1000 },
- { xh: 'NO.2', cj: '閿傜數杞﹂棿', cx: '閿傜數1绾�', cp: 'F09閿傜數', sl: 1000 },
- { xh: 'NO.3', cj: '閿傜數杞﹂棿', cx: '閿傜數1绾�', cp: 'F09閿傜數', sl: 1000 },
- { xh: 'NO.4', cj: '閿傜數杞﹂棿', cx: '閿傜數1绾�', cp: 'F09閿傜數', sl: 1000 },
- { xh: 'NO.5', cj: '閿傜數杞﹂棿', cx: '閿傜數1绾�', cp: 'F09閿傜數', sl: 1000 },
- { xh: 'NO.6', cj: '閿傜數杞﹂棿', cx: '閿傜數1绾�', cp: 'F09閿傜數', sl: 1000 },
- { xh: 'NO.7', cj: '閿傜數杞﹂棿', cx: '閿傜數1绾�', cp: 'F09閿傜數', sl: 1000 },
- { xh: 'NO.8', cj: '閿傜數杞﹂棿', cx: '閿傜數1绾�', cp: 'F09閿傜數', sl: 1000 }
- ]
+ purchaseLeftTopData: [],
+ tableData: [],
+ tableDataRank: []
}
},
@@ -361,18 +220,80 @@
setInterval(this.getNowTime, 1000)
},
mounted() {
-
+ this.getPurchaseLeftTop()
+ this.getPurchaseLeftBottom()
+ this.getPurchaseRight()
},
methods: {
- // 鑾峰彇echarts
- getEcharts() {
- loadEcharts('pie01', pie01())
-
- // setInterval(() => {
- // loadEcharts('pie01', pie01())
- // }, 5000)
+ getPurchaseLeftTop() {
+ PurchaseLeftTop().then(res => {
+ this.purchaseLeftTopData = res.data[0]
+ console.log(this.purchaseLeftTopData)
+ })
+ setInterval(() => {
+ PurchaseLeftTop().then(res => {
+ this.purchaseLeftTopData = res.data[0]
+ })
+ }, 1000 * 6)
},
+
+ getPurchaseLeftBottom() {
+ PurchaseLeftBottom().then(res => {
+ this.tableData = res.data
+ })
+
+ const divData = this.$refs.tableData.bodyWrapper
+ // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
+ setInterval(() => {
+ // 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
+ // divData.scrollTop += divData.scrollHeight / this.tableDataRank.length
+ divData.scrollTop += 1
+ // 鍒ゆ柇鍏冪礌鏄惁婊氬姩鍒板簳閮�(鍙楂樺害+璺濈椤堕儴=鏁翠釜楂樺害)
+ if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
+ // 閲嶇疆table璺濈椤堕儴璺濈
+ divData.scrollTop = 0
+ PurchaseLeftBottom().then(res => {
+ this.tableData = res.data
+ })
+ }
+ }, this.tableData.length <= 14 ? 1000 * 6 : 100)
+ },
+
+ getPurchaseRight() {
+ PurchaseRight().then(res => {
+ this.tableDataRank = res.data
+ })
+
+ const divData = this.$refs.tableDataRank.bodyWrapper
+ // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
+ setInterval(() => {
+ // 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
+ // divData.scrollTop += divData.scrollHeight / this.tableDataRank.length
+ divData.scrollTop += 1
+ // 鍒ゆ柇鍏冪礌鏄惁婊氬姩鍒板簳閮�(鍙楂樺害+璺濈椤堕儴=鏁翠釜楂樺害)
+ if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
+ // 閲嶇疆table璺濈椤堕儴璺濈
+ divData.scrollTop = 0
+ PurchaseRight().then(res => {
+ this.tableDataRank = res.data
+ })
+ }
+ }, this.tableDataRank.length <= 22 ? 1000 * 6 : 100)
+ },
+
+ tableRowClassName({ row, rowIndex }) {
+ // 鎶婃瘡涓�琛岀殑绱㈠紩鏀捐繘row
+ row.index = rowIndex + 1
+ },
+ // 鑾峰彇echarts
+ // getEcharts() {
+ // loadEcharts('pie01', pie01())
+ //
+ // // setInterval(() => {
+ // // loadEcharts('pie01', pie01())
+ // // }, 5000)
+ // },
// 鑾峰彇褰撳墠鏃堕棿
getNowTime() {
@@ -392,20 +313,21 @@
},
headerCellStyle() {
return {
- backgroundColor: '#000',
+ backgroundColor: 'rgb(30 ,33, 46)',
padding: '10px 0',
textAlign: 'center',
- color: '#fff',
- borderRight: '1px solid rgba(255,255,255,0.6)'
+ color: '#07acc2',
+ border: 'none'
}
},
cellStyle() {
return {
- padding: '5px 0',
+ padding: '8px 0',
textAlign: 'center',
- backgroundColor: '#000',
+ backgroundColor: 'rgba(30, 33, 46 )',
+ // backgroundColor: 'transparent',
color: '#fff',
- borderRight: '1px solid rgba(255,255,255,0.6)'
+ border: 'none'
}
}
}
@@ -413,6 +335,7 @@
</script>
<style scoped lang="scss">
+$kbBorderColor: #09d8f2;
.kb_content {
display: flex;
@@ -439,6 +362,7 @@
display: flex;
//border: 1px solid rgba(255, 255, 255, 0.6);
justify-content: space-around;
+ background-color: rgba(30, 33, 46,0.6);
.content01 {
margin: auto;
@@ -477,13 +401,16 @@
height: 610px;
display: flex;
flex-direction: column;
- border: 1px solid rgba(255, 255, 255, 0.6);
.content_head {
- line-height: 55px;
- border-bottom: 1px solid rgba(255, 255, 255, 0.6);
- text-align: center;
- font-size: 26px;
+ line-height: 20px;
+ font-size: 18px;
+ margin-bottom: 10px;
+ margin-top: -10px;
+ }
+
+ .content_body {
+ border: 1px solid $kbBorderColor;
}
}
}
@@ -498,17 +425,19 @@
width: 100%;
.kb_right_top_content {
- border: 1px solid rgba(255, 255, 255, 0.6);
height: 100%;
display: flex;
flex-direction: column;
.content_head {
- font-size: 26px;
- height: 55px;
- line-height: 55px;
- border-bottom: 1px solid rgba(255, 255, 255, 0.6);
- text-align: center;
+ line-height: 20px;
+ font-size: 18px;
+ margin-bottom: 10px;
+ margin-top: -10px;
+ }
+
+ .content_body {
+ border: 1px solid $kbBorderColor;
}
}
}
@@ -516,8 +445,12 @@
}
}
+::v-deep .el-table::before {
+ height: 0;
+}
+
::v-deep .el-table__body-wrapper {
- background-color: #000;
+ background-color: rgba(30, 33, 46);
}
::v-deep .el-table__body-wrapper::-webkit-scrollbar {
--
Gitblit v1.9.3