From 2d3530a7c11557a40807ad7c0b9e302ce6ce3a9f Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期五, 28 八月 2026 10:16:32 +0800
Subject: [PATCH] feat: 综合业务模块页面重构与交互完善
---
src/views/qualityManagement/processInspection/components/formDia.vue | 45 +++++++++++++++++++++++++++++++++++----------
1 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/src/views/qualityManagement/processInspection/components/formDia.vue b/src/views/qualityManagement/processInspection/components/formDia.vue
index 635360f..c82422f 100644
--- a/src/views/qualityManagement/processInspection/components/formDia.vue
+++ b/src/views/qualityManagement/processInspection/components/formDia.vue
@@ -30,6 +30,7 @@
prop="productId">
<el-tree-select v-model="form.productId"
placeholder="璇烽�夋嫨"
+ filterable
clearable
check-strictly
@change="getModels"
@@ -141,7 +142,8 @@
<el-col :span="12">
<el-form-item label="妫�娴嬬粨鏋滐細"
prop="checkResult">
- <el-select v-model="form.checkResult" :disabled="isViewMode">
+ <el-select v-model="form.checkResult"
+ :disabled="isViewMode">
<el-option label="鍚堟牸"
value="鍚堟牸" />
<el-option label="涓嶅悎鏍�"
@@ -200,7 +202,8 @@
@click="submitForm">纭</el-button>
<el-button @click="closeDia">鍙栨秷</el-button>
</template>
- <el-button v-else @click="closeDia">鍏抽棴</el-button>
+ <el-button v-else
+ @click="closeDia">鍏抽棴</el-button>
</div>
</template>
</el-dialog>
@@ -258,11 +261,15 @@
checkName: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
productId: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
productModelId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- testStandardId: [{ required: false, message: "璇烽�夋嫨鎸囨爣", trigger: "change" }],
+ testStandardId: [
+ { required: false, message: "璇烽�夋嫨鎸囨爣", trigger: "change" },
+ ],
unit: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
quantity: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
qualifiedQuantity: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- unqualifiedQuantity: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ unqualifiedQuantity: [
+ { required: true, message: "璇疯緭鍏�", trigger: "blur" },
+ ],
checkCompany: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
checkResult: [{ required: true, message: "璇疯緭鍏�", trigger: "change" }],
},
@@ -270,7 +277,7 @@
const userList = ref([]);
const { form, rules } = toRefs(data);
// 鏄惁涓烘煡鐪嬫ā寮�
- const isViewMode = computed(() => operationType.value === 'view');
+ const isViewMode = computed(() => operationType.value === "view");
// 缂栬緫鏃讹細productMainId 鎴� purchaseLedgerId 浠讳竴鏈夊�煎垯宸ュ簭銆佹暟閲忕疆鐏�
const processQuantityDisabled = computed(() => {
const v = form.value || {};
@@ -283,6 +290,19 @@
{
label: "鎸囨爣",
prop: "parameterItem",
+ },
+ {
+ label: "鍙傛暟绫诲瀷",
+ prop: "parameterType",
+ formatter: (row) => (row.parameterType === 1 ? "鏁板瓧" : row.parameterType === 0 ? "鏂囧瓧" : ""),
+ },
+ {
+ label: "鏈�澶у��",
+ prop: "maxValue",
+ },
+ {
+ label: "鏈�灏忓��",
+ prop: "minValue",
},
{
label: "鍗曚綅",
@@ -445,25 +465,26 @@
modelOptions.value.find(item => item.id == value)?.unit || "";
};
- const handleQualifiedQuantityChange = (value) => {
+ const handleQualifiedQuantityChange = value => {
if (value === null || value === undefined) {
form.value.qualifiedQuantity = 0;
return;
}
const quantity = parseFloat(form.value.quantity) || 0;
const qualified = parseFloat(value) || 0;
- form.value.qualifiedQuantity = qualified > quantity?quantity:qualified;
+ form.value.qualifiedQuantity = qualified > quantity ? quantity : qualified;
form.value.unqualifiedQuantity = Math.max(0, quantity - qualified);
};
- const handleUnqualifiedQuantityChange = (value) => {
+ const handleUnqualifiedQuantityChange = value => {
if (value === null || value === undefined) {
form.value.unqualifiedQuantity = 0;
return;
}
const quantity = parseFloat(form.value.quantity) || 0;
const unqualified = parseFloat(value) || 0;
- form.value.unqualifiedQuantity = unqualified > quantity?quantity:unqualified;
+ form.value.unqualifiedQuantity =
+ unqualified > quantity ? quantity : unqualified;
form.value.qualifiedQuantity = Math.max(0, quantity - unqualified);
};
@@ -571,8 +592,12 @@
tableData.value = res.data || [];
tableData.value = tableData.value.map(item => ({
...item,
- id: null
+ id: null,
}));
+
+ if (tableData.value.some(item => item.parameterType === null || item.parameterType === undefined)) {
+ proxy.$modal.msgWarning("鍙傛暟绫诲瀷鏈厤缃紝璇烽厤缃寚鏍囩淮鎶ゆā鏉�");
+ }
})
.catch(error => {
console.error("鑾峰彇鏍囧噯鍙傛暟澶辫触:", error);
--
Gitblit v1.9.3