suojin
/
jonhon-mes-web
25
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

人效管理-绩效管理-绩效模板维护-新增排序

Browse Source 
人效管理-绩效管理-绩效填报-新增排序
人效管理-绩效管理-绩效公示-新增排序
dev-scheduling
ysn 1 month ago
parent d2b66c99f2
commit c6fcb686c3
3 changed files with 64 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 35
      src/views/personnelEfficiencyManagement/performanceManagement/dataReporting.vue
  2. 36
      src/views/personnelEfficiencyManagement/performanceManagement/performanceDisclosure.vue
  3. 33
      src/views/personnelEfficiencyManagement/performanceManagement/templateMaintenance.vue

35
src/views/personnelEfficiencyManagement/performanceManagement/dataReporting.vue
Unescape View File

@ -250,18 +250,19 @@ export default {
columnSort: true, columnSort: true,
showOverflowTooltip: true, showOverflowTooltip: true,
searchLabelPosition: 'left', searchLabelPosition: 'left',
searchLabelPosition: 'left',
searchGutter: 24, searchGutter: 24,
searchSpan: 6, searchSpan: 6,
menuAlign: 'center', menuAlign: 'center',
gridBtn: false, gridBtn: false,
searchMenuPosition: 'right', searchMenuPosition: 'right',
labelWidth: 120,
searchLabelWidth: 'auto',
column: [ column: [
{ {
label: '任务名称', label: '任务名称',
prop: 'taskName', prop: 'taskName',
search: true, search: true,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
align: 'left', align: 'left',
headerAlign: 'center', headerAlign: 'center',
@ -270,16 +271,18 @@ export default {
label: '绩效填报人', label: '绩效填报人',
prop: 'reportUserName', prop: 'reportUserName',
search: true, search: true,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
width: 110,
}, },
{ {
label: '状态', label: '状态',
prop: 'status', prop: 'status',
type: 'select', type: 'select',
search: false, search: false,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
width: 100,
dicData: [ dicData: [
{ label: '进行中', value: 1, type: 'warning' }, // 橙色 - 处理中 { label: '进行中', value: 1, type: 'warning' }, // 橙色 - 处理中
{ label: '已完成', value: 2, type: 'success' }, // 绿色 - 成功完成 { label: '已完成', value: 2, type: 'success' }, // 绿色 - 成功完成
@ -294,22 +297,25 @@ export default {
label: '下发人', label: '下发人',
prop: 'createUserName', prop: 'createUserName',
search: false, search: false,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
width: 100,
}, },
{ {
label: '下发时间', label: '下发时间',
prop: 'createTime', prop: 'createTime',
search: false, search: false,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
width: 150,
}, },
{ {
label: '填报时间', label: '填报时间',
prop: 'reportTime', prop: 'reportTime',
search: false, search: false,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
width: 150,
}, },
], ],
}, },
@ -536,11 +542,20 @@ export default {
if (!prop) { if (!prop) {
// 如果取消排序，清空排序参数 // 如果取消排序，清空排序参数
this.query.orderByField = undefined; this.query.orderByField = undefined;
this.query.isAsc = undefined; this.query.asc = undefined;
} else { } else {
const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase(); const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
this.query.orderByField = orderByField; this.query.orderByField =
this.query.isAsc = order === 'ascending' ? true : false; orderByField == 'REPORT_USER_NAME'
? 'bu.real_name'
: orderByField == 'STATUS'
? 't.STATUS'
: orderByField == 'CREATE_USER_NAME'
? 'bu1.real_name'
: orderByField == 'CREATE_TIME'
? 't.CREATE_TIME'
: orderByField;
this.query.asc = order === 'ascending' ? true : false;
} }
// 重新加载数据 // 重新加载数据
this.onLoad(); this.onLoad();

36
src/views/personnelEfficiencyManagement/performanceManagement/performanceDisclosure.vue
Unescape View File

@ -83,7 +83,7 @@ export default {
editBtnIcon: ' ', editBtnIcon: ' ',
viewBtnText: '详情', viewBtnText: '详情',
// labelWidth: 120, // labelWidth: 120,
searchLabelWidth: 40, searchLabelWidth: 'auto',
menu: false, menu: false,
menuWidth: 120, menuWidth: 120,
dialogWidth: 1200, dialogWidth: 1200,
@ -107,14 +107,14 @@ export default {
label: '工号', label: '工号',
prop: 'employeeCode', prop: 'employeeCode',
search: true, search: true,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
}, },
{ {
label: '姓名', label: '姓名',
prop: 'employeeName', prop: 'employeeName',
search: true, search: true,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
width: 120, width: 120,
formatter: val => { formatter: val => {
@ -125,7 +125,7 @@ export default {
label: '一月', label: '一月',
prop: 'm01Score', prop: 'm01Score',
search: false, search: false,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
click: true, click: true,
}, },
@ -133,7 +133,7 @@ export default {
label: '二月', label: '二月',
prop: 'm02Score', prop: 'm02Score',
search: false, search: false,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
click: true, click: true,
}, },
@ -141,7 +141,7 @@ export default {
label: '三月', label: '三月',
prop: 'm03Score', prop: 'm03Score',
search: false, search: false,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
click: true, click: true,
}, },
@ -149,7 +149,7 @@ export default {
label: '四月', label: '四月',
prop: 'm04Score', prop: 'm04Score',
search: false, search: false,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
click: true, click: true,
}, },
@ -157,7 +157,7 @@ export default {
label: '五月', label: '五月',
prop: 'm05Score', prop: 'm05Score',
search: false, search: false,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
click: true, click: true,
}, },
@ -165,7 +165,7 @@ export default {
label: '六月', label: '六月',
prop: 'm06Score', prop: 'm06Score',
search: false, search: false,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
click: true, click: true,
}, },
@ -173,7 +173,7 @@ export default {
label: '七月', label: '七月',
prop: 'm07Score', prop: 'm07Score',
search: false, search: false,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
click: true, click: true,
}, },
@ -181,7 +181,7 @@ export default {
label: '八月', label: '八月',
prop: 'm08Score', prop: 'm08Score',
search: false, search: false,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
click: true, click: true,
}, },
@ -189,7 +189,7 @@ export default {
label: '九月', label: '九月',
prop: 'm09Score', prop: 'm09Score',
search: false, search: false,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
click: true, click: true,
}, },
@ -197,7 +197,7 @@ export default {
label: '十月', label: '十月',
prop: 'm10Score', prop: 'm10Score',
search: false, search: false,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
click: true, click: true,
}, },
@ -205,7 +205,7 @@ export default {
label: '十一月', label: '十一月',
prop: 'm11Score', prop: 'm11Score',
search: false, search: false,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
click: true, click: true,
}, },
@ -213,7 +213,7 @@ export default {
label: '十二月', label: '十二月',
prop: 'm12Score', prop: 'm12Score',
search: false, search: false,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
click: true, click: true,
}, },
@ -293,11 +293,11 @@ export default {
if (!prop) { if (!prop) {
// 如果取消排序，清空排序参数 // 如果取消排序，清空排序参数
this.query.orderByField = undefined; this.query.orderByField = undefined;
this.query.isAsc = undefined; this.query.asc = undefined;
} else { } else {
const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase(); const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
this.query.orderByField = orderByField; this.query.orderByField = orderByField.includes('M_') ? prop : orderByField;
this.query.isAsc = order === 'ascending' ? true : false; this.query.asc = order === 'ascending' ? true : false;
} }
// // 重新加载数据 // // 重新加载数据
this.onLoad(); this.onLoad();

33
src/views/personnelEfficiencyManagement/performanceManagement/templateMaintenance.vue
Unescape View File

@ -128,7 +128,7 @@ export default {
editBtnIcon: ' ', editBtnIcon: ' ',
viewBtnText: '详情', viewBtnText: '详情',
labelWidth: 120, labelWidth: 120,
searchLabelWidth: 120, searchLabelWidth: 'auto',
menu: true, menu: true,
menuWidth: 150, menuWidth: 150,
dialogWidth: 1200, dialogWidth: 1200,
@ -142,7 +142,6 @@ export default {
columnSort: true, columnSort: true,
showOverflowTooltip: true, showOverflowTooltip: true,
searchLabelPosition: 'left', searchLabelPosition: 'left',
searchLabelPosition: 'left',
searchGutter: 24, searchGutter: 24,
searchSpan: 6, searchSpan: 6,
menuAlign: 'center', menuAlign: 'center',
@ -154,7 +153,7 @@ export default {
// prop: "templateType", // prop: "templateType",
// type: "select", // type: "select",
// search: true, // search: true,
// sortable: true, // sortable: 'custom',
// overHidden: true, // overHidden: true,
// dicData: [ // dicData: [
// { label: "通用", value: 1 }, // { label: "通用", value: 1 },
@ -194,7 +193,7 @@ export default {
// prop: "applicationDept", // prop: "applicationDept",
// type: "select", // type: "select",
// search: true, // search: true,
// sortable: true, // sortable: 'custom',
// overHidden: true, // overHidden: true,
// dicData: [ // dicData: [
// { label: "质量", value: 1 }, // { label: "质量", value: 1 },
@ -214,7 +213,7 @@ export default {
label: '绩效任务名称', label: '绩效任务名称',
prop: 'taskName', prop: 'taskName',
search: false, search: false,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
rules: [ rules: [
{ {
@ -229,7 +228,7 @@ export default {
// prop: "templateContent", // prop: "templateContent",
// search: false, // search: false,
// width: 500, // width: 500,
// sortable: true, // sortable: 'custom',
// overHidden: true, // overHidden: true,
// rules: [ // rules: [
// { // {
@ -244,8 +243,9 @@ export default {
prop: 'reportUserName', prop: 'reportUserName',
type: 'select', type: 'select',
search: false, search: false,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
width: 110,
rules: [ rules: [
{ {
required: true, required: true,
@ -258,15 +258,17 @@ export default {
label: '维护人', label: '维护人',
prop: 'updateUserName', prop: 'updateUserName',
search: false, search: false,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
width: 100,
}, },
{ {
label: '维护时间', label: '维护时间',
prop: 'updateTime', prop: 'updateTime',
search: false, search: false,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
width: 150,
}, },
], ],
}, },
@ -405,11 +407,18 @@ export default {
if (!prop) { if (!prop) {
// 如果取消排序，清空排序参数 // 如果取消排序，清空排序参数
this.query.orderByField = undefined; this.query.orderByField = undefined;
this.query.isAsc = undefined; this.query.asc = undefined;
} else { } else {
const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase(); const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
this.query.orderByField = orderByField; this.query.orderByField =
this.query.isAsc = order === 'ascending' ? true : false; orderByField == 'REPORT_USER_NAME'
? 'bu.real_name'
: orderByField == 'UPDATE_USER_NAME'
? 'bu1.real_name'
: orderByField == 'UPDATE_TIME'
? 't.UPDATE_TIME'
: orderByField;
this.query.asc = order === 'ascending' ? true : false;
} }
// // 重新加载数据 // // 重新加载数据
this.onLoad(); this.onLoad();

Write Preview
Loading…
Cancel
Save