|
@@ -30,7 +30,7 @@
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
<el-form-item>
|
|
|
- <el-input v-model="searchForm.textSearch" placeholder="元素名称"></el-input>
|
|
|
|
|
|
|
+ <el-input v-model="searchForm.elementName" placeholder="元素名称" clearable></el-input>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
<el-form-item>
|
|
|
<el-button type="primary" @click="searchElement">搜索</el-button>
|
|
<el-button type="primary" @click="searchElement">搜索</el-button>
|
|
@@ -382,7 +382,11 @@ export default {
|
|
|
}
|
|
}
|
|
|
console.log(subArr,'subArr');
|
|
console.log(subArr,'subArr');
|
|
|
console.log(this.proData,'proData');
|
|
console.log(this.proData,'proData');
|
|
|
-
|
|
|
|
|
|
|
+ if(this.form.type===2&&this.proData&&!this.proData[0]['projectName']){
|
|
|
|
|
+ this.$message.warning('请先选择项目');
|
|
|
|
|
+ return;
|
|
|
|
|
+
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
submitElement(subArr).then((res) => {
|
|
submitElement(subArr).then((res) => {
|
|
|
if(res.data.code==200){
|
|
if(res.data.code==200){
|
