From a4fc9ef5d32a062a664bda212f9e50632e1b7a86 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 05 三月 2024 14:34:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
company/src/views/enterprise/switchCourt.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/company/src/views/enterprise/switchCourt.vue b/company/src/views/enterprise/switchCourt.vue
index 3ee352b..58559f8 100644
--- a/company/src/views/enterprise/switchCourt.vue
+++ b/company/src/views/enterprise/switchCourt.vue
@@ -55,19 +55,19 @@
<el-table-column prop="status" label="鐘舵��" min-width="100px">
<template slot-scope="{row}">
<span :class="'change-status'+row.status" v-if="row.status === 0">寰呯缃�</span>
- <span :class="'change-status'+row.status" v-if="row.status === 1">宸茬绔�</span>
+ <span :class="'change-status'+row.status" v-if="row.status === 1">寰呭鏍�</span>
<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="validCode" label="鎵瑰崟鍙�" min-width="100px"></el-table-column>
- <el-table-column prop="code" label="鍏宠仈淇濆崟鍙�" min-width="100px"></el-table-column>
+ <el-table-column prop="applyCode" label="鍏宠仈淇濆崟鍙�" min-width="100px"></el-table-column>
<el-table-column prop="solutionsName" label="淇濋櫓鏂规" min-width="100px"></el-table-column>
<el-table-column prop="changeNum" label="鎹㈠巶浜烘暟锛堜汉锛�" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="鎻愪氦鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="startTime" label="鎵瑰崟鐢熸晥璧锋湡" min-width="100px"></el-table-column>
+ <el-table-column prop="applyStartTime" label="鎵瑰崟鐢熸晥璧锋湡" min-width="100px"></el-table-column>
<el-table-column
label="鎿嶄綔"
min-width="120"
--
Gitblit v1.9.3