From 856d40165af92868ebf15ab68e73f57f27f81bd8 Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期四, 18 七月 2024 10:19:30 +0800
Subject: [PATCH] 优化工时管理和费用统计前端table的间距
---
src/components/tool/value-table.vue | 38 ++++++++++++++++++++++++++++++++++----
src/components/do/b3-work-time-management/work-time-management.vue | 5 ++---
src/components/do/b3-work-time-management/work-time-statistics.vue | 4 ++--
src/components/view/b1-expenses.vue | 2 +-
4 files changed, 39 insertions(+), 10 deletions(-)
diff --git a/src/components/do/b3-work-time-management/work-time-management.vue b/src/components/do/b3-work-time-management/work-time-management.vue
index f70ad63..a3891de 100644
--- a/src/components/do/b3-work-time-management/work-time-management.vue
+++ b/src/components/do/b3-work-time-management/work-time-management.vue
@@ -75,12 +75,11 @@
</div>
<div class="table">
<ValueTable ref="ValueTable0"
- v-if="currentTable == 'ValueTable0'"
+ v-if="currentTable == 'ValueTable0'" :isColumnWidth="true"
:url="$api.auxiliaryWorkingHoursDay.selectAuxiliaryWorkingHoursDay"
:delUrl="$api.auxiliaryWorkingHoursDay.deleteAuxiliaryWorkingHoursDay" :componentData="componentData" :key="upIndex"
@delete="handleDelete" />
- <ValueTable ref="ValueTable1"
- v-if="currentTable == 'ValueTable1'"
+ <ValueTable ref="ValueTable1" v-if="currentTable == 'ValueTable1'" :isColumnWidth="true"
:url="$api.auxiliaryOutputWorkingHours.selectAuxiliaryOutputWorkingHours" :componentData="componentData1" :key="upIndex1" />
</div>
<el-dialog :title="formData.id?'缂栬緫':'褰曞叆鏁版嵁'" :visible.sync="addVisible" width="600px" :before-close="handleClose">
diff --git a/src/components/do/b3-work-time-management/work-time-statistics.vue b/src/components/do/b3-work-time-management/work-time-statistics.vue
index 3b873af..cd0f643 100644
--- a/src/components/do/b3-work-time-management/work-time-statistics.vue
+++ b/src/components/do/b3-work-time-management/work-time-statistics.vue
@@ -56,11 +56,11 @@
</div>
<div class="table">
<ValueTable ref="ValueTable0"
- v-if="currentTable == 'value0'"
+ v-if="currentTable == 'value0'" :isColumnWidth="true"
:url="$api.auxiliaryOriginalHours.selectAuxiliaryOriginalHours"
:componentData="componentData" :key="upIndex" />
<ValueTable ref="ValueTable1"
- v-if="currentTable == 'value1'"
+ v-if="currentTable == 'value1'" :isColumnWidth="true"
:url="$api.auxiliaryCorrectionHours.selectAuxiliaryCorrectionHours"
:inputUrl="$api.auxiliaryCorrectionHours.upload"
:componentData="componentData0"
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index 8d20d12..024991e 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -115,12 +115,12 @@
:summary-method="getSummaries" :row-class-name="tableRowClassName" :row-key="record=>record.id"
:current-row-key="data.currentId" :highlight-current-row="data.highlight===undefined||data.highlight"
:span-method="spanMethod" :key="specialKey">
- <el-table-column type="selection" width="65" v-if="data.showSelect" :key="Math.random()">
+ <el-table-column type="selection" :width="selectionWidth" v-if="data.showSelect" :key="Math.random()">
</el-table-column>
- <el-table-column type="index" align="center" label="搴忓彿" width="65" v-if="data.isIndex" :key="Math.random()">
+ <el-table-column type="index" align="center" label="搴忓彿" :width="selectionWidth" v-if="data.isIndex" :key="Math.random()">
</el-table-column>
- <el-table-column :prop="a.label" :label="a.value" :sortable="data.sort==false?false:'custom'"
- v-for="(a, ai) in tableHead" :key="ai" show-overflow-tooltip min-width="155" v-if="!data.headNoShow||(data.headNoShow&&data.headNoShow.length==0)||(data.headNoShow&&data.headNoShow.length>0&&!data.headNoShow.find(d=>d==a.label))">
+ <el-table-column :prop="a.label" :label="a.value" :sortable="data.sort==false?false:'custom'" :isColumnWidth="isColumnWidth" :width="a.width"
+ v-for="(a, ai) in tableHead" :key="ai" show-overflow-tooltip :min-width="columnMinWidth" v-if="!data.headNoShow||(data.headNoShow&&data.headNoShow.length==0)||(data.headNoShow&&data.headNoShow.length>0&&!data.headNoShow.find(d=>d==a.label))">
<template slot-scope="scope">
<div v-if="showType(a.label, data.tagField) != null">
<template v-if="typeof(scope.row[a.label]) == 'object'">
@@ -335,6 +335,18 @@
} from 'jquery';
export default {
props: {
+ selectionWidth: {
+ type: String,
+ default: () => '65'
+ },
+ columnMinWidth: {
+ type: String,
+ default: () => '155'
+ },
+ isColumnWidth: {
+ type: Boolean,
+ default: () => false
+ },
tableRowClassName: {
type: Function
},
@@ -599,6 +611,24 @@
this.total = res.data.body.total
this.tableHead = res.data.head
this.tableData = res.data.body.records
+ if (this.isColumnWidth) {
+ this.tableHead.forEach(item => {
+ if (item.value.length === 4) {
+ item.width = 120
+ } else if (item.value.length === 3){
+ item.width = 100
+ } else if (item.value.length === 5){
+ item.width = 130
+ } else if (item.value.length === 7){
+ item.width = 160
+ } else if (item.value.length === 6){
+ item.width = 150
+ } else {
+ item.width = 86
+ }
+ })
+ console.log('this.tableHead----', this.tableHead)
+ }
// console.log(JSON.stringify(this.tableHead)+"---------"+JSON.stringify(this.tableData))
for (var a in this.data.selectField) {
if (this.data.selectField[a].choose == true) {
diff --git a/src/components/view/b1-expenses.vue b/src/components/view/b1-expenses.vue
index 31ac8d5..79d87c5 100644
--- a/src/components/view/b1-expenses.vue
+++ b/src/components/view/b1-expenses.vue
@@ -86,7 +86,7 @@
</div>
<div class="table">
<ValueTable ref="ValueTable" :url="$api.insOrder.costStatistics" :componentData="componentData" :key="upIndex"
- @handleWeave="handleWeave" />
+ @handleWeave="handleWeave" :column-min-width="'140'"/>
</div>
</div>
<el-dialog title="鍦ㄧ嚎缂栧埗" :visible.sync="claimVisible" width="70%" :modal-append-to-body="false">
--
Gitblit v1.9.3