From 84d0d2da3d5a00ec2a1612b23bd611cd1321121e Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期五, 17 四月 2026 11:35:57 +0800
Subject: [PATCH] fix(生产管理): 修复工单报产和审核逻辑
---
src/views/productionManagement/productionReporting/index.vue | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/views/productionManagement/productionReporting/index.vue b/src/views/productionManagement/productionReporting/index.vue
index 52e040a..5e956e8 100644
--- a/src/views/productionManagement/productionReporting/index.vue
+++ b/src/views/productionManagement/productionReporting/index.vue
@@ -134,6 +134,14 @@
<!-- 瀹℃牳琛ㄥ崟 -->
<div style=" padding: 15px; border-radius: 4px;">
<el-form ref="auditFormRef" :model="form" :rules="auditFormRules" label-width="100px">
+ <el-form-item label="鏈�缁堝鏍镐汉" prop="sureAuditUserName">
+ <el-input
+ v-model="form.sureAuditUserName"
+ :rows="4"
+ disabled
+ show-word-limit
+ />
+ </el-form-item>
<el-form-item label="瀹℃牳缁撴灉" prop="auditResult">
<el-radio-group v-model="form.auditResult" @change="handleAuditResultChange" size="large">
<el-radio label=1 >閫氳繃</el-radio>
@@ -241,6 +249,11 @@
},
},
{
+ label: "鏈�缁堝鏍镐汉",
+ prop: "sureAuditUserName",
+ width: 120,
+ },
+ {
label: "宸ュ崟缂栧彿",
prop: "workOrderNo",
width: 120,
@@ -311,7 +324,7 @@
clickFun: row => {
handleAudit(row);
},
- disabled: row => Number(row?.auditStatus) !== 0 || row.auditUserId !== userStore.id, // 宸插鏍告垨涓嶆槸鎸囧畾瀹℃牳浜烘椂绂佺敤
+ disabled: row => !(Number(row?.auditStatus) === 0 && (Number(row?.auditUserId) === -1 || Number(row?.auditUserId) === Number(userStore.id)))
},
],
},
@@ -505,16 +518,10 @@
// 瀹℃牳
const handleAudit = (row) => {
- if (Number(row?.auditStatus) !== 0) {
- ElMessage.warning("璇ュ伐鍗曞凡瀹℃牳");
- return;
- }
- if (row.auditUserId !== userStore.id) {
- ElMessage.warning("鎮ㄤ笉鏄宸ュ崟鐨勬寚瀹氬鏍镐汉");
- return;
- }
// 閲嶇疆琛ㄥ崟锛岄粯璁ら�夋嫨閫氳繃
form.value = {
+ sureAuditUserId: userStore.id,
+ sureAuditUserName: userStore.nickName,
auditResult: "1",
remarks: "",
};
@@ -542,9 +549,10 @@
};
// 鎻愪氦瀹℃牳
- const submitAudit = (auditResult) => {
+ const submitAudit = () => {
auditFormRef.value?.validate().then(() => {
auditLoading.value = true;
+ console.log(form);
const auditData = {
id: auditRowData.value.id,
auditStatus: Number(form.value.auditResult),
--
Gitblit v1.9.3