From 8ef070c84a703c4a8b838bf9320d68d00a7d6dca Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 28 五月 2026 11:15:32 +0800
Subject: [PATCH] 设备巡检去掉高度限制
---
src/views/qualityManagement/rawMaterialInspection/index.vue | 269 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 226 insertions(+), 43 deletions(-)
diff --git a/src/views/qualityManagement/rawMaterialInspection/index.vue b/src/views/qualityManagement/rawMaterialInspection/index.vue
index 67bf6ef..85505be 100644
--- a/src/views/qualityManagement/rawMaterialInspection/index.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/index.vue
@@ -42,29 +42,78 @@
<FormDia ref="formDia" @close="handleQuery"></FormDia>
<files-dia ref="filesDia" @close="handleQuery"></files-dia>
<!-- 妫�楠岀粨鏋滈�夋嫨瀵硅瘽妗� -->
- <el-dialog v-model="quickCheckVisible" title="妫�楠岀粨鏋�" width="30%" @close="closeQuickCheck">
+ <el-dialog v-model="quickCheckVisible" title="妫�楠�" width="40%" @close="closeQuickCheck">
<el-form :model="quickCheckForm" label-width="140px" label-position="top" ref="quickCheckRef">
- <el-form-item label="妫�娴嬬粨鏋滐細" required>
- <el-radio-group v-model="quickCheckForm.checkResult">
- <el-radio value="鍚堟牸">鍚堟牸</el-radio>
- <el-radio value="涓嶅悎鏍�">涓嶅悎鏍�</el-radio>
- </el-radio-group>
- </el-form-item>
- <el-form-item label="妫�楠屽憳锛�">
- <el-select v-model="quickCheckForm.checkName" placeholder="璇烽�夋嫨" clearable style="width: 100%">
- <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName" :value="item.nickName"/>
- </el-select>
- </el-form-item>
- <el-form-item label="妫�娴嬫棩鏈燂細">
- <el-date-picker
- v-model="quickCheckForm.checkTime"
- type="date"
- placeholder="璇烽�夋嫨鏃ユ湡"
- value-format="YYYY-MM-DD"
- format="YYYY-MM-DD"
- clearable
- style="width: 100%"
- />
+ <el-row :gutter="20">
+ <el-col :span="12">
+ <el-form-item label="妫�娴嬬粨鏋滐細" required>
+ <el-radio-group v-model="quickCheckForm.checkResult">
+ <el-radio value="鍚堟牸">鍚堟牸</el-radio>
+ <el-radio value="涓嶅悎鏍�">涓嶅悎鏍�</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="妫�楠屽憳锛�" required>
+ <el-select v-model="quickCheckForm.checkName" placeholder="璇烽�夋嫨" clearable style="width: 100%">
+ <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName" :value="item.nickName"/>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="12">
+ <el-form-item label="妫�娴嬫棩鏈燂細" required>
+ <el-date-picker
+ v-model="quickCheckForm.checkTime"
+ type="date"
+ placeholder="璇烽�夋嫨鏃ユ湡"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ clearable
+ style="width: 100%"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鎸囨爣閫夋嫨锛�">
+ <el-select
+ v-model="quickCheckForm.testStandardId"
+ placeholder="璇烽�夋嫨鎸囨爣"
+ clearable
+ @change="handleTestStandardChange"
+ style="width: 100%"
+ >
+ <el-option
+ v-for="item in testStandardOptions"
+ :key="item.id"
+ :label="item.standardName || item.standardNo"
+ :value="item.id"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="12">
+ <el-form-item label="妫�娴嬪崟浣嶏細">
+ <el-input v-model="quickCheckForm.checkCompany" placeholder="璇疯緭鍏�" clearable style="width: 100%"/>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <!-- 妫�楠屽�艰〃鏍� -->
+ <el-form-item label="妫�楠屽�硷細" v-if="quickCheckTableData.length > 0">
+ <PIMTable
+ rowKey="id"
+ :column="quickCheckTableColumn"
+ :tableData="quickCheckTableData"
+ :tableLoading="quickCheckTableLoading"
+ height="200"
+ >
+ <template #slot="{ row }">
+ <el-input v-model="row.testValue" clearable placeholder="璇疯緭鍏ユ楠屽��"/>
+ </template>
+ </PIMTable>
</el-form-item>
</el-form>
<template #footer>
@@ -104,9 +153,12 @@
import {
downloadQualityInspect,
qualityInspectDel,
+ qualityInspectDetail,
qualityInspectListPage, qualityInspectUpdate,
- submitQualityInspect
+ submitQualityInspect,
+ qualityInspectExportNew
} from "@/api/qualityManagement/rawMaterialInspection.js";
+import {qualityInspectDetailByProductId, getQualityTestStandardParamByTestStandardId} from "@/api/qualityManagement/metricMaintenance.js";
import FilesDia from "@/views/qualityManagement/rawMaterialInspection/components/filesDia.vue";
import dayjs from "dayjs";
import {userListNoPage} from "@/api/system/user.js";
@@ -273,9 +325,38 @@
const quickCheckForm = ref({
checkResult: "鍚堟牸",
checkName: "",
- checkTime: ""
+ checkTime: "",
+ testStandardId: "",
+ checkCompany: ""
});
const quickCheckRef = ref(null);
+const testStandardOptions = ref([]); // 鎸囨爣閫夋嫨涓嬫媺妗嗘暟鎹�
+const quickCheckTableColumn = ref([
+ {
+ label: "鎸囨爣",
+ prop: "parameterItem",
+ },
+ {
+ label: "鍗曚綅",
+ prop: "unit",
+ },
+ {
+ label: "鏍囧噯鍊�",
+ prop: "standardValue",
+ },
+ {
+ label: "鍐呮帶鍊�",
+ prop: "controlValue",
+ },
+ {
+ label: "妫�楠屽��",
+ prop: "testValue",
+ dataType: 'slot',
+ slot: 'slot',
+ },
+]);
+const quickCheckTableData = ref([]);
+const quickCheckTableLoading = ref(false);
const page = reactive({
current: 1,
size: 100,
@@ -363,17 +444,52 @@
};
// 瀵煎嚭
const handleOut = () => {
- ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
+ // 鍒ゆ柇鏄惁鏈夐�変腑鏁版嵁
+ const hasSelected = selectedRows.value.length > 0;
+
+ const confirmMsg = hasSelected
+ ? "閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�"
+ : "灏嗗鍑哄叏閮ㄦ暟鎹紝鏄惁纭瀵煎嚭锛�";
+
+ ElMessageBox.confirm(confirmMsg, "瀵煎嚭", {
confirmButtonText: "纭",
cancelButtonText: "鍙栨秷",
type: "warning",
})
- .then(() => {
- proxy.download("/quality/qualityInspect/export", {inspectType: 0}, "鍘熸潗鏂欐楠�.xlsx");
- })
- .catch(() => {
- proxy.$modal.msg("宸插彇娑�");
+ .then(() => {
+ // 鏋勫缓瀵煎嚭鍙傛暟
+ const exportData = {
+ inspectType: 0,
+ supplier: searchForm.value.supplier || "",
+ entryDateStart: searchForm.value.entryDateStart || "",
+ entryDateEnd: searchForm.value.entryDateEnd || "",
+ };
+
+ // 濡傛灉鏈夐�変腑鏁版嵁锛屾坊鍔爄ds
+ if (hasSelected) {
+ exportData.ids = selectedRows.value.map(item => item.id);
+ }
+
+ // 璋冪敤鏂板鍑烘帴鍙�
+ qualityInspectExportNew(exportData).then((blobData) => {
+ const blob = new Blob([blobData], {
+ type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+ });
+ const downloadUrl = window.URL.createObjectURL(blob);
+ const link = document.createElement('a');
+ link.href = downloadUrl;
+ link.download = '鍘熸潗鏂欐楠�.xlsx';
+ document.body.appendChild(link);
+ link.click();
+ document.body.removeChild(link);
+ window.URL.revokeObjectURL(downloadUrl);
+ }).catch((error) => {
+ proxy.$modal.msgError("瀵煎嚭澶辫触");
});
+ })
+ .catch(() => {
+ proxy.$modal.msg("宸插彇娑�");
+ });
};
// 鎻愪环
@@ -436,7 +552,18 @@
// 鎵撳紑妫�楠岀粨鏋滈�夋嫨瀵硅瘽妗�
const openQuickCheck = async (row) => {
- currentRow.value = row;
+ // 鍏堣皟鐢ㄨ鎯呮帴鍙ｈ幏鍙栧畬鏁存暟鎹紙鍖呭惈鎸囨爣鍜屾楠屽�硷級
+ let detailData = row;
+ try {
+ const detailRes = await qualityInspectDetail(row.id);
+ if (detailRes.code === 200 && detailRes.data) {
+ detailData = detailRes.data;
+ }
+ } catch (e) {
+ console.error("鑾峰彇妫�楠岃鎯呭け璐�", e);
+ }
+ currentRow.value = detailData;
+
// 鍔犺浇鐢ㄦ埛鍒楄〃锛岀瓫閫� roleIds 鍖呭惈 106 鐨勭敤鎴�
try {
const userLists = await userListNoPage();
@@ -448,13 +575,54 @@
console.error("鍔犺浇妫�楠屽憳鍒楄〃澶辫触", e);
userList.value = [];
}
- // 璁剧疆榛樿鍊硷紙妫�楠屽憳榛樿涓哄綋鍓嶇櫥褰曠敤鎴凤級
+ // 鍔犺浇鎸囨爣閫夐」锛堟牴鎹骇鍝両D锛�
+ if (detailData.productId) {
+ try {
+ const params = {
+ productId: detailData.productId,
+ inspectType: 0
+ };
+ const res = await qualityInspectDetailByProductId(params);
+ testStandardOptions.value = res.data || [];
+ } catch (e) {
+ console.error("鍔犺浇鎸囨爣閫夐」澶辫触", e);
+ testStandardOptions.value = [];
+ }
+ } else {
+ testStandardOptions.value = [];
+ }
+ // 璁剧疆榛樿鍊硷紙浼樺厛浣跨敤璇︽儏鏁版嵁锛屾楠屽憳榛樿涓哄綋鍓嶇櫥褰曠敤鎴凤級
quickCheckForm.value = {
- checkResult: "鍚堟牸",
- checkName: userStore.nickName || "",
- checkTime: dayjs().format("YYYY-MM-DD")
+ checkResult: detailData.checkResult || "鍚堟牸",
+ checkName: detailData.checkName || userStore.nickName || "",
+ checkTime: detailData.checkTime || dayjs().format("YYYY-MM-DD"),
+ testStandardId: detailData.testStandardId || "",
+ checkCompany: detailData.checkCompany || ""
};
+ // 濡傛灉鏈夋楠屽弬鏁版暟鎹紝鍥炴樉鍒拌〃鏍�
+ if (detailData.qualityInspectParams && detailData.qualityInspectParams.length > 0) {
+ quickCheckTableData.value = detailData.qualityInspectParams;
+ } else {
+ quickCheckTableData.value = [];
+ }
quickCheckVisible.value = true;
+};
+
+// 鎸囨爣閫夋嫨鍙樺寲澶勭悊
+const handleTestStandardChange = (testStandardId) => {
+ if (!testStandardId) {
+ quickCheckTableData.value = [];
+ return;
+ }
+ quickCheckTableLoading.value = true;
+ getQualityTestStandardParamByTestStandardId(testStandardId).then(res => {
+ quickCheckTableData.value = res.data || [];
+ }).catch(error => {
+ console.error('鑾峰彇鏍囧噯鍙傛暟澶辫触:', error);
+ quickCheckTableData.value = [];
+ }).finally(() => {
+ quickCheckTableLoading.value = false;
+ });
};
// 鍏抽棴妫�楠岀粨鏋滈�夋嫨瀵硅瘽妗�
@@ -463,8 +631,12 @@
quickCheckForm.value = {
checkResult: "鍚堟牸",
checkName: "",
- checkTime: ""
+ checkTime: "",
+ testStandardId: "",
+ checkCompany: ""
};
+ quickCheckTableData.value = [];
+ testStandardOptions.value = [];
};
// 纭妫�楠岀粨鏋�
@@ -482,14 +654,24 @@
return;
}
+ const checkNameToPass = quickCheckForm.value.checkName;
+ const checkResultToPass = quickCheckForm.value.checkResult;
+ const checkTimeToPass = quickCheckForm.value.checkTime;
+ const testStandardIdToPass = quickCheckForm.value.testStandardId;
+ const checkCompanyToPass = quickCheckForm.value.checkCompany;
+ const qualityInspectParamsToPass = [...quickCheckTableData.value];
+
if (quickCheckForm.value.checkResult === "鍚堟牸") {
// 鍚堟牸锛氱洿鎺ユ彁浜�
const data = {
id: currentRow.value.id,
checkResult: "鍚堟牸",
- checkName: quickCheckForm.value.checkName,
- checkTime: quickCheckForm.value.checkTime,
- inspectType: 0
+ checkName: checkNameToPass,
+ checkTime: checkTimeToPass,
+ testStandardId: testStandardIdToPass,
+ checkCompany: checkCompanyToPass,
+ inspectType: 0,
+ qualityInspectParams: qualityInspectParamsToPass
};
qualityInspectUpdate(data).then(res => {
proxy.$modal.msgSuccess("妫�楠屾垚鍔�");
@@ -497,12 +679,13 @@
getList();
});
} else {
- // 涓嶅悎鏍硷細鎵撳紑璇︾粏濉啓椤甸潰锛屼紶閫掓楠屽憳淇℃伅
- // 鍏堜繚瀛樻楠屽憳鍊硷紝閬垮厤 closeQuickCheck 閲嶇疆鍚庝涪澶�
- const checkNameToPass = quickCheckForm.value.checkName;
+ // 涓嶅悎鏍硷細鎵撳紑璇︾粏濉啓椤甸潰
closeQuickCheck();
nextTick(() => {
- formDia.value?.openDialog("edit", currentRow.value, "涓嶅悎鏍�", checkNameToPass);
+ currentRow.value.checkTime = checkTimeToPass;
+ currentRow.value.checkCompany = checkCompanyToPass;
+ currentRow.value.testStandardId = testStandardIdToPass;
+ formDia.value?.openDialog("edit", currentRow.value, checkResultToPass, checkNameToPass, testStandardIdToPass, checkCompanyToPass, qualityInspectParamsToPass);
});
}
};
--
Gitblit v1.9.3