From 2c59863afca9475562c4c3a99e66b4b4a4122b0f Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 23 九月 2022 17:12:17 +0800
Subject: [PATCH] 1.设备保养记录开发完成2.修改页面放大时table表错位问题
---
src/views/kb/ckgl.vue | 200 ++++++++++++++++++++++++++++++-------------------
1 files changed, 123 insertions(+), 77 deletions(-)
diff --git a/src/views/kb/ckgl.vue b/src/views/kb/ckgl.vue
index 5fe2ad3..219485c 100644
--- a/src/views/kb/ckgl.vue
+++ b/src/views/kb/ckgl.vue
@@ -14,14 +14,14 @@
:content="MarqueeTipsContent"
class="MarqueeTipsContentClass"
style="top:90px"
- :speed="300"
+ :speed="180"
/>
<div class="kb_content">
<div class="kb_left">
<!-- 1-->
<div class="kb_left_top kb_pd10">
<div class="kb_left_top_block" style="margin-top: 10px">
- <div class="headTitle kb_title_text">浜у搧寰呭叆搴�</div>
+ <div class="headTitle kb_title_text">浜у搧寰呭叆搴� <div style="margin-left: 30px">{{ number1 }} 鍗�</div></div>
<div class="content">
<el-table
ref="tableDataTopRef"
@@ -34,87 +34,99 @@
<el-table-column
prop="voucherdate"
label="鍗曟嵁鏃ユ湡"
- width="120"
+ width="140"
>
<template slot-scope="{row}">
- <div v-if=" row.voucherdate">{{ row.voucherdate.substring(0, 10) }}</div>
+ <div v-if="row.voucherdate" class="ellipsis">{{ row.voucherdate.substring(0, 10) }}</div>
<div v-else />
</template>
</el-table-column>
<el-table-column
prop="wo"
label="鍗曟嵁缂栧彿"
- width="159"
- />
+ width="189"
+ >
+ <template slot-scope="{row}">
+ <div class="ellipsis">{{ row.wo }}</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="wkshp_name"
label="鐢熶骇杞﹂棿"
width="105"
- />
+ >
+ <template slot-scope="{row}">
+ <div class="ellipsis">{{ row.wkshp_name }}</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="saleOrderCode"
label="閿�鍞鍗曞彿"
- width="180"
+ width="200"
>
<template slot-scope="{row}">
- <div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>
+ <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="96"
- />
+ width="136"
+ >
+ <template slot-scope="{row}">
+ <div class="ellipsis">{{ row.materiel_code }}</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="materiel_name"
label="浜у搧鍚嶇О"
- width="160"
+ width="180"
>
<template slot-scope="{row}">
<div class="ellipsis">{{ row.materiel_name }}</div>
</template>
</el-table-column>
- <el-table-column
- prop="specification"
- label="瑙勬牸鍨嬪彿"
- width="128"
- >
- <template slot-scope="{row}">
- <div v-if="row.specification" class="ellipsis">{{ row.specification }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="specification"-->
+ <!-- label="瑙勬牸鍨嬪彿"-->
+ <!-- width="128"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.specification" class="ellipsis">{{ row.specification }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column
prop="stck_name"
label="棰勫叆浠撳簱"
width="100"
>
<template slot-scope="{row}">
- <div v-if="row.stck_name">{{ row.stck_name }}</div>
+ <div v-if="row.stck_name" class="ellipsis">{{ row.stck_name }}</div>
<div v-else>/</div>
</template>
</el-table-column>
<el-table-column
prop="quantity"
label="鏁伴噺"
- width="55"
+ width="63"
/>
<el-table-column
prop="totalStockInQuantity"
label="宸插叆搴撴暟閲�"
- width="80"
+ width="100"
>
<template slot-scope="{row}">
<div v-if="row.totalStockInQuantity">{{ row.totalStockInQuantity }}</div>
<div v-else>0</div>
</template>
</el-table-column>
- <el-table-column
- prop="uomname"
- label="鍗曚綅"
- width="50"
- />
+ <!-- <el-table-column-->
+ <!-- prop="uomname"-->
+ <!-- label="鍗曚綅"-->
+ <!-- width="50"-->
+ <!-- />-->
<!-- <el-table-column-->
<!-- prop="preStartDate"-->
<!-- label="棰勮寮�宸�"-->
@@ -128,7 +140,7 @@
<el-table-column
prop="preFinishDate"
label="棰勮鍏ュ簱"
- width="120"
+ width="140"
>
<template slot-scope="{row}">
<div v-if="row.preFinishDate">{{ row.preFinishDate.substring(0, 10) }}</div>
@@ -139,7 +151,7 @@
</div>
</div>
<div class="kb_left_top_block" style="margin-top: 25px">
- <div class="headTitle kb_title_text">浜у搧寰呭彂璐�</div>
+ <div class="headTitle kb_title_text">浜у搧寰呭彂璐� <div style="margin-left: 30px">{{ number2 }} 鍗�</div></div>
<div class="content">
<el-table
ref="tableDataBottomRef"
@@ -152,18 +164,22 @@
<el-table-column
prop="voucherdate"
label="鍗曟嵁鏃ユ湡"
- width="110"
+ width="130"
>
<template slot-scope="{row}">
- <div v-if="row.voucherdate">{{ row.voucherdate.substring(0, 10) }}</div>
- <div v-else />
+ <div v-if="row.voucherdate" class="ellipsis">{{ row.voucherdate.substring(0, 10) }}</div>
+ <div v-else>/</div>
</template>
</el-table-column>
<el-table-column
prop="wo"
label="鍗曟嵁缂栧彿"
- width="145"
- />
+ width="195"
+ >
+ <template slot-scope="{row}">
+ <div class="ellipsis">{{ row.wo }}</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="customename"
label="瀹㈡埛"
@@ -171,73 +187,96 @@
>
<template slot-scope="{row}">
<div v-if="row.customename" class="ellipsis">{{ row.customename }}</div>
- <div v-else />
- </template>
- </el-table-column>
- <el-table-column
- prop="username"
- label="涓氬姟鍛�"
- width="65"
- />
- <el-table-column
- prop="SourceVoucherCode"
- label="鏉ユ簮鍗曞彿"
- width="145"
- >
- <template slot-scope="{row}">
- <div v-if="row.SourceVoucherCode">{{ row.SourceVoucherCode }}</div>
<div v-else>/</div>
</template>
</el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="username"-->
+ <!-- label="涓氬姟鍛�"-->
+ <!-- width="65"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.username" class="ellipsis">{{ row.username }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column
- prop="materiel_code"
- label="浜у搧缂栧彿"
- width="96"
- />
+ prop="SourceVoucherCode"
+ label="鏉ユ簮鍗曞彿"
+ width="185"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.SourceVoucherCode" class="ellipsis">{{ row.SourceVoucherCode }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="materiel_code"-->
+ <!-- label="浜у搧缂栧彿"-->
+ <!-- width="96"-->
+ <!-- />-->
<el-table-column
prop="materiel_name"
label="浜у搧鍚嶇О"
width="170"
- />
- <el-table-column
- prop="specification"
- label="瑙勬牸鍨嬪彿"
- width="100"
>
<template slot-scope="{row}">
- <div v-if="row.specification" class="ellipsis">{{ row.specification }}</div>
- <div v-else>/</div>
+ <div v-if="row.materiel_name" class="ellipsis">{{ row.materiel_name }}</div>
</template>
</el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="specification"-->
+ <!-- label="瑙勬牸鍨嬪彿"-->
+ <!-- width="100"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.specification" class="ellipsis">{{ row.specification }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column
prop="quantity"
label="鏁伴噺"
- width="47"
- />
+ width="87"
+ >
+ <template slot-scope="{row}">
+ <div class="ellipsis">{{ row.quantity }}</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="saleOutQuantity"
label="宸插彂璐ф暟閲�"
- width="80"
+ width="100"
>
<template slot-scope="{row}">
- <div v-if="row.saleOutQuantity">{{ row.saleOutQuantity }}</div>
+ <div v-if="row.saleOutQuantity" class="ellipsis">{{ row.saleOutQuantity }}</div>
<div v-else>0</div>
</template>
</el-table-column>
<el-table-column
prop="priuserdefnvc1"
label="妫�楠屾柟寮�"
- width="80"
- />
+ width="110"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.priuserdefnvc1">{{ row.priuserdefnvc1 }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="priuserdefnvc2"
label="妫�楠屼汉鍛�"
- width="80"
- />
+ width="110"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.priuserdefnvc2">{{ row.priuserdefnvc2 }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="deliveryDate"
label="棰勮浜よ揣鏃ユ湡"
- width="110"
+ width="141"
>
<template slot-scope="{row}">
<div v-if="row.deliveryDate">{{ row.deliveryDate.substring(0,10) }}</div>
@@ -291,6 +330,9 @@
tableDataTop: [],
tableDataBottom: [],
+ number1: '',
+ number2: '',
+
MarqueeTipsContent: '', // 鍏憡
speed: 100// 鍏憡鎾斁鐨勯�熷害
}
@@ -318,7 +360,7 @@
getWareHouseTopLeftData() {
WareHouseTopLeftData().then(res => {
this.tableDataTop = res.data
-
+ this.number1 = this.tableDataTop.length
const divData = this.$refs.tableDataTopRef.bodyWrapper
// 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
const task = setInterval(() => {
@@ -331,6 +373,7 @@
divData.scrollTop = 0
WareHouseTopLeftData().then(res => {
this.tableDataTop = res.data
+ this.number1 = this.tableDataTop.length
if (this.tableDataTop.length > 9) {
clearInterval(task)
this.getWareHouseTopLeftData()
@@ -344,7 +387,7 @@
getWareHouseTopBottomData() {
WareHouseTopBottomData().then(res => {
this.tableDataBottom = res.data
-
+ this.number2 = this.tableDataBottom.length
const divData = this.$refs.tableDataBottomRef.bodyWrapper
// 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
const task = setInterval(() => {
@@ -357,7 +400,7 @@
divData.scrollTop = 0
WareHouseTopBottomData().then(res => {
this.tableDataBottom = res.data
-
+ this.number2 = this.tableDataBottom.length
if (this.tableDataBottom.length > 10) {
clearInterval(task)
this.getWareHouseTopBottomData()
@@ -466,9 +509,10 @@
//text-align: center;
//font-size: 26px;
line-height: 20px;
- font-size: 18px;
+ //font-size: 18px;
margin-bottom: 10px;
margin-top: -10px;
+ display: flex;
color: #00ffff;
}
@@ -497,7 +541,7 @@
.content_head {
line-height: 20px;
- font-size: 18px;
+ //font-size: 18px;
margin-bottom: 10px;
margin-top: -10px;
color: #00ffff;
@@ -530,5 +574,7 @@
::v-deep .cell {
padding: 0 !important;
+ //font-size: 16px;
+ font-size: 18px;
}
</style>
--
Gitblit v1.9.3