From bd57081dc1bcd94e1e4043a9e0a7c6953d4bb9d4 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 01 四月 2024 19:19:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
company/src/views/business/applyChange.vue | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/company/src/views/business/applyChange.vue b/company/src/views/business/applyChange.vue
index baf8301..e2c15b5 100644
--- a/company/src/views/business/applyChange.vue
+++ b/company/src/views/business/applyChange.vue
@@ -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:[],
--
Gitblit v1.9.3