From cb94ff4f0a46eb74c21dd7b34b8d958ef9a9f11c Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 02 二月 2026 09:05:28 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbom_dianjiang
---
admin/src/views/business/importRecord.vue | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/admin/src/views/business/importRecord.vue b/admin/src/views/business/importRecord.vue
index 2cd48c9..145e518 100644
--- a/admin/src/views/business/importRecord.vue
+++ b/admin/src/views/business/importRecord.vue
@@ -56,8 +56,8 @@
<el-table-column prop="title" label="鍐呭" min-width="200px" show-overflow-tooltip></el-table-column>
<el-table-column label="涓氬姟绫诲瀷">
<template slot-scope="{row}">
- <span v-if="row.type ==0 " >鑰佸笀瀵煎叆</span>
- <span v-if="row.type == 1" >妗堜緥瀵煎叆</span>
+ <span v-if="row.type ==0 " class="green">鑰佸笀瀵煎叆</span>
+ <span v-if="row.type == 1" class="orange" >妗堜緥瀵煎叆</span>
</template>
</el-table-column>
<el-table-column label="鐘舵��">
@@ -68,10 +68,26 @@
</template>
</el-table-column>
<el-table-column prop="totalNum" label="鎬昏褰曟暟" min-width="100px"></el-table-column>
- <el-table-column prop="doneNum" label="鎴愬姛褰曞叆鏁伴噺" min-width="100px"></el-table-column>
+ <el-table-column prop="doneNum" label="鎴愬姛褰曞叆鏁伴噺" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.status == 1" class="red">{{row.ingNum}}</span>
+ <span v-else>{{ row.doneNum }}</span>
+ </template>
+ </el-table-column>
<el-table-column prop="errorNum" label="褰曞叆澶辫触鏁伴噺" min-width="100px"></el-table-column>
<el-table-column prop="updateUserName" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
+ <el-table-column prop="createTime" label="瀵煎叆鏃堕棿" min-width="150px"></el-table-column>
<el-table-column prop="updateTime" label="鏈�杩戞搷浣滄椂闂�" min-width="150px"></el-table-column>
+ <el-table-column
+ label="鎿嶄綔"
+ min-width="120"
+ fixed="right"
+ >
+ <template slot-scope="{row}">
+ <el-button type="text" v-if="row.type ==1" style="color: orange" @click="$refs.OperaCasesListWindow.open('鏌ョ湅瀵煎叆妗堜緥銆�'+row.title+'銆�',null, row.id)" icon="el-icon-open">鏌ョ湅瀵煎叆妗堜緥</el-button>
+ <el-button type="text" v-if="row.type ==0" style="color: green" @click="$refs.OperaMemberListWindow.open('鏌ョ湅瀵煎叆妗堜緥銆�'+row.title+'銆�', row.id)" icon="el-icon-open">鏌ョ湅瀵煎叆鑰佸笀</el-button>
+ </template>
+ </el-table-column>
</el-table>
<pagination
@size-change="handleSizeChange"
@@ -81,7 +97,8 @@
</pagination>
</template>
<!-- 鏂板缓/淇敼 -->
- <OperaCategoryWindow ref="operaCategoryWindow" @success="handlePageChange"/>
+ <OperaMemberListWindow ref="OperaMemberListWindow" @success="handlePageChange"/>
+ <OperaCasesListWindow ref="OperaCasesListWindow" @success="handlePageChange"/>
</TableLayout>
</template>
@@ -89,11 +106,12 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
-import OperaCategoryWindow from '@/components/business/OperaCategoryWindow'
+import OperaMemberListWindow from '@/components/business/OperaMemberListWindow'
+import OperaCasesListWindow from '@/components/business/OperaCasesListWindow'
export default {
name: 'Category',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaCategoryWindow },
+ components: { TableLayout, Pagination, OperaCasesListWindow,OperaMemberListWindow},
data () {
return {
// 鎼滅储
--
Gitblit v1.9.3