From 0b89c49a1e3ab87368b689d985e28a977a9bb84e Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 22 三月 2024 13:08:20 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/b1-inspection-order.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 0200bd6..f513eef 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -86,9 +86,9 @@
v-model="componentData.entity.entrustCode" @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="componentData.entity.sample" @keyup.enter.native="refreshTable()"></el-input></div>
+ v-model="componentData.entity.sampleType" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
<div class="search_thing" style="padding-left: 30px;">
<el-button size="small" @click="refresh()">閲� 缃�</el-button>
@@ -217,7 +217,7 @@
componentData: {
entity: {
entrustCode: null,
- sample: null,
+ sampleType: null,
state: 0,
orderBy: {
field: 'id',
@@ -447,7 +447,7 @@
handleIssued(row) {
this.issuedDialogVisible = true;
this.$axios.post(this.$api.insOrder.selectOrderManDay, {
- id: row.sampleId
+ id: row.id
}).then(res => {
this.distributeData.orderId = row.id
this.distributeData.sampleId = row.sampleId
--
Gitblit v1.9.3