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/components/formDia.vue | 63 +++++++++++++++++++++----------
1 files changed, 42 insertions(+), 21 deletions(-)
diff --git a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
index 7e373bf..4559db9 100644
--- a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
@@ -100,7 +100,7 @@
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="妫�楠屽憳锛�" prop="checkName">
- <el-select v-model="form.checkName" placeholder="璇烽�夋嫨" clearable style="width: 100%">
+ <el-select v-model="form.checkName" placeholder="璇烽�夋嫨" clearable style="width: 100%" filterable>
<el-option v-for="item in userList" :key="item.nickName" :label="item.nickName" :value="item.nickName"/>
</el-select>
</el-form-item>
@@ -228,7 +228,7 @@
});
// 鎵撳紑寮规
-const openDialog = async (type, row) => {
+const openDialog = async (type, row, defaultCheckResult = "", defaultCheckName = "", defaultTestStandardId = "", defaultCheckCompany = "", defaultQualityInspectParams = []) => {
operationType.value = type;
getOptions().then((res) => {
supplierList.value = res.data;
@@ -236,34 +236,57 @@
try {
const userRes = await userListNoPage();
- userList.value = userRes.data || [];
+ // 绛涢�� roleIds 鍖呭惈 106 鐨勭敤鎴�
+ userList.value = (userRes.data || []).filter(user => {
+ const roleIds = user.roleIds || [];
+ return roleIds.includes(106) || roleIds.includes('106');
+ });
} catch (e) {
console.error("鍔犺浇妫�楠屽憳鍒楄〃澶辫触", e);
userList.value = [];
}
- // 鍏堥噸缃〃鍗曟暟鎹紙淇濇寔瀛楁瀹屾暣锛岄伩鍏嶅脊绐楅娆℃覆鏌撴椂瑙﹀彂蹇呭～绾㈡鈥滈棯涓�涓嬧�濓級
+ // 鍏堥噸缃〃鍗曟暟鎹紙淇濇寔瀛楁瀹屾暣锛岄伩鍏嶅脊绐楅娆℃覆鏌撴椂瑙﹀彂蹇呭～绾㈡"闂竴涓�"锛�
form.value = {
checkTime: "",
supplier: "",
- checkName: "",
+ checkName: defaultCheckName || "",
productName: "",
productId: "",
productModelId: "",
model: "",
- testStandardId: "",
+ testStandardId: defaultTestStandardId || "",
unit: "",
quantity: "",
- checkCompany: "",
- checkResult: "",
+ 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') {
// 鍏堜繚瀛� testStandardId锛岄伩鍏嶈娓呯┖
const savedTestStandardId = row.testStandardId;
form.value = {...row}
+ // 濡傛灉浼犲叆浜嗛粯璁ゆ娴嬬粨鏋滐紝瑕嗙洊row涓殑鍊�
+ if (defaultCheckResult) {
+ form.value.checkResult = defaultCheckResult;
+ }
+ // 濡傛灉浼犲叆浜嗛粯璁ゆ楠屽憳锛岃鐩杛ow涓殑鍊硷紙浼樺厛浣跨敤浼犲叆鐨勬楠屽憳锛�
+ 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) {
@@ -279,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);
--
Gitblit v1.9.3