From 1e9c7a02ec2b8caf7dda6000d7f0f79849df6b45 Mon Sep 17 00:00:00 2001
From: 朱佳吉 <1527963051@qq.com>
Date: 星期四, 09 五月 2024 14:15:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/b1-inspection-order.vue | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 98df458..66e038b 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -92,23 +92,23 @@
v-model="componentData.entity.sampleType" @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="componentData.entity.sampleModel" @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="componentData.entity.sampleType" @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="componentData.entity.sampleType" @keyup.enter.native="refreshTable()"></el-input></div>
+ v-model="componentData.entity.sampleCode" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
<div class="search_thing">
<div class="search_label">涓嬪崟鏃堕棿锛�</div>
<div class="search_input">
<el-date-picker style="width:100%" v-model="componentData.entity.createTime"
- type="datetime"
+ type="date"
size="small"
format="yyyy-MM-dd"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
clearable
placeholder="閫夋嫨鏃ユ湡">
</el-date-picker>
@@ -242,6 +242,9 @@
entity: {
entrustCode: null,
sampleType: null,
+ sampleName: null,
+ sampleModel: null,
+ sampleCode: null,
state: 0,
orderBy: {
field: 'id',
--
Gitblit v1.9.3