diff --git a/src/views/basicData/teamManagement.vue b/src/views/basicData/teamManagement.vue index 517623de..f6d07a7a 100644 --- a/src/views/basicData/teamManagement.vue +++ b/src/views/basicData/teamManagement.vue @@ -352,10 +352,10 @@ export default { label: '编码', prop: 'tsCode', search: true, - sortable: true, + sortable: 'custom', filter: true, span: 12, - width: 100, + width: 200, rules: [ { required: true, @@ -367,10 +367,10 @@ export default { { label: '名称', prop: 'tsName', - sortable: true, + sortable: 'custom', filter: true, span: 12, - width: 150, + width: 200, search: true, rules: [ { @@ -385,10 +385,10 @@ export default { prop: 'teamLeader', search: false, type: 'select', - sortable: true, + sortable: 'custom', filter: true, span: 12, - width: 150, + width: 100, rules: [ { required: true, @@ -407,11 +407,11 @@ export default { label: '计划员', prop: 'planner', search: false, - sortable: true, + sortable: 'custom', filter: true, type: 'select', span: 12, - width: 150, + width: 100, rules: [ { required: true, @@ -430,12 +430,12 @@ export default { label: '调度员', prop: 'dispatcher', search: true, - sortable: true, + sortable: 'custom', filter: true, remote: true, type: 'select', span: 12, - width: 150, + width: 100, rules: [ { required: true, @@ -454,12 +454,12 @@ export default { label: '班组人员', prop: 'teamMember', search: false, - sortable: true, + sortable: 'custom', filter: true, editDisplay: false, addDisplay: false, span: 12, - width: 150, + width: 200, rules: [ { required: true, @@ -473,10 +473,10 @@ export default { prop: 'csId', search: false, type: 'select', - sortable: true, + sortable: 'custom', filter: true, span: 12, - width: 150, + width: 100, props: { label: 'name', value: 'id', @@ -488,10 +488,10 @@ export default { prop: 'tsType', search: false, type: 'select', - sortable: true, + sortable: 'custom', filter: true, span: 12, - width: 150, + width: 100, dicData: [ { value: '1', label: '针孔' }, { value: '2', label: '壳体' }, @@ -504,12 +504,12 @@ export default { label: '日分派时间', prop: 'dayPutDueTime', search: false, - sortable: true, + sortable: 'custom', editDisplay: false, filter: true, addDisplay: false, span: 12, - width: 150, + width: 200, rules: [ { required: true, @@ -522,12 +522,12 @@ export default { label: '特殊日分派时间', prop: 'specDayPutDueTime', search: false, - sortable: true, + sortable: 'custom', editDisplay: false, filter: true, addDisplay: false, span: 12, - width: 150, + width: 200, rules: [ { required: true, @@ -540,12 +540,12 @@ export default { label: '轮换时间', prop: 'exChangeTime', search: false, - sortable: true, + sortable: 'custom', editDisplay: false, filter: true, addDisplay: false, span: 12, - width: 150, + width: 200, rules: [ { required: true, @@ -559,10 +559,10 @@ export default { prop: 'special', search: false, type: 'select', - sortable: true, + sortable: 'custom', filter: true, span: 12, - width: 150, + width: 70, dicData: [ { value: '1', @@ -899,24 +899,19 @@ export default { refreshChange() { this.onLoad(this.page, this.query); }, - // 排序 sortChange({ prop, order }) { - if (!prop) { - // 如果取消排序,清空排序参数 - this.query.orderByField = undefined; - this.query.isAsc = 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.onLoad(); + this.query.descs = undefined; + this.query.ascs = undefined; + let orderByFieldKey = order === 'descending' ? 'descs' : 'ascs'; + this.query[orderByFieldKey] = !prop + ? undefined + : prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase(); + // // 重新加载数据 + this.onLoad(this.page, this.query); }, onLoad() { this.loading = true; getList({ - descs: 'TS_CODE', current: this.page.currentPage, size: this.page.pageSize, ...this.query,