From c4cfd5c566d137fb60781b8b2e0057d11cf4b051 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 17:33:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/structural/capabilityAndLaboratory/capability/index.vue | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/views/structural/capabilityAndLaboratory/capability/index.vue b/src/views/structural/capabilityAndLaboratory/capability/index.vue
index 96083ab..8041f4a 100644
--- a/src/views/structural/capabilityAndLaboratory/capability/index.vue
+++ b/src/views/structural/capabilityAndLaboratory/capability/index.vue
@@ -33,9 +33,9 @@
v-model="itemParameterForm.inspectionItemSubclass" @keyup.enter.native="refreshTable()">
</el-input>
</el-form-item>
- <el-form-item label="妫�楠屽璞�" prop="specimenName">
+ <el-form-item label="妫�楠屽璞�" prop="sample">
<el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="itemParameterForm.specimenName" @keyup.enter.native="refreshTable()">
+ v-model="itemParameterForm.sample" @keyup.enter.native="refreshTable()">
</el-input>
</el-form-item>
<el-form-item>
@@ -59,6 +59,7 @@
<!--浜у搧缁存姢寮规-->
<el-dialog title="浜у搧缁存姢" :visible.sync="diaProduct" width="900px">
<lims-table :tableData="productData" :column="productColumn" height="460"
+ @pagination="productPagination"
:page="productPage" :tableLoading="productableLoading"></lims-table>
<span slot="footer" class="dialog-footer">
<el-button @click="diaProduct = false">鍙� 娑�</el-button>
@@ -296,7 +297,7 @@
itemParameterForm: {
inspectionItem: null,
inspectionItemSubclass: null,
- specimenName: null
+ sample: null
},
radio: 0,
productLoad: false,
@@ -343,7 +344,7 @@
productPage: {
total:0,
size:10,
- current:0,
+ current:1,
layout: 'total, prev, pager, next'
},
productableLoading: false,
@@ -538,8 +539,10 @@
upProduct(row) {
this.diaProduct = true
this.objectId = row.id
+ this.productPage.current = 1
this.getProductList(row)
},
+ // 鏌ヨ浜у搧缁存姢鍒楄〃鏁版嵁
getProductList () {
const params = {
objectId: this.objectId,
@@ -553,6 +556,11 @@
this.productableLoading = false
})
},
+ // 浜у搧缁存姢鍒楄〃鍒嗛〉
+ productPagination(page) {
+ this.productPage.current = page.page
+ this.getProductList()
+ },
// 浜у搧缁存姢-鏂板-缂栬緫
editProduct (type, row) {
this.productEditDia = true
--
Gitblit v1.9.3