From a9ed2b5a1e4370ecf4c0d4f40d515daef0e999df Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 04 八月 2026 16:04:58 +0800
Subject: [PATCH] 1

---
 src/views/qualityManagement/rawMaterialInspection/components/formDia.vue |   51 ++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
index f7a6086..d3f9fc0 100644
--- a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
@@ -14,6 +14,7 @@
                   v-model="form.supplier"
                   placeholder="璇烽�夋嫨"
                   clearable
+                  filterable
                   :disabled="isViewMode || supplierQuantityDisabled"
               >
                 <el-option
@@ -96,6 +97,23 @@
               <el-input-number :step="0.01" :min="0" :max="form.quantity || 0" style="width: 100%"
                                v-model="form.unqualifiedQuantity" placeholder="璇疯緭鍏�" :precision="2"
                                @change="onUnqualifiedChange" :disabled="isViewMode"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="鏄惁鎶芥锛�" prop="isSampling">
+              <el-radio-group v-model="form.isSampling" class="sampling-radio-group" :disabled="isViewMode" @change="handleSamplingChange">
+                <el-radio-button :label="1">鏄�</el-radio-button>
+                <el-radio-button :label="0">鍚�</el-radio-button>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="form.isSampling === 1">
+            <el-form-item label="鎶芥鏁伴噺锛�" prop="samplingQuantity">
+              <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.samplingQuantity"
+                               placeholder="璇疯緭鍏�" clearable :precision="2" :disabled="isViewMode"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -190,6 +208,8 @@
     unit: "",
     quantity: "",
     checkCompany: "",
+    isSampling: 0,
+    samplingQuantity: "",
   },
   rules: {
     checkTime: [{required: true, message: "璇疯緭鍏�", trigger: "blur"},],
@@ -203,6 +223,8 @@
     qualifiedQuantity: [{required: true, message: "璇疯緭鍏�", trigger: "blur"}],
     unqualifiedQuantity: [{required: true, message: "璇疯緭鍏�", trigger: "blur"}],
     checkCompany: [{required: false, message: "璇疯緭鍏�", trigger: "blur"}],
+    isSampling: [{required: true, message: "璇烽�夋嫨鏄惁鎶芥", trigger: "change"}],
+    samplingQuantity: [{required: true, message: "璇疯緭鍏ユ娊妫�鏁伴噺", trigger: "blur"}],
   },
 });
 const tableColumn = ref([
@@ -249,11 +271,11 @@
     const n = Number(fromApi);
     if (!Number.isNaN(n)) return n;
   }
-  const quantity = Number(form.value.quantity);
-  const qualified = Number(form.value.qualifiedQuantity);
-  if (!quantity || Number.isNaN(quantity)) return null;
-  const qualifiedNum = Number.isNaN(qualified) ? 0 : qualified;
-  return (qualifiedNum / quantity) * 100;
+  const qualified = Number(form.value.qualifiedQuantity) || 0;
+  const unqualified = Number(form.value.unqualifiedQuantity) || 0;
+  const total = qualified + unqualified;
+  if (!total || total === 0) return null;
+  return (qualified / total) * 100;
 });
 
 const passRateDisplayText = computed(() => {
@@ -307,6 +329,8 @@
     unit: "",
     quantity: "",
     checkCompany: "",
+    isSampling: 0,
+    samplingQuantity: "",
   }
   testStandardOptions.value = [];
   tableData.value = [];
@@ -315,7 +339,8 @@
   if (operationType.value === 'edit' || operationType.value === 'view') {
     // 鍏堜繚瀛� testStandardId锛岄伩鍏嶈娓呯┖
     const savedTestStandardId = row.testStandardId;
-    form.value = {...row}
+    const { passRate, ...rowWithoutPassRate } = row;
+    form.value = { ...rowWithoutPassRate, testStandardId: "" };
     currentProductId.value = row.productId || 0
     // 鍏抽敭锛氱紪杈戞椂鍔犺浇瑙勬牸鍨嬪彿涓嬫媺閫夐」锛屾墠鑳藉弽鏄� productModelId
     if (currentProductId.value) {
@@ -530,6 +555,16 @@
   }
 };
 
+// 鏄惁鎶芥鍒囨崲
+const handleSamplingChange = (value) => {
+  if (value !== 1) {
+    form.value.samplingQuantity = "";
+    nextTick(() => {
+      proxy.$refs?.formRef?.clearValidate?.("samplingQuantity");
+    });
+  }
+};
+
 // 鍏抽棴寮规
 const closeDia = () => {
   proxy.resetForm("formRef");
@@ -545,5 +580,7 @@
 </script>
 
 <style scoped>
-
+.sampling-radio-group {
+  height: 32px;
+}
 </style>

--
Gitblit v1.9.3