From fd85c03902343231574fdbe7f3fcdd388593a5ff Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期五, 17 四月 2026 15:03:20 +0800
Subject: [PATCH] 不合格管理：新增不良品照片上传功能及相关逻辑优化
---
src/views/qualityManagement/nonconformingManagement/components/formDia.vue | 234 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 226 insertions(+), 8 deletions(-)
diff --git a/src/views/qualityManagement/nonconformingManagement/components/formDia.vue b/src/views/qualityManagement/nonconformingManagement/components/formDia.vue
index d33ddad..20d01e0 100644
--- a/src/views/qualityManagement/nonconformingManagement/components/formDia.vue
+++ b/src/views/qualityManagement/nonconformingManagement/components/formDia.vue
@@ -57,7 +57,9 @@
<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 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">
@@ -91,7 +93,9 @@
<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 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">
@@ -108,6 +112,82 @@
</el-form-item>
</el-col>
</el-row>
+ <el-row :gutter="30">
+ <el-col :span="12">
+ <el-form-item label="宸ユ椂鎹熷け锛�" prop="lossWorking">
+ <el-input-number
+ v-model="form.lossWorking"
+ :min="0"
+ :step="0.01"
+ :precision="2"
+ style="width: 100%"
+ placeholder="璇疯緭鍏�"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鏉愭枡璐规崯澶憋細" prop="lossMaterial">
+ <el-input-number
+ v-model="form.lossMaterial"
+ :min="0"
+ :step="0.01"
+ :precision="2"
+ style="width: 100%"
+ placeholder="璇疯緭鍏�"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="12">
+ <el-form-item label="鍘熷洜鍒嗘瀽锛�" prop="reasonAnalysis">
+ <el-input
+ v-model="form.reasonAnalysis"
+ type="textarea"
+ :rows="4"
+ placeholder="璇疯緭鍏�"
+ clearable
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="棰勯槻涓庣籂姝ｆ帾鏂斤細" prop="preventiveCorrective">
+ <el-input
+ v-model="form.preventiveCorrective"
+ type="textarea"
+ :rows="4"
+ placeholder="璇疯緭鍏�"
+ clearable
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="24">
+ <el-form-item label="涓嶈壇鍝佺収鐗囷細" prop="defectivePhotos">
+ <el-upload
+ v-model:file-list="defectivePhotoFileList"
+ :action="upload.url"
+ multiple
+ ref="defectivePhotoUploadRef"
+ auto-upload
+ accept="image/*"
+ :headers="upload.headers"
+ :before-upload="handleBeforeUpload"
+ :on-error="handleUploadError"
+ :on-success="handleDefectivePhotoUploadSuccess"
+ :on-remove="handleDefectivePhotoRemove"
+ >
+ <el-button type="primary" v-if="operationType !== 'view'">涓婁紶</el-button>
+ <template #tip v-if="operationType !== 'view'">
+ <div class="el-upload__tip">
+ 鏂囦欢鏍煎紡鏀寔 doc锛宒ocx锛寈ls锛寈lsx锛宲pt锛宲ptx锛宲df锛宼xt锛寈ml锛宩pg锛宩peg锛宲ng锛実if锛宐mp锛宺ar锛寊ip锛�7z
+ </div>
+ </template>
+ </el-upload>
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-form>
<template #footer>
<div class="dialog-footer">
@@ -120,19 +200,29 @@
</template>
<script setup>
-import {ref} from "vue";
+import { ref, reactive, toRefs, getCurrentInstance, watch } 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";
+import { getToken } from "@/utils/auth";
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 defectivePhotoFileList = ref([]);
+const defectivePhotoUploadRef = ref(null);
+const upload = reactive({
+ url: import.meta.env.VITE_APP_BASE_API + "/file/upload",
+ headers: { Authorization: "Bearer " + getToken() },
+});
const data = reactive({
form: {
checkTime: "",
@@ -147,34 +237,82 @@
checkResult: "",
inspectType: '',
defectivePhenomena: '',
+ defectivePhotos: '',
+ tempFileIds: [],
dealResult: '',
+ dealName: '',
+ dealTime: '',
+ reasonAnalysis: '',
+ preventiveCorrective: '',
+ lossWorking: 0,
+ lossMaterial: 0,
},
rules: {
checkTime: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" },],
process: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- checkName: [{ required: false, 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 modelOptions = ref([]);
+const userList = ref([]); // 妫�楠屽憳/澶勭悊浜轰笅鎷夊垪琛�
// 鎵撳紑寮规
-const openDialog = (type, row) => {
+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;
- form.value = {}
+ if (operationType.value === 'add') {
+ defectivePhotoFileList.value = [];
+ form.value = {
+ checkName: userStore.nickName || '',
+ dealName: '',
+ dealTime: '',
+ dealResult: '',
+ defectivePhenomena: '',
+ defectivePhotos: '',
+ tempFileIds: [],
+ inspectType: '',
+ checkTime: '',
+ productId: '',
+ model: '',
+ unit: '',
+ quantity: '',
+ productName: '',
+ reasonAnalysis: '',
+ preventiveCorrective: '',
+ lossWorking: 0,
+ lossMaterial: 0,
+ };
+ } else {
+ defectivePhotoFileList.value = [];
+ form.value = {};
+ }
getProductOptions();
if (operationType.value === 'edit') {
getQualityUnqualifiedInfo(row.id).then(res => {
const { inspectState, ...rest } = (res.data || {})
- form.value = { ...rest }
+ form.value = {
+ reasonAnalysis: '',
+ preventiveCorrective: '',
+ lossWorking: 0,
+ lossMaterial: 0,
+ ...rest
+ }
})
}
}
@@ -237,8 +375,88 @@
}
})
}
+
+// 涓婁紶鍓嶆牎妫�锛堝弬鑰冨崗鍚屽鎵归檮浠朵笂浼狅級
+function handleBeforeUpload() {
+ proxy.$modal.loading("姝ｅ湪涓婁紶鏂囦欢锛岃绋嶅��...");
+ return true;
+}
+function handleUploadError() {
+ proxy.$modal.msgError("涓婁紶鏂囦欢澶辫触");
+ proxy.$modal.closeLoading();
+}
+// 涓嶈壇鍝佺収鐗囦笂浼犳垚鍔燂細淇濆瓨 tempId 涓� tempPath锛屽苟鍥炲啓鍒拌〃鍗�
+function handleDefectivePhotoUploadSuccess(res, file) {
+ proxy.$modal.closeLoading();
+ if (res?.code === 200) {
+ const tempId = res?.data?.tempId;
+ const tempPath = res?.data?.tempPath || res?.data?.url || "";
+ const originalName = res?.data?.originalName || file?.name || "鍥剧墖";
+
+ if (!form.value.tempFileIds) form.value.tempFileIds = [];
+ if (tempId) form.value.tempFileIds.push(tempId);
+
+ // el-upload 鍒楄〃鍥炴樉闇�瑕� url/name
+ file.id = tempId || file.id;
+ file.name = originalName;
+ file.url = tempPath ? (import.meta.env.VITE_APP_BASE_API + tempPath) : file.url;
+
+ // 浠モ�滆矾寰勫瓧绗︿覆鈥濆舰寮忎紶缁欐柊澧�/缂栬緫鎺ュ彛锛堝悗绔嫢鍙 tempFileIds 涔熶笉鍐茬獊锛�
+ syncDefectivePhotosFromFileList();
+ proxy.$modal.msgSuccess("涓婁紶鎴愬姛");
+ } else {
+ proxy.$modal.msgError(res?.msg || "涓婁紶澶辫触");
+ defectivePhotoUploadRef.value?.handleRemove(file);
+ }
+}
+
+function handleDefectivePhotoRemove(file) {
+ // 鍚屾绉婚櫎 tempFileIds
+ const tempId = file?.id || file?.response?.data?.tempId;
+ if (tempId && Array.isArray(form.value.tempFileIds)) {
+ form.value.tempFileIds = form.value.tempFileIds.filter(id => id !== tempId);
+ }
+ syncDefectivePhotosFromFileList();
+}
+
+function syncDefectivePhotosFromFileList() {
+ const base = import.meta.env.VITE_APP_BASE_API;
+ const paths = (defectivePhotoFileList.value || [])
+ .map(f => f?.url || f?.response?.data?.tempPath || f?.response?.data?.url)
+ .filter(Boolean)
+ .map(url => (typeof url === "string" ? url.replace(base, "") : ""))
+ .filter(Boolean);
+ form.value.defectivePhotos = paths.join(",");
+}
+
+// 缂栬緫/璇︽儏鏃讹紝鎶婂悗绔繑鍥炵殑 defectivePhotos 璺緞涓茶浆鎴� el-upload 鍙洖鏄剧殑 fileList
+watch(
+ () => form.value?.defectivePhotos,
+ val => {
+ if (!val) {
+ defectivePhotoFileList.value = [];
+ return;
+ }
+ const base = import.meta.env.VITE_APP_BASE_API;
+ const list = String(val)
+ .split(",")
+ .map((p, idx) => {
+ const path = p?.trim();
+ if (!path) return null;
+ return {
+ name: `鍥剧墖${idx + 1}`,
+ url: path.startsWith("http") ? path : base + path,
+ id: undefined,
+ };
+ })
+ .filter(Boolean);
+ defectivePhotoFileList.value = list;
+ },
+ { immediate: true }
+);
// 鍏抽棴寮规
const closeDia = () => {
+ defectivePhotoFileList.value = []
proxy.resetForm("formRef");
dialogFormVisible.value = false;
emit('close')
--
Gitblit v1.9.3