From 3ca7a7fe929d39c51e705e39306a99e452b1efe7 Mon Sep 17 00:00:00 2001
From: 晏有为 <13214124+yan-youwei@user.noreply.gitee.com>
Date: 星期一, 27 五月 2024 16:23:29 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before
---
src/components/view/b1-inspection-order.vue | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 9d19061..8d285c2 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -77,6 +77,7 @@
<el-row class="title">
<el-col :span="12" style="padding-left: 20px;">妫�楠屼笅鍗�</el-col>
<el-col :span="12" style="text-align: right;">
+ <el-button size="medium" type="primary" @click="playOrder(4)">鍏夌氦閰嶇疆</el-button>
<el-button size="medium" type="primary" @click="playOrder(1)" v-if="addPower">涓嬪崟</el-button>
</el-col>
</el-row>
@@ -120,17 +121,17 @@
<div class="search_thing" style="width: 20%;" v-if="more">
<div class="search_label">涓嬪崟浜猴細</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="componentData.entity.value1" @keyup.enter.native="refreshTable()"></el-input></div>
+ v-model="componentData.entity.name" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
<div class="search_thing" style="width: 20%;" v-if="more">
<div class="search_label">宸ョ▼鍚嶇О锛�</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="componentData.entity.value2" @keyup.enter.native="refreshTable()"></el-input></div>
+ v-model="componentData.entity.engineering" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
<div class="search_thing" style="width: 20%;" v-if="more">
<div class="search_label">鐢熶骇鍗曚綅锛�</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="componentData.entity.value3" @keyup.enter.native="refreshTable()"></el-input></div>
+ v-model="componentData.entity.production" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
</el-col>
<el-col :span="4">
@@ -227,7 +228,7 @@
</el-dialog>
</div>
<div style="width: 100%;height: 100%;" v-if="active >0">
- <Add :active="active" :currentId="currentId" v-if="active<4" />
+ <Add :active="active" :currentId="currentId" v-show="active<4" />
<fiberOpticConfig :currentId="currentId" v-if="active==4" />
</div>
</div>
@@ -272,9 +273,9 @@
sampleModel: null,
sampleCode: null,
state: 0,
- value1:null,
- value2:null,
- value3:null,
+ name:null,
+ engineering:null,
+ production:null,
orderBy: {
field: 'id',
order: 'asc'
--
Gitblit v1.9.3