Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
O
on-site-service-admin-view
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
external
on-site-service-admin-view
Commits
de622e79
Commit
de622e79
authored
Jul 19, 2022
by
shangtx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 搜索表单高度问题
parent
e2135daf
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
57 additions
and
7 deletions
+57
-7
serv.js
src/api/serv.js
+9
-0
SearchForm.vue
src/components/table/SearchForm.vue
+1
-1
TableScript.vue
src/components/table/TableScript.vue
+2
-1
util.js
src/util/util.js
+3
-0
OrderList.vue
src/views/order/OrderList.vue
+42
-5
No files found.
src/api/serv.js
View file @
de622e79
...
...
@@ -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
src/components/table/SearchForm.vue
View file @
de622e79
...
...
@@ -162,7 +162,7 @@ export default {
},
activa
ted
()
{
moun
ted
()
{
// 初始化一些必要数据
// this.list.forEach();
// 计算修改量
...
...
src/components/table/TableScript.vue
View file @
de622e79
...
...
@@ -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
}
},
...
...
src/util/util.js
View file @
de622e79
...
...
@@ -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
};
...
...
src/views/order/OrderList.vue
View file @
de622e79
...
...
@@ -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
:
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment