From c4355a18506cf0e8f63469a8a38f2e8d5e67d6f9 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 09 九月 2023 14:53:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/laboratoryManagement.vue | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/src/components/view/laboratoryManagement.vue b/src/components/view/laboratoryManagement.vue
index 55d2727..9cbf45d 100644
--- a/src/components/view/laboratoryManagement.vue
+++ b/src/components/view/laboratoryManagement.vue
@@ -1,7 +1,7 @@
<template>
<div>
<el-row>
- <el-col :span="12" class="top_left_name">瀹為獙瀹ょ鐞�</el-col>
+ <el-col :span="12" class="top_left_name">璁惧缁存姢</el-col>
<el-col :span="12" style="text-align: right;">
<el-button
@click="testItem()"
@@ -224,9 +224,9 @@
></i>
{{ data.father }}</span
>
- <el-button type="text" size="mini" @click.stop="remove(node, data)">
+ <!-- <el-button type="text" size="mini" @click.stop="remove(node, data)">
<i class="el-icon-delete"></i>
- </el-button>
+ </el-button> -->
</div>
</el-tree>
</div>
@@ -427,7 +427,7 @@
equr:1,
},
delete:{},
- equip:[],
+ equip:1,
rules: {
name: [
{ required: true, message: "璇疯緭鍏ヤ华鍣ㄨ澶囩紪鍙�", trigger: "blur" },
@@ -465,12 +465,20 @@
}
};
},
+ mounted() {
+ // 鍒濆鍖栬皟鐢ㄤ簩绾ф爲
+ this.twoTreeApi();
+ // 鍒濆鍖栬皟鐢ㄨ〃鏍兼暟鎹�
+ // this.tableDataApi();
+ this.selectDevice()//鍙宠竟
+ },
methods: {
selectDevice() {//鍙宠竟鏁版嵁
- console.log(this.$api.url.selectDevice);
+ console.log(this.ruleForm.treedata.father);
+ console.log(this.equip);
this.$axios.get(this.$api.url.selectDevice,{
params:{
- father:this.treedata.father,
+ father:this.ruleForm.treedata.father,
type:this.equip,
}
}).then(res =>{
@@ -582,7 +590,7 @@
},
handleNodeClick(data) {
console.log(data);
- this.treedata = data
+ // this.treedata = data
this.selectDevice()
},
handlerDeptList() {
@@ -720,13 +728,7 @@
});
}
},
- mounted() {
- // 鍒濆鍖栬皟鐢ㄤ簩绾ф爲
- this.twoTreeApi();
- // 鍒濆鍖栬皟鐢ㄨ〃鏍兼暟鎹�
- this.tableDataApi();
- this.selectDevice()//鍙宠竟
- },
+
watch: {
"ruleForm.rawInsProductId": {
//鐩戝惉ruleForm.rawInsProductId
--
Gitblit v1.9.3