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/rawMaterialInspection/components/formDia.vue | 296 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 282 insertions(+), 14 deletions(-)
diff --git a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
index 5170b60..18e7df8 100644
--- a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
@@ -83,24 +83,29 @@
</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-row>
- <el-row :gutter="30">
<el-col :span="12">
<el-form-item label="妫�娴嬪崟浣嶏細" prop="checkCompany">
<el-input v-model="form.checkCompany" placeholder="璇疯緭鍏�" clearable/>
</el-form-item>
</el-col>
+ </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>
@@ -112,6 +117,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
@@ -123,6 +130,47 @@
clearable
style="width: 100%"
/>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="24">
+ <el-form-item>
+ <template #label>
+ <div style="display: flex; align-items: center; justify-content: space-between; width: 100%;">
+ <span>瀹℃壒浜洪�夋嫨锛�</span>
+ <el-button type="primary"
+ size="small"
+ @click="addApproverNode"
+ icon="Plus">鏂板鑺傜偣</el-button>
+ </div>
+ </template>
+ <div class="approver-nodes-container">
+ <div v-for="(node, index) in approverNodes"
+ :key="node.id"
+ class="approver-node-item">
+ <div class="approver-node-header">
+ <span class="approver-node-label">瀹℃壒鑺傜偣 {{ index + 1 }}</span>
+ <el-button v-if="approverNodes.length > 1"
+ type="danger"
+ size="small"
+ text
+ @click="removeApproverNode(index)"
+ icon="Delete">鍒犻櫎</el-button>
+ </div>
+ <el-select v-model="node.userId"
+ placeholder="璇烽�夋嫨瀹℃壒浜�"
+ filterable
+ style="width: 100%">
+ <el-option
+ v-for="item in approverList"
+ :key="item.userId"
+ :label="item.userName"
+ :value="item.userId"
+ />
+ </el-select>
+ </div>
+ </div>
</el-form-item>
</el-col>
</el-row>
@@ -159,6 +207,7 @@
import {qualityInspectParamDel, qualityInspectParamInfo} from "@/api/qualityManagement/qualityInspectParam.js";
import {qualityInspectDetailByProductId, getQualityTestStandardParamByTestStandardId} from "@/api/qualityManagement/metricMaintenance.js";
import {userListNoPage} from "@/api/system/user.js";
+import { approveUserList } from "@/api/collaborativeApproval/approvalProcess.js";
const {proxy} = getCurrentInstance()
const emit = defineEmits(['close'])
@@ -178,8 +227,10 @@
unit: "",
thickness: "",
quantity: "",
+ qualifiedQuantity: null,
+ unqualifiedQuantity: null,
checkCompany: "",
- checkResult: "",
+ reviewName: "",
},
rules: {
checkTime: [{required: true, message: "璇疯緭鍏�", trigger: "blur"},],
@@ -192,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([
@@ -223,12 +275,129 @@
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);
const testStandardOptions = ref([]); // 鎸囨爣閫夋嫨涓嬫媺妗嗘暟鎹�
const modelOptions = ref([]);
const userList = ref([]); // 妫�楠屽憳涓嬫媺鍒楄〃
+const approverList = ref([]); // 瀹℃壒浜轰笅鎷夊垪琛�
+const approverNodes = ref([{ id: 1, userId: null }]);
+let nextApproverId = 2;
+const addApproverNode = () => {
+ approverNodes.value.push({ id: nextApproverId++, userId: null });
+};
+const removeApproverNode = index => {
+ approverNodes.value.splice(index, 1);
+};
// 缂栬緫鏃讹細productMainId 鎴� purchaseLedgerId 浠讳竴鏈夊�煎垯渚涘簲鍟嗐�佹暟閲忕疆鐏�
const supplierQuantityDisabled = computed(() => {
@@ -246,9 +415,12 @@
try {
const userRes = await userListNoPage();
userList.value = userRes.data || [];
+ const approverRes = await approveUserList({ approveType: 9 });
+ approverList.value = approverRes.data || [];
} catch (e) {
- console.error("鍔犺浇妫�楠屽憳鍒楄〃澶辫触", e);
+ console.error("鍔犺浇浜哄憳鍒楄〃澶辫触", e);
userList.value = [];
+ approverList.value = [];
}
// 鍏堥噸缃〃鍗曟暟鎹紙淇濇寔瀛楁瀹屾暣锛岄伩鍏嶅脊绐楅娆℃覆鏌撴椂瑙﹀彂蹇呭～绾㈡鈥滈棯涓�涓嬧�濓級
form.value = {
@@ -263,9 +435,13 @@
unit: "",
thickness: "",
quantity: "",
+ qualifiedQuantity: null,
+ unqualifiedQuantity: null,
checkCompany: "",
- checkResult: "",
+ reviewName: "",
}
+ approverNodes.value = [{ id: 1, userId: null }];
+ nextApproverId = 2;
testStandardOptions.value = [];
tableData.value = [];
// 鍏堢‘淇濅骇鍝佹爲宸插姞杞斤紝鍚﹀垯缂栬緫鏃朵骇鍝�/瑙勬牸鍨嬪彿鏃犳硶鍙嶆樉
@@ -274,6 +450,26 @@
// 鍏堜繚瀛� testStandardId锛岄伩鍏嶈娓呯┖
const savedTestStandardId = row.testStandardId;
form.value = {...row}
+ normalizeQuantitiesFromLegacy()
+ if (form.value.approveUserIds) {
+ const ids = String(form.value.approveUserIds)
+ .split(",")
+ .map(id => id.trim())
+ .filter(Boolean);
+ if (ids.length > 0) {
+ approverNodes.value = ids.map((id, index) => ({
+ id: index + 1,
+ userId: Number(id),
+ }));
+ nextApproverId = ids.length + 1;
+ }
+ } else if (form.value.reviewName) {
+ const matchedReviewer = approverList.value.find(item => item.userName === form.value.reviewName);
+ if (matchedReviewer?.userId) {
+ approverNodes.value = [{ id: 1, userId: matchedReviewer.userId }];
+ nextApproverId = 2;
+ }
+ }
currentProductId.value = row.productId || 0
// 鍏抽敭锛氱紪杈戞椂鍔犺浇瑙勬牸鍨嬪彿涓嬫媺閫夐」锛屾墠鑳藉弽鏄� productModelId
if (currentProductId.value) {
@@ -397,13 +593,33 @@
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("璇蜂负鎵�鏈夊鎵硅妭鐐归�夋嫨瀹℃壒浜猴紒");
+ return;
+ }
+ const approveUserIds = approverNodes.value.map(node => node.userId).join(",");
+ const firstApproverName =
+ approverList.value.find(item => String(item.userId) === String(approverNodes.value[0]?.userId))
+ ?.userName || "";
form.value.inspectType = 0
if (operationType.value === "add") {
tableData.value.forEach((item) => {
delete item.id
})
}
- const data = {...form.value, qualityInspectParams: tableData.value}
+ const data = {
+ ...form.value,
+ reviewName: firstApproverName,
+ approveUserIds,
+ // 鍏煎鍚庣涓嶅悓瀛楁鍛藉悕
+ auditName: firstApproverName,
+ qualityInspectParams: tableData.value,
+ }
if (operationType.value === "add") {
qualityInspectAdd(data).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
@@ -464,6 +680,8 @@
// 鍏抽棴寮规
const closeDia = () => {
proxy.resetForm("formRef");
+ approverNodes.value = [{ id: 1, userId: null }];
+ nextApproverId = 2;
tableData.value = [];
testStandardOptions.value = [];
form.value.testStandardId = '';
@@ -488,4 +706,54 @@
cursor: not-allowed;
}
+.approver-nodes-container {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 16px;
+ padding: 16px;
+ background-color: #f8f9fa;
+ border-radius: 4px;
+ border: 1px solid #e4e7ed;
+}
+
+.approver-node-item {
+ flex: 0 0 calc(33.333% - 12px);
+ min-width: 200px;
+ padding: 12px;
+ background-color: #fff;
+ border-radius: 4px;
+ border: 1px solid #dcdfe6;
+ transition: all 0.3s;
+}
+
+.approver-node-item:hover {
+ border-color: #409eff;
+ box-shadow: 0 2px 8px rgba(64, 158, 255, 0.1);
+}
+
+.approver-node-header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ margin-bottom: 8px;
+}
+
+.approver-node-label {
+ font-size: 13px;
+ font-weight: 500;
+ color: #606266;
+}
+
+@media (max-width: 1200px) {
+ .approver-node-item {
+ flex: 0 0 calc(50% - 8px);
+ }
+}
+
+@media (max-width: 768px) {
+ .approver-node-item {
+ flex: 0 0 100%;
+ }
+}
+
</style>
\ No newline at end of file
--
Gitblit v1.9.3