From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/structural/capabilityAndLaboratory/capability/index.vue | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/src/views/structural/capabilityAndLaboratory/capability/index.vue b/src/views/structural/capabilityAndLaboratory/capability/index.vue
index 96083ab..19f9318 100644
--- a/src/views/structural/capabilityAndLaboratory/capability/index.vue
+++ b/src/views/structural/capabilityAndLaboratory/capability/index.vue
@@ -33,14 +33,24 @@
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" v-if="radio===0">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="itemParameterForm.sample" @keyup.enter.native="refreshTable()">
+ </el-input>
+ </el-form-item>
+ <el-form-item label="妫�楠屽璞�" prop="specimenName" v-if="radio===1">
<el-input size="small" placeholder="璇疯緭鍏�" clearable
v-model="itemParameterForm.specimenName" @keyup.enter.native="refreshTable()">
</el-input>
</el-form-item>
+ <el-form-item label="闆朵欢鍙�" prop="partNo" v-if="radio===1">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="itemParameterForm.partNo" @keyup.enter.native="refreshTable()">
+ </el-input>
+ </el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable">鏌� 璇�</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="refresh">閲� 缃�</el-button>
+ <el-button type="primary" size="mini" @click="refreshTable">鏌ヨ</el-button>
+ <el-button size="mini" @click="refresh">閲嶇疆</el-button>
</el-form-item>
</el-form>
<!-- 妫�楠岄」鐩弬鏁拌〃鏍�-->
@@ -59,6 +69,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>
@@ -126,6 +137,7 @@
import { obtainItemParameterList } from '@/api/structural/laboratoryScope'
export default {
+ name: 'Capability',
components: {limsTable, EditForm, testObjectEditForm, BindPartDialog, BindSupplierDensityDialog},
data() {
return {
@@ -296,7 +308,9 @@
itemParameterForm: {
inspectionItem: null,
inspectionItemSubclass: null,
- specimenName: null
+ sample: null,
+ specimenName: null,
+ partNo: null
},
radio: 0,
productLoad: false,
@@ -343,7 +357,8 @@
productPage: {
total:0,
size:10,
- current:0,
+ current:1,
+ partNo: null,
layout: 'total, prev, pager, next'
},
productableLoading: false,
@@ -538,8 +553,11 @@
upProduct(row) {
this.diaProduct = true
this.objectId = row.id
+ this.productPage.current = 1
+ this.productPage.partNo = this.itemParameterForm.partNo
this.getProductList(row)
},
+ // 鏌ヨ浜у搧缁存姢鍒楄〃鏁版嵁
getProductList () {
const params = {
objectId: this.objectId,
@@ -553,6 +571,11 @@
this.productableLoading = false
})
},
+ // 浜у搧缁存姢鍒楄〃鍒嗛〉
+ productPagination(page) {
+ this.productPage.current = page.page
+ this.getProductList()
+ },
// 浜у搧缁存姢-鏂板-缂栬緫
editProduct (type, row) {
this.productEditDia = true
--
Gitblit v1.9.3