From b4660addf0c30b6d07ec826f0802d50998367db8 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 24 三月 2026 16:12:04 +0800
Subject: [PATCH] fix:首页质量统计数据优化
---
src/views/qualityManagement/nonconformingManagement/components/formDia.vue | 330 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 275 insertions(+), 55 deletions(-)
diff --git a/src/views/qualityManagement/nonconformingManagement/components/formDia.vue b/src/views/qualityManagement/nonconformingManagement/components/formDia.vue
index b464762..d5836a2 100644
--- a/src/views/qualityManagement/nonconformingManagement/components/formDia.vue
+++ b/src/views/qualityManagement/nonconformingManagement/components/formDia.vue
@@ -2,34 +2,16 @@
<div>
<el-dialog
v-model="dialogFormVisible"
- :title="operationType === 'add' ? '鏂板鍘熸潗鏂欐楠�' : '缂栬緫鍘熸潗鏂欐楠�'"
+ :title="operationType === 'add' ? '鏂板涓嶅悎鏍肩鐞�' : '缂栬緫涓嶅悎鏍肩鐞�'"
width="70%"
@close="closeDia"
>
<el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="鐘舵�侊細" prop="inspectState">
- <el-select v-model="form.inspectState">
- <el-option label="寰呭鐞�" :value="0" />
- <el-option label="宸插鐞�" :value="1" />
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="绫诲埆锛�" prop="inspectType">
- <el-select v-model="form.inspectType">
- <el-option label="鍘熸潗鏂欐楠�" :value="0" />
- <el-option label="杩囩▼妫�楠�" :value="1" />
- <el-option label="鍑哄巶妫�楠�" :value="2" />
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="30">
- <el-col :span="12">
<el-form-item label="浜у搧鍚嶇О锛�" prop="productId">
<el-tree-select
+ v-if="operationType !== 'edit'"
v-model="form.productId"
placeholder="璇烽�夋嫨"
clearable
@@ -39,30 +21,81 @@
:render-after-expand="false"
style="width: 100%"
/>
+ <!-- 缂栬緫鎬侊細涓嶄緷璧栦笅鎷夐�夐」鍥炴樉锛岀洿鎺ュ睍绀烘枃鏈� -->
+ <el-input
+ v-else
+ v-model="form.productName"
+ disabled
+ style="width: 100%"
+ />
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="model">
- <el-input v-model="form.model" placeholder="璇疯緭鍏�" clearable/>
+ <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="productModelId">
+ <el-select
+ v-if="operationType !== 'edit'"
+ v-model="form.productModelId"
+ placeholder="璇烽�夋嫨"
+ clearable
+ filterable
+ readonly
+ @change="handleChangeModel"
+ >
+ <el-option
+ v-for="item in modelOptions"
+ :key="item.id"
+ :label="item.model"
+ :value="item.id"
+ />
+ </el-select>
+ <!-- 缂栬緫鎬侊細涓嶅睍绀鸿鏍煎瀷鍙峰垪琛紝鐩存帴灞曠ず鏂囨湰 -->
+ <el-input
+ v-else
+ v-model="form.model"
+ disabled
+ style="width: 100%"
+ />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="鍗曚綅锛�" prop="unit">
- <el-input v-model="form.unit" placeholder="璇疯緭鍏�" clearable/>
+ <el-input v-model="form.unit" disabled/>
</el-form-item>
</el-col>
<el-col :span="12">
- <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"/>
+ <el-form-item label="鎵瑰彿锛�" prop="batchNo">
+ <el-input style="width: 100%" v-model="form.batchNo" placeholder="璇疯緭鍏�" clearable/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
+ <el-form-item label="妫�楠岀被鍨嬶細" prop="checkType">
+ <el-select v-model="form.checkType">
+ <el-option label="鍏ュ巶妫�" :value="0"/>
+ <el-option label="杞﹂棿妫�" :value="1"/>
+ <el-option label="鍑哄巶妫�" :value="2"/>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <!-- <el-col :span="12">
+ <el-form-item label="妫�娴嬬粨鏋滐細" prop="checkResult">
+ <el-select v-model="form.checkResult">
+ <el-option label="鍚堟牸" :value="1"/>
+ <el-option label="涓嶅悎鏍�" :value="0"/>
+ </el-select>
+ </el-form-item>
+ </el-col> -->
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="12">
<el-form-item label="妫�楠屽憳锛�" prop="checkName">
- <el-input v-model="form.checkName" placeholder="璇疯緭鍏�" clearable/>
+ <el-select v-model="form.checkName" placeholder="璇烽�夋嫨" clearable filterable 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-col :span="12">
@@ -87,14 +120,25 @@
</el-col>
<el-col :span="12">
<el-form-item label="澶勭悊缁撴灉锛�" prop="dealResult">
- <el-input v-model="form.dealResult" placeholder="璇疯緭鍏�" clearable/>
+ <el-select v-model="form.dealResult" placeholder="鎶ュ簾" disabled>
+ <el-option
+ :label="item.label"
+ :value="item.value"
+ v-for="item in rejection_handling"
+ :key="item.value"
+ :disabled="String(item.label) !== '鎶ュ簾'"
+ />
+ </el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="澶勭悊浜猴細" prop="dealName">
- <el-input v-model="form.dealName" placeholder="璇疯緭鍏�" clearable/>
+ <el-select v-model="form.dealName" placeholder="璇烽�夋嫨" clearable filterable 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-col :span="12">
@@ -123,69 +167,216 @@
</template>
<script setup>
-import {ref} from "vue";
-import {productTreeList} from "@/api/basicData/product.js";
+import {ref, reactive, toRefs, getCurrentInstance} from "vue";
+import {modelList, productTreeList} from "@/api/basicData/product.js";
import {
getQualityUnqualifiedInfo,
qualityUnqualifiedAdd,
qualityUnqualifiedUpdate
} from "@/api/qualityManagement/nonconformingManagement.js";
+import {userListNoPage} from "@/api/system/user.js";
const { proxy } = getCurrentInstance()
const emit = defineEmits(['close'])
const dialogFormVisible = ref(false);
const operationType = ref('')
+const { rejection_handling } = proxy.useDict("rejection_handling")
+
+const getScrapDealResultValue = () => {
+ const list = rejection_handling?.value || rejection_handling || [];
+ const scrap = (list || []).find((it) => String(it?.label ?? "") === "鎶ュ簾");
+ return scrap?.value ?? "";
+};
const data = reactive({
form: {
checkTime: "",
- process: "",
checkName: "",
productName: "",
productId: "",
+ productModelId: "",
model: "",
unit: "",
- quantity: "",
- checkCompany: "",
+ batchNo: "",
+ checkType: undefined,
checkResult: "",
- inspectState: '',
- inspectType: '',
defectivePhenomena: '',
dealResult: '',
+ dealName: "",
+ dealTime: "",
},
rules: {
- checkTime: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" },],
- process: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- checkName: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
- productId: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- model: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
- unit: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
- quantity: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- checkCompany: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
- checkResult: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
+ checkTime: [{ required: true, message: "璇烽�夋嫨妫�娴嬫棩鏈�", trigger: "change" }],
+ checkName: [{ required: true, message: "璇烽�夋嫨妫�楠屽憳", trigger: "change" }],
+ productId: [{ required: true, message: "璇烽�夋嫨浜у搧鍚嶇О", trigger: "change" }],
+ productModelId: [{ required: true, message: "璇烽�夋嫨瑙勬牸鍨嬪彿", trigger: "change" }],
+ batchNo: [{ required: true, message: "璇疯緭鍏ユ壒鍙�", trigger: "blur" }],
+ checkType: [{ required: true, message: "璇烽�夋嫨妫�楠岀被鍨�", trigger: "change" }],
+ checkResult: [{ required: true, message: "璇烽�夋嫨妫�娴嬬粨鏋�", trigger: "change" }],
+ dealResult: [{ required: true, message: "澶勭悊缁撴灉榛樿涓烘姤搴�", trigger: "change" }],
+ dealTime: [{ required: true, message: "璇烽�夋嫨澶勭悊鏃ユ湡", trigger: "change" }],
},
});
const { form, rules } = toRefs(data);
+const userList = ref([]);
const productOptions = ref([]);
+const modelOptions = ref([])
// 鎵撳紑寮规
-const openDialog = (type, row) => {
+const openDialog = async (type, row) => {
operationType.value = type;
dialogFormVisible.value = true;
form.value = {}
- getProductOptions();
+
+ // 缂栬緫鎬佷笉鏍￠獙瑙勬牸鍨嬪彿锛坧rop 浠嶇粦瀹� productModelId锛屼絾缂栬緫鎬佹敼涓烘枃鏈睍绀猴級
+ data.rules.productModelId = [
+ {
+ required: type !== "edit",
+ message: "璇烽�夋嫨瑙勬牸鍨嬪彿",
+ trigger: "change",
+ },
+ ];
+
+ // 鍏堝姞杞戒笅鎷夐�夐」锛岀‘淇濈紪杈戞暟鎹彲浠ユ纭尮閰嶅洖鏄�
+ const userRes = await userListNoPage();
+ userList.value = userRes.data || [];
+
+ await getProductOptions();
+
+ // 澶勭悊缁撴灉榛樿鈥滄姤搴熲�濓紝涓斾笉鍙�夋嫨鍏跺畠椤�
+ form.value.dealResult = getScrapDealResultValue();
if (operationType.value === 'edit') {
- getQualityUnqualifiedInfo(row.id).then(res => {
- form.value = {...res.data}
- })
+ const fallback = row || {};
+ const res = await getQualityUnqualifiedInfo(fallback.id);
+ const { inspectState, ...rest } = res.data || {};
+
+ // 鍏堢敤鍒楄〃琛屾暟鎹妸鈥滃繀鍥炴樉瀛楁鈥濈洿鎺ュ～涓婏紝閬垮厤璇︽儏鎺ュ彛瀛楁鍚嶄笉涓�鑷村鑷村叏绌恒��
+ const productName = rest?.productName ?? fallback?.productName;
+ const modelName = rest?.model ?? fallback?.model;
+
+ const checkTypeValue = rest?.checkType ?? fallback?.checkType;
+ const checkNameValue =
+ rest?.checkName ??
+ rest?.checkUserName ??
+ fallback?.checkName ??
+ fallback?.checkUserName;
+
+ const productId =
+ rest?.productId ??
+ findProductIdByLabel(productOptions.value, productName);
+
+ // 鍏堝洖濉瓧娈碉紙productModelId 闇�瑕佷緷璧� modelOptions锛岀◢鍚庡啀琛ワ級
+ const normalizedProductId = normalizeProductIdByOptions(productId);
+
+ // 缂栬緫鎬佷骇鍝佸悕绉板睍绀哄彧灞曠ず label锛岄伩鍏嶆爲缁勪欢鍥炴樉渚濊禆 value 鍖归厤
+ const productNameLabel =
+ rest?.productName ??
+ fallback?.productName ??
+ findNodeById(productOptions.value, normalizedProductId) ??
+ productName;
+ form.value = {
+ ...rest,
+ productName: productNameLabel,
+ productId: normalizedProductId,
+ productModelId: rest?.productModelId ?? undefined,
+ model: rest?.model ?? fallback?.model,
+ unit: rest?.unit ?? fallback?.unit,
+ batchNo: rest?.batchNo ?? fallback?.batchNo ?? "",
+ checkType:
+ checkTypeValue === undefined || checkTypeValue === null
+ ? undefined
+ : Number(checkTypeValue),
+ checkName: checkNameValue ?? "",
+ checkTime: rest?.checkTime ?? fallback?.checkTime ?? "",
+ defectivePhenomena:
+ rest?.defectivePhenomena ?? fallback?.defectivePhenomena ?? "",
+ dealName: rest?.dealName ?? fallback?.dealName ?? "",
+ dealTime: rest?.dealTime ?? fallback?.dealTime ?? "",
+ dealResult: getScrapDealResultValue(),
+ };
+
+ // 瑙勬牸鍨嬪彿涓嬫媺闇�瑕佷緷璧� productId
+ await loadModelsForProductId(form.value.productId);
+
+ // 瑙勬牸鍨嬪彿鍥炴樉锛堝璇︽儏娌＄粰 productModelId锛屽氨鐢� model 鍚嶇О鍙嶆煡锛�
+ if (!form.value.productModelId) {
+ form.value.productModelId = findModelIdByModel(
+ modelOptions.value,
+ modelName
+ );
+ }
+
+ // 鏍规嵁 productModelId 鍥炲～ model/unit
+ if (form.value.productModelId) {
+ form.value.productModelId = normalizeModelIdByOptions(form.value.productModelId);
+ handleChangeModel(form.value.productModelId);
+ } else if (modelName) {
+ // productModelId 浠嶇劧鎷夸笉鍒版椂锛岃嚦灏戜繚璇� model/unit 鏂囨湰鍥炴樉
+ const matched =
+ (modelOptions.value || []).find((m) => {
+ const model = String(m?.model ?? "");
+ const id = String(m?.id ?? "");
+ const target = String(modelName ?? "");
+ return model === target || id === target;
+ }) ?? null;
+ if (matched) {
+ form.value.model = matched.model ?? form.value.model;
+ form.value.unit = matched.unit ?? form.value.unit;
+ } else {
+ form.value.model = modelName;
+ }
+ }
}
}
-const getProductOptions = () => {
- productTreeList().then((res) => {
- productOptions.value = convertIdToValue(res);
- });
+const getProductOptions = async () => {
+ const res = await productTreeList();
+ productOptions.value = convertIdToValue(res);
};
const getModels = (value) => {
form.value.productName = findNodeById(productOptions.value, value);
+ form.value.productModelId = undefined;
+ form.value.model = "";
+ form.value.unit = "";
+ modelOptions.value = [];
+ modelList({ id: value }).then((res) => {
+ modelOptions.value = res;
+ })
+};
+
+// 缂栬緫妯″紡/鎴栦换鎰忛渶瑕佹椂锛氬彧鎷夊彇瑙勬牸鍨嬪彿鍒楄〃锛屼笉娓呯┖宸插洖濉殑瀛楁
+const loadModelsForProductId = async (productId) => {
+ if (!productId) return;
+ const res = await modelList({ id: productId });
+ modelOptions.value = res || [];
+
+ // 璁╁崟浣�/鍨嬪彿绛夊瓧娈典繚鎸佷笌褰撳墠 productModelId 涓�鑷�
+ if (form.value.productModelId) {
+ form.value.productModelId = normalizeModelIdByOptions(form.value.productModelId);
+ handleChangeModel(form.value.productModelId);
+ }
+};
+
+const handleChangeModel = (value) => {
+ form.value.model = modelOptions.value.find(item => item.id == value)?.model || '';
+ form.value.unit = modelOptions.value.find(item => item.id == value)?.unit || '';
+};
+
+// 瑙ｅ喅鍥炴樉鏃剁被鍨嬩笉涓�鑷村鑷� el-tree-select / el-select 鍙樉绀� value锛坕d锛�
+const normalizeProductIdByOptions = (productId) => {
+ if (productId === undefined || productId === null) return productId;
+ const target = String(productId);
+ const stack = Array.isArray(productOptions.value) ? [...productOptions.value] : [];
+ while (stack.length) {
+ const node = stack.shift();
+ if (node && String(node?.value ?? "") === target) return node?.value;
+ if (node?.children?.length) stack.push(...node.children);
+ }
+ return productId;
+};
+
+const normalizeModelIdByOptions = (modelId) => {
+ if (modelId === undefined || modelId === null) return modelId;
+ const target = String(modelId);
+ return (modelOptions.value || []).find((m) => String(m?.id ?? "") === target)?.id ?? modelId;
};
const findNodeById = (nodes, productId) => {
for (let i = 0; i < nodes.length; i++) {
@@ -200,6 +391,33 @@
}
}
return null; // 娌℃湁鎵惧埌鑺傜偣锛岃繑鍥瀗ull
+};
+
+// 鏍规嵁鏍戣妭鐐� label 鍥炲～ value锛堢紪杈戝洖鏄惧厹搴曠敤锛�
+const findProductIdByLabel = (nodes, label) => {
+ const target = String(label ?? "");
+ if (!target) return undefined;
+
+ const stack = Array.isArray(nodes) ? [...nodes] : [];
+ while (stack.length) {
+ const node = stack.shift();
+ if (node && String(node?.label ?? "") === target) return node?.value;
+ if (node?.children?.length) stack.push(...node.children);
+ }
+ return undefined;
+};
+
+// 鏍规嵁瑙勬牸鍨嬪彿鍚嶇О鍙嶆煡 id锛堢紪杈戝洖鏄惧厹搴曠敤锛�
+const findModelIdByModel = (models, model) => {
+ const target = String(model ?? "");
+ if (!target) return undefined;
+ return (
+ (models || []).find((m) => {
+ const mModel = String(m?.model ?? "");
+ const mId = String(m?.id ?? "");
+ return mModel === target || mId === target;
+ })?.id
+ );
};
function convertIdToValue(data) {
return data.map((item) => {
@@ -219,13 +437,15 @@
const submitForm = () => {
proxy.$refs.formRef.validate(valid => {
if (valid) {
+ // 鐘舵�佸瓧娈典笉鍦ㄨ〃鍗曞～鍐欙紝涔熶笉浼犵粰鍚庣
+ const { inspectState, ...payload } = (form.value || {})
if (operationType.value === "add") {
- qualityUnqualifiedAdd(form.value).then(res => {
+ qualityUnqualifiedAdd(payload).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
closeDia();
})
} else {
- qualityUnqualifiedUpdate(form.value).then(res => {
+ qualityUnqualifiedUpdate(payload).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
closeDia();
})
--
Gitblit v1.9.3