From f3371fc9c33f979bd2b00e3241769a27c9c79c38 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 25 三月 2025 16:56:19 +0800
Subject: [PATCH] Merge branch 'radio-frequency-cable' of http://114.132.189.42:9002/r/lims-ruoyi-before into radio-frequency-cable
---
src/views/CNAS/personnel/personnelInfo/tabs/reward-punishment-record.vue | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/views/CNAS/personnel/personnelInfo/tabs/reward-punishment-record.vue b/src/views/CNAS/personnel/personnelInfo/tabs/reward-punishment-record.vue
index 7b55725..0f8e6af 100644
--- a/src/views/CNAS/personnel/personnelInfo/tabs/reward-punishment-record.vue
+++ b/src/views/CNAS/personnel/personnelInfo/tabs/reward-punishment-record.vue
@@ -8,14 +8,14 @@
<el-input v-model="search.userName" clearable placeholder="璇疯緭鍏ュ叧閿瓧" size="small"
style="width: 20vh;"></el-input>
</el-form-item>
- <el-form-item label="濂栨儵鏃ユ湡">
+ <el-form-item label="濂栨儵鏃ユ湡" class="dateTime">
<el-date-picker v-model="search.searchTimeList" :picker-options="pickerOptions" align="right" clearable
end-placeholder="缁撴潫鏃ユ湡" format="yyyy-MM-dd" range-separator="鑷�" size="small" start-placeholder="寮�濮嬫棩鏈�"
style="width: 100%" type="daterange" unlink-panels value-format="yyyy-MM-dd 00:00:00">
</el-date-picker>
</el-form-item>
<el-form-item>
- <el-button size="small" type="primary" @click="getPersonnelTraining(departId)">鏌ヨ</el-button>
+ <el-button size="mini" type="primary" @click="getPersonnelTraining(departId)">鏌ヨ</el-button>
</el-form-item>
</el-form>
<div>
@@ -25,7 +25,9 @@
</div>
</div>
<div class="table">
- <el-table :data="tableData" v-loading="tableLoading" height="66.5vh" style="width: 100%">
+ <el-table :data="tableData" v-loading="tableLoading"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
+ height="66.5vh" style="width: 100%">
<el-table-column label="搴忓彿" type="index" width="120">
<template v-slot="scope">
<span>{{ (search.current - 1) * search.size + scope.$index + 1 }}</span>
@@ -317,3 +319,8 @@
}
};
</script>
+<style scoped>
+.dateTime >>>.el-form-item__content {
+ width: 260px;
+}
+</style>
--
Gitblit v1.9.3