From e5a70efeaa9fd96ce1242e5d582c8237319fade4 Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期五, 10 四月 2026 11:13:15 +0800
Subject: [PATCH] Merge branch 'dev_天津_阳光印刷' of http://114.132.189.42:9002/r/product-inventory-management into dev_天津_阳光印刷
---
src/views/productionManagement/productionReporting/index.vue | 52 ++++++++++++++++++++++++++++++----------------------
1 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/src/views/productionManagement/productionReporting/index.vue b/src/views/productionManagement/productionReporting/index.vue
index f06131a..1f16a83 100644
--- a/src/views/productionManagement/productionReporting/index.vue
+++ b/src/views/productionManagement/productionReporting/index.vue
@@ -218,6 +218,20 @@
prop: "process",
width: 120,
},
+ {
+ label: "瀹℃牳鐘舵��",
+ prop: "auditStatus",
+ width: 120,
+ dataType: "tag",
+ formatData: val => {
+ const statusMap = { 0: "鏈鏍�", 1: "閫氳繃", 2: "涓嶉�氳繃" };
+ return statusMap[val] ?? "鏈煡";
+ },
+ formatType: val => {
+ const typeMap = { 0: "info", 1: "success", 2: "danger" };
+ return typeMap[val] ?? "";
+ },
+ },
{
label: "宸ュ崟缂栧彿",
prop: "workOrderNo",
@@ -259,18 +273,9 @@
width: 120,
},
{
- label: "瀹℃牳鐘舵��",
- prop: "auditStatus",
- width: 120,
- dataType: "tag",
- formatData: val => {
- const statusMap = { 0: "鏈鏍�", 1: "閫氳繃", 2: "涓嶉�氳繃" };
- return statusMap[val] ?? "鏈煡";
- },
- formatType: val => {
- const typeMap = { 0: "info", 1: "success", 2: "danger" };
- return typeMap[val] ?? "";
- },
+ label: "澶囨敞淇℃伅",
+ prop: "auditOpinion",
+ minWidth: 120,
},
{
label: "鍒涘缓鏃堕棿",
@@ -292,20 +297,19 @@
},
},
{
- name:"瀹℃牳",
- // 榛勮壊
- color: "#E6A23C",
- clickFun: row => {
- handleAudit(row);
- },
- showHide: row => Number(row?.auditStatus) === 0, // 浠呭綋鏈鏍告椂鏄剧ず瀹℃牳鎸夐挳
- },
- {
name: "鍒犻櫎",
type: "danger",
clickFun: row => {
deleteReport(row);
},
+ },
+ {
+ name:"瀹℃牳",
+ color: "#E6A23C",
+ clickFun: row => {
+ handleAudit(row);
+ },
+ disabled: row => Number(row?.auditStatus) !== 0, // 宸插鏍告椂绂佺敤瀹℃牳鎸夐挳
},
],
},
@@ -544,7 +548,11 @@
productAudit(auditData)
.then(res => {
if (res.code === 200) {
- proxy.$modal.msgSuccess(auditResult === 1 ? "瀹℃牳閫氳繃" : "瀹℃牳涓嶉�氳繃");
+ if(form.value.auditResult == 1){
+ proxy.$modal.msgSuccess("瀹℃牳閫氳繃");
+ }else{
+ proxy.$modal.msgError("瀹℃牳涓嶉�氳繃");
+ }
auditDialogVisible.value = false;
getList();
} else {
--
Gitblit v1.9.3