From 1193ed5cf72c8d1093d0c061b9eefe61a28b0cb7 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 12 十月 2026 18:00:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue b/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue
index 2626247..79bddd0 100644
--- a/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue
+++ b/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue
@@ -48,7 +48,7 @@
addRecordRef: false,
columns: [
{
- label: "鍑哄満缂栧彿",
+ label: "鍑哄巶缂栧彿",
prop: "factoryNum"
},
{
@@ -60,7 +60,7 @@
prop: "factoryManufacturer"
},
{
- label: "鏂囨。缂栧彿",
+ label: "妗ｆ缂栧彿",
prop: "fileNum"
},
{
@@ -85,13 +85,17 @@
// },
{
label: "鎻愪氦鏃ユ湡",
- prop: "acquisitionDate"
+ prop: "createTime"
},
{
label: "鏁伴噺",
prop: "quantity"
},
{
+ label: "鍗曚綅",
+ prop: "unit"
+ },
+ {
fixed: "right",
label: "鎿嶄綔",
align: "center",
--
Gitblit v1.9.3