From 5d681a5c48d6b09b7bc053795760fa8030f5f1cf Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 15 九月 2023 14:24:59 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before
---
src/components/view/technology.vue | 6
src/components/view/laboratoryManagement.vue | 56 ++++----
src/components/view/record-content.vue | 42 +++---
src/components/view/processInspectionUpdate.vue | 50 +++++--
src/components/view/finishedProductInspectionUp.vue | 47 +++++--
src/components/view/finishedProductInspectionAdd.vue | 45 ++++--
src/components/view/processInspection.vue | 59 ++++++---
src/components/view/rawInsDetail.vue | 46 +++++--
8 files changed, 218 insertions(+), 133 deletions(-)
diff --git a/src/components/view/finishedProductInspectionAdd.vue b/src/components/view/finishedProductInspectionAdd.vue
index d043147..7c2948c 100644
--- a/src/components/view/finishedProductInspectionAdd.vue
+++ b/src/components/view/finishedProductInspectionAdd.vue
@@ -120,9 +120,13 @@
</el-table-column>
<el-table-column prop="dname" label="璇曢獙璁惧" min-width="100">
<template slot-scope="scope">
- <el-button type="text" @click="clickTableSelect(scope)">{{
+ <el-button v-if="!scope.row.isSelectDevice" type="text" @click="clickTableSelect(scope)">{{
scope.row.dname == null ? "璇烽�夋嫨" : scope.row.dname
}}</el-button>
+ <el-select style="width: 100%;" @change="clickNodeSure(scope.row)" v-model="filterText" placeholder="璇烽�夋嫨">
+ <el-option v-for="item in materialOptions" :key="item.id" :label="item.device" :value="item.id">
+ </el-option>
+ </el-select>
</template>
</el-table-column>
<el-table-column label="缁撹">
@@ -200,7 +204,8 @@
qualityTraceability: null,
quantity: null,
specificationsModel: null,
- unit: null
+ unit: null,
+ technologyId: null
},
InspectioniD: null,
addInspectionform: [
@@ -312,17 +317,18 @@
}
}).then(res => {
this.materialOptions = res.data;
+ this.filterText = row.did
});
},
// 鐐瑰嚮琛ㄦ牸閫夋嫨瑙﹀彂
clickTableSelect(scope) {
- this.centerDialogVisible = true;
+ scope.row.isSelectDevice = true
this.clickSelectDevice.index = scope.$index;
this.clickSelectDevice.rpId = scope.row.id;
this.getOptions(scope.row);
},
// 鐐瑰嚮鏍戦噷闈㈢殑纭畾
- clickNodeSure() {
+ clickNodeSure(row) {
let select = this.materialOptions.filter(item => {
return item.id === this.filterText
})[0]
@@ -346,28 +352,32 @@
.then(res => {
this.getTableData()
this.centerDialogVisible = false;
+ row.isSelectDevice=false
});
}
},
changeState(row, index) {
if (row.did != null && row.did != '') {
- let val = row.empiricalValueAddss.filter(item => {
- return item != '' && item != null
- })
- let eq = val.filter(item => {
- return /^[^><=]/.test(item)
- })
- if (eq.length > 0) {
- this.$message({
- message: "妫�娴嬪�糩" + eq + "]鏍煎紡棣栦綅搴斿寘鍚�>,<鎴栬��=",
- type: 'warning'
- });
- return
- }
+ // let val = row.empiricalValueAddss.filter(item => {
+ // return item != '' && item != null
+ // })
+ // let eq = val.filter(item => {
+ // return /^[^><=]/.test(item)
+ // })
+ // if (eq.length > 0) {
+ // this.$message({
+ // message: "妫�娴嬪�糩" + eq + "]鏍煎紡棣栦綅搴斿寘鍚�>,<鎴栬��=",
+ // type: 'warning'
+ // });
+ // return
+ // }
let str = ""
row.empiricalValueAddss.forEach(e => {
str += e + ","
})
+ if (str.slice(0, -1) === '' || str.slice(0, -1) === null || str.slice(0, -1) === undefined) {
+ return
+ }
this.$axios.post(this.$api.url.inspectionItemlose_focus_update, {
deviceId: row.did,
inspectionItemId: row.id,
@@ -489,6 +499,7 @@
c.empiricalValueAddss.push("")
}
uName.push(c['username'])
+ c.isSelectDevice = false
arr.push(c)
})
})
diff --git a/src/components/view/finishedProductInspectionUp.vue b/src/components/view/finishedProductInspectionUp.vue
index 63cdb1d..de810a2 100644
--- a/src/components/view/finishedProductInspectionUp.vue
+++ b/src/components/view/finishedProductInspectionUp.vue
@@ -121,9 +121,13 @@
</el-table-column>
<el-table-column prop="dname" label="璇曢獙璁惧" min-width="100">
<template slot-scope="scope">
- <el-button type="text" @click="clickTableSelect(scope)">{{
+ <el-button v-if="!scope.row.isSelectDevice" type="text" @click="clickTableSelect(scope)">{{
scope.row.dname == null ? "璇烽�夋嫨" : scope.row.dname
}}</el-button>
+ <el-select v-if="scope.row.isSelectDevice" style="width: 100%;" @change="clickNodeSure(scope.row)" v-model="filterText" placeholder="璇烽�夋嫨">
+ <el-option v-for="item in materialOptions" :key="item.id" :label="item.device" :value="item.id">
+ </el-option>
+ </el-select>
</template>
</el-table-column>
<el-table-column label="缁撹">
@@ -295,6 +299,10 @@
// this.getOptions();
},
methods: {
+ // blurNode(row){
+ // console.log(11);
+ // row.isSelectDevice=false
+ // },
escalation() {
let arr = this.inspectionItems
let bl = false
@@ -388,17 +396,19 @@
}
}).then(res => {
this.materialOptions = res.data;
+ this.filterText = row.did
});
},
// 鐐瑰嚮琛ㄦ牸閫夋嫨瑙﹀彂
clickTableSelect(scope) {
- this.centerDialogVisible = true;
+ scope.row.isSelectDevice = true
+ // this.centerDialogVisible = true;
this.clickSelectDevice.index = scope.$index;
this.clickSelectDevice.rpId = scope.row.id;
this.getOptions(scope.row);
},
// 鐐瑰嚮鏍戦噷闈㈢殑纭畾
- clickNodeSure() {
+ clickNodeSure(row) {
let select = this.materialOptions.filter(item => {
return item.id === this.filterText
})[0]
@@ -422,28 +432,32 @@
.then(res => {
this.getTableData()
this.centerDialogVisible = false;
+ row.isSelectDevice=false
});
}
},
changeState(row, index) {
if (row.did != null && row.did != '') {
- let val = row.empiricalValueAddss.filter(item => {
- return item != '' && item != null
- })
- let eq = val.filter(item => {
- return /^[^><=]/.test(item)
- })
- if (eq.length > 0) {
- this.$message({
- message: "妫�娴嬪�糩" + eq + "]鏍煎紡棣栦綅搴斿寘鍚�>,<鎴栬��=",
- type: 'warning'
- });
- return
- }
+ // let val = row.empiricalValueAddss.filter(item => {
+ // return item != '' && item != null
+ // })
+ // let eq = val.filter(item => {
+ // return /^[^><=]/.test(item)
+ // })
+ // if (eq.length > 0) {
+ // this.$message({
+ // message: "妫�娴嬪�糩" + eq + "]鏍煎紡棣栦綅搴斿寘鍚�>,<鎴栬��=",
+ // type: 'warning'
+ // });
+ // return
+ // }
let str = ""
row.empiricalValueAddss.forEach(e => {
str += e + ","
})
+ if (str.slice(0, -1) === '' || str.slice(0, -1) === null || str.slice(0, -1) === undefined) {
+ return
+ }
this.$axios.post(this.$api.url.inspectionItemlose_focus_update, {
deviceId: row.did,
inspectionItemId: row.id,
@@ -566,6 +580,7 @@
c.empiricalValueAddss.push("")
}
uName.push(c['username'])
+ c.isSelectDevice = false
arr.push(c)
})
})
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/processInspection.vue b/src/components/view/processInspection.vue
index 02cb997..3a1abf5 100644
--- a/src/components/view/processInspection.vue
+++ b/src/components/view/processInspection.vue
@@ -80,8 +80,8 @@
<el-col :span="12">鏂板杩囩▼妫�楠屽崟</el-col>
<el-col :span="12" style="text-align: right;">
<!-- 鐐瑰嚮杩斿洖锛屽綋鍓嶉〉闈㈠�间负false -->
- <el-button type="primary" size="mini" style="background: #004EA2; "
- icon="el-icon-circle-plus-outline">鏂板</el-button>
+ <!-- <el-button type="primary" size="mini" style="background: #004EA2; "
+ icon="el-icon-circle-plus-outline">鏂板</el-button> -->
<el-button @click="combackIndex" type="primary" size="mini" icon="el-icon-back"
style="background: #004EA2; ">杩斿洖</el-button>
</el-col>
@@ -192,9 +192,14 @@
</el-table-column>
<el-table-column prop="dname" label="璇曢獙璁惧" min-width="100">
<template slot-scope="scope">
- <el-button type="text" @click="clickTableSelect(scope)">{{
+ <el-button v-if="!scope.row.isSelectDevice" type="text" @click="clickTableSelect(scope)">{{
scope.row.dname == null ? "璇烽�夋嫨" : scope.row.dname
}}</el-button>
+ <el-select v-if="scope.row.isSelectDevice" style="width: 100%;" @change="clickNodeSure(scope.row)"
+ v-model="filterText" placeholder="璇烽�夋嫨">
+ <el-option v-for="item in materialOptions" :key="item.id" :label="item.device" :value="item.id">
+ </el-option>
+ </el-select>
</template>
</el-table-column>
<el-table-column label="缁撹">
@@ -335,9 +340,9 @@
};
},
watch: {
- filterText(val) {
- this.$refs.tree.filter(val);
- }
+ // filterText(val) {
+ // this.$refs.tree.filter(val);
+ // }
},
mounted() {
// this.getTableData()
@@ -388,14 +393,16 @@
}
}).then(res => {
this.materialOptions = res.data;
+ this.filterText = row.did
});
},
// 鐐瑰嚮琛ㄦ牸閫夋嫨瑙﹀彂
clickTableSelect(scope) {
- this.centerDialogVisible = true;
+ // this.centerDialogVisible = true;
+ scope.row.isSelectDevice = true
this.clickSelectDevice.index = scope.$index;
this.clickSelectDevice.rpId = scope.row.id;
- this.options(scope.row)
+ this.getOptions(scope.row)
},
// 鐐瑰嚮鏍戦噷闈㈢殑纭畾
clickNodeSure() {
@@ -427,23 +434,26 @@
},
changeState(row, index) {
if (row.did != null && row.did != '') {
- let val = row.empiricalValueAddss.filter(item => {
- return item != '' && item != null
- })
- let eq = val.filter(item => {
- return /^[^><=]/.test(item)
- })
- if (eq.length > 0) {
- this.$message({
- message: "妫�娴嬪�糩" + eq + "]鏍煎紡棣栦綅搴斿寘鍚�>,<鎴栬��=",
- type: 'warning'
- });
- return
- }
+ // let val = row.empiricalValueAddss.filter(item => {
+ // return item != '' && item != null
+ // })
+ // let eq = val.filter(item => {
+ // return /^[^><=]/.test(item)
+ // })
+ // if (eq.length > 0) {
+ // this.$message({
+ // message: "妫�娴嬪�糩" + eq + "]鏍煎紡棣栦綅搴斿寘鍚�>,<鎴栬��=",
+ // type: 'warning'
+ // });
+ // return
+ // }
let str = ""
row.empiricalValueAddss.forEach(e => {
str += e + ","
})
+ if (str.slice(0, -1) === '' || str.slice(0, -1) === null || str.slice(0, -1) === undefined) {
+ return
+ }
this.$axios.post(this.$api.url.inspectionItemlose_focus_update, {
deviceId: row.did,
inspectionItemId: row.id,
@@ -519,10 +529,10 @@
this.optionTechnology = working.children
},
addTestProjevt() {
- this.isAddProject = true
let val = JSON.parse(JSON.stringify(this.processInspectVo))
val.techname = this.processInspectVo.techname.split("-")[1]
val.technologyId = this.processInspectVo.techname.split("-")[0]
+ this.processInspectVo.technologyId=val.technologyId
this.$axios.post(this.$api.url.processInspectAddProcess, {
material: val.material,
materialCode: val.materialCode,
@@ -543,6 +553,7 @@
});
return
}
+ this.isAddProject = true
this.detailId = res.data
this.inspectionResultForm[0].id = val.materialCode
this.inspectionResultForm[0].name = val.material
@@ -572,6 +583,7 @@
c.empiricalValueAddss.push("")
}
uName.push(c['username'])
+ c.isSelectDevice=false
arr.push(c)
})
})
@@ -768,4 +780,5 @@
.inspectionProject_span .el-button {
float: right;
font-size: 13px !important;
-}</style>
+}
+</style>
diff --git a/src/components/view/processInspectionUpdate.vue b/src/components/view/processInspectionUpdate.vue
index fddd5ae..53bafbb 100644
--- a/src/components/view/processInspectionUpdate.vue
+++ b/src/components/view/processInspectionUpdate.vue
@@ -123,9 +123,14 @@
</el-table-column>
<el-table-column prop="dname" label="璇曢獙璁惧" min-width="100">
<template slot-scope="scope">
- <el-button type="text" @click="clickTableSelect(scope)">{{
+ <el-button v-if="!scope.row.isSelectDevice" type="text" @click="clickTableSelect(scope)">{{
scope.row.dname == null ? "璇烽�夋嫨" : scope.row.dname
}}</el-button>
+ <el-select v-if="scope.row.isSelectDevice" style="width: 100%;" @change="clickNodeSure(scope.row)"
+ v-model="filterText" placeholder="璇烽�夋嫨">
+ <el-option v-for="item in materialOptions" :key="item.id" :label="item.device" :value="item.id">
+ </el-option>
+ </el-select>
</template>
</el-table-column>
<el-table-column label="缁撹">
@@ -297,6 +302,10 @@
this.getTableData()
},
methods: {
+ // blurNode(row){
+ // console.log(1111);
+ // row.isSelectDevice=false
+ // },
escalation() {
let arr = this.inspectionItems
let bl = false
@@ -366,6 +375,7 @@
}
}).then(res => {
this.materialOptions = res.data;
+ this.filterText = row.did
});
},
//杩斿洖
@@ -374,13 +384,14 @@
},
// 鐐瑰嚮琛ㄦ牸閫夋嫨瑙﹀彂
clickTableSelect(scope) {
- this.centerDialogVisible = true;
+ // this.centerDialogVisible = true;
+ scope.row.isSelectDevice = true
this.clickSelectDevice.index = scope.$index;
this.clickSelectDevice.rpId = scope.row.id;
this.getOptions(scope.row);
},
// 鐐瑰嚮鏍戦噷闈㈢殑纭畾
- clickNodeSure() {
+ clickNodeSure(row) {
let select = this.materialOptions.filter(item => {
return item.id === this.filterText
})[0]
@@ -402,6 +413,8 @@
devId: this.nodeData.id
})
.then(res => {
+ row.isSelectDevice = false
+ this.filterText=0
this.getTableData()
this.centerDialogVisible = false;
});
@@ -409,23 +422,26 @@
},
changeState(row, index) {
if (row.did != null && row.did != '') {
- let val = row.empiricalValueAddss.filter(item => {
- return item != '' && item != null
- })
- let eq = val.filter(item => {
- return /^[^><=]/.test(item)
- })
- if (eq.length > 0) {
- this.$message({
- message: "妫�娴嬪�糩" + eq + "]鏍煎紡棣栦綅搴斿寘鍚�>,<鎴栬��=",
- type: 'warning'
- });
- return
- }
+ // let val = row.empiricalValueAddss.filter(item => {
+ // return item != '' && item != null
+ // })
+ // let eq = val.filter(item => {
+ // return /^[^><=]/.test(item)
+ // })
+ // if (eq.length > 0) {
+ // this.$message({
+ // message: "妫�娴嬪�糩" + eq + "]鏍煎紡棣栦綅搴斿寘鍚�>,<鎴栬��=",
+ // type: 'warning'
+ // });
+ // return
+ // }
let str = ""
row.empiricalValueAddss.forEach(e => {
str += e + ","
})
+ if (str.slice(0, -1) === '' || str.slice(0, -1) === null || str.slice(0, -1) === undefined) {
+ return
+ }
this.$axios.post(this.$api.url.inspectionItemlose_focus_update, {
deviceId: row.did,
inspectionItemId: row.id,
@@ -559,6 +575,8 @@
c.empiricalValueAddss.push("")
}
uName.push(c['username'])
+ c.isSelectDevice = false
+ this.filterText=0
arr.push(c)
})
})
diff --git a/src/components/view/rawInsDetail.vue b/src/components/view/rawInsDetail.vue
index 19898d7..13741d8 100644
--- a/src/components/view/rawInsDetail.vue
+++ b/src/components/view/rawInsDetail.vue
@@ -194,6 +194,7 @@
<template slot-scope="scope">
<el-input
:disabled="detailId != null"
+ @blur="assertTest(scope.row)"
v-model="scope.row.required"
placeholder="璇疯緭鍏ユ爣鍑嗗��"
></el-input>
@@ -202,6 +203,7 @@
<el-table-column prop="internal" label="鍐呮帶鍊�" min-width="150">
<template slot-scope="scope">
<el-input
+ @blur="assertTest(scope.row)"
:disabled="detailId != null"
v-model="scope.row.internal"
placeholder="璇疯緭鍏ュ唴鎺у��"
@@ -424,6 +426,23 @@
}
},
methods: {
+ assertTest(row){
+ let fuArr=['>', '<', '=']
+ if(!fuArr.includes(row.required[0])){
+ this.$message({
+ message: "鏍囧噯鍊糩"+row.required+"]鏍煎紡棣栦綅搴斿寘鍚�>,<鎴栬��=",
+ type: 'warning'
+ });
+ return
+ }
+ if(!fuArr.includes(row.internal[0])){
+ this.$message({
+ message: "鍐呮帶鍊糩"+row.internal+"]鏍煎紡棣栦綅搴斿寘鍚�>,<鎴栬��=",
+ type: 'warning'
+ });
+ return
+ }
+ },
// 璁惧鏍戣繃婊ゆ悳绱�
filterNode(value, data) {
if (!value) return true;
@@ -456,6 +475,20 @@
},
// 鏂板妫�楠屽崟
async addNewRawInspect() {
+ //TODO:
+ console.log(this.projectTable);
+ if(this.projectTable.length>0){
+ let filterTable= this.projectTable.filter(item=>{
+ return item.required===''||item.internal===''||item.required===null||item.internal===null
+ })
+ if(filterTable.length>0) {
+ this.$message({
+ message: "鏍囧噯鍊煎拰鍐呮帶鍊间笉鑳戒负绌猴紒",
+ type: 'warning'
+ });
+ return
+ }
+ }
this.projectTable.forEach(i => {
// 灏嗗垪琛ㄨ浆鎹负瀛楃涓�
i.testValue = i.testValueList.join(",");
@@ -474,19 +507,6 @@
// 淇敼椤圭洰鐨勬娴嬪�兼敼鍙樼粨璁�
async changeState(row, index) {
- let val=row.testValueList.filter(item=>{
- return item!=''&&item!=null
- })
- let eq=val.filter(item=>{
- return /^[^><=]/.test(item)
- })
- if(eq.length>0){
- this.$message({
- message: "杈撳叆鍊糩"+eq+"]鏍煎紡棣栦綅搴斿寘鍚�>,<鎴栬��=",
- type: 'warning'
- });
- return
- }
if (this.detailId !== null) {
const res = await this.$axios.post(this.$api.url.updaterawInsProduct, {
DevId: row.deviceId,
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