Commit de622e79 authored by shangtx's avatar shangtx

fix: 搜索表单高度问题

parent e2135daf
......@@ -42,4 +42,13 @@ export function saveOrUpdateSubClass(data) {
method: 'post',
data
})
}
export function getSubClassSelectable() {
return axios({
url: `${BASE_URL}/subclass-selectable`,
method: 'get',
})
}
\ No newline at end of file
......@@ -162,7 +162,7 @@ export default {
},
activated() {
mounted() {
// 初始化一些必要数据
// this.list.forEach();
// 计算修改量
......
......@@ -134,7 +134,7 @@ export default {
}
}
this.loading = false
if(this.loadSuccess) {
if (this.loadSuccess) {
this.loadSuccess()
}
})
......@@ -226,6 +226,7 @@ export default {
}
},
onCollapse(gap) {
console.info('gap', gap)
this.searchHeight = gap
}
},
......
......@@ -3,6 +3,7 @@
*/
import store from '@/store/index'
import {getCommonCode} from '@/api/system/sysCode'
import {getSubClassSelectable} from '@/api/serv'
export function triggerWindowResizeEvent() {
let event = document.createEvent('HTMLEvents')
......@@ -97,9 +98,11 @@ export function hasBtnPermission(permission) {
}
const bizCode = {
SUB_CLASSES: 'subClasses'
};
const bizCodeMapping = {
[bizCode.SUB_CLASSES]: () => getSubClassSelectable().then(({data}) => data)
};
export { bizCode, bizCodeMapping };
......
......@@ -13,17 +13,53 @@ import { TableTemplate, TableScript, SearchType } from '@/components/table'
import { getPage, STATUS } from '@/api/order'
import OrderDetail from './OrderDetail.vue'
import dayjs from 'dayjs'
import { bizCode } from '@/util/util'
const columns = [
{ title: '服务项', width: 130, dataIndex: 'serviceName' },
{ title: '订单状态', width: 100, dataIndex: 'orderStatusValue' },
{ title: '订单号', width: 200, dataIndex: 'orderNo' },
{ title: '用户', width: 120, dataIndex: 'userName' },
{ title: '联系电话', dataIndex: 'phone', width: 130 },
{
title: '服务项',
hidden: true,
dataIndex: 'subClassId',
enum: bizCode.SUB_CLASSES,
filter: { type: SearchType.ENUM }
},
{
title: '订单状态',
width: 100,
dataIndex: 'orderStatusValue'
},
{
title: '订单状态',
hidden: true,
dataIndex: 'orderStatus',
filter: { type: SearchType.ENUM },
enum: 'BIZ0002'
},
{
title: '订单号',
width: 200,
dataIndex: 'orderNo',
filter: { type: SearchType.STRING }
},
{
title: '用户',
width: 120,
dataIndex: 'userName',
filter: { type: SearchType.STRING }
},
{
title: '联系电话',
dataIndex: 'phone',
width: 130,
filter: { type: SearchType.STRING }
},
{
title: '服务时间',
dataIndex: 'expectArrivalTime',
width: 130,
filter: { type: SearchType.RANGE },
customRender: (text) => dayjs(text).format('YYYY-MM-DD HH:mm:ss')
},
{
......@@ -51,7 +87,8 @@ export default {
columns,
useYScroll: true,
title: '订单管理',
STATUS
STATUS,
codes: [['BIZ0002'], [bizCode.SUB_CLASSES]]
}
},
methods: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment