From fbedd467c8ea2d4ae7c31d4eab1090bf17617b0d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 04 九月 2024 03:36:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/contract/contract-result/index.vue | 4 ++--
src/views/system/data-manage/data-detail/list.js | 13 ++++++++++++-
src/views/system/contract/contract/index.vue | 7 ++++---
src/views/system/contract/report/index.vue | 36 +++++++++++++++++++-----------------
4 files changed, 37 insertions(+), 23 deletions(-)
diff --git a/src/views/system/contract/contract-result/index.vue b/src/views/system/contract/contract-result/index.vue
index 0820f3d..e97a6e6 100644
--- a/src/views/system/contract/contract-result/index.vue
+++ b/src/views/system/contract/contract-result/index.vue
@@ -6,7 +6,6 @@
size="small"
:inline="true"
v-show="showSearch"
- label-width="100px"
>
<el-form-item label="鑰冩牳瀵硅薄" prop="unitId">
<el-select
@@ -100,7 +99,7 @@
></right-toolbar> -->
</el-row>
- <el-row v-loading="loading">
+ <el-row v-if="checkResultList && checkResultList.length > 0" v-loading="loading">
<el-col
:xl="8"
:lg="8"
@@ -151,6 +150,7 @@
</el-card>
</el-col>
</el-row>
+ <el-empty v-else description="鏆傛棤鏁版嵁"></el-empty>
<pagination
v-show="total > 0"
diff --git a/src/views/system/contract/contract/index.vue b/src/views/system/contract/contract/index.vue
index 320f5dd..7740bb7 100644
--- a/src/views/system/contract/contract/index.vue
+++ b/src/views/system/contract/contract/index.vue
@@ -37,7 +37,7 @@
>
</el-col>
</el-row>
- <el-row v-loading="loading" :gutter="20">
+ <el-row v-if="contractList && contractList.length > 0" v-loading="loading" :gutter="20">
<el-col
:span="8"
v-for="(item, index) in contractList"
@@ -68,6 +68,7 @@
</el-card>
</el-col>
</el-row>
+ <el-empty v-else description="鏆傛棤鏁版嵁"></el-empty>
<!-- 鍚堝悓璇︽儏 -->
<el-dialog
@@ -79,13 +80,13 @@
<el-form label-position="left" inline class="table-expand">
<el-collapse v-model="activeNames">
<el-collapse-item
- v-for="name, index in ruleName"
+ v-for="(name, index) in ruleName"
:key="index"
:title="name"
>
<div
class="inline-input-container"
- v-for="item, index in ruleData"
+ v-for="(item, index) in ruleData"
:key="index"
>
<el-tooltip :content="
diff --git a/src/views/system/contract/report/index.vue b/src/views/system/contract/report/index.vue
index 112a1e2..f7d3304 100644
--- a/src/views/system/contract/report/index.vue
+++ b/src/views/system/contract/report/index.vue
@@ -13,23 +13,25 @@
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> -->
-
- <el-card class="box-card" v-for="item in checkResultList" :key="item.id">
- <div slot="header" class="clearfix">
- <span>{{ item.unitName }}</span>
- <el-button style="float: right; padding: 3px 0" type="text" @click="handleDetail(item)">鏍哥畻</el-button>
- </div>
- <div class="text item">鍚堝悓<span class="time">{{ item.contractName }}</span></div>
- <div class="text item">鏈�杩戞墸鍑忛噾棰�<span class="time">{{ item.latestDeductMoney }}</span></div>
- <div class="text item">绱鎵ｅ噺閲戦<span class="time">{{ item.deductMoney }}</span></div>
- <div class="text item">鏈�杩戞牳绠楁湀浠�
- <span v-if="item.latestTime" class="time">{{ new Date(item.latestTime).getFullYear() }}骞磠{ new Date(item.latestTime).getMonth() }}鏈�</span>
- <span v-else class="time">鏆傛棤</span>
- </div>
- <el-button size="small" type="primary" round style="float: right;margin-left: 18px;" @click="handleExport(item)" v-hasPermi="['system:calculate:report:export']">瀵煎嚭</el-button>
- <el-button size="small" round style="float: right;margin-bottom: 18px;" @click="handlePublish(item)" v-if="item.status === 'not_publish'" :disabled="!item.canPublish" v-hasPermi="['system:calculate:report:status']">纭鍙戝竷</el-button>
- <el-button size="small" round style="float: right;margin-bottom: 18px;" @click="handlePublish(item)" v-if="item.status === 'published'" v-hasPermi="['system:calculate:report:status']">鍙栨秷鍙戝竷</el-button>
- </el-card>
+ <div v-if="checkResultList && checkResultList.length > 0">
+ <el-card class="box-card" v-for="item in checkResultList" :key="item.id">
+ <div slot="header" class="clearfix">
+ <span>{{ item.unitName }}</span>
+ <el-button style="float: right; padding: 3px 0" type="text" @click="handleDetail(item)">鏍哥畻</el-button>
+ </div>
+ <div class="text item">鍚堝悓<span class="time">{{ item.contractName }}</span></div>
+ <div class="text item">鏈�杩戞墸鍑忛噾棰�<span class="time">{{ item.latestDeductMoney }}</span></div>
+ <div class="text item">绱鎵ｅ噺閲戦<span class="time">{{ item.deductMoney }}</span></div>
+ <div class="text item">鏈�杩戞牳绠楁湀浠�
+ <span v-if="item.latestTime" class="time">{{ new Date(item.latestTime).getFullYear() }}骞磠{ new Date(item.latestTime).getMonth() }}鏈�</span>
+ <span v-else class="time">鏆傛棤</span>
+ </div>
+ <el-button size="small" type="primary" round style="float: right;margin-left: 18px;" @click="handleExport(item)" v-hasPermi="['system:calculate:report:export']">瀵煎嚭</el-button>
+ <el-button size="small" round style="float: right;margin-bottom: 18px;" @click="handlePublish(item)" v-if="item.status === 'not_publish'" :disabled="!item.canPublish" v-hasPermi="['system:calculate:report:status']">纭鍙戝竷</el-button>
+ <el-button size="small" round style="float: right;margin-bottom: 18px;" @click="handlePublish(item)" v-if="item.status === 'published'" v-hasPermi="['system:calculate:report:status']">鍙栨秷鍙戝竷</el-button>
+ </el-card>
+ </div>
+ <el-empty v-else description="鏆傛棤鏁版嵁"></el-empty>
<pagination
v-show="total>0"
diff --git a/src/views/system/data-manage/data-detail/list.js b/src/views/system/data-manage/data-detail/list.js
index 5dfc08e..d1a8e7b 100644
--- a/src/views/system/data-manage/data-detail/list.js
+++ b/src/views/system/data-manage/data-detail/list.js
@@ -4323,7 +4323,18 @@
{
icon: 'el-icon-truck',
dataList: [
-
+ {
+ label: 'IP寮傚父鏁�'
+ },
+ {
+ label: 'MAC鍦板潃寮傚父鏁�'
+ },
+ {
+ label: '缁忓害寮傚父鏁�'
+ },
+ {
+ label: '绾害寮傚父鏁�'
+ },
]
}
],
--
Gitblit v1.8.0