From 377c0a70c094d024aeb0bb94f4b791c6d5530c1e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 06 八月 2026 10:21:55 +0800
Subject: [PATCH] 新疆_马铃薯 1.不合格管理添加拒收逻辑
---
src/views/qualityManagement/nonconformingManagement/components/formDia.vue | 14 ++------------
src/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue | 5 ++++-
src/views/qualityManagement/nonconformingManagement/index.vue | 7 ++++++-
3 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/src/views/qualityManagement/nonconformingManagement/components/formDia.vue b/src/views/qualityManagement/nonconformingManagement/components/formDia.vue
index 4cf9be8..c29519d 100644
--- a/src/views/qualityManagement/nonconformingManagement/components/formDia.vue
+++ b/src/views/qualityManagement/nonconformingManagement/components/formDia.vue
@@ -85,7 +85,7 @@
<el-col :span="12">
<el-form-item label="澶勭悊缁撴灉锛�" prop="dealResult">
<el-select v-model="form.dealResult" placeholder="璇烽�夋嫨" clearable>
- <el-option :label="item.label" :value="item.value" v-for="item in dealResultOptions" :key="item.value" />
+ <el-option :label="item.label" :value="item.value" v-for="item in rejection_handling" :key="item.value" />
</el-select>
</el-form-item>
</el-col>
@@ -124,7 +124,7 @@
</template>
<script setup>
-import {ref, reactive, toRefs, computed} from "vue";
+import {ref, reactive, toRefs} from "vue";
import {modelList, productTreeList} from "@/api/basicData/product.js";
import {
getQualityUnqualifiedInfo,
@@ -176,15 +176,6 @@
const productOptions = ref([]);
const modelOptions = ref([]);
const userList = ref([]); // 妫�楠屽憳/澶勭悊浜轰笅鎷夊垪琛�
-
-// 澶勭悊缁撴灉閫夐」锛氬師鏉愭枡妫�楠屾椂澧炲姞"鎷掓敹"
-const dealResultOptions = computed(() => {
- const options = [...rejection_handling.value];
- if (form.value.inspectType === 0) {
- options.push({ label: '鎷掓敹', value: '鎷掓敹' });
- }
- return options;
-});
// 鎵撳紑寮规
const openDialog = async (type, row) => {
@@ -273,7 +264,6 @@
const submitForm = () => {
proxy.$refs.formRef.validate(valid => {
if (valid) {
- // 鐘舵�佸瓧娈典笉鍦ㄨ〃鍗曞～鍐欙紝涔熶笉浼犵粰鍚庣
const { inspectState, ...payload } = (form.value || {})
if (operationType.value === "add") {
qualityUnqualifiedAdd(payload).then(res => {
diff --git a/src/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue b/src/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue
index 788eaf3..e5df400 100644
--- a/src/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue
+++ b/src/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue
@@ -174,7 +174,10 @@
const userList = ref([]); // 澶勭悊浜轰笅鎷夊垪琛�
const filteredRejectionHandling = computed(() => {
- const data = rejection_handling.value;
+ const data = [...rejection_handling.value];
+ if (form.value.inspectType === 0) {
+ data.push({ label: '鎷掓敹', value: '鎷掓敹' });
+ }
if (form.value.method) {
return data.filter(item => item && item.label && item.label !== '杩斿伐' && item.label !== '杩斾慨')
}
diff --git a/src/views/qualityManagement/nonconformingManagement/index.vue b/src/views/qualityManagement/nonconformingManagement/index.vue
index 30ddc6c..1252628 100644
--- a/src/views/qualityManagement/nonconformingManagement/index.vue
+++ b/src/views/qualityManagement/nonconformingManagement/index.vue
@@ -160,7 +160,12 @@
{
label: "澶勭悊缁撴灉",
prop: "dealResult",
- width: 120
+ width: 120,
+ dataType: "tag",
+ formatType: (params) => {
+ if (params === '鎷掓敹') return 'danger';
+ return '';
+ },
},
{
label: "澶勭悊浜�",
--
Gitblit v1.9.3