Compare commits

..

No commits in common. 'a7f5e312fee0256a722d829647bca471c91c7fc3' and '67ff8ac23163b7dc398d31b75f036b099b2521a2' have entirely different histories.

  1. 6
      ant-design-vue-jeecg/src/views/fieldx/FieldxList.vue
  2. 9
      ant-design-vue-jeecg/src/views/projectx/ProjectxList.vue

@ -244,10 +244,6 @@
superFieldList: [], superFieldList: [],
// //
loadRouteType: false, loadRouteType: false,
isorterx: {
column: 'createTime',
order: 'asc',
},
} }
}, },
@ -424,7 +420,7 @@
sqp['superQueryParams'] = encodeURI(this.superQueryParams) sqp['superQueryParams'] = encodeURI(this.superQueryParams)
sqp['superQueryMatchType'] = this.superQueryMatchType sqp['superQueryMatchType'] = this.superQueryMatchType
} }
var param = Object.assign(sqp, this.queryParam, this.isorterx, this.filters); var param = Object.assign(sqp, this.queryParam, this.isorter, this.filters);
param.field = this.getQueryField(); param.field = this.getQueryField();
param.pageNo = this.ipagination.current; param.pageNo = this.ipagination.current;
param.pageSize = this.ipagination.pageSize; param.pageSize = this.ipagination.pageSize;

@ -116,17 +116,14 @@ import '@/assets/less/TableExpand.less'
import {mixinDevice} from '@/utils/mixin' import {mixinDevice} from '@/utils/mixin'
import {JeecgListMixin} from '@/mixins/JeecgListMixin' import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import ProjectxModal from './modules/ProjectxModal' import ProjectxModal from './modules/ProjectxModal'
import JEllipsis from '@/components/jeecg/JEllipsis'
export default { export default {
name: 'ProjectxList', // name: 'ProjectxList', //
mixins: [JeecgListMixin, mixinDevice], mixins: [JeecgListMixin, mixinDevice],
components: { components: {
ProjectxModal, ProjectxModal
JEllipsis,
}, },
data() { data() {
let ellipsis = (v, l = 20) => (<j-ellipsis value={v} length={l}/>)
return { return {
description: '项目管理 管理项目基本信息管理页面', description: '项目管理 管理项目基本信息管理页面',
// //
@ -144,14 +141,12 @@ export default {
{ {
title: '项目中文名称', title: '项目中文名称',
align: "center", align: "center",
dataIndex: 'projectName', dataIndex: 'projectName'
customRender: (t)=>ellipsis(t)
}, },
{ {
title: '项目英文名称', title: '项目英文名称',
align: "center", align: "center",
dataIndex: 'projectEnName', dataIndex: 'projectEnName',
customRender: (t)=>ellipsis(t)
}, },
{ {
title: '项目编码', title: '项目编码',

Loading…
Cancel
Save