From 3c456949b70671cc2ad95ad5395dfaceda519f17 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 23 二月 2024 10:12:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
company/src/views/business/switchCourt.vue | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/company/src/views/business/switchCourt.vue b/company/src/views/business/switchCourt.vue
index 00090cc..de3094c 100644
--- a/company/src/views/business/switchCourt.vue
+++ b/company/src/views/business/switchCourt.vue
@@ -5,8 +5,8 @@
<el-form-item label="淇濆崟鐘舵��" prop="status">
<el-select v-model="searchForm.status" placeholder="璇烽�夋嫨" @change="search">
<el-option label="鍏ㄩ儴" value=""></el-option>
- <el-option label="寰呯缃�" value="0"></el-option>
- <el-option label="寰呭鏍�" value="1"></el-option>
+ <el-option label="寰呯缃�" value="1"></el-option>
+ <el-option label="寰呭鏍�" value="0"></el-option>
<el-option label="宸茬敓鏁�" value="2"></el-option>
<el-option label="鐢宠閫�鍥�" value="3"></el-option>
<!-- 3 4 閮芥槸閫�鍥炵敵璇蜂腑-->
@@ -64,12 +64,12 @@
</el-table-column>
<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 === 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 === 1">寰呯缃�</span>
+ <span :class="'change-status'+ row.status" v-if="row.status === 0">寰呭鏍�</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 ===6">宸插叧闂�</span>
</template>
</el-table-column>
<el-table-column prop="companyName" label="鎶曚繚浼佷笟" min-width="100px"></el-table-column>
@@ -83,7 +83,7 @@
min-width="120"
fixed="right">
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaApplyChangeDetailWindow.open('鍔犲噺淇濊鎯�', row)">鏌ョ湅璇︽儏</el-button>
+ <el-button type="text" @click="$refs.operaApplyChangeDetailWindow.open('鎹㈠巶璇︽儏', row)">鏌ョ湅璇︽儏</el-button>
</template>
</el-table-column>
</el-table>
@@ -119,6 +119,8 @@
solutionsId: '',
createDateE: '',
createDateS: '',
+ baseSolutionsId: '',
+ companyId: '',
time: []
},
solutionList:[],
--
Gitblit v1.9.3