From 3f783b4c4a8b23045e67d664cf78c022410e62fc Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期五, 15 九月 2023 13:10:17 +0800
Subject: [PATCH] 改bug
---
src/components/view/technology.vue | 6 ++-
src/components/view/laboratoryManagement.vue | 56 ++++++++++++++-------------
src/components/view/record-content.vue | 42 +++++++++++---------
3 files changed, 56 insertions(+), 48 deletions(-)
diff --git a/src/components/view/laboratoryManagement.vue b/src/components/view/laboratoryManagement.vue
index 8874507..c29f494 100644
--- a/src/components/view/laboratoryManagement.vue
+++ b/src/components/view/laboratoryManagement.vue
@@ -51,11 +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"
+ @create=""
placeholder="璇烽�夋嫨璁惧缁�"
>
<el-option
@@ -65,13 +65,13 @@
:value="list"
>
</el-option>
- </el-select> -->
- <el-autocomplete
+ </el-select>
+ <!-- <el-autocomplete
class="inline-input"
v-model="ruleForm.equr"
:fetch-suggestions="querySearch"
placeholder="璇疯緭鍏ュ唴瀹�"
- ></el-autocomplete>
+ ></el-autocomplete> -->
</el-form-item>
</el-col>
<el-col :span="12">
@@ -496,18 +496,18 @@
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);
- };
- },
+ // 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 = [];
@@ -579,15 +579,17 @@
params:{
type:this.equip
}
- }).then(res =>{
- res.data.forEach(item=>{
- let obj={
- id: item,
- value: item
- }
- this.equaip.push(obj)
- 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){
@@ -669,9 +671,9 @@
type:this.ruleForm.type,
}, {headers: {"Content-Type": "application/json"}
}).then(res =>{
+ this.selectDevice()
this.$message.success('鏂板鎴愬姛')
this.ruleForm = {}
- this.selectDevice()
})
},
// tableDataApi() {
diff --git a/src/components/view/record-content.vue b/src/components/view/record-content.vue
index e727526..111f284 100644
--- a/src/components/view/record-content.vue
+++ b/src/components/view/record-content.vue
@@ -144,7 +144,7 @@
ref="ruleForm" width="35%">
<div>
<el-form ref="form" :model="form" label-width="80px">
- <el-form-item label="绫诲瀷">
+ <el-form-item label="绫诲瀷" prop="type">
<template>
<el-select v-model="form.type"
@change="edittype" placeholder="璇烽�夋嫨" style="width: 480px;">
@@ -155,7 +155,7 @@
</el-select>
</template>
</el-form-item>
- <el-form-item label="宸ュ簭">
+ <el-form-item label="宸ュ簭" prop="work">
<template>
<el-select v-model="form.work"
@change="workevent"
@@ -169,7 +169,7 @@
</el-select>
</template>
</el-form-item>
- <el-form-item label="宸ヨ壓鍚嶇О">
+ <el-form-item label="宸ヨ壓鍚嶇О" prop="name">
<template>
<el-select v-model="form.craft" placeholder="璇烽�夋嫨" style="width: 480px;">
<el-option
@@ -181,13 +181,13 @@
</el-select>
</template>
</el-form-item>
- <el-form-item label="璁板綍">
+ <el-form-item label="璁板綍" prop="record">
<el-input v-model="form.record"></el-input>
</el-form-item>
<el-form-item label="澶囨敞">
<el-input v-model="form.remarks"></el-input>
</el-form-item>
- <el-form-item label="鍗曚綅">
+ <el-form-item label="鍗曚綅" prop="unit">
<el-input v-model="form.unit"></el-input>
</el-form-item>
</el-form>
@@ -260,7 +260,14 @@
<script>
export default {
data() {
- return {
+ var checktype = (rule, value, callback) => {
+ if (!value) {
+ return callback(new Error('绫诲瀷涓嶈兘涓虹┖'));
+ }else{
+ return callback
+ }
+ };
+ return {
search: {
type: 0,
technology: null
@@ -278,7 +285,7 @@
unit:'',
},
Rules:{
- type:{required:true,message:'绫诲瀷涓嶈兘涓虹┖',trigger:'change'},
+ type:{validator:checktype,required:true,message:'绫诲瀷涓嶈兘涓虹┖',trigger:'change'},
work:{required:true,message:'宸ュ簭涓嶈兘涓虹┖',trigger:'change'},
name:{required:true,message:'宸ヨ壓涓嶈兘涓虹┖',trigger:'change'},
record:{required:true,message:'璁板綍涓嶈兘涓虹┖',trigger:'blur'},
@@ -367,22 +374,19 @@
this.selectjilu()
})
},
- add() {
- this.$refs[formName].validate((valid) => {
- if (valid) {
- alert('submit!');
- } else {
- console.log('error submit!!');
- return false;
- }
- });
+ add(formName) {
this.dialogVisible = false
this.addRecord()
+ // this.$refs[formName].validate((valid) => {
+ // if (valid) {
+ // alert('submit!');
+ // } else {
+ // console.log('error submit!!');
+ // return false;
+ // }
+ // });
this.form = {};
},
- resetForm(formName) {
- this.$refs[formName].resetFields();
- },
query() {
this.selectAllleft()
},
diff --git a/src/components/view/technology.vue b/src/components/view/technology.vue
index 1026936..f7870aa 100644
--- a/src/components/view/technology.vue
+++ b/src/components/view/technology.vue
@@ -371,6 +371,7 @@
allow-create
filterable
@create=""
+
placeholder="璇烽�夋嫨"
style="width: 480px"
>
@@ -620,7 +621,6 @@
this.$axios
.post(
this.$api.url.addTechTemp,
-
{
deviceGroup: this.form.deviceGroup,
// elementId: JSON.stringify(this.form.elementId).replace("[","").replace("]",""),
@@ -658,7 +658,9 @@
// console.log(this.equipment);
});
},
-
+ // onTypeBlur(e) {
+ // if (e.target.value) {
+ // this.type = e.target.value;}},
//宸ュ簭
chooseTech() {
this.$axios.get(this.$api.url.chooseTech,{
--
Gitblit v1.9.3