From 0b9a9b4aa3051565b213b9efcb5e02ecbda0e791 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期一, 04 九月 2023 15:22:35 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.73.113:9001/r/lims-before
---
src/views/laboratory/ledger/index.vue | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/views/laboratory/ledger/index.vue b/src/views/laboratory/ledger/index.vue
index 7cbc78a..9746cd5 100644
--- a/src/views/laboratory/ledger/index.vue
+++ b/src/views/laboratory/ledger/index.vue
@@ -52,8 +52,8 @@
</div>
</div>
<div class="table-box">
- <el-table ref="equipmentTable" node-key="father_name" :cell-style="{ textAlign: 'center' }"
- :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'center' }"
+ <el-table ref="equipmentTable" node-key="father_name" :cell-style="{ textAlign: 'left' }"
+ :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'left' }"
:data="equipmentTable" style="width: 100%;">
<el-table-column type="index" label="搴忓彿" min-width="90" />
<el-table-column prop="equipment_code" label="浠櫒璁惧缂栧彿" min-width="200" />
@@ -685,7 +685,7 @@
// 鑺傜偣鐐瑰嚮澶勭悊
nodeClickHandler(data, node, element) {
this.nodeclicked = data
- // console.log(data)
+ console.log(data)
// 鍙湁鏁版嵁涓惡甯d鎵嶈兘鍙戦�佹煡璇㈣姹�
if (data.id) {
this.getEquipmentTable({ classifyId: data.id, pageSize: this.pageSize, pageNo: this.currentPage, whetherWhether: this.isOut })
@@ -950,15 +950,14 @@
this.deletedialogVisible = true
},
async deleteInstrument() {
- let up = await deleteInstrument({ instrumentId: this.instrumentId })
- if (up.data) {
- this.$message({
- message: '鎿嶄綔鎴愬姛锛�',
- type: 'success'
- });
+ await deleteInstrument({ instrumentId: this.instrumentId }).then(res=>{
+ this.$message.error('鍒犻櫎鎴愬姛锛�');
let d = this.nodeclicked
+ console.log(d);
this.nodeClickHandler(d);
- }
+ }).catch(()=>{
+ this.$message.error('鍒犻櫎澶辫触锛�');
+ });
this.deletedialogVisible = false
},
async submitTreeForm(formName) {
--
Gitblit v1.9.3