From 9ea5ff67655241271bdf04bb50ca3a8d60c4e22a Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 11 八月 2026 15:07:02 +0800
Subject: [PATCH] fix: 用河南鹤壁代码覆盖山西长治
---
src/views/qualityManagement/nonconformingManagement/components/formDia.vue | 494 ++++++++++++++++++++++++------------------------------
1 files changed, 224 insertions(+), 270 deletions(-)
diff --git a/src/views/qualityManagement/nonconformingManagement/components/formDia.vue b/src/views/qualityManagement/nonconformingManagement/components/formDia.vue
index 5e20709..e747d04 100644
--- a/src/views/qualityManagement/nonconformingManagement/components/formDia.vue
+++ b/src/views/qualityManagement/nonconformingManagement/components/formDia.vue
@@ -1,168 +1,121 @@
<template>
<div>
- <el-dialog v-model="dialogFormVisible"
- :title="operationType === 'add' ? '鏂板涓嶅悎鏍肩鐞�' : '缂栬緫涓嶅悎鏍肩鐞�'"
- width="70%"
- @close="closeDia">
- <el-form :model="form"
- label-width="140px"
- label-position="top"
- :rules="rules"
- ref="formRef">
+ <el-dialog
+ v-model="dialogFormVisible"
+ :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="inspectType">
+ <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-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-model="form.productId"
- placeholder="璇烽�夋嫨"
- filterable
- clearable
- check-strictly
- @change="getModels"
- :data="productOptions"
- :render-after-expand="false"
- style="width: 100%" />
+ <el-form-item label="浜у搧鍚嶇О锛�" prop="productId">
+ <el-tree-select
+ v-model="form.productId"
+ placeholder="璇烽�夋嫨"
+ clearable
+ check-strictly
+ @change="getModels"
+ :data="productOptions"
+ :render-after-expand="false"
+ style="width: 100%"
+ />
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="瑙勬牸鍨嬪彿锛�"
- prop="model">
- <el-select v-model="form.productModelId"
- placeholder="璇烽�夋嫨"
- clearable
- :disabled="operationType === 'edit'"
- filterable
- readonly
- @change="handleChangeModel">
- <el-option v-for="item in modelOptions"
- :key="item.id"
- :label="item.model"
- :value="item.id" />
+ <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="model">
+ <el-select v-model="form.productModelId" placeholder="璇烽�夋嫨" clearable :disabled="operationType === 'edit'"
+ filterable readonly @change="handleChangeModel">
+ <el-option v-for="item in modelOptions" :key="item.id" :label="item.model" :value="item.id" />
</el-select>
</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-form-item label="鍗曚綅锛�" prop="unit">
+ <el-input v-model="form.unit" placeholder="璇疯緭鍏�" clearable/>
</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="quantity">
+ <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.quantity" placeholder="璇疯緭鍏�" clearable :precision="2"/>
</el-form-item>
</el-col>
</el-row>
<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-option v-for="item in userList"
- :key="item.nickName"
- :label="item.nickName"
- :value="item.nickName" />
+ <el-form-item label="妫�楠屽憳锛�" prop="checkName">
+ <el-select v-model="form.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-col :span="12">
- <el-form-item label="妫�娴嬫棩鏈燂細"
- prop="checkTime">
- <el-date-picker v-model="form.checkTime"
- type="date"
- placeholder="璇烽�夋嫨鏃ユ湡"
- value-format="YYYY-MM-DD"
- format="YYYY-MM-DD"
- clearable
- style="width: 100%" />
+ <el-form-item label="妫�娴嬫棩鏈燂細" prop="checkTime">
+ <el-date-picker
+ v-model="form.checkTime"
+ type="date"
+ placeholder="璇烽�夋嫨鏃ユ湡"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ clearable
+ style="width: 100%"
+ />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="涓嶅悎鏍肩幇璞★細"
- prop="defectivePhenomena">
- <el-input v-model="form.defectivePhenomena"
- placeholder="璇疯緭鍏�"
- clearable />
+ <el-form-item label="涓嶅悎鏍肩幇璞★細" prop="defectivePhenomena">
+ <el-input v-model="form.defectivePhenomena" placeholder="璇疯緭鍏�" clearable/>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="澶勭悊缁撴灉锛�"
- prop="dealResult">
- <el-select v-model="form.dealResult"
- placeholder="璇烽�夋嫨"
- clearable>
- <el-option :label="item.label"
- :value="item.value"
- v-for="item in rejection_handling"
- :key="item.value" />
+ <el-form-item label="澶勭悊缁撴灉锛�" prop="dealResult">
+ <el-select v-model="form.dealResult" placeholder="璇烽�夋嫨" clearable>
+ <el-option :label="item.label" :value="item.value" v-for="item in rejection_handling" :key="item.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="澶勭悊浜猴細"
- prop="dealName">
- <el-select v-model="form.dealName"
- placeholder="璇烽�夋嫨"
- clearable
- style="width: 100%">
- <el-option v-for="item in userList"
- :key="item.nickName"
- :label="item.nickName"
- :value="item.nickName" />
+ <el-form-item label="澶勭悊浜猴細" prop="dealName">
+ <el-select v-model="form.dealName" 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-col :span="12">
- <el-form-item label="澶勭悊鏃ユ湡锛�"
- prop="dealTime">
- <el-date-picker v-model="form.dealTime"
- type="date"
- placeholder="璇烽�夋嫨鏃ユ湡"
- value-format="YYYY-MM-DD"
- format="YYYY-MM-DD"
- clearable
- style="width: 100%" />
+ <el-form-item label="澶勭悊鏃ユ湡锛�" prop="dealTime">
+ <el-date-picker
+ v-model="form.dealTime"
+ type="date"
+ placeholder="璇烽�夋嫨鏃ユ湡"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ clearable
+ style="width: 100%"
+ />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<div class="dialog-footer">
- <el-button type="primary"
- @click="submitForm">纭</el-button>
+ <el-button type="primary" @click="submitForm">纭</el-button>
<el-button @click="closeDia">鍙栨秷</el-button>
</div>
</template>
@@ -171,172 +124,173 @@
</template>
<script setup>
- import { ref, reactive, toRefs } 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";
- import useUserStore from "@/store/modules/user";
- const { proxy } = getCurrentInstance();
- const userStore = useUserStore();
- const emit = defineEmits(["close"]);
+import {ref, reactive, toRefs} 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";
+import useUserStore from "@/store/modules/user";
+const { proxy } = getCurrentInstance()
+const userStore = useUserStore()
+const emit = defineEmits(['close'])
- const dialogFormVisible = ref(false);
- const operationType = ref("");
- const { rejection_handling } = proxy.useDict("rejection_handling");
- const data = reactive({
- form: {
- checkTime: "",
- process: "",
- checkName: "",
- productName: "",
- productId: "",
- model: "",
- unit: "",
- quantity: undefined,
- checkCompany: "",
- checkResult: "",
- inspectType: "",
- defectivePhenomena: "",
- dealResult: "",
- dealName: "",
- dealTime: "",
- productModelId: undefined,
- },
- rules: {
- checkTime: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
- process: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- checkName: [{ required: true, message: "璇烽�夋嫨妫�楠屽憳", trigger: "change" }],
- productId: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- model: [{ required: true, 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" }],
- dealName: [{ required: true, message: "璇烽�夋嫨澶勭悊浜�", trigger: "change" }],
- },
- });
- const { form, rules } = toRefs(data);
- const productOptions = ref([]);
- const modelOptions = ref([]);
- const userList = ref([]); // 妫�楠屽憳/澶勭悊浜轰笅鎷夊垪琛�
+const dialogFormVisible = ref(false);
+const operationType = ref('')
+const { rejection_handling } = proxy.useDict("rejection_handling")
+const data = reactive({
+ form: {
+ checkTime: "",
+ process: "",
+ checkName: "",
+ productName: "",
+ productId: "",
+ model: "",
+ unit: "",
+ quantity: undefined,
+ checkCompany: "",
+ checkResult: "",
+ inspectType: '',
+ defectivePhenomena: '',
+ dealResult: '',
+ dealName: '',
+ dealTime: '',
+ productModelId: undefined,
+ },
+ rules: {
+ checkTime: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" },],
+ process: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ checkName: [{ required: true, message: "璇烽�夋嫨妫�楠屽憳", trigger: "change" }],
+ productId: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ model: [{ required: true, 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" }],
+ dealName: [{ required: true, message: "璇烽�夋嫨澶勭悊浜�", trigger: "change" }],
+ },
+});
+const { form, rules } = toRefs(data);
+const productOptions = ref([]);
+const modelOptions = ref([]);
+const userList = ref([]); // 妫�楠屽憳/澶勭悊浜轰笅鎷夊垪琛�
- // 鎵撳紑寮规
- const openDialog = async (type, row) => {
- operationType.value = type;
- try {
- const userRes = await userListNoPage();
- userList.value = userRes.data || [];
- } catch (e) {
- console.error("鍔犺浇鐢ㄦ埛鍒楄〃澶辫触", e);
- userList.value = [];
- }
- dialogFormVisible.value = true;
- if (operationType.value === "add") {
- form.value = {
- checkName: userStore.nickName || "",
- dealName: "",
- dealTime: "",
- dealResult: "",
- defectivePhenomena: "",
- inspectType: "",
- checkTime: "",
- productId: "",
- model: "",
- unit: "",
- quantity: undefined,
- productName: "",
- productModelId: undefined,
- };
- } else {
- form.value = {};
- }
- getProductOptions();
- if (operationType.value === "edit") {
- getQualityUnqualifiedInfo(row.id).then(res => {
- const { inspectState, ...rest } = res.data || {};
- form.value = { ...rest };
- });
- }
- };
- const getProductOptions = () => {
- productTreeList().then(res => {
- productOptions.value = convertIdToValue(res);
- });
- };
- const getModels = value => {
- form.value.productName = findNodeById(productOptions.value, value);
- modelList({ id: value }).then(res => {
- modelOptions.value = res;
- });
- };
- const handleChangeModel = value => {
- const selectedModel = modelOptions.value.find(item => item.id === value);
- if (selectedModel) {
- form.value.model = selectedModel.model;
- }
- };
- const findNodeById = (nodes, productId) => {
- for (let i = 0; i < nodes.length; i++) {
- if (nodes[i].value === productId) {
- return nodes[i].label; // 鎵惧埌鑺傜偣锛岃繑鍥炶鑺傜偣
- }
- if (nodes[i].children && nodes[i].children.length > 0) {
- const foundNode = findNodeById(nodes[i].children, productId);
- if (foundNode) {
- return foundNode; // 鍦ㄥ瓙鑺傜偣涓壘鍒帮紝杩斿洖璇ヨ妭鐐�
- }
- }
- }
- return null; // 娌℃湁鎵惧埌鑺傜偣锛岃繑鍥瀗ull
- };
- function convertIdToValue(data) {
- return data.map(item => {
- const { id, children, ...rest } = item;
- const newItem = {
- ...rest,
- value: id, // 灏� id 鏀逛负 value
- };
- if (children && children.length > 0) {
- newItem.children = convertIdToValue(children);
- }
-
- return newItem;
- });
+// 鎵撳紑寮规
+const openDialog = async (type, row) => {
+ operationType.value = type;
+ try {
+ const userRes = await userListNoPage();
+ userList.value = userRes.data || [];
+ } catch (e) {
+ console.error("鍔犺浇鐢ㄦ埛鍒楄〃澶辫触", e);
+ userList.value = [];
}
- // 鎻愪氦浜у搧琛ㄥ崟
- const submitForm = () => {
- proxy.$refs.formRef.validate(valid => {
- if (valid) {
- // 鐘舵�佸瓧娈典笉鍦ㄨ〃鍗曞～鍐欙紝涔熶笉浼犵粰鍚庣
- const { inspectState, ...payload } = form.value || {};
- if (operationType.value === "add") {
- qualityUnqualifiedAdd(payload).then(res => {
- proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
- closeDia();
- });
- } else {
- qualityUnqualifiedUpdate(payload).then(res => {
- proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
- closeDia();
- });
- }
- }
- });
- };
- // 鍏抽棴寮规
- const closeDia = () => {
- proxy.resetForm("formRef");
- dialogFormVisible.value = false;
- emit("close");
- };
- defineExpose({
- openDialog,
+ dialogFormVisible.value = true;
+ if (operationType.value === 'add') {
+ form.value = {
+ checkName: userStore.nickName || '',
+ dealName: '',
+ dealTime: '',
+ dealResult: '',
+ defectivePhenomena: '',
+ inspectType: '',
+ checkTime: '',
+ productId: '',
+ model: '',
+ unit: '',
+ quantity: undefined,
+ productName: '',
+ productModelId: undefined,
+ };
+ } else {
+ form.value = {};
+ }
+ getProductOptions();
+ if (operationType.value === 'edit') {
+ getQualityUnqualifiedInfo(row.id).then(res => {
+ const { inspectState, ...rest } = (res.data || {})
+ form.value = { ...rest }
+ })
+ }
+}
+const getProductOptions = () => {
+ productTreeList().then((res) => {
+ productOptions.value = convertIdToValue(res);
});
+};
+const getModels = (value) => {
+ form.value.productName = findNodeById(productOptions.value, value);
+ modelList({ id: value }).then((res) => {
+ modelOptions.value = res;
+ })
+};
+const handleChangeModel = (value) => {
+ const selectedModel = modelOptions.value.find(item => item.id === value);
+ if (selectedModel) {
+ form.value.model = selectedModel.model;
+ }
+};
+const findNodeById = (nodes, productId) => {
+ for (let i = 0; i < nodes.length; i++) {
+ if (nodes[i].value === productId) {
+ return nodes[i].label; // 鎵惧埌鑺傜偣锛岃繑鍥炶鑺傜偣
+ }
+ if (nodes[i].children && nodes[i].children.length > 0) {
+ const foundNode = findNodeById(nodes[i].children, productId);
+ if (foundNode) {
+ return foundNode; // 鍦ㄥ瓙鑺傜偣涓壘鍒帮紝杩斿洖璇ヨ妭鐐�
+ }
+ }
+ }
+ return null; // 娌℃湁鎵惧埌鑺傜偣锛岃繑鍥瀗ull
+};
+function convertIdToValue(data) {
+ return data.map((item) => {
+ const { id, children, ...rest } = item;
+ const newItem = {
+ ...rest,
+ value: id, // 灏� id 鏀逛负 value
+ };
+ if (children && children.length > 0) {
+ newItem.children = convertIdToValue(children);
+ }
+
+ return newItem;
+ });
+}
+// 鎻愪氦浜у搧琛ㄥ崟
+const submitForm = () => {
+ proxy.$refs.formRef.validate(valid => {
+ if (valid) {
+ // 鐘舵�佸瓧娈典笉鍦ㄨ〃鍗曞～鍐欙紝涔熶笉浼犵粰鍚庣
+ const { inspectState, ...payload } = (form.value || {})
+ if (operationType.value === "add") {
+ qualityUnqualifiedAdd(payload).then(res => {
+ proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
+ closeDia();
+ })
+ } else {
+ qualityUnqualifiedUpdate(payload).then(res => {
+ proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
+ closeDia();
+ })
+ }
+ }
+ })
+}
+// 鍏抽棴寮规
+const closeDia = () => {
+ proxy.resetForm("formRef");
+ dialogFormVisible.value = false;
+ emit('close')
+};
+defineExpose({
+ openDialog,
+});
</script>
<style scoped>
+
</style>
--
Gitblit v1.9.3