From 3c2e49d7bcc91268a75689db400d1f1698c0f8b7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 04 二月 2024 16:41:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
company/src/components/business/OperaApplyChangeUnitDetailWindow.vue | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
index 40346f0..22f4c6d 100644
--- a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
@@ -12,13 +12,8 @@
<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">淇濆崟鐘舵�侊細宸插叧闂�</span>
@@ -183,8 +178,10 @@
<additionSubtractionApplication ref="additionSubtractionApplication" @success="successEvent" />
<!-- 鎹㈠巶鐢宠 -->
<factoryChange ref="factoryChange" @success="successEvent" />
-
<editFactoryChange ref="editFactoryChange" @success="successEvent" />
+ <template v-slot:footer>
+ <el-button @click="visible=false">杩斿洖</el-button>
+ </template>
</GlobalWindow>
</template>
@@ -243,7 +240,7 @@
memberName: '',
types: ''
},
- reverse: true,
+ reverse: false,
radio: 0,
activities: [],
tableData: [],
--
Gitblit v1.9.3