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, 7 insertions(+), 4 deletions(-)
diff --git a/company/src/views/business/applyChange.vue b/company/src/views/business/applyChange.vue
index baf8301..1e2c6e7 100644
--- a/company/src/views/business/applyChange.vue
+++ b/company/src/views/business/applyChange.vue
@@ -15,7 +15,7 @@
</el-select>
</el-form-item>
<el-form-item label="鎶曚繚浼佷笟" prop="companyId">
- <el-select v-model="searchForm.companyId" placeholder="璇烽�夋嫨" @change="search">
+ <el-select v-model="searchForm.companyId" filterable placeholder="璇烽�夋嫨" @change="search">
<el-option
v-for="item in companyList"
:key="item.id"
@@ -25,7 +25,7 @@
</el-select>
</el-form-item>
<el-form-item label="淇濋櫓鏂规" prop="baseSolutionsId">
- <el-select v-model="searchForm.baseSolutionsId" placeholder="璇烽�夋嫨" @change="search">
+ <el-select v-model="searchForm.baseSolutionsId" filterable placeholder="璇烽�夋嫨" @change="search">
<el-option
v-for="item in solutionList"
:key="item.baseId"
@@ -69,7 +69,7 @@
<span :class="'change-status'+row.status" v-if="row.status === 2">宸茬敓鏁�</span>
<span :class="'change-status'+row.status" v-if="row.status === 3 || row.status === 4">閫�鍥炵敵璇�</span>
<span :class="'change-status'+row.status" v-if="row.status ===5 || row.status === 8">宸查��鍥�</span>
- <span :class="'change-status'+row.status" v-if="row.status ===7">宸插叧闂�</span>
+ <span :class="'change-status'+row.status" v-if="row.status ===6">宸插叧闂�</span>
</template>
</el-table-column>
<el-table-column prop="companyName" label="鎶曚繚浼佷笟" min-width="100px"></el-table-column>
@@ -121,6 +121,9 @@
solutionsId: '',
createDateE: '',
createDateS: '',
+ companyId: '',
+ solutionType: 0,
+ baseSolutionsId: '',
time: []
},
solutionList:[],
@@ -139,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