From 14b0c0560fede0fedac2282bf8ca6dd463a6b52f Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 14 九月 2023 15:25:41 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before
---
src/components/view/technology.vue | 1 +
src/components/view/laboratoryManagement.vue | 41 +++++++++++++++++++++++++++++++++++------
src/components/view/technical.vue | 3 ++-
src/components/view/sale.vue | 1 +
4 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/src/components/view/laboratoryManagement.vue b/src/components/view/laboratoryManagement.vue
index b099a46..8874507 100644
--- a/src/components/view/laboratoryManagement.vue
+++ b/src/components/view/laboratoryManagement.vue
@@ -51,8 +51,11 @@
<el-row>
<el-col :span="12">
<el-form-item label="璁惧缁�" prop="name">
- <el-select
+ <!-- <el-select
v-model="ruleForm.equr"
+ allow-create
+ filterable
+ @blur="selectInput"
placeholder="璇烽�夋嫨璁惧缁�"
>
<el-option
@@ -62,7 +65,13 @@
:value="list"
>
</el-option>
- </el-select>
+ </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 = [];
@@ -557,8 +580,14 @@
type:this.equip
}
}).then(res =>{
- this.equaip = res.data
- console.log(this.equip);
+ res.data.forEach(item=>{
+ let obj={
+ id: item,
+ value: item
+ }
+ this.equaip.push(obj)
+ console.log("璁惧缁�",this.equip);
+ })
})
},
RadioChange(val){
diff --git a/src/components/view/sale.vue b/src/components/view/sale.vue
index dc35e6b..d3e59a2 100644
--- a/src/components/view/sale.vue
+++ b/src/components/view/sale.vue
@@ -562,6 +562,7 @@
type: 1
}).then(res => {
this.selectRawInspectsList()
+ this.$parent.removeAllTab()
})
}).catch(e => {
if (e == 'cancel') {
diff --git a/src/components/view/technical.vue b/src/components/view/technical.vue
index 488e2ad..ff9bf51 100644
--- a/src/components/view/technical.vue
+++ b/src/components/view/technical.vue
@@ -39,6 +39,7 @@
<div class="technical-table">
<div class="table-box">
<el-table
+ height="490"
border style="width: 100%"
:data="technicalTable"
>
@@ -379,7 +380,7 @@
/* 鎶�鏈枃浠惰〃鏍兼牱寮� */
.technical-table{
margin-top: 11px;
- height: calc(100% - 140px);
+ /* height: calc(100% - 140px); */
background: #fff;
padding: 23px 21px ;
font-size: 14px;
diff --git a/src/components/view/technology.vue b/src/components/view/technology.vue
index a6c319a..93e60ed 100644
--- a/src/components/view/technology.vue
+++ b/src/components/view/technology.vue
@@ -361,6 +361,7 @@
v-model="form.father"
allow-create
filterable
+ @create=""
placeholder="璇烽�夋嫨"
style="width: 480px"
>
--
Gitblit v1.9.3