From 62b4b7af6fb8dea23cf14b0709156871a3c144af Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 23 六月 2026 14:41:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_新疆_大罗素马铃薯new' into dev_新疆_大罗素马铃薯new
---
src/views/qualityManagement/finalInspection/index.vue | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/views/qualityManagement/finalInspection/index.vue b/src/views/qualityManagement/finalInspection/index.vue
index 88ba755..c4c33fb 100644
--- a/src/views/qualityManagement/finalInspection/index.vue
+++ b/src/views/qualityManagement/finalInspection/index.vue
@@ -51,7 +51,7 @@
<el-button type="primary" @click="openQuickCheck">蹇�熸楠�</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>
+ <el-button type="danger" plain @click="handleDelete" v-hasPermi="['qualityManagement:finalInspection:remove']">鍒犻櫎</el-button>
</div>
<PIMTable rowKey="id"
:column="tableColumn"
@@ -237,6 +237,22 @@
},
},
{
+ label: "妫�楠岃鍒�",
+ prop: "inspectRule",
+ width: 100,
+ formatData: (val) => val === 0 ? "鍏ㄦ" : val === 1 ? "鎶芥" : ""
+ },
+ {
+ label: "鎶芥姣斾緥(%)",
+ prop: "sampleRatio",
+ width: 120,
+ },
+ {
+ label: "鎶芥鏁伴噺",
+ prop: "sampleQuantity",
+ width: 100,
+ },
+ {
dataType: "action",
label: "鎿嶄綔",
align: "center",
--
Gitblit v1.9.3