From c7ccbc6510a9350e0a0a5a39a84f46c382d080b3 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 15 九月 2023 15:00:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before
---
src/components/view/laboratoryManagement.vue | 74 ++++++++++++++++++++++++++++++++----
1 files changed, 65 insertions(+), 9 deletions(-)
diff --git a/src/components/view/laboratoryManagement.vue b/src/components/view/laboratoryManagement.vue
index f03f361..c29f494 100644
--- a/src/components/view/laboratoryManagement.vue
+++ b/src/components/view/laboratoryManagement.vue
@@ -1,8 +1,8 @@
<template>
- <div>
+ <div class="laboratoryMangement">
<el-row>
<el-col :span="12" class="top_left_name">璁惧缁存姢</el-col>
- <el-col :span="12" style="text-align: right;">
+ <el-col :span="12" style="text-align: right;" class="title">
<el-button
@click="testItem()"
type="primary"
@@ -53,6 +53,9 @@
<el-form-item label="璁惧缁�" prop="name">
<el-select
v-model="ruleForm.equr"
+ allow-create
+ filterable
+ @create=""
placeholder="璇烽�夋嫨璁惧缁�"
>
<el-option
@@ -63,6 +66,12 @@
>
</el-option>
</el-select>
+ <!-- <el-autocomplete
+ class="inline-input"
+ v-model="ruleForm.equr"
+ :fetch-suggestions="querySearch"
+ placeholder="璇疯緭鍏ュ唴瀹�"
+ ></el-autocomplete> -->
</el-form-item>
</el-col>
<el-col :span="12">
@@ -414,7 +423,7 @@
// BOM鏍戞暟鎹粨鏋�
towTree: [],
equipment: '1',
- equaip:'',
+ equaip:[],
ruleForm: {
// 鏂板浠櫒琛ㄥ崟
code: "",
@@ -484,7 +493,21 @@
console.log(this.checkTreeNode);
this.selectDevice()
},
-
+ selectInput(){
+
+ },
+ // querySearch(queryString, cb) {
+ // console.log(this.equaip);
+ // var restaurants = this.equaip;
+ // var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+ // // 璋冪敤 callback 杩斿洖寤鸿鍒楄〃鐨勬暟鎹�
+ // cb(results);
+ // },
+ // createFilter(queryString) {
+ // return (restaurant) => {
+ // return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+ // };
+ // },
staueValueChange() {
this.selectDevice()
// this.tableData = [];
@@ -556,9 +579,17 @@
params:{
type:this.equip
}
- }).then(res =>{
- this.equaip = res.data
- console.log(this.equip);
+ })
+ .then(res =>{
+ this.equaip = res.data
+ // res.data.forEach(item=>{
+ // let obj={
+ // id: item,
+ // value: item
+ // }
+ // this.equaip.push(obj)
+ console.log(this.equaip);
+ // })
})
},
RadioChange(val){
@@ -588,6 +619,7 @@
let one=this.towTree[0]
console.log(one);
let name =one.father
+ this.checkTreeNode.father = name
console.log(name);
this.selectDeviceStart(name)
});
@@ -639,9 +671,9 @@
type:this.ruleForm.type,
}, {headers: {"Content-Type": "application/json"}
}).then(res =>{
+ this.selectDevice()
this.$message.success('鏂板鎴愬姛')
this.ruleForm = {}
- this.selectDevice()
})
},
// tableDataApi() {
@@ -696,7 +728,9 @@
delDeviceById() {
this.$axios.post(this.$api.url.delDeviceById,{
id:this.delete.id
- })
+ }).then(res=>{
+ this.$parent.removeAllTab()
+ });
},
handleClick(row) {
console.log(row);
@@ -995,3 +1029,25 @@
line-height: 14px;
}
</style>
+<style>
+ .laboratoryMangement .title *{
+ font-size: 14px;
+ }
+
+ .laboratoryMangement .table_top_div *{
+ font-size: 14px;
+ }
+
+ .laboratoryMangement .title .el-button {
+ height: 32px;
+ border: 1px solid rgba(190, 190, 190, 0.44);
+ box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41);
+ padding: 0 12px;
+ }
+ .laboratoryMangement .table_top_div .el-button {
+ height: 32px;
+ border: 1px solid rgba(190, 190, 190, 0.44);
+ box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41);
+ padding: 0 12px;
+ }
+</style>
\ No newline at end of file
--
Gitblit v1.9.3