From c05b81c7f50df80ab247a05f9f92af2d799e77cd Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 10 四月 2026 15:59:04 +0800
Subject: [PATCH] feat:1.销售添加是否生产 2.生产订单添加备注
---
src/views/qualityManagement/nonconformingManagement/index.vue | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/views/qualityManagement/nonconformingManagement/index.vue b/src/views/qualityManagement/nonconformingManagement/index.vue
index 7b4d55b..a20a47a 100644
--- a/src/views/qualityManagement/nonconformingManagement/index.vue
+++ b/src/views/qualityManagement/nonconformingManagement/index.vue
@@ -5,9 +5,8 @@
<div>
<span class="search_title">绫诲瀷锛�</span>
<el-select v-model="searchForm.inspectType" clearable style="width: 200px" @change="handleQuery">
- <el-option label="鍘熸潗鏂欐楠�" :value="0" />
<el-option label="杩囩▼妫�楠�" :value="1" />
- <el-option label="鍑哄巶妫�楠�" :value="2" />
+ <el-option label="鎴愬搧妫�楠�" :value="2" />
</el-select>
</div>
<div style="margin-left: 10px">
@@ -35,7 +34,7 @@
<el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
</div>
<div>
- <el-button type="primary" @click="openForm('add')">鏂板</el-button>
+ <!-- <el-button type="primary" @click="openForm('add')">鏂板</el-button> -->
<el-button @click="handleOut">瀵煎嚭</el-button>
<el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
</div>
@@ -113,12 +112,10 @@
dataType: "tag",
width: 120,
formatData: (params) => {
- if (params == 0) {
- return "鍘熸潗鏂欐楠�";
- } else if (params == 1) {
+ if (params == 1) {
return "杩囩▼妫�楠�";
} else {
- return '鍑哄巶妫�楠�';
+ return '鎴愬搧妫�楠�';
}
},
formatType: (params) => {
@@ -142,6 +139,15 @@
{
label: "瑙勬牸鍨嬪彿",
prop: "model",
+ },
+ {
+ label: "鐢熶骇鎵瑰彿",
+ prop: "batchNo",
+ width: 140,
+ },
+ {
+ label: "鏂欏彿",
+ prop: "materialCode",
},
{
label: "鍗曚綅",
@@ -236,7 +242,11 @@
params.entryDate = undefined
qualityUnqualifiedListPage(params).then(res => {
tableLoading.value = false;
- tableData.value = res.data.records
+ const records = res.data.records || [];
+ tableData.value = records.map((row) => ({
+ ...row,
+ batchNo: row.batchNo ?? row.productionBatchNo ?? "",
+ }));
page.total = res.data.total;
}).catch(err => {
tableLoading.value = false;
--
Gitblit v1.9.3