From 889d80d88abd7b4a60846678624f4b976c15f820 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期五, 13 六月 2025 09:07:36 +0800
Subject: [PATCH] 1.新增判断：当不良数量为零时，合格数量不能为零
---
src/views/kanbanManager/ckgl.vue | 234 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 115 insertions(+), 119 deletions(-)
diff --git a/src/views/kanbanManager/ckgl.vue b/src/views/kanbanManager/ckgl.vue
index 830582a..735dc7c 100644
--- a/src/views/kanbanManager/ckgl.vue
+++ b/src/views/kanbanManager/ckgl.vue
@@ -5,7 +5,7 @@
<div class="kb_backgroundCustom" />
<div class="kb_header">
<div class="kb_headTime" style="top: 35px;left: 20px">
- <span>姘稿悍甯傛ˉ涓嬪鏂欏巶</span>
+ <span>姘稿悍甯傛柊鍏夌伅鍏锋湁闄愬叕鍙�</span>
</div>
<div class="kb_headTime kb_header_text" style="top: 35px;left: 800px">
@@ -19,12 +19,12 @@
<div style="display: flex;justify-content: space-between;padding:0 20px 20px 20px;height: 950px">
<div style="width: 1350px;z-index: 2;margin-top: 50px;" class="flex_c_b">
- <div>
+ <div style="height: 945px;">
<div class="smallTitle">
<svg-icon icon-class="cpdrk" class="svg_class" />
- 鐢熶骇鍏ュ簱
+ 鐢熶骇寰呭叆搴�
</div>
- <div class="lineContent horn" style="height: 886px">
+ <div class="lineContent horn" style="height: 885px">
<el-table
ref="tableDataTopRef"
:data="tableDataTop"
@@ -32,7 +32,7 @@
class="tableData"
:header-cell-style="headerCellStyleCenter"
:cell-style="cellStyleCenter"
- height="870"
+ height="880"
>
<el-table-column
prop="voucherdate"
@@ -56,7 +56,7 @@
<el-table-column
prop="wkshp_name"
label="鐢熶骇杞﹂棿"
- width="105"
+ width="135"
>
<template slot-scope="{row}">
<div class="ellipsis">{{ row.wkshp_name }}</div>
@@ -84,26 +84,26 @@
<el-table-column
prop="materiel_name"
label="浜у搧鍚嶇О"
- width="270"
+ width="400"
>
<template slot-scope="{row}">
<div class="ellipsis">{{ row.materiel_name }}</div>
</template>
</el-table-column>
- <el-table-column
- prop="specification"
- label="瑙勬牸鍨嬪彿"
- width="186"
- >
- <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="136"-->
+ <!-- >-->
+ <!-- <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"
+ width="156"
>
<template slot-scope="{row}">
<div v-if="row.stck_name" class="ellipsis">{{ row.stck_name }}</div>
@@ -113,7 +113,7 @@
<el-table-column
prop="quantity"
label="鏁伴噺"
- width="113"
+ width="83"
/>
<el-table-column
prop="totalStockInQuantity"
@@ -154,104 +154,104 @@
</el-table>
</div>
</div>
- <!-- <div style="height: 470px;margin-top: 30px;">-->
- <!-- <div class="smallTitle">-->
- <!-- <svg-icon icon-class="drk" class="svg_class" />-->
- <!-- 濮斿寰呭叆搴�-->
- <!-- </div>-->
- <!-- <div class="lineContent horn" style="height: 410px">-->
- <!-- <el-table-->
- <!-- ref="tableDataBottomRef"-->
- <!-- :data="tableDataBottom"-->
- <!-- style="width: 100%;"-->
- <!-- class="tableData"-->
- <!-- :header-cell-style="headerCellStyleCenter"-->
- <!-- :cell-style="cellStyleCenter"-->
- <!-- height="405"-->
- <!-- >-->
- <!-- <el-table-column-->
- <!-- prop="voucherdate"-->
- <!-- label="鍗曟嵁鏃ユ湡"-->
- <!-- width="151"-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <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="225"-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <div class="ellipsis">{{ row.wo }}</div>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
+ <div v-if="false" style="height: 470px;margin-top: 30px;">
+ <div class="smallTitle">
+ <svg-icon icon-class="drk" class="svg_class" />
+ 濮斿寰呭叆搴�
+ </div>
+ <div class="lineContent horn" style="height: 410px">
+ <el-table
+ ref="tableDataBottomRef"
+ :data="tableDataBottom"
+ style="width: 100%;"
+ class="tableData"
+ :header-cell-style="headerCellStyleCenter"
+ :cell-style="cellStyleCenter"
+ height="405"
+ >
+ <el-table-column
+ prop="voucherdate"
+ label="鍗曟嵁鏃ユ湡"
+ width="151"
+ >
+ <template slot-scope="{row}">
+ <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="225"
+ >
+ <template slot-scope="{row}">
+ <div class="ellipsis">{{ row.wo }}</div>
+ </template>
+ </el-table-column>
- <!-- <el-table-column-->
- <!-- prop="materiel_name"-->
- <!-- label="浜у搧鍚嶇О"-->
- <!-- width="278"-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <div v-if="row.materiel_name" class="ellipsis">{{ row.materiel_name }}</div>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
- <!-- <el-table-column-->
- <!-- prop="specification"-->
- <!-- label="瑙勬牸鍨嬪彿"-->
- <!-- width="220"-->
- <!-- >-->
- <!-- <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="120"-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <div class="ellipsis">{{ row.quantity }}</div>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
- <!-- <el-table-column-->
- <!-- prop="saleOutQuantity"-->
- <!-- label="宸插彂璐ф暟閲�"-->
- <!-- width="140"-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <div v-if="row.saleOutQuantity" class="ellipsis">{{ row.saleOutQuantity }}</div>-->
- <!-- <div v-else>0</div>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
+ <el-table-column
+ prop="materiel_name"
+ label="浜у搧鍚嶇О"
+ width="278"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.materiel_name" class="ellipsis">{{ row.materiel_name }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="specification"
+ label="瑙勬牸鍨嬪彿"
+ width="220"
+ >
+ <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="120"
+ >
+ <template slot-scope="{row}">
+ <div class="ellipsis">{{ row.quantity }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="saleOutQuantity"
+ label="宸插彂璐ф暟閲�"
+ width="140"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.saleOutQuantity" class="ellipsis">{{ row.saleOutQuantity }}</div>
+ <div v-else>0</div>
+ </template>
+ </el-table-column>
- <!-- <el-table-column-->
- <!-- prop="deliveryDate"-->
- <!-- label="棰勮浜や粯鏃ユ湡"-->
- <!-- width="200"-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <div v-if="row.deliveryDate">{{ row.deliveryDate.substring(0, 10) }}</div>-->
- <!-- <div v-else>/</div>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
+ <el-table-column
+ prop="deliveryDate"
+ label="棰勮浜や粯鏃ユ湡"
+ width="200"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.deliveryDate">{{ row.deliveryDate.substring(0, 10) }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
- <!-- <!– <el-table-column–>-->
- <!-- <!– prop="warning"–>-->
- <!-- <!– label="寤舵湡澶╂暟"–>-->
- <!-- <!– width="130"–>-->
- <!-- <!– >–>-->
- <!-- <!– <template slot-scope="{row}">–>-->
- <!-- <!– <div v-if="row.warning">{{ row.warning }}</div>–>-->
- <!-- <!– <div v-else>/</div>–>-->
- <!-- <!– </template>–>-->
- <!-- <!– </el-table-column>–>-->
- <!-- </el-table>-->
- <!-- </div>-->
- <!-- </div>-->
+ <!-- <el-table-column-->
+ <!-- prop="warning"-->
+ <!-- label="寤舵湡澶╂暟"-->
+ <!-- width="130"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.warning">{{ row.warning }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ </el-table>
+ </div>
+ </div>
</div>
<div style="width: 500px;z-index: 2;margin-top: 50px;" class="flex_c_b">
@@ -301,7 +301,7 @@
headTime: '',
tableDataTop: [],
- // tableDataBottom: [],
+ tableDataBottom: [],
MarqueeTipsContent: '', // 鍏憡
speed: 100, // 鍏憡鎾斁鐨勯�熷害
@@ -317,10 +317,6 @@
}
},
- activated() {
- window.addEventListener('resize', this.getHeight)
- this.getHeight()
- },
created() {
setInterval(this.getNowTime, 1000)
--
Gitblit v1.9.3