From 7f9514f20911fbb8046ca03716c2bc9304ec2fa0 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 18 二月 2025 17:43:44 +0800
Subject: [PATCH] 1.原材料报检迁移 2.原材料下单迁移 3.同材料下单迁移
---
src/views/structural/capabilityAndLaboratory/capability/index.vue | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/views/structural/capabilityAndLaboratory/capability/index.vue b/src/views/structural/capabilityAndLaboratory/capability/index.vue
index 41918b9..1bb6202 100644
--- a/src/views/structural/capabilityAndLaboratory/capability/index.vue
+++ b/src/views/structural/capabilityAndLaboratory/capability/index.vue
@@ -45,12 +45,14 @@
</el-form>
<!-- 妫�楠岄」鐩弬鏁拌〃鏍�-->
<div class="table" v-if="radio===0">
- <lims-table :tableData="tableData" :column="column"
+ <lims-table :tableData="tableData" :column="column" key="tableData"
+ @pagination="pagination" :height="'calc(100vh - 290px)'"
:page="page" :tableLoading="tableLoading"></lims-table>
</div>
<!-- 妫�楠屽璞¤〃鏍�-->
<div class="table" v-if="radio===1">
- <lims-table :tableData="testObjectTableData" :column="testObjectColumn"
+ <lims-table :tableData="testObjectTableData" :column="testObjectColumn" key="testObjectTableData"
+ @pagination="pagination" :height="'calc(100vh - 290px)'"
:page="testObjectPage" :tableLoading="tableLoading"></lims-table>
</div>
</div>
@@ -110,16 +112,16 @@
</template>
<script>
-import BindPartDialog from "@/components/capability/bindPartDialog.vue"
-import BindSupplierDensityDialog from "@/components/capability/bindSupplierDensityDialog.vue"
+import BindPartDialog from "@/views/structural/capabilityAndLaboratory/capabilityComponents/bindPartDialog.vue"
+import BindSupplierDensityDialog from "@/views/structural/capabilityAndLaboratory/capabilityComponents/bindSupplierDensityDialog.vue"
import {
addProduct,
delItemParameter, delProduct, delTestObject, selectItemParameterList, selectProductListByObjectId,
selectTestObjectList, upProduct,
} from "@/api/structural/capability";
import limsTable from "@/components/Table/lims-table.vue";
-import EditForm from "@/components/capability/EditForm.vue";
-import testObjectEditForm from "@/components/capability/testObjectEditForm.vue";
+import EditForm from "@/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue";
+import testObjectEditForm from "@/views/structural/capabilityAndLaboratory/capabilityComponents/testObjectEditForm.vue";
import {getToken} from "@/utils/auth";
export default {
@@ -129,6 +131,7 @@
uploadAction: process.env.VUE_APP_BASE_API + '/capacityScope/importExcel',
uploadAction1: process.env.VUE_APP_BASE_API + '/capacityScope/importEquipData',
tableData: [],
+ tableLoading: false,
column: [
{label: '妫�楠岄」', prop: 'inspectionItem'},
{label: '妫�楠岄」EN', prop: 'inspectionItemEn'},
@@ -174,7 +177,7 @@
page: {
total:0,
size:10,
- current:0
+ current:1
},
testObjectTableData: [],
testObjectColumn: [
@@ -280,7 +283,6 @@
size:10,
current:0
},
- tableLoading: false,
addOrUpdate: '',
tree: null,
loading: true,
@@ -334,7 +336,8 @@
productPage: {
total:0,
size:10,
- current:0
+ current:0,
+ layout: 'total, prev, pager, next'
},
productableLoading: false,
productEditDia: false,
@@ -459,6 +462,11 @@
},
refresh() {
this.resetForm('itemParameterForm')
+ this.page.current = 1
+ this.refreshTable()
+ },
+ pagination (page) {
+ this.page.size = page.limit
this.refreshTable()
},
// 妫�楠岄」鐩弬鏁版柊澧�
--
Gitblit v1.9.3