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 | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue b/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue
index 9a302b4..79bddd0 100644
--- a/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue
+++ b/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue
@@ -3,7 +3,7 @@
<div style="display: flex;justify-content: space-between">
<div style="display: flex;">
<div style="margin-bottom: 18px;margin-right: 10px;display: flex;align-items: center;line-height: 32px;">
- <span style="width: 88px;font-size: 14px;font-weight: 700;color: #606266;">鐗╄川鍚嶇О</span>
+ <span style="width: 88px;font-size: 14px;font-weight: 700;color: var(--lims-text-2);">鐗╄川鍚嶇О</span>
<el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="form.name"
@keyup.enter="getTableData"></el-input>
</div>
@@ -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