From 85f72c9c092956dd6b093e61b0d41f383e8b9833 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 25 二月 2025 14:51:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/CNAS/resourceDemand/standardMaterial/index.vue | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/standardMaterial/index.vue b/src/views/CNAS/resourceDemand/standardMaterial/index.vue
index e75f44f..c23d9f9 100644
--- a/src/views/CNAS/resourceDemand/standardMaterial/index.vue
+++ b/src/views/CNAS/resourceDemand/standardMaterial/index.vue
@@ -35,9 +35,6 @@
<script>
-// import FormDia from '../do/a6-standard-material-list/formDia.vue';
-// import BorrowDia from '../do/a6-standard-material-list/borrowDia.vue';
-// import ReturnDia from '../do/a6-standard-material-list/returnDia.vue';
import limsTable from '@/components/Table/lims-table.vue'
import {
getPageStandardSubstance,
@@ -121,11 +118,6 @@
prop: 'remark',
minWidth: '100'
},
- // {
- // label: '鍒涘缓浜�',
- // prop: 'createUser',
- // minWidth: '100'
- // },
{
label: '鍒涘缓鏃堕棿',
prop: 'createTime',
--
Gitblit v1.9.3