From 5535157ce811a29c4e3c68148fd110c9c5a4137b Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 05 九月 2023 16:39:58 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.65.113:9001/r/lims-before
---
src/views/laboratory/ledger/index.vue | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/views/laboratory/ledger/index.vue b/src/views/laboratory/ledger/index.vue
index 5ce4d90..48f4240 100644
--- a/src/views/laboratory/ledger/index.vue
+++ b/src/views/laboratory/ledger/index.vue
@@ -33,7 +33,7 @@
</el-col>
</el-row>
</div>
- <el-tree highlight-current="true" ref="classTree" :data="classTree" :props="defaultProps" :default-expand-all="true"
+ <el-tree :highlight-current="true" ref="classTree" :data="classTree" :props="defaultProps" :default-expand-all="true"
:filter-node-method="filterNode" @node-click="nodeClickHandler" />
</div>
<div class="library-table">
@@ -154,7 +154,7 @@
<span><i class="el-icon-edit" />楠屾敹鏃ユ湡锛歿{ equipmentDetail.acceptanceDate }}</span>
</div>
<div class="message-item">
- <span><i class="el-icon-edit" />淇濈浜猴細{{ equipmentDetail.name }}</span>
+ <span><i class="el-icon-edit" />淇濈浜猴細{{ equipmentDetail.userName }}</span>
</div>
<div class="message-item">
<span><i class="el-icon-edit" />鏄惁鏀寔鏁伴噰锛歿{ equipmentDetail.whetherDataAcquisition == 1 ? '鏀寔' : '涓嶆敮鎸�'
@@ -350,8 +350,8 @@
</el-row>
<el-row v-show="equipmentform.equipmentMeasurement === 1" :gutter="50">
<el-col :span="12">
- <el-form-item label="璁￠噺鎴鏈夋晥鏈燂細" label-width="80">
- <el-input min="0" v-model="equipmentform.termValidity" placeholder="璇峰～鍐欒閲忔湁鏁堟湡" type="number" />
+ <el-form-item label="璁￠噺鍛ㄦ湡(鏈�)锛�" label-width="80">
+ <el-input min="0" v-model="equipmentform.termValidity" placeholder="璇峰～鍐欒閲忓懆鏈�" type="number" />
</el-form-item>
</el-col>
</el-row>
@@ -470,10 +470,6 @@
userOpetions: [],
// 浠櫒鐘舵�侀厤缃」
conditionsOptions: [
- {
- label: '鍏ㄩ儴',
- value: 0
- },
{
label: '杩愯',
value: 1
@@ -736,7 +732,7 @@
this.$message.success('娣诲姞鎴愬姛')
}
} catch (error) {
- this.$message.error(error)
+ this.$message.error(error.message)
}
await this.closeCodePoins()
},
@@ -777,7 +773,7 @@
this.$message.error('娣诲姞澶辫触')
}
this.$message.success('娣诲姞鎴愬姛')
- let d = this.nodeclicked
+ let d = this.nodeclicked;
this.nodeClickHandler(d);
this.addDrawerVisible = false
this.equipmentform = {}
@@ -787,6 +783,8 @@
try {
const res = await changeInstrument(this.equipmentform)
this.$message.success('淇敼鎴愬姛')
+ let d = this.nodeclicked;
+ this.nodeClickHandler(d);
this.addDrawerVisible = false
this.detailDrawer = false
} catch (error) {
--
Gitblit v1.9.3