From 5fc4e0f0cd2554eeaa911384ed87373aa4ee3c5f Mon Sep 17 00:00:00 2001
From: ZN <zhang_12370@163.com>
Date: 星期一, 30 三月 2026 10:51:21 +0800
Subject: [PATCH] feat(生产报表/销售台账): 添加审核备注列并优化发货状态显示
---
src/views/productionManagement/productionReporting/index.vue | 5 +++++
src/views/salesManagement/salesLedger/index.vue | 5 ++++-
2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/views/productionManagement/productionReporting/index.vue b/src/views/productionManagement/productionReporting/index.vue
index 1d5d475..1f16a83 100644
--- a/src/views/productionManagement/productionReporting/index.vue
+++ b/src/views/productionManagement/productionReporting/index.vue
@@ -273,6 +273,11 @@
width: 120,
},
{
+ label: "澶囨敞淇℃伅",
+ prop: "auditOpinion",
+ minWidth: 120,
+ },
+ {
label: "鍒涘缓鏃堕棿",
prop: "createTime",
width: 120,
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 5c2b9bb..6524daa 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -51,7 +51,9 @@
width="100px"
align="center">
<template #default="scope">
- <el-tag v-if="scope.row.approveStatus === 1"
+ <el-tag v-if="getShippingStatusText(scope.row) === '宸插彂璐�'"
+ type="success">宸插嚭搴�</el-tag>
+ <el-tag v-else-if="scope.row.approveStatus === 2"
type="success">鍏呰冻</el-tag>
<el-tag v-else
type="danger">涓嶈冻</el-tag>
@@ -1419,6 +1421,7 @@
/** 鍒ゆ柇鍗曚釜浜у搧鏄惁宸插彂璐э紙鏍规嵁shippingStatus鍒ゆ柇锛屽凡鍙戣揣鎴栧鏍搁�氳繃涓嶅彲缂栬緫鍜屽垹闄わ級 */
const isProductShipped = (product) => {
if (!product) return false;
+
const status = String(product.shippingStatus || "").trim();
// 濡傛灉鍙戣揣鐘舵�佹槸"宸插彂璐�"鎴�"瀹℃牳閫氳繃"锛屽垯涓嶅彲缂栬緫鍜屽垹闄�
return status === "宸插彂璐�" || status === "瀹℃牳閫氳繃";
--
Gitblit v1.9.3