From 0ac076bd5d4b37a63e250eb461c2cb6e9ea73eb6 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 13 十月 2023 11:22:31 +0800
Subject: [PATCH] 1.模具清单100% 2.模具点检项100%
---
src/views/produce/stepReport.vue | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/src/views/produce/stepReport.vue b/src/views/produce/stepReport.vue
index 1275cd3..2b67881 100644
--- a/src/views/produce/stepReport.vue
+++ b/src/views/produce/stepReport.vue
@@ -316,8 +316,10 @@
@close="handleClose"
>
<el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="110px">
- <el-divider v-if="activeName==='鐢熶骇鍒楄〃'||activeName==='澶栧崗鏀舵枡'||activeName==='涓嶈壇寰呭鐞�'" content-position="left">鍩烘湰淇℃伅
- </el-divider>
+ <!-- <el-divider v-if="activeName==='鐢熶骇鍒楄〃'||activeName==='澶栧崗鏀舵枡'||activeName==='涓嶈壇寰呭鐞�'" content-position="left">鍩烘湰淇℃伅</el-divider>-->
+ <el-divider v-if="activeName==='鐢熶骇鍒楄〃'" content-position="left">鎶ュ伐淇℃伅</el-divider>
+ <el-divider v-if="activeName==='澶栧崗鏀舵枡'" content-position="left">鏀舵枡淇℃伅</el-divider>
+ <el-divider v-if="activeName==='涓嶈壇寰呭鐞�'" content-position="left">寰呭鐞嗕俊鎭�</el-divider>
<el-form-item label="宸ュ崟缂栧彿" class="dialogFormItem">
<div class="dialogFormItemDiv">{{ dialogForm.wo_code }}</div>
</el-form-item>
@@ -328,13 +330,13 @@
<div class="dialogFormItemDiv">{{ dialogForm.partname }}</div>
</el-form-item>
<el-form-item label="瑙勬牸鍨嬪彿" class="dialogFormItem">
- <div class="dialogFormItemDiv">{{ dialogForm.partspec? dialogForm.partspec:'/' }}</div>
+ <div class="dialogFormItemDiv">{{ dialogForm.partspec ? dialogForm.partspec : '/' }}</div>
</el-form-item>
<el-form-item label="褰撳墠宸ュ簭" class="dialogFormItem">
<div class="dialogFormItemDiv">{{ dialogForm.stepname }}</div>
</el-form-item>
<el-form-item label="涓嬮亾宸ュ簭" class="dialogFormItem">
- <div class="dialogFormItemDiv">{{ dialogForm.nextstepname?dialogForm.nextstepname :'/' }}</div>
+ <div class="dialogFormItemDiv">{{ dialogForm.nextstepname ? dialogForm.nextstepname : '/' }}</div>
</el-form-item>
<el-form-item label="浠诲姟鏁伴噺" class="dialogFormItem">
<div class="dialogFormItemDiv">{{ dialogForm.planqty }}</div>
@@ -490,7 +492,7 @@
<el-input v-model="dialogForm.sqty" oninput="value=value.replace(/[^\d]/g,'')" style="width: 200px" />
</el-form-item>
- <el-divider v-if="activeName==='鐢熶骇鍒楄〃'||activeName==='澶栧崗鏀舵枡'" content-position="left">涓嶈壇鏄庣粏</el-divider>
+ <el-divider v-if="activeName==='鐢熶骇鍒楄〃'||activeName==='澶栧崗鏀舵枡'" content-position="left">涓嶈壇鏄庣粏淇℃伅</el-divider>
<el-button
v-if="activeName==='鐢熶骇鍒楄〃'||activeName==='澶栧崗鏀舵枡'"
v-waves
@@ -520,7 +522,6 @@
/>
<el-table-column
prop="stepcode"
- show-tooltip-when-overflow
label="缂洪櫡缂栫爜/鍚嶇О"
align="center"
min-width="450"
@@ -547,7 +548,6 @@
<el-table-column
prop="badqty"
label="涓嶈壇鏁伴噺"
- show-tooltip-when-overflow
align="center"
>
<template slot-scope="{row}">
@@ -660,7 +660,6 @@
<el-table-column
prop="repair_qty"
label="缁翠慨鍚堟牸鏁伴噺"
- show-tooltip-when-overflow
align="center"
>
<template slot-scope="{row}">
@@ -676,7 +675,6 @@
<el-table-column
prop="laborbad_qty"
label="宸ュ簾鏁伴噺"
- show-tooltip-when-overflow
align="center"
>
<template slot-scope="{row}">
@@ -692,7 +690,6 @@
<el-table-column
prop="materielbad_qty"
label="鏂欏簾鏁伴噺"
- show-tooltip-when-overflow
align="center"
>
<template slot-scope="{row}">
@@ -1110,13 +1107,15 @@
this.dialogForm.eqpcode = res.eqpcode
this.dialogForm.eqpname = res.eqpname
- this.dialogForm.list = []
- res.list.forEach(i => {
- i.acceptQty = parseFloat(i.fqty) - parseFloat(i.sqty) - parseFloat(i.ng_qty) - parseFloat(i.laborbad_qty) - parseFloat(i.materielbad_qty)
- if (i.acceptQty > 0) {
- this.dialogForm.list.push(i)
- }
- })
+ if (this.activeName === '澶栧崗鏀舵枡') {
+ this.dialogForm.list = []
+ res.list.forEach(i => {
+ i.acceptQty = parseFloat(i.fqty) - parseFloat(i.sqty) - parseFloat(i.ng_qty) - parseFloat(i.laborbad_qty) - parseFloat(i.materielbad_qty)
+ if (i.acceptQty > 0) {
+ this.dialogForm.list.push(i)
+ }
+ })
+ }
// this.dialogForm.list = res.list
@@ -1461,4 +1460,12 @@
justify-content: center;
}
+::v-deep .el-dialog .el-form-item__label {
+ font-weight: lighter !important;
+}
+
+::v-deep .el-dialog .el-divider__text {
+ font-weight: bolder !important;
+}
+
</style>
--
Gitblit v1.9.3