From 71c4ece010f68a74eeff5e986caecb9a0bb2e36c Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 25 四月 2024 17:37:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/a5-capacity-scope.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/components/view/a5-capacity-scope.vue b/src/components/view/a5-capacity-scope.vue
index 05ce114..1265682 100644
--- a/src/components/view/a5-capacity-scope.vue
+++ b/src/components/view/a5-capacity-scope.vue
@@ -66,9 +66,9 @@
v-model="itemParameterData.entity.inspectionItem" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
<div class="search_thing">
- <div class="search_label">瀹為獙瀹わ細</div>
+ <div class="search_label">妫�楠屽瓙椤癸細</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="itemParameterData.entity.laboratory" @keyup.enter.native="refreshTable()"></el-input></div>
+ v-model="itemParameterData.entity.inspectionItemSubclass" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
<div class="search_thing" style="padding-left: 30px;">
<el-button size="small" @click="refresh()">閲� 缃�</el-button>
@@ -116,7 +116,7 @@
itemParameterData: {
entity: {
inspectionItem: null,
- laboratory: null,
+ inspectionItemSubclass: null,
orderBy: {
field: 'id',
order: 'asc'
@@ -210,8 +210,8 @@
}],
tagField: {},
selectField: {},
- requiredAdd: ['specimenName'],
- requiredUp: ['specimenName']
+ requiredAdd: ['specimenName','code'],
+ requiredUp: ['specimenName','code']
},
itemParameterEntityCopy: {},
testObjectDataEntityCopy: {},
--
Gitblit v1.9.3