From a01d637e9ff2bf26aa44c65a239413a38bd8b1fe Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 04 六月 2025 09:39:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/views/business/unionChange.vue | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/company/src/views/business/unionChange.vue b/company/src/views/business/unionChange.vue
index 5d2adfe..3a5e242 100644
--- a/company/src/views/business/unionChange.vue
+++ b/company/src/views/business/unionChange.vue
@@ -31,32 +31,40 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-if="userInfo.type==2" v-permissions="['business:unionchange:create']">
- <li><el-button type="primary" @click="$refs.OpearaUnionChange.open('鍔犲噺淇濈敵璇�')" v-permissions="['business:unionchange:create']">鎻愪氦鐢宠</el-button></li>
- </ul>
+<!-- <ul class="toolbar" v-if="userInfo.type==2 && " v-permissions="['business:unionchange:create']">-->
+<!-- <li><el-button type="primary" @click="$refs.OpearaUnionChange.open('鍔犲噺淇濈敵璇�')" v-permissions="['business:unionchange:create']">鎻愪氦鐢宠</el-button></li>-->
+<!-- </ul>-->
<el-table
v-loading="isWorking.search"
:data="tableData.list"
stripe
>
- <el-table-column label="搴忓彿" width="80px">
+ <el-table-column align="center" label="搴忓彿" width="50px">
<template slot-scope="scope">
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
- <el-table-column prop="status" label="淇濆崟鐘舵��" min-width="100px">
+ <el-table-column align="center" prop="status" label="淇濆崟鐘舵��" min-width="100px">
<template slot-scope="{row}">
<span :class="'union-change-status'+row.status" v-if="row.status === 0">寰呯缃�</span>
<span :class="'union-change-status'+row.status" v-if="row.status === 1">寰呭鏍�</span>
<span :class="'union-change-status'+row.status" v-if="row.status === 2">宸茬敓鏁�</span>
- <span :class="'union-change-status'+row.status" v-if="row.status === 3">宸查��鍥�</span>
+ <span style="color: red;" v-if="row.status === 3">宸查��鍥�</span>
</template>
</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="addNum" label="鍔犱繚浜烘暟锛堜汉锛�" min-width="100px"></el-table-column>
- <el-table-column prop="delNum" label="鍑忎繚浜烘暟锛堜汉锛�" min-width="100px"></el-table-column>
- <el-table-column prop="createDate" label="鎻愪氦鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column align="center" prop="applyCode" label="鍏宠仈淇濆崟鍙�" min-width="150px"></el-table-column>
+ <el-table-column align="center" prop="solutionsName" label="淇濋櫓鏂规" min-width="150px"></el-table-column>
+ <el-table-column align="center" prop="addNum" label="鍔犱繚浜烘暟" min-width="100px">
+ <template slot-scope="{row}">
+ {{row.addNum||0}} 浜�
+ </template>
+ </el-table-column>
+ <el-table-column align="center" prop="delNum" label="鍑忎繚浜烘暟" min-width="100px">
+ <template slot-scope="{row}">
+ {{row.delNum||0}} 浜�
+ </template>
+ </el-table-column>
+ <el-table-column align="center" prop="createDate" label="鎻愪氦鏃堕棿" min-width="150px"></el-table-column>
<el-table-column
label="鎿嶄綔"
min-width="120"
@@ -75,7 +83,7 @@
</pagination>
</template>
<!-- 鎻愪氦鐢宠 -->
- <OpearaUnionChange ref="OpearaUnionChange" />
+ <OpearaUnionChange ref="OpearaUnionChange" @success="handlerSuccess"/>
<OperaUnionChangeDetailWindow ref="OperaUnionChangeDetailWindow" @success="handlerSuccess"/>
</TableLayout>
</template>
@@ -114,7 +122,7 @@
},
methods: {
handlerSuccess(){
- this.reset();
+ this.reset()
},
changeTime(e) {
if (e.length > 0) {
--
Gitblit v1.9.3