From bf8d85d5f83c2036fb4239d764d33e99c1b62bd3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 31 五月 2024 14:53:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/task/index.vue | 57 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 48 insertions(+), 9 deletions(-)
diff --git a/admin/src/views/task/index.vue b/admin/src/views/task/index.vue
index 131db2c..d2673f6 100644
--- a/admin/src/views/task/index.vue
+++ b/admin/src/views/task/index.vue
@@ -1,24 +1,63 @@
<template>
<div class="main_app">
- <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear" />
+ <QueryForm
+ v-model="filters"
+ :query-form-config="queryFormConfig"
+ @handleQuery="getList(1)"
+ @clear="clear"
+ />
<!-- -->
<el-tabs v-model="activeTab">
- <el-tab-pane label="寰呭鐞�" name="0"></el-tab-pane>
+ <el-tab-pane label="寰呭鐞�" name="0">
+ <template #label>
+ <span
+ >寰呭鐞�
+ <el-badge :value="11" class="item" type="danger"> </el-badge>
+ </span>
+ </template>
+ </el-tab-pane>
<el-tab-pane label="宸插鐞�" name="1"></el-tab-pane>
<el-tab-pane label="鎴戝彂璧风殑" name="2"></el-tab-pane>
<el-tab-pane label="鎶勯�佹垜鐨�" name="3"></el-tab-pane>
</el-tabs>
- <el-table v-loading="loading" :data="list" stripe row-key="id" default-expand-all>
- <el-table-column prop="name" label="浠诲姟绫诲瀷" min-width="100"></el-table-column>
- <el-table-column prop="name" label="鎻愪氦浜�" min-width="80"></el-table-column>
- <el-table-column prop="companyNamePath" label="鎻愪氦鏃堕棿" min-width="100"></el-table-column>
+ <el-table
+ v-loading="loading"
+ :data="list"
+ stripe
+ row-key="id"
+ default-expand-all
+ >
+ <el-table-column
+ prop="name"
+ label="浠诲姟绫诲瀷"
+ min-width="100"
+ ></el-table-column>
+ <el-table-column
+ prop="name"
+ label="鎻愪氦浜�"
+ min-width="80"
+ ></el-table-column>
+ <el-table-column
+ prop="companyNamePath"
+ label="鎻愪氦鏃堕棿"
+ min-width="100"
+ ></el-table-column>
<el-table-column label="鎿嶄綔" width="230" fixed="right">
- <template slot-scope="{row}">
- <el-button type="text" @click="handleDetail(row)" v-permissions="['business:company:update']">鏌ョ湅璇︽儏</el-button>
+ <template slot-scope="{ row }">
+ <el-button
+ type="text"
+ @click="handleDetail(row)"
+ v-permissions="['business:company:update']"
+ >鏌ョ湅璇︽儏</el-button
+ >
</template>
</el-table-column>
</el-table>
- <pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" />
+ <pagination
+ @size-change="handleSizeChange"
+ @current-change="getList"
+ :pagination="pagination"
+ />
<TaskDetail v-if="isShowDetail" ref="DetailRef" />
</div>
</template>
--
Gitblit v1.9.3