From 8837c26b0a0c19e872d8251fad0bafe2f149ef61 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期日, 28 四月 2024 10:50:52 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/view/a5-capacity-scope.vue | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/components/view/a5-capacity-scope.vue b/src/components/view/a5-capacity-scope.vue
index 94936fc..3618d06 100644
--- a/src/components/view/a5-capacity-scope.vue
+++ b/src/components/view/a5-capacity-scope.vue
@@ -54,7 +54,7 @@
</el-col>
<el-col :span="12" style="text-align: right;">
<el-button size="medium" type="primary" @click="openAdd" v-if="addPower">鏂板</el-button>
- <el-button size="medium" icon="el-icon-delete">鍒犻櫎</el-button>
+ <!-- <el-button size="medium" icon="el-icon-delete">鍒犻櫎</el-button> -->
</el-col>
</el-row>
</div>
@@ -69,6 +69,12 @@
<div class="search_label">妫�楠屽瓙椤癸細</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
v-model="itemParameterData.entity.inspectionItemSubclass" @keyup.enter.native="refreshTable()"></el-input>
+ </div>
+ </div>
+ <div class="search_thing">
+ <div class="search_label">妫�楠屽璞★細</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="itemParameterData.entity.sample" @keyup.enter.native="refreshTable()"></el-input>
</div>
</div>
<div class="search_thing" style="padding-left: 30px;">
@@ -129,13 +135,14 @@
entity: {
inspectionItem: null,
inspectionItemSubclass: null,
+ sample: null,
orderBy: {
field: 'id',
order: 'asc'
}
},
- isIndex: false,
- showSelect: true,
+ isIndex: true,
+ showSelect: false,
select: true,
row: 2,
do: [{
@@ -217,7 +224,7 @@
props:{
value:'name',
label:'name',
- checkStrictly: false
+ checkStrictly: true
}
},
requiredAdd: ['sonLaboratory', 'inspectionItem', 'manHour', 'inspectionItemType', 'inspectionValueType',
@@ -235,8 +242,8 @@
order: 'asc'
}
},
- isIndex: false,
- showSelect: true,
+ isIndex: true,
+ showSelect: false,
select: true,
do: [{
id: 'update',
--
Gitblit v1.9.3