From db75ca47a300f6a27040386c4be34e070e25c465 Mon Sep 17 00:00:00 2001 From: spring <2396852758@qq.com> Date: 星期二, 25 三月 2025 10:20:51 +0800 Subject: [PATCH] Merge branch 'radio-frequency-cable' of http://114.132.189.42:9002/r/lims-ruoyi-before into radio-frequency-cable --- src/views/business/rawMaterialInspection/index.vue | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/src/views/business/rawMaterialInspection/index.vue b/src/views/business/rawMaterialInspection/index.vue index f931927..f2b893b 100644 --- a/src/views/business/rawMaterialInspection/index.vue +++ b/src/views/business/rawMaterialInspection/index.vue @@ -262,7 +262,16 @@ } } }, - { label: '鎶ユ绫诲瀷', prop: 'inspectionType' }, + { + label: '鎶ユ绫诲瀷', prop: 'inspectionType', dataType: 'tag', + formatType: (params) => { + if (params == '鍘熻緟鏂�') { + return 'success' + } else { + return 'warning' + } + } + }, { label: '璁㈠崟鍙�', prop: 'orderNo' }, { label: '鎶佃揪鐨勯噰璐暟閲�', prop: 'qtyArrived', width: '140px', }, { label: '鎵瑰彿', prop: 'updateBatchNo' }, @@ -294,6 +303,7 @@ { dataType: 'action', label: '鎿嶄綔', + fixed: 'right', operation: [ { name: '鎶ユ', @@ -534,6 +544,9 @@ buyUnitMeas: [ { required: false, message: '璇峰~鍐欏崟浣�', trigger: 'blur' } ], + inspectionType: [ + { required: true, message: '璇峰~鍐欐姤妫�绫诲瀷', trigger: 'change' } + ], }, tabList: [ { -- Gitblit v1.9.3