From 473189750d56fcd56a062e0c6ea0849672d40380 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 16 四月 2026 14:00:00 +0800
Subject: [PATCH] fix: 工序要加是否质检、是否入库、是否报工
---
src/views/productionManagement/productionProcess/index.vue | 14 ++++++++++++++
src/views/productionManagement/processRoute/processRouteItem/index.vue | 23 +++++++++++++++++++++++
src/views/productionManagement/productionProcess/Edit.vue | 12 ++++++++++++
src/views/productionManagement/productionProcess/New.vue | 8 ++++++++
4 files changed, 57 insertions(+), 0 deletions(-)
diff --git a/src/views/productionManagement/processRoute/processRouteItem/index.vue b/src/views/productionManagement/processRoute/processRouteItem/index.vue
index c1c490c..6169e9d 100644
--- a/src/views/productionManagement/processRoute/processRouteItem/index.vue
+++ b/src/views/productionManagement/processRoute/processRouteItem/index.vue
@@ -87,6 +87,16 @@
{{scope.row.isQuality ? "鏄�" : "鍚�"}}
</template>
</el-table-column>
+ <el-table-column label="鏄惁鍏ュ簱" prop="isInbound" width="100">
+ <template #default="scope">
+ {{ scope.row.isInbound ? "鏄�" : "鍚�" }}
+ </template>
+ </el-table-column>
+ <el-table-column label="鏄惁鎶ュ伐" prop="isReportWork" width="100">
+ <template #default="scope">
+ {{ scope.row.isReportWork ? "鏄�" : "鍚�" }}
+ </template>
+ </el-table-column>
<el-table-column label="鎿嶄綔" align="center" fixed="right" width="150">
<template #default="scope">
<el-button type="primary" link size="small" @click="handleEdit(scope.row)" :disabled="scope.row.isComplete">缂栬緫</el-button>
@@ -136,6 +146,10 @@
<!-- <span v-if="item.unit" class="product-unit">{{ item.unit }}</span> -->
</div>
<el-tag type="primary" class="product-tag" v-if="item.isQuality">璐ㄦ</el-tag>
+ <div class="product-flags">
+ <span>鍏ュ簱锛歿{ item.isInbound ? "鏄�" : "鍚�" }}</span>
+ <span>鎶ュ伐锛歿{ item.isReportWork ? "鏄�" : "鍚�" }}</span>
+ </div>
</div>
<div v-else class="product-info empty">鏆傛棤浜у搧淇℃伅</div>
</div>
@@ -753,6 +767,15 @@
margin: 10px 0;
}
+.product-flags {
+ margin-top: 8px;
+ display: flex;
+ justify-content: center;
+ gap: 12px;
+ color: #606266;
+ font-size: 12px;
+}
+
.card-footer {
display: flex;
justify-content: space-around;
diff --git a/src/views/productionManagement/productionProcess/Edit.vue b/src/views/productionManagement/productionProcess/Edit.vue
index fb0ee74..2d3d10b 100644
--- a/src/views/productionManagement/productionProcess/Edit.vue
+++ b/src/views/productionManagement/productionProcess/Edit.vue
@@ -46,6 +46,12 @@
<el-form-item label="鏄惁璐ㄦ" prop="isQuality">
<el-switch v-model="formState.isQuality" :active-value="true" inactive-value="false"/>
</el-form-item>
+ <el-form-item label="鏄惁鍏ュ簱" prop="isInbound">
+ <el-switch v-model="formState.isInbound" :active-value="true" inactive-value="false"/>
+ </el-form-item>
+ <el-form-item label="鏄惁鎶ュ伐" prop="isReportWork">
+ <el-switch v-model="formState.isReportWork" :active-value="true" inactive-value="false"/>
+ </el-form-item>
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="formState.remark" type="textarea" />
</el-form-item>
@@ -87,6 +93,8 @@
remark: props.record.remark,
salaryQuota: props.record.salaryQuota,
isQuality: props.record.isQuality,
+ isInbound: props.record.isInbound,
+ isReportWork: props.record.isReportWork,
});
const isShow = computed({
@@ -109,6 +117,8 @@
remark: newRecord.remark || '',
salaryQuota: newRecord.salaryQuota || '',
isQuality: props.record.isQuality,
+ isInbound: newRecord.isInbound,
+ isReportWork: newRecord.isReportWork,
};
}
}, { immediate: true, deep: true });
@@ -124,6 +134,8 @@
remark: props.record.remark || '',
salaryQuota: props.record.salaryQuota || '',
isQuality: props.record.isQuality,
+ isInbound: props.record.isInbound,
+ isReportWork: props.record.isReportWork,
};
}
});
diff --git a/src/views/productionManagement/productionProcess/New.vue b/src/views/productionManagement/productionProcess/New.vue
index a5f00aa..7110915 100644
--- a/src/views/productionManagement/productionProcess/New.vue
+++ b/src/views/productionManagement/productionProcess/New.vue
@@ -48,6 +48,12 @@
<el-form-item label="鏄惁璐ㄦ" prop="isQuality">
<el-switch v-model="formState.isQuality" :active-value="true" inactive-value="false"/>
</el-form-item>
+ <el-form-item label="鏄惁鍏ュ簱" prop="isInbound">
+ <el-switch v-model="formState.isInbound" :active-value="true" inactive-value="false"/>
+ </el-form-item>
+ <el-form-item label="鏄惁鎶ュ伐" prop="isReportWork">
+ <el-switch v-model="formState.isReportWork" :active-value="true" inactive-value="false"/>
+ </el-form-item>
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="formState.remark" type="textarea" />
</el-form-item>
@@ -82,6 +88,8 @@
remark: '',
salaryQuota: '',
isQuality: false,
+ isInbound: false,
+ isReportWork: false,
});
const isShow = computed({
diff --git a/src/views/productionManagement/productionProcess/index.vue b/src/views/productionManagement/productionProcess/index.vue
index ffe13fc..8c3e56f 100644
--- a/src/views/productionManagement/productionProcess/index.vue
+++ b/src/views/productionManagement/productionProcess/index.vue
@@ -114,6 +114,20 @@
},
},
{
+ label: "鏄惁鍏ュ簱",
+ prop: "isInbound",
+ formatData: (params) => {
+ return params ? "鏄�" : "鍚�";
+ },
+ },
+ {
+ label: "鏄惁鎶ュ伐",
+ prop: "isReportWork",
+ formatData: (params) => {
+ return params ? "鏄�" : "鍚�";
+ },
+ },
+ {
label: "澶囨敞",
prop: "remark",
},
--
Gitblit v1.9.3