From 4d685f52c0ab2ebd4614ce4c2639e31b9eb68bf5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 01 十一月 2024 14:21:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/views/business/applyChange.vue | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/company/src/views/business/applyChange.vue b/company/src/views/business/applyChange.vue
index 3c3421d..1e2c6e7 100644
--- a/company/src/views/business/applyChange.vue
+++ b/company/src/views/business/applyChange.vue
@@ -14,8 +14,8 @@
<el-option label="宸插叧闂�" value="6"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="鎶曚繚浼佷笟" prop="companyId">{{searchForm.companyId}}
- <el-select v-model="searchForm.companyId" placeholder="璇烽�夋嫨" @change="search">
+ <el-form-item label="鎶曚繚浼佷笟" prop="companyId">
+ <el-select v-model="searchForm.companyId" filterable placeholder="璇烽�夋嫨" @change="search">
<el-option
v-for="item in companyList"
:key="item.id"
@@ -24,8 +24,8 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="淇濋櫓鏂规" prop="baseSolutionsId">{{searchForm.baseSolutionsId}}
- <el-select v-model="searchForm.baseSolutionsId" placeholder="璇烽�夋嫨" @change="search">
+ <el-form-item label="淇濋櫓鏂规" prop="baseSolutionsId">
+ <el-select v-model="searchForm.baseSolutionsId" filterable placeholder="璇烽�夋嫨" @change="search">
<el-option
v-for="item in solutionList"
:key="item.baseId"
@@ -122,6 +122,7 @@
createDateE: '',
createDateS: '',
companyId: '',
+ solutionType: 0,
baseSolutionsId: '',
time: []
},
@@ -141,7 +142,7 @@
},
methods: {
loadSelectList() {
- solutionAll({dataType:2}).then(res => {
+ solutionAll({dataType:2,type:0}).then(res => {
this.solutionList = res
}).catch(err => {
})
--
Gitblit v1.9.3