Commit de622e79 authored by shangtx's avatar shangtx

fix: 搜索表单高度问题

parent e2135daf
...@@ -43,3 +43,12 @@ export function saveOrUpdateSubClass(data) { ...@@ -43,3 +43,12 @@ export function saveOrUpdateSubClass(data) {
data 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 { ...@@ -162,7 +162,7 @@ export default {
}, },
activated() { mounted() {
// 初始化一些必要数据 // 初始化一些必要数据
// this.list.forEach(); // this.list.forEach();
// 计算修改量 // 计算修改量
......
...@@ -134,7 +134,7 @@ export default { ...@@ -134,7 +134,7 @@ export default {
} }
} }
this.loading = false this.loading = false
if(this.loadSuccess) { if (this.loadSuccess) {
this.loadSuccess() this.loadSuccess()
} }
}) })
...@@ -226,6 +226,7 @@ export default { ...@@ -226,6 +226,7 @@ export default {
} }
}, },
onCollapse(gap) { onCollapse(gap) {
console.info('gap', gap)
this.searchHeight = gap this.searchHeight = gap
} }
}, },
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
*/ */
import store from '@/store/index' import store from '@/store/index'
import {getCommonCode} from '@/api/system/sysCode' import {getCommonCode} from '@/api/system/sysCode'
import {getSubClassSelectable} from '@/api/serv'
export function triggerWindowResizeEvent() { export function triggerWindowResizeEvent() {
let event = document.createEvent('HTMLEvents') let event = document.createEvent('HTMLEvents')
...@@ -97,9 +98,11 @@ export function hasBtnPermission(permission) { ...@@ -97,9 +98,11 @@ export function hasBtnPermission(permission) {
} }
const bizCode = { const bizCode = {
SUB_CLASSES: 'subClasses'
}; };
const bizCodeMapping = { const bizCodeMapping = {
[bizCode.SUB_CLASSES]: () => getSubClassSelectable().then(({data}) => data)
}; };
export { bizCode, bizCodeMapping }; export { bizCode, bizCodeMapping };
......
...@@ -13,17 +13,53 @@ import { TableTemplate, TableScript, SearchType } from '@/components/table' ...@@ -13,17 +13,53 @@ import { TableTemplate, TableScript, SearchType } from '@/components/table'
import { getPage, STATUS } from '@/api/order' import { getPage, STATUS } from '@/api/order'
import OrderDetail from './OrderDetail.vue' import OrderDetail from './OrderDetail.vue'
import dayjs from 'dayjs' import dayjs from 'dayjs'
import { bizCode } from '@/util/util'
const columns = [ const columns = [
{ title: '服务项', width: 130, dataIndex: 'serviceName' }, { title: '服务项', width: 130, dataIndex: 'serviceName' },
{ title: '订单状态', width: 100, dataIndex: 'orderStatusValue' }, {
{ title: '订单号', width: 200, dataIndex: 'orderNo' }, title: '服务项',
{ title: '用户', width: 120, dataIndex: 'userName' }, hidden: true,
{ title: '联系电话', dataIndex: 'phone', width: 130 }, 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: '服务时间', title: '服务时间',
dataIndex: 'expectArrivalTime', dataIndex: 'expectArrivalTime',
width: 130, width: 130,
filter: { type: SearchType.RANGE },
customRender: (text) => dayjs(text).format('YYYY-MM-DD HH:mm:ss') customRender: (text) => dayjs(text).format('YYYY-MM-DD HH:mm:ss')
}, },
{ {
...@@ -51,7 +87,8 @@ export default { ...@@ -51,7 +87,8 @@ export default {
columns, columns,
useYScroll: true, useYScroll: true,
title: '订单管理', title: '订单管理',
STATUS STATUS,
codes: [['BIZ0002'], [bizCode.SUB_CLASSES]]
} }
}, },
methods: { 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