From 12c8999bab7206bc652fd69ac4f364d84c9e7153 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 12 六月 2026 18:07:46 +0800
Subject: [PATCH] 不合格处理：支持多生产批次提交oa；oa流程查看调整
---
src/views/business/unpass/components/OAProcess.vue | 46 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/src/views/business/unpass/components/OAProcess.vue b/src/views/business/unpass/components/OAProcess.vue
index 7b4e8e6..53b774d 100644
--- a/src/views/business/unpass/components/OAProcess.vue
+++ b/src/views/business/unpass/components/OAProcess.vue
@@ -12,6 +12,7 @@
<el-timeline-item
placement="top"
v-for="node in isOldData?oldNodes:newNodes"
+ v-if="(node.classType && node.classType===classType) || node.classType==='-1'"
:key="node.id"
:timestamp="node.name"
:icon="node.hasData ? 'el-icon-check' : 'el-icon-time'"
@@ -29,7 +30,7 @@
<span class="value">{{ node.time || "-" }}</span>
</div>
<div class="detail-item">
- <span class="label">{{node.name && node.name==='1妫�楠屽憳'?'涓嶅悎鏍兼弿杩帮細':'澶勭悊鎰忚锛�'}}</span>
+ <span class="label">{{node.infoTitle}}</span>
<span class="value">{{ node.info || "-" }}</span>
</div>
</div>
@@ -67,6 +68,7 @@
id: 1,
name: "1妫�楠屽憳",
info: "",
+ infoTitle:"涓嶅悎鏍兼儏鍐垫弿杩�:",
time: "",
operator: "",
operation: "",
@@ -75,6 +77,7 @@
{
id: 2,
name: "2妫�娴嬩富绠＄‘璁�",
+ infoTitle:"澶勭悊鎰忚:",
info: "",
time: "",
operator: "",
@@ -84,6 +87,7 @@
{
id: 3,
name: "3鐗╂祦閮ㄧ‘璁�",
+ infoTitle:"澶勭悊鎰忚:",
info: "",
time: "",
operator: "",
@@ -93,6 +97,7 @@
{
id: 4,
name: "4浜у搧宸ョ▼甯堝鐞嗘剰瑙�",
+ infoTitle:"澶勭悊鎰忚:",
info: "",
time: "",
operator: "",
@@ -102,6 +107,7 @@
{
id: 5,
name: "5.鎬诲伐鎴栬�呭壇缁忕悊鐨勫鐞嗘剰瑙�",
+ infoTitle:"澶勭悊鎰忚:",
info: "",
time: "",
operator: "",
@@ -111,6 +117,7 @@
{
id: 6,
name: "6璐ㄩ噺閮ㄥ鐞嗘剰瑙�",
+ infoTitle:"澶勭悊鎰忚:",
info: "",
time: "",
operator: "",
@@ -120,6 +127,7 @@
{
id: 7,
name: "7璐ㄩ噺閮ㄧ粡鐞�",
+ infoTitle:"澶勭悊鎰忚:",
info: "",
time: "",
operator: "",
@@ -129,6 +137,7 @@
{
id: 8,
name: "8鏍哥畻鍛�",
+ infoTitle:"澶勭悊鎰忚:",
info: "",
time: "",
operator: "",
@@ -138,6 +147,7 @@
{
id: 9,
name: "9鐗╂祦閮ㄧ储璧旂粨鏋�",
+ infoTitle:"澶勭悊鎰忚:",
info: "",
time: "",
operator: "",
@@ -149,8 +159,10 @@
newNodes:[
{
id: 1,
+ classType: "-1",
name: "1鐢宠",
info: "",
+ infoTitle:"涓嶅悎鏍兼儏鍐垫弿杩�:",
time: "",
operator: "",
operation: "",
@@ -158,8 +170,10 @@
},
{
id: 2,
- name: "2璐ㄩ噺閮ㄧ粡鐞�",
+ classType: "-1",
+ name: "2璐ㄩ噺缁忕悊",
info: "",
+ infoTitle:"瀵逛笉鍚堟牸浜у搧鐨勫鐞嗚姹�:",
time: "",
operator: "",
operation: "",
@@ -167,7 +181,9 @@
},
{
id: 3,
+ classType: "0",
name: "3宸ヨ壓锛堜竴绫讳笉鍚堟牸锛�",
+ infoTitle:"鏀硅繘瑕佹眰:",
info: "",
time: "",
operator: "",
@@ -176,7 +192,9 @@
},
{
id: 4,
+ classType: "1",
name: "3宸ヨ壓锛堜簩绫讳笉鍚堟牸锛�",
+ infoTitle:"鏀硅繘瑕佹眰:",
info: "",
time: "",
operator: "",
@@ -185,8 +203,10 @@
},
{
id: 5,
+ classType: "0",
name: "4鎶�鏈粡鐞嗭紙涓�绫讳笉鍚堟牸锛�",
info: "",
+ infoTitle:"鎺柦瑕佹眰:",
time: "",
operator: "",
operation: "",
@@ -194,8 +214,10 @@
},
{
id: 6,
+ classType: "1",
name: "4鎶�鏈粡鐞嗭紙浜岀被涓嶅悎鏍硷級",
info: "",
+ infoTitle:"鎺柦瑕佹眰:",
time: "",
operator: "",
operation: "",
@@ -203,8 +225,10 @@
},
{
id: 7,
+ classType: "0",
name: "5鏍哥畻锛堜竴绫讳笉鍚堟牸锛�",
info: "",
+ infoTitle:"绱㈣禂瑕佹眰(浜烘皯甯丷MB锟�):",
time: "",
operator: "",
operation: "",
@@ -212,8 +236,10 @@
},
{
id: 8,
+ classType: "1",
name: "5鎬荤粡鐞嗭紙浜岀被涓嶅悎鏍硷級",
info: "",
+ infoTitle:"鏈�缁堝鐞嗘剰瑙�:",
time: "",
operator: "",
operation: "",
@@ -221,8 +247,10 @@
},
{
id: 9,
+ classType: "0",
name: "6褰掓。锛堜竴绫讳笉鍚堟牸锛�",
info: "",
+ infoTitle:"澶勭悊鎰忚:",
time: "",
operator: "",
operation: "",
@@ -230,8 +258,10 @@
},
{
id: 10,
+ classType: "1",
name: "6鏍哥畻锛堜簩绫讳笉鍚堟牸锛�",
info: "",
+ infoTitle:"绱㈣禂瑕佹眰(浜烘皯甯丷MB锟�):",
time: "",
operator: "",
operation: "",
@@ -239,19 +269,23 @@
},
{
id: 11,
+ classType: "1",
name: "7褰掓。锛堜簩绫讳笉鍚堟牸锛�",
info: "",
+ infoTitle:"澶勭悊鎰忚:",
time: "",
operator: "",
operation: "",
hasData: false,
},
- ]
+ ],
+ classType:null,
};
},
// 鏂规硶闆嗗悎
methods: {
- getInfo(id,unqualifiedDesc) {
+ getInfo(id,unqualifiedDesc,classType) {
+ if(classType)this.classType = classType;
getOaFlow({
id: id,
})
@@ -264,7 +298,7 @@
const node = nodes.find((n) => n.name === item.nodeName);
if (node) {
node.time = item.approvalDate + " " + item.approvalTime;
- if(item.nodeName && item.nodeName==="1妫�楠屽憳"){
+ if(item.nodeName && ['1妫�楠屽憳','1鐢宠'].includes(item.nodeName)){
node.info=unqualifiedDesc;
}else{
node.info = item.approvalOpinion;
@@ -318,7 +352,7 @@
font-weight: 500;
color: #606266;
margin-right: 8px;
- min-width: 90px;
+ min-width: 110px;
}
.value {
--
Gitblit v1.9.3