From 955c05d19906b0c37c295935943f623bba04995b Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 27 五月 2026 11:48:25 +0800
Subject: [PATCH] feat 质检检测调整

---
 src/views/qualityManagement/processInspection/components/formDia.vue     |    2 
 src/api/basicData/enum.js                                                |    4 
 src/views/productionManagement/workOrder/index.vue                       |    6 
 src/views/qualityManagement/rawMaterialInspection/components/formDia.vue |   44 +-
 src/api/qualityManagement/rawMaterialInspection.js                       |   18 +
 src/views/qualityManagement/rawMaterialInspection/index.vue              |  269 ++++++++++++++--
 src/views/qualityManagement/finalInspection/index.vue                    |  279 ++++++++++++++---
 src/views/qualityManagement/processInspection/index.vue                  |  280 ++++++++++++++---
 8 files changed, 740 insertions(+), 162 deletions(-)

diff --git a/src/api/basicData/enum.js b/src/api/basicData/enum.js
index 350df17..f4c8dba 100644
--- a/src/api/basicData/enum.js
+++ b/src/api/basicData/enum.js
@@ -18,7 +18,7 @@
 // 涓嶅悎鏍煎叆搴撴潵婧愮被鍨�
 export function findAllUnQualifiedStockInRecordTypeOptions() {
     return request({
-        url: '/basic/enum/StockInUnQualifiedRecordTypeEnum',
+        url: '/basic/enum/StockInQualifiedRecordTypeEnum',
         method: 'get'
     })
 }
@@ -34,7 +34,7 @@
 // 涓嶅悎鏍煎嚭搴撴潵婧愮被鍨�
 export function findAllUnQualifiedStockOutRecordTypeOptions() {
     return request({
-        url: '/basic/enum/StockOutUnQualifiedRecordTypeEnum',
+        url: '/basic/enum/StockOutQualifiedRecordTypeEnum',
         method: 'get'
     })
 }
diff --git a/src/api/qualityManagement/rawMaterialInspection.js b/src/api/qualityManagement/rawMaterialInspection.js
index dcb3869..0cb6817 100644
--- a/src/api/qualityManagement/rawMaterialInspection.js
+++ b/src/api/qualityManagement/rawMaterialInspection.js
@@ -9,6 +9,14 @@
     })
 }
 
+// 鏌ヨ妫�楠岃鎯�
+export function qualityInspectDetail(id) {
+    return request({
+        url: '/quality/qualityInspect/' + id,
+        method: 'get',
+    })
+}
+
 // 鏂板鍘熸潗鏂欐楠�
 export function qualityInspectAdd(query) {
     return request({
@@ -55,3 +63,13 @@
     })
 }
 
+// 瀵煎嚭妫�楠岃褰曪紙鏂版帴鍙ｏ紝鏀寔閫変腑瀵煎嚭鍜屾楠屽弬鏁帮級
+export function qualityInspectExportNew(data) {
+    return request({
+        url: '/quality/qualityInspect/exportNew',
+        method: 'post',
+        data: data,
+        responseType: "blob",
+    })
+}
+
diff --git a/src/views/productionManagement/workOrder/index.vue b/src/views/productionManagement/workOrder/index.vue
index 2456dfb..3f9c995 100644
--- a/src/views/productionManagement/workOrder/index.vue
+++ b/src/views/productionManagement/workOrder/index.vue
@@ -1067,9 +1067,9 @@
         clickFun: row => {
           showReportDialog(row);
         },
-        // 鐢ㄦ埛褰撳墠id
-        disabled: row => row.completeQuantity >= row.planQuantity ||
-            !isCurrentUserInUserIds(row) || row.hasUnreportedMachine
+        // // 鐢ㄦ埛褰撳墠id
+        // disabled: row => row.completeQuantity >= row.planQuantity ||
+        //     !isCurrentUserInUserIds(row) || row.hasUnreportedMachine
       },
       {
         name: "鐢熶骇鎺掍骇",
diff --git a/src/views/qualityManagement/finalInspection/index.vue b/src/views/qualityManagement/finalInspection/index.vue
index 456ae7f..1e57190 100644
--- a/src/views/qualityManagement/finalInspection/index.vue
+++ b/src/views/qualityManagement/finalInspection/index.vue
@@ -41,29 +41,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>
@@ -102,9 +151,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/finalInspection/components/filesDia.vue";
 import dayjs from "dayjs";
 import {userListNoPage} from "@/api/system/user.js";
@@ -277,9 +329,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 changeDaterange = (value) => {
   searchForm.value.entryDateStart = undefined;
@@ -363,17 +444,52 @@
 };
 // 瀵煎嚭
 const handleOut = () => {
-  ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
-    confirmButtonText: "纭",
-    cancelButtonText: "鍙栨秷",
-    type: "warning",
-  })
-      .then(() => {
-        proxy.download("/quality/qualityInspect/export", {inspectType: 2}, "鍑哄巶妫�楠�.xlsx");
-      })
-      .catch(() => {
-        proxy.$modal.msg("宸插彇娑�");
-      });
+	// 鍒ゆ柇鏄惁鏈夐�変腑鏁版嵁
+	const hasSelected = selectedRows.value.length > 0;
+
+	const confirmMsg = hasSelected
+		? "閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�"
+		: "灏嗗鍑哄叏閮ㄦ暟鎹紝鏄惁纭瀵煎嚭锛�";
+
+	ElMessageBox.confirm(confirmMsg, "瀵煎嚭", {
+		confirmButtonText: "纭",
+		cancelButtonText: "鍙栨秷",
+		type: "warning",
+	})
+		.then(() => {
+			// 鏋勫缓瀵煎嚭鍙傛暟
+			const exportData = {
+				inspectType: 2,
+				productName: searchForm.value.productName || "",
+				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: 2
+			};
+			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: 2
+			checkName: checkNameToPass,
+			checkTime: checkTimeToPass,
+			testStandardId: testStandardIdToPass,
+			checkCompany: checkCompanyToPass,
+			inspectType: 2,
+			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);
 		});
 	}
 };
diff --git a/src/views/qualityManagement/processInspection/components/formDia.vue b/src/views/qualityManagement/processInspection/components/formDia.vue
index fb2f830..d5aca1a 100644
--- a/src/views/qualityManagement/processInspection/components/formDia.vue
+++ b/src/views/qualityManagement/processInspection/components/formDia.vue
@@ -216,7 +216,7 @@
 const modelOptions = ref([]);
 
 // 鎵撳紑寮规
-const openDialog = async (type, row, defaultCheckResult = "", defaultCheckName = "") => {
+const openDialog = async (type, row, defaultCheckResult = "", defaultCheckName = "", defaultTestStandardId = "", defaultCheckCompany = "", defaultQualityInspectParams = []) => {
 	operationType.value = type;
 	getOptions().then((res) => {
 		supplierList.value = res.data;
diff --git a/src/views/qualityManagement/processInspection/index.vue b/src/views/qualityManagement/processInspection/index.vue
index cf1e77c..e8c890c 100644
--- a/src/views/qualityManagement/processInspection/index.vue
+++ b/src/views/qualityManagement/processInspection/index.vue
@@ -41,29 +41,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>
@@ -102,9 +151,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/processInspection/components/filesDia.vue";
 import dayjs from "dayjs";
 import {userListNoPage} from "@/api/system/user.js";
@@ -272,9 +324,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,
@@ -420,22 +501,68 @@
 };
 // 瀵煎嚭
 const handleOut = () => {
-  ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
-    confirmButtonText: "纭",
-    cancelButtonText: "鍙栨秷",
-    type: "warning",
-  })
-      .then(() => {
-        proxy.download("/quality/qualityInspect/export", {inspectType: 1}, "杩囩▼妫�楠�.xlsx");
-      })
-      .catch(() => {
-        proxy.$modal.msg("宸插彇娑�");
-      });
+	// 鍒ゆ柇鏄惁鏈夐�変腑鏁版嵁
+	const hasSelected = selectedRows.value.length > 0;
+
+	const confirmMsg = hasSelected
+		? "閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�"
+		: "灏嗗鍑哄叏閮ㄦ暟鎹紝鏄惁纭瀵煎嚭锛�";
+
+	ElMessageBox.confirm(confirmMsg, "瀵煎嚭", {
+		confirmButtonText: "纭",
+		cancelButtonText: "鍙栨秷",
+		type: "warning",
+	})
+		.then(() => {
+			// 鏋勫缓瀵煎嚭鍙傛暟
+			const exportData = {
+				inspectType: 1,
+				process: searchForm.value.process || "",
+				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("宸插彇娑�");
+		});
 };
 
 // 鎵撳紑妫�楠岀粨鏋滈�夋嫨瀵硅瘽妗�
 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();
@@ -447,13 +574,55 @@
 		console.error("鍔犺浇妫�楠屽憳鍒楄〃澶辫触", e);
 		userList.value = [];
 	}
-	// 璁剧疆榛樿鍊硷紙妫�楠屽憳榛樿涓哄綋鍓嶇櫥褰曠敤鎴凤級
+	// 鍔犺浇鎸囨爣閫夐」锛堟牴鎹骇鍝両D锛�
+	if (detailData.productId) {
+		try {
+			const params = {
+				productId: detailData.productId,
+				inspectType: 1,
+				process: detailData.process || ''
+			};
+			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;
+  });
 };
 
 // 鍏抽棴妫�楠岀粨鏋滈�夋嫨瀵硅瘽妗�
@@ -462,8 +631,12 @@
 	quickCheckForm.value = {
 		checkResult: "鍚堟牸",
 		checkName: "",
-		checkTime: ""
+		checkTime: "",
+		testStandardId: "",
+		checkCompany: ""
 	};
+	quickCheckTableData.value = [];
+	testStandardOptions.value = [];
 };
 
 // 纭妫�楠岀粨鏋�
@@ -481,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: 1
+			checkName: checkNameToPass,
+			checkTime: checkTimeToPass,
+			testStandardId: testStandardIdToPass,
+			checkCompany: checkCompanyToPass,
+			inspectType: 1,
+			qualityInspectParams: qualityInspectParamsToPass
 		};
 		qualityInspectUpdate(data).then(res => {
 			proxy.$modal.msgSuccess("妫�楠屾垚鍔�");
@@ -496,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);
 		});
 	}
 };
diff --git a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
index bec44df..4559db9 100644
--- a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
@@ -228,7 +228,7 @@
 });
 
 // 鎵撳紑寮规
-const openDialog = async (type, row, defaultCheckResult = "", defaultCheckName = "") => {
+const openDialog = async (type, row, defaultCheckResult = "", defaultCheckName = "", defaultTestStandardId = "", defaultCheckCompany = "", defaultQualityInspectParams = []) => {
   operationType.value = type;
   getOptions().then((res) => {
     supplierList.value = res.data;
@@ -254,14 +254,19 @@
     productId: "",
     productModelId: "",
     model: "",
-    testStandardId: "",
+    testStandardId: defaultTestStandardId || "",
     unit: "",
     quantity: "",
-    checkCompany: "",
+    checkCompany: defaultCheckCompany || "",
     checkResult: defaultCheckResult || "",
   }
   testStandardOptions.value = [];
-  tableData.value = [];
+  // 濡傛灉浠庢楠屽脊绐椾紶鍏ヤ簡鍙傛暟鏁版嵁锛岀洿鎺ヤ娇鐢紱鍚﹀垯娓呯┖
+  if (defaultQualityInspectParams && defaultQualityInspectParams.length > 0) {
+    tableData.value = defaultQualityInspectParams;
+  } else {
+    tableData.value = [];
+  }
   // 鍏堢‘淇濅骇鍝佹爲宸插姞杞斤紝鍚﹀垯缂栬緫鏃朵骇鍝�/瑙勬牸鍨嬪彿鏃犳硶鍙嶆樉
   await getProductOptions();
   if (operationType.value === 'edit') {
@@ -273,8 +278,15 @@
       form.value.checkResult = defaultCheckResult;
     }
     // 濡傛灉浼犲叆浜嗛粯璁ゆ楠屽憳锛岃鐩杛ow涓殑鍊硷紙浼樺厛浣跨敤浼犲叆鐨勬楠屽憳锛�
-    console.log('formDia checkName debug:', { defaultCheckName, rowCheckName: row.checkName });
     form.value.checkName = defaultCheckName || row.checkName || "";
+    // 濡傛灉浼犲叆浜嗛粯璁ゆ寚鏍囬�夋嫨锛岃鐩杛ow涓殑鍊�
+    if (defaultTestStandardId) {
+      form.value.testStandardId = defaultTestStandardId;
+    }
+    // 濡傛灉浼犲叆浜嗛粯璁ゆ娴嬪崟浣嶏紝瑕嗙洊row涓殑鍊�
+    if (defaultCheckCompany) {
+      form.value.checkCompany = defaultCheckCompany;
+    }
     currentProductId.value = row.productId || 0
     // 鍏抽敭锛氱紪杈戞椂鍔犺浇瑙勬牸鍨嬪彿涓嬫媺閫夐」锛屾墠鑳藉弽鏄� productModelId
     if (currentProductId.value) {
@@ -290,37 +302,35 @@
         modelOptions.value = [];
       }
     }
-    // 缂栬緫妯″紡涓嬶紝鍏堝姞杞芥寚鏍囬�夐」锛岀劧鍚庡姞杞藉弬鏁板垪琛�
+    // 缂栬緫妯″紡涓嬶紝鍏堝姞杞芥寚鏍囬�夐」
     if (currentProductId.value) {
-      // 鍏堝姞杞芥寚鏍囬�夐」
       let params = {
         productId: currentProductId.value,
         inspectType: 0
       }
       qualityInspectDetailByProductId(params).then(res => {
         testStandardOptions.value = res.data || [];
-        // 浣跨敤 nextTick 鍜� setTimeout 纭繚閫夐」宸茬粡娓叉煋鍒� DOM
         nextTick(() => {
           setTimeout(() => {
-            // 濡傛灉缂栬緫鏁版嵁涓湁 testStandardId锛屽垯璁剧疆骞跺姞杞藉搴旂殑鍙傛暟
-            if (savedTestStandardId) {
-              // 纭繚绫诲瀷鍖归厤锛坕tem.id 鍙兘鏄暟瀛楁垨瀛楃涓诧級
-              const matchedOption = testStandardOptions.value.find(item => 
+            // 濡傛灉浠庢楠屽脊绐椾紶鍏ヤ簡鍙傛暟鏁版嵁锛岀洿鎺ヤ娇鐢紱鍚﹀垯鍔犺浇鍘熷弬鏁版暟鎹�
+            if (defaultQualityInspectParams && defaultQualityInspectParams.length > 0) {
+              // 宸茬粡鍦ㄤ笂闈㈣缃簡 tableData锛岃繖閲屽彧闇�瑕佽缃� testStandardId
+              if (defaultTestStandardId) {
+                form.value.testStandardId = defaultTestStandardId;
+              }
+            } else if (savedTestStandardId) {
+              // 娌℃湁浼犲叆鍙傛暟鏁版嵁锛屼娇鐢ㄥ師鏈夐�昏緫
+              const matchedOption = testStandardOptions.value.find(item =>
                 item.id == savedTestStandardId || String(item.id) === String(savedTestStandardId)
               );
               if (matchedOption) {
-                // 纭繚浣跨敤鍖归厤椤圭殑 id锛堜繚鎸佺被鍨嬩竴鑷达級
                 form.value.testStandardId = matchedOption.id;
-                // 缂栬緫淇濈暀鍘熸楠屽�硷紝鐩存帴鎷夊彇鍘熷弬鏁版暟鎹�
                 getQualityInspectParamList(row.id);
               } else {
-                // 濡傛灉鎵句笉鍒板尮閰嶉」锛屽皾璇曠洿鎺ヤ娇鐢ㄥ師鍊�
-                console.warn('鏈壘鍒板尮閰嶇殑鎸囨爣閫夐」锛宼estStandardId:', savedTestStandardId, '鍙敤閫夐」:', testStandardOptions.value);
                 form.value.testStandardId = savedTestStandardId;
                 getQualityInspectParamList(row.id);
               }
             } else {
-              // 鍚﹀垯浣跨敤鏃х殑閫昏緫
               getQualityInspectParamList(row.id);
             }
           }, 100);
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