diff --git a/src/views/personnelEfficiencyManagement/performanceManagement/dataReporting.vue b/src/views/personnelEfficiencyManagement/performanceManagement/dataReporting.vue index 13feee06..469d8682 100644 --- a/src/views/personnelEfficiencyManagement/performanceManagement/dataReporting.vue +++ b/src/views/personnelEfficiencyManagement/performanceManagement/dataReporting.vue @@ -250,18 +250,19 @@ export default { columnSort: true, showOverflowTooltip: true, searchLabelPosition: 'left', - searchLabelPosition: 'left', searchGutter: 24, searchSpan: 6, menuAlign: 'center', gridBtn: false, searchMenuPosition: 'right', + labelWidth: 120, + searchLabelWidth: 'auto', column: [ { label: '任务名称', prop: 'taskName', search: true, - sortable: true, + sortable: 'custom', overHidden: true, align: 'left', headerAlign: 'center', @@ -270,16 +271,18 @@ export default { label: '绩效填报人', prop: 'reportUserName', search: true, - sortable: true, + sortable: 'custom', overHidden: true, + width: 110, }, { label: '状态', prop: 'status', type: 'select', search: false, - sortable: true, + sortable: 'custom', overHidden: true, + width: 100, dicData: [ { label: '进行中', value: 1, type: 'warning' }, // 橙色 - 处理中 { label: '已完成', value: 2, type: 'success' }, // 绿色 - 成功完成 @@ -294,22 +297,25 @@ export default { label: '下发人', prop: 'createUserName', search: false, - sortable: true, + sortable: 'custom', overHidden: true, + width: 100, }, { label: '下发时间', prop: 'createTime', search: false, - sortable: true, + sortable: 'custom', overHidden: true, + width: 150, }, { label: '填报时间', prop: 'reportTime', search: false, - sortable: true, + sortable: 'custom', overHidden: true, + width: 150, }, ], }, @@ -536,11 +542,20 @@ export default { if (!prop) { // 如果取消排序，清空排序参数 this.query.orderByField = undefined; - this.query.isAsc = undefined; + this.query.asc = undefined; } else { const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase(); - this.query.orderByField = orderByField; - this.query.isAsc = order === 'ascending' ? true : false; + this.query.orderByField = + 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(); diff --git a/src/views/personnelEfficiencyManagement/performanceManagement/performanceDisclosure.vue b/src/views/personnelEfficiencyManagement/performanceManagement/performanceDisclosure.vue index 14c2cddc..c0db0178 100644 --- a/src/views/personnelEfficiencyManagement/performanceManagement/performanceDisclosure.vue +++ b/src/views/personnelEfficiencyManagement/performanceManagement/performanceDisclosure.vue @@ -83,7 +83,7 @@ export default { editBtnIcon: ' ', viewBtnText: '详情', // labelWidth: 120, - searchLabelWidth: 40, + searchLabelWidth: 'auto', menu: false, menuWidth: 120, dialogWidth: 1200, @@ -107,14 +107,14 @@ export default { label: '工号', prop: 'employeeCode', search: true, - sortable: true, + sortable: 'custom', overHidden: true, }, { label: '姓名', prop: 'employeeName', search: true, - sortable: true, + sortable: 'custom', overHidden: true, width: 120, formatter: val => { @@ -125,7 +125,7 @@ export default { label: '一月', prop: 'm01Score', search: false, - sortable: true, + sortable: 'custom', overHidden: true, click: true, }, @@ -133,7 +133,7 @@ export default { label: '二月', prop: 'm02Score', search: false, - sortable: true, + sortable: 'custom', overHidden: true, click: true, }, @@ -141,7 +141,7 @@ export default { label: '三月', prop: 'm03Score', search: false, - sortable: true, + sortable: 'custom', overHidden: true, click: true, }, @@ -149,7 +149,7 @@ export default { label: '四月', prop: 'm04Score', search: false, - sortable: true, + sortable: 'custom', overHidden: true, click: true, }, @@ -157,7 +157,7 @@ export default { label: '五月', prop: 'm05Score', search: false, - sortable: true, + sortable: 'custom', overHidden: true, click: true, }, @@ -165,7 +165,7 @@ export default { label: '六月', prop: 'm06Score', search: false, - sortable: true, + sortable: 'custom', overHidden: true, click: true, }, @@ -173,7 +173,7 @@ export default { label: '七月', prop: 'm07Score', search: false, - sortable: true, + sortable: 'custom', overHidden: true, click: true, }, @@ -181,7 +181,7 @@ export default { label: '八月', prop: 'm08Score', search: false, - sortable: true, + sortable: 'custom', overHidden: true, click: true, }, @@ -189,7 +189,7 @@ export default { label: '九月', prop: 'm09Score', search: false, - sortable: true, + sortable: 'custom', overHidden: true, click: true, }, @@ -197,7 +197,7 @@ export default { label: '十月', prop: 'm10Score', search: false, - sortable: true, + sortable: 'custom', overHidden: true, click: true, }, @@ -205,7 +205,7 @@ export default { label: '十一月', prop: 'm11Score', search: false, - sortable: true, + sortable: 'custom', overHidden: true, click: true, }, @@ -213,7 +213,7 @@ export default { label: '十二月', prop: 'm12Score', search: false, - sortable: true, + sortable: 'custom', overHidden: true, click: true, }, @@ -293,11 +293,11 @@ export default { if (!prop) { // 如果取消排序，清空排序参数 this.query.orderByField = undefined; - this.query.isAsc = undefined; + this.query.asc = undefined; } else { const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase(); - this.query.orderByField = orderByField; - this.query.isAsc = order === 'ascending' ? true : false; + this.query.orderByField = orderByField.includes('M_') ? prop : orderByField; + this.query.asc = order === 'ascending' ? true : false; } // // 重新加载数据 this.onLoad(); diff --git a/src/views/personnelEfficiencyManagement/performanceManagement/templateMaintenance.vue b/src/views/personnelEfficiencyManagement/performanceManagement/templateMaintenance.vue index 79669178..486f4995 100644 --- a/src/views/personnelEfficiencyManagement/performanceManagement/templateMaintenance.vue +++ b/src/views/personnelEfficiencyManagement/performanceManagement/templateMaintenance.vue @@ -128,7 +128,7 @@ export default { editBtnIcon: ' ', viewBtnText: '详情', labelWidth: 120, - searchLabelWidth: 120, + searchLabelWidth: 'auto', menu: true, menuWidth: 150, dialogWidth: 1200, @@ -142,7 +142,6 @@ export default { columnSort: true, showOverflowTooltip: true, searchLabelPosition: 'left', - searchLabelPosition: 'left', searchGutter: 24, searchSpan: 6, menuAlign: 'center', @@ -154,7 +153,7 @@ export default { // prop: "templateType", // type: "select", // search: true, - // sortable: true, + // sortable: 'custom', // overHidden: true, // dicData: [ // { label: "通用", value: 1 }, @@ -194,7 +193,7 @@ export default { // prop: "applicationDept", // type: "select", // search: true, - // sortable: true, + // sortable: 'custom', // overHidden: true, // dicData: [ // { label: "质量", value: 1 }, @@ -214,7 +213,7 @@ export default { label: '绩效任务名称', prop: 'taskName', search: false, - sortable: true, + sortable: 'custom', overHidden: true, rules: [ { @@ -229,7 +228,7 @@ export default { // prop: "templateContent", // search: false, // width: 500, - // sortable: true, + // sortable: 'custom', // overHidden: true, // rules: [ // { @@ -244,8 +243,9 @@ export default { prop: 'reportUserName', type: 'select', search: false, - sortable: true, + sortable: 'custom', overHidden: true, + width: 110, rules: [ { required: true, @@ -258,15 +258,17 @@ export default { label: '维护人', prop: 'updateUserName', search: false, - sortable: true, + sortable: 'custom', overHidden: true, + width: 100, }, { label: '维护时间', prop: 'updateTime', search: false, - sortable: true, + sortable: 'custom', overHidden: true, + width: 150, }, ], }, @@ -405,11 +407,18 @@ export default { if (!prop) { // 如果取消排序，清空排序参数 this.query.orderByField = undefined; - this.query.isAsc = undefined; + this.query.asc = undefined; } else { const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase(); - this.query.orderByField = orderByField; - this.query.isAsc = order === 'ascending' ? true : false; + this.query.orderByField = + 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();