From e17bee42c359614b663836c169badd558210761c Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期三, 31 七月 2024 13:32:59 +0800
Subject: [PATCH] 检测中心-表格排序修改
---
src/components/tool/value-table.vue | 11 ++
src/components/view/role-manage.vue | 3
src/components/view/b2-standard-template.vue | 3
src/components/do/b3-work-time-management/work-time-config.vue | 101 ++++++++++++------------
src/components/view/b1-inspect-order-plan.vue | 2
src/components/view/custom_manage.vue | 1
src/components/do/b3-personnel-evaluation/evaluation.vue | 1
src/components/view/person-manage.vue | 1
src/components/view/enums.vue | 3
src/components/view/b1-report-preparation.vue | 1
src/components/do/b3-work-time-management/work-time-management.vue | 3
src/components/do/b3-work-time-management/work-time-statistics.vue | 82 ++++++++++----------
src/components/view/system-log.vue | 3
src/components/view/b1-inspection-order.vue | 3
src/components/view/b1-unpass.vue | 3
src/components/view/b1-expenses.vue | 3
16 files changed, 122 insertions(+), 102 deletions(-)
diff --git a/src/components/do/b3-personnel-evaluation/evaluation.vue b/src/components/do/b3-personnel-evaluation/evaluation.vue
index 24ce248..0e0de4d 100644
--- a/src/components/do/b3-personnel-evaluation/evaluation.vue
+++ b/src/components/do/b3-personnel-evaluation/evaluation.vue
@@ -36,6 +36,7 @@
selectField: {},
requiredAdd: [],
requiredUp: [],
+ needSort: ['name'],
},
upIndex:0,
}
diff --git a/src/components/do/b3-work-time-management/work-time-config.vue b/src/components/do/b3-work-time-management/work-time-config.vue
index e0f1c59..c02fe8a 100644
--- a/src/components/do/b3-work-time-management/work-time-config.vue
+++ b/src/components/do/b3-work-time-management/work-time-config.vue
@@ -48,56 +48,57 @@
data () {
return{
componentData: {
- entity: {
- number: null,
- department: null,
- laboratory: null,
- orderBy: {
- field: 'id',
- order: 'desc'
- }
- },
- isIndex: true,
- showSelect: false,
- select: true,
- do: [{
- id: 'delete',
- font: '鍒犻櫎',
- type: 'text',
- method: 'doDiy'
- }, {
- id: 'update',
- font: '缂栬緫',
- type: 'text',
- method: 'doDiy',
- field: ['department']
- }],
- tagField: {
- laboratory: {
- select: []
- },
- unit: {
- select: []
- },
- // department: {
- // select: []
- // },
- },
- linkEvent: {
- },
- selectField: {
- laboratory: {
- select: []
- },
- unit: {
- select: []
- },
- // department: {
- // select: []
- // },
- },
- requiredAdd: ['number','auxiliaryProject','laboratory','unit','approvedWorkingHour'],
- requiredUp: ['number','auxiliaryProject','laboratory','unit','approvedWorkingHour']
+ entity: {
+ number: null,
+ department: null,
+ laboratory: null,
+ orderBy: {
+ field: 'id',
+ order: 'desc'
+ }
+ },
+ isIndex: true,
+ showSelect: false,
+ select: true,
+ do: [{
+ id: 'delete',
+ font: '鍒犻櫎',
+ type: 'text',
+ method: 'doDiy'
+ }, {
+ id: 'update',
+ font: '缂栬緫',
+ type: 'text',
+ method: 'doDiy',
+ field: ['department']
+ }],
+ tagField: {
+ laboratory: {
+ select: []
+ },
+ unit: {
+ select: []
+ },
+ // department: {
+ // select: []
+ // },
+ },
+ linkEvent: {
+ },
+ selectField: {
+ laboratory: {
+ select: []
+ },
+ unit: {
+ select: []
+ },
+ // department: {
+ // select: []
+ // },
+ },
+ needSort: ['auxiliaryProject'],
+ requiredAdd: ['number','auxiliaryProject','laboratory','unit','approvedWorkingHour'],
+ requiredUp: ['number','auxiliaryProject','laboratory','unit','approvedWorkingHour']
},
entityCopy: {},
upIndex: 0,
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 6211dad..add61f4 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
@@ -332,7 +332,8 @@
}
},
requiredAdd: [],
- requiredUp: []
+ requiredUp: [],
+ needSort: ['createTime', 'name']
},
entityCopy: {},
upIndex: 0,
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 d7d6d4c..29a8650 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
@@ -84,50 +84,48 @@
down:false,
up:false,
componentData: {
- entity: {
- month: getYearAndMonthAndDays().split('-')[0]+'-'+getYearAndMonthAndDays().split('-')[1],
- name: null,
- departLims: null,
- },
- isIndex: true,
- showSelect: false,
- select: false,
- do: [],
- tagField: {},
- linkEvent: {},
- selectField: {},
- requiredAdd: [],
- requiredUp: [],
- accept:聽'.xlsx',
- sort: false,
- inputType:聽'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
- cellSpecialStyle:{
- redColorByKey:'Hours'
- }
+ entity: {
+ month: getYearAndMonthAndDays().split('-')[0]+'-'+getYearAndMonthAndDays().split('-')[1],
+ name: null,
+ departLims: null,
+ },
+ isIndex: true,
+ showSelect: false,
+ select: false,
+ do: [],
+ tagField: {},
+ linkEvent: {},
+ selectField: {},
+ requiredAdd: [],
+ requiredUp: [],
+ accept:聽'.xlsx',
+ inputType:聽'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+ cellSpecialStyle:{
+ redColorByKey:'Hours'
+ },
},
componentData0: {
- entity: {
- month: getYearAndMonthAndDays().split('-')[0]+'-'+getYearAndMonthAndDays().split('-')[1],
- name: null,
- departLims: null,
- orderBy: {
- field: 'id',
- order: 'desc'
- }
- },
- sort: false,
- isIndex: true,
- showSelect: false,
- select: false,
- do: [],
- tagField: {},
- linkEvent: {
- },
- selectField: {},
- requiredAdd: [],
- requiredUp: [],
- accept:聽'.xlsx',
- inputType:聽'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+ entity: {
+ month: getYearAndMonthAndDays().split('-')[0]+'-'+getYearAndMonthAndDays().split('-')[1],
+ name: null,
+ departLims: null,
+ orderBy: {
+ field: 'id',
+ order: 'desc'
+ }
+ },
+ isIndex: true,
+ showSelect: false,
+ select: false,
+ do: [],
+ tagField: {},
+ linkEvent: {
+ },
+ selectField: {},
+ requiredAdd: [],
+ requiredUp: [],
+ accept:聽'.xlsx',
+ inputType:聽'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
},
entity:{
month:getYearAndMonthAndDays(),
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index 08b369c..3335bf3 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -123,7 +123,7 @@
</el-table-column>
<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'" :isColumnWidth="isColumnWidth" :width="a.width" :isShowZero="isShowZero"
+ <el-table-column :prop="a.label" :label="a.value" :sortable="a.sort === 'custom' ? 'custom' : false" :isColumnWidth="isColumnWidth" :width="a.width" :isShowZero="isShowZero"
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">
@@ -624,6 +624,15 @@
this.total = res.data.body.total
this.tableHead = res.data.head
this.tableData = res.data.body.records
+ if (this.data.needSort !== undefined) {
+ for (var i = 0; i < this.data.needSort.length; i++) {
+ this.tableHead.forEach(item => {
+ if (item.label === this.data.needSort[i]) {
+ item.sort = 'custom'
+ }
+ })
+ }
+ }
if (this.isShowZero) {
this.tableData.map(item => {
Object.keys(item).forEach(val => {
diff --git a/src/components/view/b1-expenses.vue b/src/components/view/b1-expenses.vue
index 1c7ee1e..ec1837d 100644
--- a/src/components/view/b1-expenses.vue
+++ b/src/components/view/b1-expenses.vue
@@ -197,7 +197,8 @@
},
selectField: {},
requiredAdd: [],
- requiredUp: []
+ requiredUp: [],
+ needSort: ['createTime', 'sample'],
},
entityCopy: {},
upIndex: 0,
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index 89ed36f..d46fe59 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -239,8 +239,8 @@
isIndex: true,
showSelect: false,
select: false,
- sort: false,
init: false,
+ needSort: ['createTime', 'sendTime', 'type', 'appointed', 'insState'],
do: [{
id: '',
font: '妫�楠�',
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 238a71c..cf1c56b 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -583,7 +583,8 @@
},
selectField: {},
requiredAdd: [],
- requiredUp: []
+ requiredUp: [],
+ needSort: ['createTime', 'sendTime', 'type', 'appointed']
},
componentDataDataLook: {
entity: {
diff --git a/src/components/view/b1-report-preparation.vue b/src/components/view/b1-report-preparation.vue
index 1aeb786..25f4170 100644
--- a/src/components/view/b1-report-preparation.vue
+++ b/src/components/view/b1-report-preparation.vue
@@ -277,6 +277,7 @@
},
selectField: {},
requiredAdd: [],
+ needSort: ['createTime', 'state', 'writeTime', 'isExamine', 'examineTime', 'ratifyTime'],
requiredUp: []
},
entityCopy: {},
diff --git a/src/components/view/b1-unpass.vue b/src/components/view/b1-unpass.vue
index 03c1cf0..4948f63 100644
--- a/src/components/view/b1-unpass.vue
+++ b/src/components/view/b1-unpass.vue
@@ -103,7 +103,8 @@
tagField: [],
selectField: [],
requiredAdd: ['model','sample',],
- requiredUp: []
+ requiredUp: [],
+ needSort: ['sample'],
},
entityCopy: {},
upIndex: 0,
diff --git a/src/components/view/b2-standard-template.vue b/src/components/view/b2-standard-template.vue
index 7b37cae..87881a2 100644
--- a/src/components/view/b2-standard-template.vue
+++ b/src/components/view/b2-standard-template.vue
@@ -112,7 +112,8 @@
tagField: {},
selectField: {},
requiredAdd: ['name'],
- requiredUp: ['name']
+ requiredUp: ['name'],
+ needSort: ['createTime', 'updateTime', 'name'],
},
entityCopy: {},
upIndex: 0,
diff --git a/src/components/view/custom_manage.vue b/src/components/view/custom_manage.vue
index 9424091..d9cc053 100644
--- a/src/components/view/custom_manage.vue
+++ b/src/components/view/custom_manage.vue
@@ -247,6 +247,7 @@
}
},
selectField: {},
+ needSort: ['company'],
}
}
},
diff --git a/src/components/view/enums.vue b/src/components/view/enums.vue
index 44095aa..c2b67e8 100644
--- a/src/components/view/enums.vue
+++ b/src/components/view/enums.vue
@@ -170,7 +170,8 @@
],
},
requiredAdd:['category','label','value'],
- requiredUp:['category','label','value']
+ requiredUp:['category','label','value'],
+ needSort: ['createTime', 'updateTime', 'type'],
},
entityCopy: {},
upIndex: 0,
diff --git a/src/components/view/person-manage.vue b/src/components/view/person-manage.vue
index 5c39a75..8c0e23c 100644
--- a/src/components/view/person-manage.vue
+++ b/src/components/view/person-manage.vue
@@ -329,6 +329,7 @@
accept: '.png, .jpg, .jpeg, .gif',
url: this.$api.deviceScope.uploadFile
},
+ needSort: ['name', 'state'],
},
entityCopy: {},
upIndex: 0,
diff --git a/src/components/view/role-manage.vue b/src/components/view/role-manage.vue
index c92965d..1d52a49 100644
--- a/src/components/view/role-manage.vue
+++ b/src/components/view/role-manage.vue
@@ -150,7 +150,8 @@
select: []
}
},
- selectField: {}
+ selectField: {},
+ needSort: ['createTime', 'updateTime', 'name'],
},
entityCopy: {},
upIndex: 0,
diff --git a/src/components/view/system-log.vue b/src/components/view/system-log.vue
index 4754648..ef01ea7 100644
--- a/src/components/view/system-log.vue
+++ b/src/components/view/system-log.vue
@@ -87,7 +87,8 @@
tagField: {},
selectField: {},
requiredAdd:[],
- requiredUp:[]
+ requiredUp:[],
+ needSort: ['createTime'],
},
entityCopy: {},
upIndex: 0
--
Gitblit v1.9.3