From 6697f708b99c9b63e00a7e490f91d1cb4fa64450 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期二, 28 四月 2026 16:33:45 +0800
Subject: [PATCH] Merge branch 'dev_NEW_pro' of http://114.132.189.42:9002/r/product-inventory-management into dev_NEW_pro
---
src/views/productionManagement/productionProcess/index.vue | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/views/productionManagement/productionProcess/index.vue b/src/views/productionManagement/productionProcess/index.vue
index ae1732f..9668853 100644
--- a/src/views/productionManagement/productionProcess/index.vue
+++ b/src/views/productionManagement/productionProcess/index.vue
@@ -52,6 +52,11 @@
: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"
:type="process.type == 1 ? 'primary' : 'success'"
@@ -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,
@@ -513,6 +523,7 @@
processForm.name = "";
processForm.salaryQuota = null;
processForm.isQuality = false;
+ processForm.isProduction = false;
processForm.remark = "";
processForm.deviceLedgerId = null;
processForm.type = 0;
@@ -526,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