diff --git a/src/views/basicData/workCenter.vue b/src/views/basicData/workCenter.vue index 64ef46d8..2bc6dc05 100644 --- a/src/views/basicData/workCenter.vue +++ b/src/views/basicData/workCenter.vue @@ -215,7 +215,7 @@ export default { span: 12, overflow: true, search: true, - sortable: true, + sortable: 'custom', rules: [ { required: true, @@ -230,7 +230,7 @@ export default { span: 12, overflow: true, search: true, - sortable: true, + sortable: 'custom', rules: [ { required: true, @@ -248,7 +248,7 @@ export default { editDisplay: false, overflow: true, search: false, - sortable: true, + sortable: 'custom', rules: [ { required: true, @@ -265,7 +265,7 @@ export default { search: false, addDisplay: false, editDisplay: false, - sortable: true, + sortable: 'custom', rules: [ { required: true, @@ -280,7 +280,7 @@ export default { span: 12, overflow: true, search: true, - sortable: true, + sortable: 'custom', rules: [ { required: true, @@ -288,6 +288,7 @@ export default { trigger: 'blur', }, ], + width: 120, }, { label: '主管工艺员', @@ -298,7 +299,7 @@ export default { // search: true, addDisplay: false, editDisplay: false, - sortable: true, + sortable: 'custom', rules: [ { required: true, @@ -315,6 +316,7 @@ export default { // value: "id", // res:"data.records" // }, + width: 120, }, { label: '主管工艺员', @@ -324,7 +326,7 @@ export default { overflow: true, search: true, hide: true, - sortable: true, + sortable: 'custom', rules: [ { required: true, @@ -352,7 +354,7 @@ export default { editDisplay: false, overflow: true, search: true, - sortable: true, + sortable: 'custom', rules: [ { required: true, @@ -369,7 +371,7 @@ export default { overflow: true, search: false, dicUrl: '/api/blade-system/dict/dictionary?code=workCenterJfCenter', //字典中取值 - sortable: true, + sortable: 'custom', props: { label: 'dictValue', value: 'dictKey', @@ -381,6 +383,7 @@ export default { trigger: 'blur', }, ], + width: 120, }, { label: '描述', @@ -390,7 +393,7 @@ export default { hide: true, overflow: true, search: false, - sortable: true, + sortable: 'custom', // rules: [ // { // required: true, @@ -472,6 +475,7 @@ export default { search: false, addDisplay: false, editDisplay: false, + width: 150, }, ], }, @@ -723,17 +727,14 @@ export default { }, // 排序 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() { getList({