From c6c1caafba75438cc0eff215f19e9e0b900778d7 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 15 五月 2026 15:54:06 +0800
Subject: [PATCH] feat: 质检数量区分合格/不合格

---
 src/views/qualityManagement/processInspection/components/formDia.vue               |  150 ++++++++++++-
 src/views/qualityManagement/rawMaterialInspection/components/inspectionFormDia.vue |    2 
 src/views/qualityManagement/finalInspection/components/formDia.vue                 |  149 ++++++++++++-
 src/views/qualityManagement/rawMaterialInspection/components/formDia.vue           |  143 ++++++++++++
 src/views/qualityManagement/finalInspection/components/inspectionFormDia.vue       |    2 
 src/views/qualityManagement/rawMaterialInspection/index.vue                        |   64 +++--
 src/views/qualityManagement/finalInspection/index.vue                              |   64 +++--
 src/views/qualityManagement/processInspection/index.vue                            |   64 +++--
 src/views/qualityManagement/processInspection/components/inspectionFormDia.vue     |    2 
 9 files changed, 525 insertions(+), 115 deletions(-)

diff --git a/src/views/qualityManagement/finalInspection/components/formDia.vue b/src/views/qualityManagement/finalInspection/components/formDia.vue
index a6013f9..42689f0 100644
--- a/src/views/qualityManagement/finalInspection/components/formDia.vue
+++ b/src/views/qualityManagement/finalInspection/components/formDia.vue
@@ -62,8 +62,21 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="鏁伴噺锛�" prop="quantity">
-              <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.quantity" placeholder="璇疯緭鍏�" clearable :precision="2" :disabled="quantityDisabled"/>
+            <el-form-item label="鎬绘暟閲忥細" prop="quantity">
+              <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.quantity" placeholder="璇疯緭鍏�" clearable :precision="2" :disabled="quantityDisabled"
+                               @change="onTotalQuantityChange"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="鍚堟牸鏁伴噺锛�" prop="qualifiedQuantity">
+              <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.qualifiedQuantity" placeholder="璇疯緭鍏�" clearable :precision="2" @change="onQualifiedQuantityChange"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="涓嶅悎鏍兼暟閲忥細" prop="unqualifiedQuantity">
+              <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.unqualifiedQuantity" placeholder="璇疯緭鍏�" clearable :precision="2" @change="onUnqualifiedQuantityChange"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -74,16 +87,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="妫�娴嬬粨鏋滐細" prop="checkResult">
-              <el-select v-model="form.checkResult">
-                <el-option label="鍚堟牸" value="鍚堟牸" />
-                <el-option label="涓嶅悎鏍�" value="涓嶅悎鏍�" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="30">
-          <el-col :span="12">
             <el-form-item label="妫�楠屽憳锛�" prop="checkName">
 							<el-select v-model="form.checkName" placeholder="璇烽�夋嫨" clearable>
 								<el-option v-for="item in userList" :key="item.nickName" :label="item.nickName"
@@ -91,6 +94,8 @@
 							</el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="30">
           <el-col :span="12">
             <el-form-item label="妫�娴嬫棩鏈燂細" prop="checkTime">
               <el-date-picker
@@ -152,13 +157,14 @@
     testStandardId: "",
     unit: "",
     quantity: "",
+    qualifiedQuantity: null,
+    unqualifiedQuantity: null,
     checkCompany: "",
-    checkResult: "",
     thickness:""
   },
   rules: {
     checkTime: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" },],
-    process: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+    process: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
     checkName: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
     productId: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
     productModelId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
@@ -166,10 +172,118 @@
     unit: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
     quantity: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
     checkCompany: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
-    checkResult: [{ required: true, message: "璇疯緭鍏�", trigger: "change" }],
+    qualifiedQuantity: [{ required: true, message: "璇疯緭鍏ュ悎鏍兼暟閲�", trigger: "blur" }],
+    unqualifiedQuantity: [{ required: true, message: "璇疯緭鍏ヤ笉鍚堟牸鏁伴噺", trigger: "blur" }],
   },
 });
 const { form, rules } = toRefs(data);
+
+function normalizeQuantitiesFromLegacy() {
+  const qty = form.value.quantity != null ? Number(form.value.quantity) : null
+  if (qty == null || Number.isNaN(qty)) return
+  const hasQ = form.value.qualifiedQuantity != null && form.value.qualifiedQuantity !== ''
+  const hasU = form.value.unqualifiedQuantity != null && form.value.unqualifiedQuantity !== ''
+  if (hasQ && hasU) return
+  if (form.value.checkResult === '涓嶅悎鏍�') {
+    form.value.qualifiedQuantity = 0
+    form.value.unqualifiedQuantity = qty
+  } else {
+    form.value.qualifiedQuantity = qty
+    form.value.unqualifiedQuantity = 0
+  }
+}
+
+function assertQtySplitOrError() {
+  const total = Number(form.value.quantity)
+  const a = form.value.qualifiedQuantity != null ? Number(form.value.qualifiedQuantity) : NaN
+  const b = form.value.unqualifiedQuantity != null ? Number(form.value.unqualifiedQuantity) : NaN
+  if (!Number.isFinite(total) || total < 0) {
+    proxy.$modal.msgError('璇峰厛濉啓鏈夋晥鐨勬�绘暟閲�')
+    return false
+  }
+  if (!Number.isFinite(a) || !Number.isFinite(b) || a < 0 || b < 0) {
+    proxy.$modal.msgError('璇峰～鍐欏悎鏍兼暟閲忎笌涓嶅悎鏍兼暟閲�')
+    return false
+  }
+  if (a + b - total > 0.001) {
+    proxy.$modal.msgError('鍚堟牸鏁伴噺涓庝笉鍚堟牸鏁伴噺涔嬪拰涓嶈兘瓒呰繃鎬绘暟閲�')
+    return false
+  }
+  return true
+}
+
+function roundQty(n) {
+  if (!Number.isFinite(n)) return 0
+  return Math.round(n * 100) / 100
+}
+
+function parseTotalQty() {
+  const t = Number(form.value.quantity)
+  return Number.isFinite(t) && t >= 0 ? t : null
+}
+
+function onQualifiedQuantityChange(val) {
+  const total = parseTotalQty()
+  if (total == null) return
+  let q = val == null || val === '' ? 0 : Number(val)
+  if (!Number.isFinite(q) || q < 0) q = 0
+  if (q > total) q = total
+  q = roundQty(q)
+  form.value.qualifiedQuantity = q
+  form.value.unqualifiedQuantity = roundQty(total - q)
+}
+
+function onUnqualifiedQuantityChange(val) {
+  const total = parseTotalQty()
+  if (total == null) return
+  let u = val == null || val === '' ? 0 : Number(val)
+  if (!Number.isFinite(u) || u < 0) u = 0
+  if (u > total) u = total
+  u = roundQty(u)
+  form.value.unqualifiedQuantity = u
+  form.value.qualifiedQuantity = roundQty(total - u)
+}
+
+function onTotalQuantityChange() {
+  const total = parseTotalQty()
+  if (total == null) return
+  const q = form.value.qualifiedQuantity != null && form.value.qualifiedQuantity !== '' ? Number(form.value.qualifiedQuantity) : NaN
+  const u = form.value.unqualifiedQuantity != null && form.value.unqualifiedQuantity !== '' ? Number(form.value.unqualifiedQuantity) : NaN
+  if (!Number.isFinite(q) && !Number.isFinite(u)) {
+    form.value.qualifiedQuantity = roundQty(total)
+    form.value.unqualifiedQuantity = 0
+    return
+  }
+  if (Number.isFinite(q) && Number.isFinite(u)) {
+    const sum = q + u
+    if (sum > total + 0.001) {
+      const nq = roundQty(Math.min(Math.max(0, q), total))
+      form.value.qualifiedQuantity = nq
+      form.value.unqualifiedQuantity = roundQty(total - nq)
+    }
+    return
+  }
+  if (Number.isFinite(q)) {
+    const nq = roundQty(Math.min(Math.max(0, q), total))
+    form.value.qualifiedQuantity = nq
+    form.value.unqualifiedQuantity = roundQty(total - nq)
+  } else if (Number.isFinite(u)) {
+    const nu = roundQty(Math.min(Math.max(0, u), total))
+    form.value.unqualifiedQuantity = nu
+    form.value.qualifiedQuantity = roundQty(total - nu)
+  }
+}
+
+function ensureQtyPairInitialized() {
+  const total = parseTotalQty()
+  if (total == null) return
+  const qEmpty = form.value.qualifiedQuantity == null || form.value.qualifiedQuantity === ''
+  const uEmpty = form.value.unqualifiedQuantity == null || form.value.unqualifiedQuantity === ''
+  if (qEmpty && uEmpty) {
+    form.value.qualifiedQuantity = roundQty(total)
+    form.value.unqualifiedQuantity = 0
+  }
+}
 // 缂栬緫鏃讹細productMainId 鎴� purchaseLedgerId 浠讳竴鏈夊�煎垯鏁伴噺缃伆
 const quantityDisabled = computed(() => {
   const v = form.value || {};
@@ -235,6 +349,7 @@
     const savedTestStandardId = row.testStandardId;
     // 鍏堣缃〃鍗曟暟鎹紝浣嗘殏鏃舵竻绌� testStandardId锛岀瓑閫夐」鍔犺浇瀹屾垚鍚庡啀璁剧疆
     form.value = {...row, testStandardId: ''}
+    normalizeQuantitiesFromLegacy()
     currentProductId.value = row.productId || 0
     // 娓呯┖楠岃瘉鐘舵�侊紝閬垮厤鏁版嵁鍔犺浇杩囩▼涓殑鏍￠獙闂儊
     nextTick(() => {
@@ -353,6 +468,10 @@
 const submitForm = () => {
   proxy.$refs.formRef.validate(valid => {
     if (valid) {
+      ensureQtyPairInitialized()
+      if (!assertQtySplitOrError()) {
+        return
+      }
       form.value.inspectType = 2
 			if (operationType.value === "add") {
 				tableData.value.forEach((item) => {
diff --git a/src/views/qualityManagement/finalInspection/components/inspectionFormDia.vue b/src/views/qualityManagement/finalInspection/components/inspectionFormDia.vue
index 411856c..6227664 100644
--- a/src/views/qualityManagement/finalInspection/components/inspectionFormDia.vue
+++ b/src/views/qualityManagement/finalInspection/components/inspectionFormDia.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script setup>
-import {ref} from "vue";
+import {ref, getCurrentInstance} from "vue";
 import {Search} from "@element-plus/icons-vue";
 import {
   qualityInspectParamDel,
diff --git a/src/views/qualityManagement/finalInspection/index.vue b/src/views/qualityManagement/finalInspection/index.vue
index 1c05851..edaf6c6 100644
--- a/src/views/qualityManagement/finalInspection/index.vue
+++ b/src/views/qualityManagement/finalInspection/index.vue
@@ -126,34 +126,46 @@
     width: 100
   },
   {
+    label: "鍚堟牸鏁伴噺",
+    prop: "qualifiedQuantity",
+    width: 100
+  },
+  {
+    label: "涓嶅悎鏍兼暟閲�",
+    prop: "unqualifiedQuantity",
+    width: 100
+  },
+  {
+    label: "鍚堟牸鐜�",
+    prop: "passRate",
+    width: 100,
+    dataType: "tag",
+    formatData: (params) => {
+      if (params == null || params === '') return '鈥�';
+      const n = Number(params);
+      if (Number.isNaN(n)) return '鈥�';
+      return `${n.toFixed(2)}%`;
+    },
+    formatType: (params) => {
+      if (params == null || params === '') return 'info';
+      const n = Number(params);
+      if (Number.isNaN(n)) return 'info';
+      if (n >= 100) return 'success';
+      if (n >= 90) return 'warning';
+      return 'danger';
+    },
+  },
+  {
     label: "妫�娴嬪崟浣�",
     prop: "checkCompany",
     width: 120
   },
-  {
-    label: "妫�娴嬬粨鏋�",
-    prop: "checkResult",
-    dataType: "tag",
-    formatType: (params) => {
-      if (params == '涓嶅悎鏍�') {
-        return "danger";
-      } else if (params == '鍚堟牸') {
-        return "success";
-      } else {
-        return null;
-      }
-    },
-  },
 	{
 		label: "鎻愪氦鐘舵��",
 		prop: "inspectState",
-		formatData: (params) => {
-			if (params) {
-				return "宸叉彁浜�";
-			} else {
-				return "鏈彁浜�";
-			}
-		},
+    dataType: "tag",
+    formatData: (params) => (params == 1 || params === true ? '宸叉彁浜�' : '鏈彁浜�'),
+    formatType: (params) => (params == 1 || params === true ? 'success' : 'info'),
 	},
   {
     dataType: "action",
@@ -189,7 +201,7 @@
 				name: "鎻愪氦",
 				type: "text",
 				clickFun: (row) => {
-					submit(row.id);
+					submit(row);
 				},
 				disabled: (row) => {
 					// 宸叉彁浜ゅ垯绂佺敤
@@ -342,8 +354,12 @@
 };
 
 // 鎻愪环
-const submit = async (id) => {
-	const res = await submitQualityInspect({id: id})
+const submit = async (row) => {
+	const res = await submitQualityInspect({
+    id: row.id,
+    qualifiedQuantity: row.qualifiedQuantity,
+    unqualifiedQuantity: row.unqualifiedQuantity
+  })
 	if (res.code === 200) {
 		proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
 		getList();
diff --git a/src/views/qualityManagement/processInspection/components/formDia.vue b/src/views/qualityManagement/processInspection/components/formDia.vue
index d9dbee3..cfa803f 100644
--- a/src/views/qualityManagement/processInspection/components/formDia.vue
+++ b/src/views/qualityManagement/processInspection/components/formDia.vue
@@ -73,8 +73,21 @@
         </el-row>
         <el-row :gutter="30">
           <el-col :span="12">
-            <el-form-item label="鏁伴噺锛�" prop="quantity">
-              <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.quantity" placeholder="璇疯緭鍏�" clearable :precision="2" :disabled="processQuantityDisabled"/>
+            <el-form-item label="鎬绘暟閲忥細" prop="quantity">
+              <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.quantity" placeholder="璇疯緭鍏�" clearable :precision="2" :disabled="processQuantityDisabled"
+                               @change="onTotalQuantityChange"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="鍚堟牸鏁伴噺锛�" prop="qualifiedQuantity">
+              <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.qualifiedQuantity" placeholder="璇疯緭鍏�" clearable :precision="2" @change="onQualifiedQuantityChange"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="涓嶅悎鏍兼暟閲忥細" prop="unqualifiedQuantity">
+              <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.unqualifiedQuantity" placeholder="璇疯緭鍏�" clearable :precision="2" @change="onUnqualifiedQuantityChange"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -85,16 +98,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="妫�娴嬬粨鏋滐細" prop="checkResult">
-              <el-select v-model="form.checkResult">
-                <el-option label="鍚堟牸" value="鍚堟牸" />
-                <el-option label="涓嶅悎鏍�" value="涓嶅悎鏍�" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="30">
-          <el-col :span="12">
             <el-form-item label="妫�楠屽憳锛�" prop="checkName">
 							<el-select v-model="form.checkName" placeholder="璇烽�夋嫨" clearable>
 								<el-option v-for="item in userList" :key="item.nickName" :label="item.nickName"
@@ -102,6 +105,8 @@
 							</el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="30">
           <el-col :span="12">
             <el-form-item label="妫�娴嬫棩鏈燂細" prop="checkTime">
               <el-date-picker
@@ -167,8 +172,9 @@
     unit: "",
     thickness: "",
     quantity: "",
+    qualifiedQuantity: null,
+    unqualifiedQuantity: null,
     checkCompany: "",
-    checkResult: "",
   },
   rules: {
     checkTime: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" },],
@@ -181,11 +187,119 @@
     thickness: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
     quantity: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
     checkCompany: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
-    checkResult: [{ required: true, message: "璇疯緭鍏�", trigger: "change" }],
+    qualifiedQuantity: [{ required: true, message: "璇疯緭鍏ュ悎鏍兼暟閲�", trigger: "blur" }],
+    unqualifiedQuantity: [{ required: true, message: "璇疯緭鍏ヤ笉鍚堟牸鏁伴噺", trigger: "blur" }],
   },
 });
 const userList = ref([]);
 const { form, rules } = toRefs(data);
+
+function normalizeQuantitiesFromLegacy() {
+  const qty = form.value.quantity != null ? Number(form.value.quantity) : null
+  if (qty == null || Number.isNaN(qty)) return
+  const hasQ = form.value.qualifiedQuantity != null && form.value.qualifiedQuantity !== ''
+  const hasU = form.value.unqualifiedQuantity != null && form.value.unqualifiedQuantity !== ''
+  if (hasQ && hasU) return
+  if (form.value.checkResult === '涓嶅悎鏍�') {
+    form.value.qualifiedQuantity = 0
+    form.value.unqualifiedQuantity = qty
+  } else {
+    form.value.qualifiedQuantity = qty
+    form.value.unqualifiedQuantity = 0
+  }
+}
+
+function assertQtySplitOrError() {
+  const total = Number(form.value.quantity)
+  const a = form.value.qualifiedQuantity != null ? Number(form.value.qualifiedQuantity) : NaN
+  const b = form.value.unqualifiedQuantity != null ? Number(form.value.unqualifiedQuantity) : NaN
+  if (!Number.isFinite(total) || total < 0) {
+    proxy.$modal.msgError('璇峰厛濉啓鏈夋晥鐨勬�绘暟閲�')
+    return false
+  }
+  if (!Number.isFinite(a) || !Number.isFinite(b) || a < 0 || b < 0) {
+    proxy.$modal.msgError('璇峰～鍐欏悎鏍兼暟閲忎笌涓嶅悎鏍兼暟閲�')
+    return false
+  }
+  if (a + b - total > 0.001) {
+    proxy.$modal.msgError('鍚堟牸鏁伴噺涓庝笉鍚堟牸鏁伴噺涔嬪拰涓嶈兘瓒呰繃鎬绘暟閲�')
+    return false
+  }
+  return true
+}
+
+function roundQty(n) {
+  if (!Number.isFinite(n)) return 0
+  return Math.round(n * 100) / 100
+}
+
+function parseTotalQty() {
+  const t = Number(form.value.quantity)
+  return Number.isFinite(t) && t >= 0 ? t : null
+}
+
+function onQualifiedQuantityChange(val) {
+  const total = parseTotalQty()
+  if (total == null) return
+  let q = val == null || val === '' ? 0 : Number(val)
+  if (!Number.isFinite(q) || q < 0) q = 0
+  if (q > total) q = total
+  q = roundQty(q)
+  form.value.qualifiedQuantity = q
+  form.value.unqualifiedQuantity = roundQty(total - q)
+}
+
+function onUnqualifiedQuantityChange(val) {
+  const total = parseTotalQty()
+  if (total == null) return
+  let u = val == null || val === '' ? 0 : Number(val)
+  if (!Number.isFinite(u) || u < 0) u = 0
+  if (u > total) u = total
+  u = roundQty(u)
+  form.value.unqualifiedQuantity = u
+  form.value.qualifiedQuantity = roundQty(total - u)
+}
+
+function onTotalQuantityChange() {
+  const total = parseTotalQty()
+  if (total == null) return
+  const q = form.value.qualifiedQuantity != null && form.value.qualifiedQuantity !== '' ? Number(form.value.qualifiedQuantity) : NaN
+  const u = form.value.unqualifiedQuantity != null && form.value.unqualifiedQuantity !== '' ? Number(form.value.unqualifiedQuantity) : NaN
+  if (!Number.isFinite(q) && !Number.isFinite(u)) {
+    form.value.qualifiedQuantity = roundQty(total)
+    form.value.unqualifiedQuantity = 0
+    return
+  }
+  if (Number.isFinite(q) && Number.isFinite(u)) {
+    const sum = q + u
+    if (sum > total + 0.001) {
+      const nq = roundQty(Math.min(Math.max(0, q), total))
+      form.value.qualifiedQuantity = nq
+      form.value.unqualifiedQuantity = roundQty(total - nq)
+    }
+    return
+  }
+  if (Number.isFinite(q)) {
+    const nq = roundQty(Math.min(Math.max(0, q), total))
+    form.value.qualifiedQuantity = nq
+    form.value.unqualifiedQuantity = roundQty(total - nq)
+  } else if (Number.isFinite(u)) {
+    const nu = roundQty(Math.min(Math.max(0, u), total))
+    form.value.unqualifiedQuantity = nu
+    form.value.qualifiedQuantity = roundQty(total - nu)
+  }
+}
+
+function ensureQtyPairInitialized() {
+  const total = parseTotalQty()
+  if (total == null) return
+  const qEmpty = form.value.qualifiedQuantity == null || form.value.qualifiedQuantity === ''
+  const uEmpty = form.value.unqualifiedQuantity == null || form.value.unqualifiedQuantity === ''
+  if (qEmpty && uEmpty) {
+    form.value.qualifiedQuantity = roundQty(total)
+    form.value.unqualifiedQuantity = 0
+  }
+}
 // 缂栬緫鏃讹細productMainId 鎴� purchaseLedgerId 浠讳竴鏈夊�煎垯宸ュ簭銆佹暟閲忕疆鐏�
 const processQuantityDisabled = computed(() => {
   const v = form.value || {};
@@ -253,8 +367,9 @@
 		unit: "",
 		thickness: "",
 		quantity: "",
+		qualifiedQuantity: null,
+		unqualifiedQuantity: null,
 		checkCompany: "",
-		checkResult: "",
 	}
 	testStandardOptions.value = [];
 	tableData.value = [];
@@ -265,6 +380,7 @@
 		const savedTestStandardId = row.testStandardId;
 		// 鍏堣缃〃鍗曟暟鎹紝浣嗘殏鏃舵竻绌� testStandardId锛岀瓑閫夐」鍔犺浇瀹屾垚鍚庡啀璁剧疆
 		form.value = {...row, testStandardId: ''}
+		normalizeQuantitiesFromLegacy()
 		currentProductId.value = row.productId || 0
 		// 鍏抽敭锛氱紪杈戞椂鍔犺浇瑙勬牸鍨嬪彿涓嬫媺閫夐」锛屾墠鑳藉弽鏄� productModelId
 		if (currentProductId.value) {
@@ -388,6 +504,10 @@
 const submitForm = () => {
   proxy.$refs.formRef.validate(valid => {
     if (valid) {
+      ensureQtyPairInitialized()
+      if (!assertQtySplitOrError()) {
+        return
+      }
       form.value.inspectType = 1
 			const processName = form.value.process || '';
 			if (operationType.value === "add") {
diff --git a/src/views/qualityManagement/processInspection/components/inspectionFormDia.vue b/src/views/qualityManagement/processInspection/components/inspectionFormDia.vue
index 411856c..6227664 100644
--- a/src/views/qualityManagement/processInspection/components/inspectionFormDia.vue
+++ b/src/views/qualityManagement/processInspection/components/inspectionFormDia.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script setup>
-import {ref} from "vue";
+import {ref, getCurrentInstance} from "vue";
 import {Search} from "@element-plus/icons-vue";
 import {
   qualityInspectParamDel,
diff --git a/src/views/qualityManagement/processInspection/index.vue b/src/views/qualityManagement/processInspection/index.vue
index 68eda91..85ca0c4 100644
--- a/src/views/qualityManagement/processInspection/index.vue
+++ b/src/views/qualityManagement/processInspection/index.vue
@@ -131,34 +131,46 @@
     width: 100
   },
   {
+    label: "鍚堟牸鏁伴噺",
+    prop: "qualifiedQuantity",
+    width: 100
+  },
+  {
+    label: "涓嶅悎鏍兼暟閲�",
+    prop: "unqualifiedQuantity",
+    width: 100
+  },
+  {
+    label: "鍚堟牸鐜�",
+    prop: "passRate",
+    width: 100,
+    dataType: "tag",
+    formatData: (params) => {
+      if (params == null || params === '') return '鈥�';
+      const n = Number(params);
+      if (Number.isNaN(n)) return '鈥�';
+      return `${n.toFixed(2)}%`;
+    },
+    formatType: (params) => {
+      if (params == null || params === '') return 'info';
+      const n = Number(params);
+      if (Number.isNaN(n)) return 'info';
+      if (n >= 100) return 'success';
+      if (n >= 90) return 'warning';
+      return 'danger';
+    },
+  },
+  {
     label: "妫�娴嬪崟浣�",
     prop: "checkCompany",
     width: 120
   },
-  {
-    label: "妫�娴嬬粨鏋�",
-    prop: "checkResult",
-    dataType: "tag",
-    formatType: (params) => {
-      if (params == '涓嶅悎鏍�') {
-        return "danger";
-      } else if (params == '鍚堟牸') {
-        return "success";
-      } else {
-        return null;
-      }
-    },
-  },
 	{
 		label: "鎻愪氦鐘舵��",
 		prop: "inspectState",
-		formatData: (params) => {
-			if (params) {
-				return "宸叉彁浜�";
-			} else {
-				return "鏈彁浜�";
-			}
-		},
+    dataType: "tag",
+    formatData: (params) => (params == 1 || params === true ? '宸叉彁浜�' : '鏈彁浜�'),
+    formatType: (params) => (params == 1 || params === true ? 'success' : 'info'),
 	},
   {
     dataType: "action",
@@ -194,7 +206,7 @@
 				name: "鎻愪氦",
 				type: "text",
 				clickFun: (row) => {
-					submit(row.id);
+					submit(row);
 				},
 				disabled: (row) => {
 					// 宸叉彁浜ゅ垯绂佺敤
@@ -305,8 +317,12 @@
   })
 };
 // 鎻愪环
-const submit = async (id) => {
-	const res = await submitQualityInspect({id: id})
+const submit = async (row) => {
+	const res = await submitQualityInspect({
+    id: row.id,
+    qualifiedQuantity: row.qualifiedQuantity,
+    unqualifiedQuantity: row.unqualifiedQuantity
+  })
 	if (res.code === 200) {
 		proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
 		getList();
diff --git a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
index a61c4d8..18e7df8 100644
--- a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
@@ -83,9 +83,10 @@
         </el-row>
         <el-row :gutter="30">
           <el-col :span="12">
-            <el-form-item label="鏁伴噺锛�" prop="quantity">
+            <el-form-item label="鎬绘暟閲忥細" prop="quantity">
               <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.quantity" placeholder="璇疯緭鍏�"
-                               clearable :precision="2" :disabled="supplierQuantityDisabled"/>
+                               clearable :precision="2" :disabled="supplierQuantityDisabled"
+                               @change="onTotalQuantityChange"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -96,13 +97,19 @@
         </el-row>
         <el-row :gutter="30">
           <el-col :span="12">
-            <el-form-item label="妫�娴嬬粨鏋滐細" prop="checkResult">
-              <el-select v-model="form.checkResult">
-                <el-option label="鍚堟牸" value="鍚堟牸"/>
-                <el-option label="涓嶅悎鏍�" value="涓嶅悎鏍�"/>
-              </el-select>
+            <el-form-item label="鍚堟牸鏁伴噺锛�" prop="qualifiedQuantity">
+              <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.qualifiedQuantity" placeholder="璇疯緭鍏�"
+                               clearable :precision="2" @change="onQualifiedQuantityChange"/>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="涓嶅悎鏍兼暟閲忥細" prop="unqualifiedQuantity">
+              <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.unqualifiedQuantity" placeholder="璇疯緭鍏�"
+                               clearable :precision="2" @change="onUnqualifiedQuantityChange"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
           <el-col :span="12">
             <el-form-item label="妫�楠屽憳锛�" prop="checkName">
               <el-select v-model="form.checkName" placeholder="璇烽�夋嫨" clearable style="width: 100%">
@@ -220,8 +227,9 @@
     unit: "",
     thickness: "",
     quantity: "",
+    qualifiedQuantity: null,
+    unqualifiedQuantity: null,
     checkCompany: "",
-    checkResult: "",
     reviewName: "",
   },
   rules: {
@@ -235,7 +243,8 @@
     thickness: [{required: false, message: "璇疯緭鍏�", trigger: "blur"}],
     quantity: [{required: true, message: "璇疯緭鍏�", trigger: "blur"}],
     checkCompany: [{required: false, message: "璇疯緭鍏�", trigger: "blur"}],
-    checkResult: [{required: true, message: "璇烽�夋嫨妫�娴嬬粨鏋�", trigger: "change"}],
+    qualifiedQuantity: [{required: true, message: "璇疯緭鍏ュ悎鏍兼暟閲�", trigger: "blur"}],
+    unqualifiedQuantity: [{required: true, message: "璇疯緭鍏ヤ笉鍚堟牸鏁伴噺", trigger: "blur"}],
   },
 });
 const tableColumn = ref([
@@ -266,6 +275,114 @@
 const tableLoading = ref(false);
 
 const {form, rules} = toRefs(data);
+
+function normalizeQuantitiesFromLegacy() {
+  const qty = form.value.quantity != null ? Number(form.value.quantity) : null
+  if (qty == null || Number.isNaN(qty)) return
+  const hasQ = form.value.qualifiedQuantity != null && form.value.qualifiedQuantity !== ''
+  const hasU = form.value.unqualifiedQuantity != null && form.value.unqualifiedQuantity !== ''
+  if (hasQ && hasU) return
+  if (form.value.checkResult === '涓嶅悎鏍�') {
+    form.value.qualifiedQuantity = 0
+    form.value.unqualifiedQuantity = qty
+  } else {
+    form.value.qualifiedQuantity = qty
+    form.value.unqualifiedQuantity = 0
+  }
+}
+
+function assertQtySplitOrError() {
+  const total = Number(form.value.quantity)
+  const a = form.value.qualifiedQuantity != null ? Number(form.value.qualifiedQuantity) : NaN
+  const b = form.value.unqualifiedQuantity != null ? Number(form.value.unqualifiedQuantity) : NaN
+  if (!Number.isFinite(total) || total < 0) {
+    proxy.$modal.msgError('璇峰厛濉啓鏈夋晥鐨勬�绘暟閲�')
+    return false
+  }
+  if (!Number.isFinite(a) || !Number.isFinite(b) || a < 0 || b < 0) {
+    proxy.$modal.msgError('璇峰～鍐欏悎鏍兼暟閲忎笌涓嶅悎鏍兼暟閲�')
+    return false
+  }
+  if (a + b - total > 0.001) {
+    proxy.$modal.msgError('鍚堟牸鏁伴噺涓庝笉鍚堟牸鏁伴噺涔嬪拰涓嶈兘瓒呰繃鎬绘暟閲�')
+    return false
+  }
+  return true
+}
+
+function roundQty(n) {
+  if (!Number.isFinite(n)) return 0
+  return Math.round(n * 100) / 100
+}
+
+function parseTotalQty() {
+  const t = Number(form.value.quantity)
+  return Number.isFinite(t) && t >= 0 ? t : null
+}
+
+function onQualifiedQuantityChange(val) {
+  const total = parseTotalQty()
+  if (total == null) return
+  let q = val == null || val === '' ? 0 : Number(val)
+  if (!Number.isFinite(q) || q < 0) q = 0
+  if (q > total) q = total
+  q = roundQty(q)
+  form.value.qualifiedQuantity = q
+  form.value.unqualifiedQuantity = roundQty(total - q)
+}
+
+function onUnqualifiedQuantityChange(val) {
+  const total = parseTotalQty()
+  if (total == null) return
+  let u = val == null || val === '' ? 0 : Number(val)
+  if (!Number.isFinite(u) || u < 0) u = 0
+  if (u > total) u = total
+  u = roundQty(u)
+  form.value.unqualifiedQuantity = u
+  form.value.qualifiedQuantity = roundQty(total - u)
+}
+
+function onTotalQuantityChange() {
+  const total = parseTotalQty()
+  if (total == null) return
+  const q = form.value.qualifiedQuantity != null && form.value.qualifiedQuantity !== '' ? Number(form.value.qualifiedQuantity) : NaN
+  const u = form.value.unqualifiedQuantity != null && form.value.unqualifiedQuantity !== '' ? Number(form.value.unqualifiedQuantity) : NaN
+  if (!Number.isFinite(q) && !Number.isFinite(u)) {
+    form.value.qualifiedQuantity = roundQty(total)
+    form.value.unqualifiedQuantity = 0
+    return
+  }
+  if (Number.isFinite(q) && Number.isFinite(u)) {
+    const sum = q + u
+    if (sum > total + 0.001) {
+      const nq = roundQty(Math.min(Math.max(0, q), total))
+      form.value.qualifiedQuantity = nq
+      form.value.unqualifiedQuantity = roundQty(total - nq)
+    }
+    return
+  }
+  if (Number.isFinite(q)) {
+    const nq = roundQty(Math.min(Math.max(0, q), total))
+    form.value.qualifiedQuantity = nq
+    form.value.unqualifiedQuantity = roundQty(total - nq)
+  } else if (Number.isFinite(u)) {
+    const nu = roundQty(Math.min(Math.max(0, u), total))
+    form.value.unqualifiedQuantity = nu
+    form.value.qualifiedQuantity = roundQty(total - nu)
+  }
+}
+
+function ensureQtyPairInitialized() {
+  const total = parseTotalQty()
+  if (total == null) return
+  const qEmpty = form.value.qualifiedQuantity == null || form.value.qualifiedQuantity === ''
+  const uEmpty = form.value.unqualifiedQuantity == null || form.value.unqualifiedQuantity === ''
+  if (qEmpty && uEmpty) {
+    form.value.qualifiedQuantity = roundQty(total)
+    form.value.unqualifiedQuantity = 0
+  }
+}
+
 const supplierList = ref([]);
 const productOptions = ref([]);
 const currentProductId = ref(0);
@@ -318,8 +435,9 @@
     unit: "",
     thickness: "",
     quantity: "",
+    qualifiedQuantity: null,
+    unqualifiedQuantity: null,
     checkCompany: "",
-    checkResult: "",
     reviewName: "",
   }
   approverNodes.value = [{ id: 1, userId: null }];
@@ -332,6 +450,7 @@
     // 鍏堜繚瀛� testStandardId锛岄伩鍏嶈娓呯┖
     const savedTestStandardId = row.testStandardId;
     form.value = {...row}
+    normalizeQuantitiesFromLegacy()
     if (form.value.approveUserIds) {
       const ids = String(form.value.approveUserIds)
         .split(",")
@@ -474,6 +593,10 @@
 const submitForm = () => {
   proxy.$refs.formRef.validate(valid => {
     if (valid) {
+      ensureQtyPairInitialized()
+      if (!assertQtySplitOrError()) {
+        return
+      }
       const hasEmptyApprover = approverNodes.value.some(node => !node.userId);
       if (hasEmptyApprover) {
         proxy.$modal.msgError("璇蜂负鎵�鏈夊鎵硅妭鐐归�夋嫨瀹℃壒浜猴紒");
diff --git a/src/views/qualityManagement/rawMaterialInspection/components/inspectionFormDia.vue b/src/views/qualityManagement/rawMaterialInspection/components/inspectionFormDia.vue
index 411856c..6227664 100644
--- a/src/views/qualityManagement/rawMaterialInspection/components/inspectionFormDia.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/components/inspectionFormDia.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script setup>
-import {ref} from "vue";
+import {ref, getCurrentInstance} from "vue";
 import {Search} from "@element-plus/icons-vue";
 import {
   qualityInspectParamDel,
diff --git a/src/views/qualityManagement/rawMaterialInspection/index.vue b/src/views/qualityManagement/rawMaterialInspection/index.vue
index 3ba4df4..845d433 100644
--- a/src/views/qualityManagement/rawMaterialInspection/index.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/index.vue
@@ -133,34 +133,46 @@
     width: 120
   },
   {
+    label: "鍚堟牸鏁伴噺",
+    prop: "qualifiedQuantity",
+    width: 100
+  },
+  {
+    label: "涓嶅悎鏍兼暟閲�",
+    prop: "unqualifiedQuantity",
+    width: 100
+  },
+  {
+    label: "鍚堟牸鐜�",
+    prop: "passRate",
+    width: 100,
+    dataType: "tag",
+    formatData: (params) => {
+      if (params == null || params === '') return '鈥�';
+      const n = Number(params);
+      if (Number.isNaN(n)) return '鈥�';
+      return `${n.toFixed(2)}%`;
+    },
+    formatType: (params) => {
+      if (params == null || params === '') return 'info';
+      const n = Number(params);
+      if (Number.isNaN(n)) return 'info';
+      if (n >= 100) return 'success';
+      if (n >= 90) return 'warning';
+      return 'danger';
+    },
+  },
+  {
     label: "妫�娴嬪崟浣�",
     prop: "checkCompany",
     width: 120
   },
   {
-    label: "妫�娴嬬粨鏋�",
-    prop: "checkResult",
-    dataType: "tag",
-    formatType: (params) => {
-      if (params === '涓嶅悎鏍�') {
-        return "danger";
-      } else if (params === '鍚堟牸') {
-        return "success";
-      } else {
-        return null;
-      }
-    },
-  },
-  {
     label: "鎻愪氦鐘舵��",
     prop: "inspectState",
-    formatData: (params) => {
-      if (params) {
-        return "宸叉彁浜�";
-      } else {
-        return "鏈彁浜�";
-      }
-    },
+    dataType: "tag",
+    formatData: (params) => (params == 1 || params === true ? '宸叉彁浜�' : '鏈彁浜�'),
+    formatType: (params) => (params == 1 || params === true ? 'success' : 'info'),
   },
   {
     dataType: "action",
@@ -196,7 +208,7 @@
         name: "鎻愪氦",
         type: "text",
         clickFun: (row) => {
-          submit(row.id);
+          submit(row);
         },
 				disabled: (row) => {
 					// 宸叉彁浜ゅ垯绂佺敤
@@ -341,8 +353,12 @@
 };
 
 // 鎻愪环
-const submit = async (id) => {
-  const res = await submitQualityInspect({id: id})
+const submit = async (row) => {
+  const res = await submitQualityInspect({
+    id: row.id,
+    qualifiedQuantity: row.qualifiedQuantity,
+    unqualifiedQuantity: row.unqualifiedQuantity
+  })
   if (res.code === 200) {
     proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
     getList();

--
Gitblit v1.9.3