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 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 135 insertions(+), 15 deletions(-)
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") {
--
Gitblit v1.9.3