From 48ad70d6c9dca8d62d0c3120f8dba640272db4a5 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 05 九月 2023 14:52:55 +0800
Subject: [PATCH] modified: src/api/laboratory/organizational.js modified: src/views/experiment/planAssignments/plan.vue modified: src/views/laboratory/ledger/index.vue modified: src/views/standardLibrary/index.vue
---
src/views/standardLibrary/index.vue | 8 +++++---
src/views/experiment/planAssignments/plan.vue | 5 +++--
src/views/laboratory/ledger/index.vue | 8 ++++----
src/api/laboratory/organizational.js | 2 +-
4 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/api/laboratory/organizational.js b/src/api/laboratory/organizational.js
index bec30c9..5234aef 100644
--- a/src/api/laboratory/organizational.js
+++ b/src/api/laboratory/organizational.js
@@ -4,7 +4,7 @@
getOrganizational: "/organizational/list", // 鍥涚骇鏍�
getTableInitialization: "/organizational/table", // 琛ㄦ牸鏁版嵁鎺ュ彛
organizationalAdd: "/organizational/add", // 娣诲姞閮ㄩ棬
- organizationalUpdate: "/organizational/add", // 淇敼閮ㄩ棬
+ organizationalUpdate: "/organizational/update", // 淇敼閮ㄩ棬
organizationalDelete: "/organizational/delete", // 鍒犻櫎閮ㄩ棬
}
export function getOrganizationalApi() {
diff --git a/src/views/experiment/planAssignments/plan.vue b/src/views/experiment/planAssignments/plan.vue
index 8d55e13..4be59d6 100644
--- a/src/views/experiment/planAssignments/plan.vue
+++ b/src/views/experiment/planAssignments/plan.vue
@@ -96,8 +96,8 @@
</el-table-column>
<el-table-column prop="testState" label="妫�楠岀姸鎬�" width="100px">
<template slot-scope="scope">
- <el-tag type="success" v-if="scope.row.testState==1">鍚堟牸</el-tag>
- <el-tag type="danger" v-else-if="scope.row.testState==0">涓嶅悎鏍�</el-tag>
+ <el-tag type="success" v-if="scope.row.testState==1">宸叉姤妫�</el-tag>
+ <el-tag type="danger" v-else-if="scope.row.testState==0">鏈姤妫�</el-tag>
</template>
</el-table-column>
<el-table-column prop="startTime" label="妫�楠屽紑濮�" width="100px">
@@ -268,6 +268,7 @@
.children.length
},
openUpDia(row) {
+ console.log(row);
this.upDia = true
this.upData = {
id: row.code,
diff --git a/src/views/laboratory/ledger/index.vue b/src/views/laboratory/ledger/index.vue
index b2d13b5..9a35f5c 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">
@@ -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>
@@ -736,7 +736,7 @@
this.$message.success('娣诲姞鎴愬姛')
}
} catch (error) {
- this.$message.error(error)
+ this.$message.error(error.message)
}
await this.closeCodePoins()
},
diff --git a/src/views/standardLibrary/index.vue b/src/views/standardLibrary/index.vue
index d476cc5..2f37add 100644
--- a/src/views/standardLibrary/index.vue
+++ b/src/views/standardLibrary/index.vue
@@ -2,10 +2,10 @@
<div class="standard-library-main">
<div class="content-main">
<div class="library-bom" style="width: 300px">
- <el-input v-model="filterText" placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"></el-input>
+ <el-input clearable v-model="filterText" placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"></el-input>
<el-button type="text">鍏ㄩ儴</el-button>
<el-tree ref="tree" style="width: 100%" class="filter-tree" :data="standardTree" :props="defaultProps"
- node-key="id" highlight-current default-expand-all :filter-node-method="filterNode"
+ node-key="id" :highlight-current="true" :default-expand-all="true" :filter-node-method="filterNode"
:render-content="renderContent" @node-click="nodeClick" />
</div>
<div class="library-table" style="width: 80%">
@@ -108,6 +108,7 @@
export default {
data() {
return {
+ filterNodeData: [],
options: [],
versionValue: "",
deleteList: [],
@@ -189,7 +190,7 @@
})
.catch(() => {});
},
- filterNode(value, data) {
+ filterNode(value, data,node) {
if (!value) return true;
return data.name.indexOf(value) !== -1;
},
@@ -242,6 +243,7 @@
//TODO handle the exception
}
});
+
},
getDefault(arr, index) {
for (const item of arr) {
--
Gitblit v1.9.3