From 904710d226d8dd5253937cbd572ca208be804ea5 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 26 二月 2025 17:10:28 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue | 29 +++--------------------------
1 files changed, 3 insertions(+), 26 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue b/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue
index 1a67d66..241a3c0 100644
--- a/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue
+++ b/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue
@@ -23,30 +23,6 @@
</div>
<AddRecord ref="addRecordRef" @submit="submit"></AddRecord>
</div>
-
- <!-- <div class="tables">-->
- <!-- <ZTTable-->
- <!-- :column="columns"-->
- <!-- :table-data="tableData"-->
- <!-- >-->
- <!-- <template slot="action" slot-scope="{ row }">-->
- <!-- <el-button type="text" @click="edit(row)">缂栬緫</el-button>-->
- <!-- </template>-->
- <!-- </ZTTable>-->
- <!-- <div class="pagination">-->
- <!-- <div></div>-->
- <!-- <el-pagination-->
- <!-- :page-size="pagination.pageSize"-->
- <!-- :page-sizes="[10, 20, 30, 40]"-->
- <!-- :total="pagination.total"-->
- <!-- layout="total, sizes, prev, pager, next, jumper"-->
- <!-- @current-change="handleCurrent"-->
- <!-- @size-change="handleSize"-->
- <!-- >-->
- <!-- </el-pagination>-->
- <!-- </div>-->
- <!-- </div>-->
- <!-- <AddRecord ref="addRecordRef" @submit="submit"></AddRecord>-->
</template>
<script>
@@ -56,6 +32,7 @@
// import AddRecord from './components/AddRecord.vue';
import limsTable from '@/components/Table/lims-table.vue'
+import AddRecord from './component/AddRecord.vue';
import {
getPageAcceptance,
updateAcceptanc,
@@ -63,8 +40,8 @@
} from '@/api/cnas/resourceDemand/standardMaterialAccept/standardMaterialAccept'
export default {
components: {
- limsTable
-
+ limsTable,
+ AddRecord
},
data() {
return {
--
Gitblit v1.9.3