From 50fb58286ed3b718c39a97e0987ee7561a295651 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 04 七月 2025 17:56:41 +0800
Subject: [PATCH] git ch
---
company/src/views/business/unionChangeUnit.vue | 50 ++++++++++++++++++++++++++++++--------------------
1 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/company/src/views/business/unionChangeUnit.vue b/company/src/views/business/unionChangeUnit.vue
index 5db3aa1..1b2b926 100644
--- a/company/src/views/business/unionChangeUnit.vue
+++ b/company/src/views/business/unionChangeUnit.vue
@@ -4,10 +4,10 @@
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
<el-form-item label="淇濆崟鐘舵��" prop="status">
<el-select v-model="searchForm.status" clearable @change="search">
- <el-option label="寰呯缃�" value="1"></el-option>
- <el-option label="寰呭鏍�" value="2"></el-option>
- <el-option label="宸茬敓鏁�" value="3"></el-option>
- <el-option label="宸查��鍥�" value="4"></el-option>
+ <el-option label="寰呯缃�" value="0"></el-option>
+ <el-option label="寰呭鏍�" value="1"></el-option>
+ <el-option label="宸茬敓鏁�" value="2"></el-option>
+ <el-option label="宸查��鍥�" value="3"></el-option>
</el-select>
</el-form-item>
<el-form-item label="淇濋櫓鏂规" prop="solutionName">
@@ -31,38 +31,43 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:unionchange:create']">
- <li><el-button type="primary" @click="$refs.OpearaUnionChangeUnit.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.OpearaUnionChangeUnit.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="80px">
<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 :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 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="changeNum" 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="changeNum" label="鏇存崲娲鹃仯鍗曚綅浜烘暟" min-width="150px">
+ <template slot-scope="{row}">
+ {{row.changeNum||0}} 浜�
+ </template>
+ </el-table-column>
+ <el-table-column align="center" prop="createDate" label="鎻愪氦鏃堕棿" min-width="150px"></el-table-column>
<el-table-column
label="鎿嶄綔"
+ align="center"
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.OperaUnionChangeUnitDetailWindow.open('鏇存崲娲鹃仯鍗曚綅璇︽儏', row)">鏌ョ湅璇︽儏</el-button>
</template>
</el-table-column>
</el-table>
@@ -74,7 +79,8 @@
</pagination>
</template>
<!-- 鎻愪氦鐢宠 -->
- <OpearaUnionChangeUnit ref="OpearaUnionChangeUnit" />
+ <OpearaUnionChangeUnit ref="OpearaUnionChangeUnit" @success="successDo"/>
+ <OperaUnionChangeUnitDetailWindow ref="OperaUnionChangeUnitDetailWindow" @success="successDo" />
</TableLayout>
</template>
@@ -82,11 +88,12 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
+import OperaUnionChangeUnitDetailWindow from '@/components/business/OperaUnionChangeUnitDetailWindow'
import OpearaUnionChangeUnit from '@/components/business/OpearaUnionChangeUnit'
export default {
name: 'unionChangeUnit',
extends: BaseTable,
- components: { TableLayout, Pagination, OpearaUnionChangeUnit },
+ components: { TableLayout, Pagination, OpearaUnionChangeUnit,OperaUnionChangeUnitDetailWindow },
data () {
return {
// 鎼滅储
@@ -110,6 +117,9 @@
this.search()
},
methods: {
+ successDo(){
+ this.reset()
+ },
changeTime(e) {
if (e.length > 0) {
this.searchForm.queryStartTime = e[0]
--
Gitblit v1.9.3