From f84e425bb9debb5f2af8e417bf07d2a2b0077609 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 28 四月 2026 17:00:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro
---
src/views/productionManagement/productionProcess/index.vue | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/views/productionManagement/productionProcess/index.vue b/src/views/productionManagement/productionProcess/index.vue
index e4a1348..9668853 100644
--- a/src/views/productionManagement/productionProcess/index.vue
+++ b/src/views/productionManagement/productionProcess/index.vue
@@ -44,13 +44,18 @@
<div class="card-body">
<!-- <div class="process-name">{{ process.name }}</div> -->
<div class="process-desc">{{ process.remark || '鏆傛棤鎻忚堪' }}</div>
- <div class="process-device">鍏宠仈璁惧: {{ deviceOptions.find(item => item.id === Number(process.deviceLedgerId)).deviceName|| '鏈叧鑱�' }}</div>
+ <div class="process-device">鍏宠仈璁惧: {{ deviceOptions.find(item => item.id === Number(process.deviceLedgerId))?.deviceName|| '鏈叧鑱�' }}</div>
</div>
<div class="card-footer">
<div class="status-tag">
<el-tag size="small"
:type="process.isQuality ? 'warning' : 'info'">
{{ process.isQuality ? '璐ㄦ' : '闈炶川妫�' }}
+ </el-tag>
+ <el-tag size="small"
+ style="margin-left: 8px"
+ :type="process.isProduction ? 'warning' : 'info'">
+ {{ process.isProduction ? '鐢熶骇' : '涓嶇敓浜�' }}
</el-tag>
<el-tag v-if="process.type !== null && process.type !== undefined"
size="small"
@@ -122,6 +127,10 @@
<el-form-item label="鏄惁璐ㄦ"
prop="isQuality">
<el-switch v-model="processForm.isQuality" />
+ </el-form-item>
+ <el-form-item label="鏄惁鐢熶骇"
+ prop="isProduction">
+ <el-switch v-model="processForm.isProduction" />
</el-form-item>
<el-form-item label="璁¤垂绫诲瀷"
prop="type">
@@ -321,6 +330,7 @@
name: "",
salaryQuota: null,
isQuality: false,
+ isProduction: false,
remark: "",
deviceLedgerId: null,
type: 0,
@@ -453,6 +463,10 @@
getProcessListApi({ size: -1, current: -1 })
.then(res => {
processValueList.value = res.data.records || [];
+ console.log(
+ processValueList.value,
+ "reprocessValueList.value==========s"
+ );
})
.catch(() => {
ElMessage.error("鑾峰彇宸ュ簭鍒楄〃澶辫触");
@@ -509,6 +523,7 @@
processForm.name = "";
processForm.salaryQuota = null;
processForm.isQuality = false;
+ processForm.isProduction = false;
processForm.remark = "";
processForm.deviceLedgerId = null;
processForm.type = 0;
@@ -522,6 +537,7 @@
processForm.name = process.name;
processForm.salaryQuota = process.salaryQuota;
processForm.isQuality = !!process.isQuality;
+ processForm.isProduction = !!process.isProduction;
processForm.remark = process.remark || "";
processForm.deviceLedgerId = Number(process.deviceLedgerId);
processForm.type = process.type;
--
Gitblit v1.9.3