From 8635253d498ea4fefd6ea465704569ff34fed3f8 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 08 九月 2023 14:41:13 +0800
Subject: [PATCH] modified: src/api/basicData/index.js modified: src/views/experiment/inspectionApplication/index.vue modified: src/views/experiment/nonConformingFeedback/index.vue modified: src/views/experiment/reportAuditing/index.vue modified: src/views/standardLibrary/index.vue
---
src/views/standardLibrary/index.vue | 55 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/src/views/standardLibrary/index.vue b/src/views/standardLibrary/index.vue
index c515bee..d09e80c 100644
--- a/src/views/standardLibrary/index.vue
+++ b/src/views/standardLibrary/index.vue
@@ -7,8 +7,7 @@
<el-input size="small" clearable v-model="filterText" placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"></el-input>
</el-col>
<el-col :span="5">
- <el-button size="small" type="primary" icon="el-icon-plus"
- @click="addTreeFormVisible = true"></el-button>
+ <el-button size="small" type="primary" icon="el-icon-plus" @click="addSdantard()"></el-button>
</el-col>
</el-row>
<el-button size="small" type="text">鍏ㄩ儴</el-button>
@@ -73,12 +72,17 @@
</div>
<el-dialog class="addTree" title="娣诲姞鏍囧噯鎸囨爣" width="28%" :visible.sync="addTreeFormVisible">
<el-form v-model="addTreeForm" label-position="top">
- <el-form-item label="鏍囧噯绫诲瀷">
+ <el-form-item :required="true" label="鏍囧噯绫诲瀷">
<el-cascader v-model="addTreeForm.addTypeArr" :options="formTypeOptions"
:props="{ ...defaultProps, checkStrictly: true }" clearable @change="changeCascader" />
</el-form-item>
- <el-form-item v-show="addTreeForm.addTypeArr.length < 2" label="鐗╂枡鍚嶇О">
- <el-input @change="changeSample" v-model="addTreeForm.materialName" />
+ <el-form-item :required="true" v-show="addTreeForm.addTypeArr.length < 2" label="鐗╂枡鍚嶇О">
+ <el-select style="width: 100%;" @blur="changeSample" v-model="addTreeForm.materialName"
+ placeholder="璇烽�夋嫨">
+ <el-option v-for="item in materialList" :key="item.material" :label="item.material"
+ :value="item.material">
+ </el-option>
+ </el-select>
</el-form-item>
<el-form-item v-show="addTreeForm.addTypeArr.length < 3" label="鎵ц鏍囧噯">
<el-input v-model="addTreeForm.standardName" />
@@ -138,6 +142,7 @@
} from "@/api/standardLibrary";
import {
addStandardProjectGroupApi,
+ getSample
} from "@/api/basicData/index";
export default {
data() {
@@ -187,7 +192,8 @@
specificationsName: "",
materialName: "",
standardName: "",
- }
+ },
+ materialList: []
};
},
watch: {
@@ -221,6 +227,11 @@
},
methods: {
+ async addSdantard() {
+ this.addTreeFormVisible = true
+ let res = await getSample()
+ this.materialList = res.data
+ },
querySearch(queryString, cb) {
var restaurants = []
this.projectGroupingOptions.forEach(a => {
@@ -245,22 +256,15 @@
this.addTreeForm.standardName = ''
},
changeSample() {
- let selectType = this.standardTree.filter(item => {
- return item.id === this.addTreeForm.addTypeArr[0]
- })[0];
- if (this.addTreeForm.addTypeArr.length == 1) {
- let samples = selectType.children.filter(item => {
- return item.name === this.addTreeForm.materialName
- })[0]
- if (samples === undefined || samples === []) {
- this.$message({
- message: '璇峰厛鍦ㄥ熀纭�鏁版嵁涓坊鍔犺銆�' + this.addTreeForm.materialName + '銆戞牱鍝�',
- type: 'warning'
- });
- return false;
- }
+ if (this.addTreeForm.materialName != null && this.addTreeForm.materialName != '') {
+ return true
+ } else {
+ this.$message({
+ message: '璇峰厛閫夋嫨鐗╂枡锛�',
+ type: 'warning'
+ });
+ return false
}
- return true
},
oneSize() { },
twoSize() {
@@ -464,14 +468,15 @@
});
return
}
- let handelerSample = this.changeSample()
- if (!handelerSample) {
- return;
- }
let res = null;
+ // return;
try {
switch (this.addTreeForm.addTypeArr.length) {
case 1:
+ let handelerSample = this.changeSample()
+ if (!handelerSample) {
+ return;
+ }
res = await addMaterial({
...this.addTreeForm,
type: this.addTreeForm.addTypeArr[0],
--
Gitblit v1.9.3