From 5eb40c731da8ccf235ba557f97a5e05a70a75308 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 02 二月 2024 14:35:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
company/src/components/business/OperaApplyChangeDetailWindow.vue | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/company/src/components/business/OperaApplyChangeDetailWindow.vue b/company/src/components/business/OperaApplyChangeDetailWindow.vue
index 7b74b15..80da9b3 100644
--- a/company/src/components/business/OperaApplyChangeDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeDetailWindow.vue
@@ -11,17 +11,14 @@
<div class="desc_item_label">
<div class="desc_item_label_left">
<span>鎶曚繚浼佷笟锛歿{ apply.companyName }}</span>
- <span v-if="model.status === 0">淇濆崟鐘舵�侊細寰呯缃�</span>
-<<<<<<< HEAD
- <span v-if="model.status === 1">淇濆崟鐘舵�侊細寰呭鏍�</span>
- <span v-if="model.status === 2">淇濆崟鐘舵�侊細宸蹭笂浼犳壒鍗�</span>
-=======
- <span v-if="model.status === 1">淇濆崟鐘舵�侊細宸茬绔�</span>
- <span v-if="model.status === 2">淇濆崟鐘舵�侊細宸茬敓鏁�</span>
->>>>>>> 35bd55ad951fe8c5fb997dfa7bd836ad53db96fe
- <span v-if="model.status === 3 || model.status === 4">淇濆崟鐘舵�侊細閫�鍥炵敵璇�</span>
- <span v-if="model.status === 5 || model.status === 8">淇濆崟鐘舵�侊細宸查��鍥�</span>
- <span v-if="model.status === 7 || model.status === 6">淇濆崟鐘舵�侊細宸插叧闂�</span>
+ <span v-if="model.status === 0">淇濆崟鐘舵�侊細寰呯缃�</span>
+ <span v-if="model.status === 1">淇濆崟鐘舵�侊細寰呭鏍�</span>
+ <span v-if="model.status === 2">淇濆崟鐘舵�侊細宸蹭笂浼犳壒鍗�</span>
+ <span v-if="model.status === 1">淇濆崟鐘舵�侊細宸茬绔�</span>
+ <span v-if="model.status === 2">淇濆崟鐘舵�侊細宸茬敓鏁�</span>
+ <span v-if="model.status === 3 || model.status === 4">淇濆崟鐘舵�侊細閫�鍥炵敵璇�</span>
+ <span v-if="model.status === 5 || model.status === 8">淇濆崟鐘舵�侊細宸查��鍥�</span>
+ <span v-if="model.status === 7 || model.status === 6">淇濆崟鐘舵�侊細宸插叧闂�</span>
<span>鎻愪氦鏃堕棿锛歿{ model.createDate }}</span>
</div>
<div class="desc_item_label_right">
@@ -247,7 +244,7 @@
memberName: '',
types: ''
},
- reverse: true,
+ reverse: false,
radio: 0,
activities: [],
tableData: [],
@@ -450,6 +447,9 @@
align-items: center;
justify-content: space-between;
margin-bottom: 10px;
+ .desc_item_label_left {
+ flex-shrink: 0;
+ }
span {
font-size: 14px;
color: black;
--
Gitblit v1.9.3