Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
TF-MOM-WEB
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
TFMOM
TF-MOM-WEB
Commits
0a15c831
Commit
0a15c831
authored
Jan 05, 2024
by
jingnan
👀
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
领用出库确认,生产准备工确认右侧样式修改
parent
b3324372
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
293 additions
and
45 deletions
+293
-45
right copy.vue
...PlanTask/outStorageMatchConfirm/components/right copy.vue
+160
-0
right.vue
...nter/myPlanTask/outStorageOutConfirm/components/right.vue
+66
-22
right.vue
.../myPlanTask/proPreparatWorkerConfirm/components/right.vue
+66
-22
taskList.vue
...er/src/views/workflow/task-center/myPlanTask/taskList.vue
+1
-1
No files found.
applications/dee-task-center/src/views/workflow/task-center/myPlanTask/outStorageMatchConfirm/components/right copy.vue
0 → 100644
View file @
0a15c831
<
template
>
<div
class=
"matchConfirmRight"
>
<split-pane
ref=
"splitPane"
:min-percent=
"20"
:default-percent=
"30"
split=
"horizontal"
:class=
"['detail-pane','collapse']"
>
<template
slot=
"paneL"
>
<div
class=
"table-box"
>
<dee-as-com
ref=
"outStorageMatch"
:table-height=
"autoTopHeight"
:basic-data=
"
{ selectData: selectData }"
:lay-config="{ typeName: 'OutStorageMatch', layKey: 'batchSign_OutStorageMatch'}"
@selectionChange="selectionChange"
/>
</div>
</
template
>
<
template
slot=
"paneR"
>
<div
class=
"detail"
>
<split-pane
ref=
"splitPaneInner"
:min-percent=
"20"
:default-percent=
"30"
split=
"horizontal"
:class=
"['detail-pane','collapse']"
>
<template
slot=
"paneL"
>
<div
class=
"table-box"
>
<dee-as-com
ref=
"outStorageMatchItem"
:lay-config=
"
{ typeName: 'OutStorageMatchItem', layKey: 'batchSign_OutStorageMatchItem'}"
:table-height="autoBottomHeight"
@selectionChange="selectionChange_item"
/>
</div>
</
template
>
<
template
slot=
"paneR"
>
<div
class=
"detail"
>
<dee-as-com
ref=
"jobResponseOutStorageMatch"
table-height=
"100%"
:lay-config=
"
{ typeName: 'JobResponseOutStorageMatch', layKey: 'batchSign_JobResOutStorageMatch'}"
@selectionChange="selectionChange_jobRes"
/>
</div>
</
template
>
</split-pane>
</div>
</template>
</split-pane>
</div>
</template>
<
script
>
export
default
{
name
:
'MatchConfirmRight'
,
components
:
{},
props
:
{
selectData
:
{
type
:
Object
,
default
:
()
=>
{}
}
},
data
()
{
return
{
selectionRows
:
[],
selectionItemRows
:
[],
selectionJobResRows
:
[],
autoBottomHeight
:
'280px'
,
autoTopHeight
:
'280px'
}
},
computed
:
{},
watch
:
{},
created
()
{},
mounted
()
{
this
.
$bus
.
$on
(
'refreshMatchConfirm'
,
(
hasFlag
)
=>
{
this
.
$nextTick
(()
=>
{
this
.
selectionChange
(
this
.
selectionRows
)
this
.
selectionChange_item
(
this
.
selectionItemRows
)
})
})
this
.
$nextTick
(
function
()
{
const
splitPane
=
this
.
$refs
.
splitPane
const
height
=
document
.
getElementById
(
'app'
).
offsetHeight
if
(
splitPane
)
{
this
.
$watch
(
function
()
{
return
splitPane
.
percent
},
(
val
,
oval
)
=>
{
this
.
autoTopHeight
=
val
/
100
*
height
-
80
+
'px'
// this.autoBottomHeight = (100 - val) / 100 * height - 270 + 'px'
}
)
}
})
},
// 组件方法
methods
:
{
selectionChange
(
val
)
{
this
.
selectionRows
=
val
const
requestIds
=
val
&&
val
.
map
(
item
=>
item
.
id
)
this
.
$refs
.
outStorageMatchItem
.
$refs
.
asCom
.
getData
(
requestIds
)
},
selectionChange_item
(
val
)
{
this
.
selectionItemRows
=
val
const
itemIds
=
val
&&
val
.
map
(
item
=>
item
.
id
)
this
.
$refs
.
jobResponseOutStorageMatch
.
$refs
.
asCom
.
getData
(
itemIds
)
},
selectionChange_jobRes
(
val
)
{
this
.
selectionJobResRows
=
val
},
init
(
checkList
)
{
const
aoIds
=
checkList
&&
checkList
.
map
(
item
=>
item
.
id
)
this
.
$refs
.
outStorageMatch
.
$refs
.
asCom
.
getData
(
aoIds
)
}
}
}
</
script
>
<
style
lang=
'scss'
>
.matchConfirmRight
{
overflow
:
auto
;
width
:
100%
;
height
:
100%
;
box-sizing
:
border-box
;
padding-left
:
8px
;
// .sub-title{
// padding-top: 0px!important;
// }
.splitter-pane-resizer.horizontal
{
opacity
:
1
;
background-color
:
#F1F4F5
;
height
:
8px
;
border-bottom
:
1px
solid
#e0e0e0
;
border-top
:
1px
solid
#e0e0e0
;
}
.detail
{
height
:
100%
;
background-color
:
#fff
;
}
.dee-table
{
.dee-tools
{
margin
:
2px
0
!
important
;
}
.dee-table-config-bar
{
margin
:
2px
0
!
important
;
}
.dee-table-pagination
{
margin-top
:
12px
!
important
;
}
}
}
</
style
>
applications/dee-task-center/src/views/workflow/task-center/myPlanTask/outStorageOutConfirm/components/right.vue
View file @
0a15c831
<
template
>
<div
class=
"proPreConfirmRight"
>
<dee-as-com
ref=
"requestTable"
:basic-data=
"
{ selectData,...currentLeftData,selectionRows}"
:lay-config="{ typeName: 'OutStorageOut', layKey:topLayKey}"
table-height="auto"
@selectionChange="selectionChange"
/>
<dee-as-com
ref=
"itemsTable"
:lay-config=
"
{ typeName: 'OutStorageOutItem', layKey: 'edit_outStorageOutItem_confirm'}"
table-height="35%"
:basic-data=" { selectData,selectionRowsItem,...currentLeftData }"
@selectionChange="selectionChangeItem"
/>
<dee-as-com
ref=
"responseTable"
:lay-config=
"
{ typeName: 'JobResponseOutStorageOut', layKey: 'batchSign_outStorageOutJobResponse'}"
table-height="47%"
:basic-data=" { selectData,selectionRowsRes,...currentLeftData }"
@selectionChangeRes="selectionChangeRes"
/>
<split-pane
ref=
"splitPane"
:min-percent=
"30"
:default-percent=
"47"
split=
"horizontal"
:class=
"['detail-pane','collapse']"
>
<template
slot=
"paneL"
>
<div
class=
"table-box"
>
<dee-as-com
ref=
"requestTable"
:basic-data=
"
{ selectData,...currentLeftData,selectionRows}"
:lay-config="{ typeName: 'OutStorageOut', layKey:topLayKey}"
table-height="auto"
@selectionChange="selectionChange"
/>
<dee-as-com
ref=
"itemsTable"
:lay-config=
"
{ typeName: 'OutStorageOutItem', layKey: 'edit_outStorageOutItem_confirm'}"
:table-height="autoTopHeight"
:basic-data=" { selectData,selectionRowsItem,...currentLeftData }"
@selectionChange="selectionChangeItem"
/>
</div>
</
template
>
<
template
slot=
"paneR"
>
<div
class=
"detail"
>
<dee-as-com
ref=
"responseTable"
:lay-config=
"
{ typeName: 'JobResponseOutStorageOut', layKey: 'batchSign_outStorageOutJobResponse'}"
:table-height="autoBottomHeight"
:basic-data=" { selectData,selectionRowsRes,...currentLeftData }"
@selectionChangeRes="selectionChangeRes"
/>
</div>
</
template
>
</split-pane>
</div>
</template>
...
...
@@ -43,7 +59,9 @@ export default {
selectionRows
:
[],
selectionRowsItem
:
[],
selectionRowsRes
:
[],
topLayKey
:
'e3b7e2e1-af45-4e28-99f6-6f7583d2c216'
topLayKey
:
'e3b7e2e1-af45-4e28-99f6-6f7583d2c216'
,
autoBottomHeight
:
'100%'
,
autoTopHeight
:
'300px'
}
},
computed
:
{},
...
...
@@ -68,6 +86,21 @@ export default {
this
.
$bus
.
$on
(
'refreshUseItemConfirm'
,
(
data
)
=>
{
this
.
$refs
.
itemsTable
&&
this
.
$refs
.
itemsTable
.
$refs
.
asCom
.
getData
()
})
this
.
$nextTick
(
function
()
{
const
splitPane
=
this
.
$refs
.
splitPane
const
height
=
document
.
getElementById
(
'app'
).
offsetHeight
-
140
if
(
splitPane
)
{
this
.
$watch
(
function
()
{
return
splitPane
.
percent
},
(
val
,
oval
)
=>
{
this
.
autoTopHeight
=
val
/
100
*
height
-
120
+
'px'
// this.autoBottomHeight = (100 - val) / 100 * height - 270 + 'px'
}
)
}
})
},
// 组件方法
methods
:
{
...
...
@@ -100,6 +133,17 @@ export default {
.sub-title
{
padding-top
:
10px
!
important
;
}
.splitter-pane-resizer.horizontal
{
opacity
:
1
;
background-color
:
#F1F4F5
;
height
:
8px
;
border-bottom
:
1px
solid
#e0e0e0
;
border-top
:
1px
solid
#e0e0e0
;
}
.detail
{
height
:
100%
;
background-color
:
#fff
;
}
.dee-table
{
.dee-tools
{
margin
:
2px
0
!
important
;
...
...
applications/dee-task-center/src/views/workflow/task-center/myPlanTask/proPreparatWorkerConfirm/components/right.vue
View file @
0a15c831
<
template
>
<div
class=
"proPreConfirmRight"
>
<dee-as-com
:basic-data=
"
{...(currentAo
&&
currentAo.joExecutePlan
&&
currentAo.joExecutePlan[0]||{})}"
:lay-config="{ typeName: 'JoExecutePlan', layKey: 'batchSign_proPreConfirm_aoInfo'}"
/>
<dee-as-com
ref=
"outStorageMatch"
:basic-data=
"
{ selectData: selectData }"
:lay-config="{ typeName: 'ExtSupportingItem', layKey: 'batchSign_proPreConfirm_rightTop'}"
table-height="calc(50vh - 80px)"
/>
<dee-as-com
ref=
"outStorageMatchItem"
:lay-config=
"
{ typeName: 'OutStorageMatchItem', layKey: 'batchSign_proPreConfirm_rightBottom'}"
table-height="calc(50vh - 80px)"
:basic-data=" { selectData,selectionRows }"
@selectionChange="selectionChange"
/>
<split-pane
ref=
"splitPane"
:min-percent=
"30"
:default-percent=
"60"
split=
"horizontal"
:class=
"['detail-pane','collapse']"
>
<template
slot=
"paneL"
>
<div
class=
"table-box"
>
<dee-as-com
:basic-data=
"
{...(currentAo
&&
currentAo.joExecutePlan
&&
currentAo.joExecutePlan[0]||{})}"
:lay-config="{ typeName: 'JoExecutePlan', layKey: 'batchSign_proPreConfirm_aoInfo'}"
/>
<dee-as-com
ref=
"outStorageMatch"
:basic-data=
"
{ selectData: selectData }"
:lay-config="{ typeName: 'ExtSupportingItem', layKey: 'batchSign_proPreConfirm_rightTop'}"
:table-height="autoTopHeight"
/>
</div>
</
template
>
<
template
slot=
"paneR"
>
<div
class=
"detail"
>
<dee-as-com
ref=
"outStorageMatchItem"
:lay-config=
"
{ typeName: 'OutStorageMatchItem', layKey: 'batchSign_proPreConfirm_rightBottom'}"
:table-height="autoBottomHeight"
:basic-data=" { selectData,selectionRows }"
@selectionChange="selectionChange"
/>
</div>
</
template
>
</split-pane>
</div>
</template>
<
script
>
export
default
{
name
:
'
Match
ConfirmRight'
,
name
:
'
ProPre
ConfirmRight'
,
components
:
{},
props
:
{
selectData
:
{
...
...
@@ -36,7 +52,9 @@ export default {
},
data
()
{
return
{
selectionRows
:
[]
selectionRows
:
[],
autoBottomHeight
:
'100%'
,
autoTopHeight
:
'480px'
}
},
computed
:
{},
...
...
@@ -48,6 +66,21 @@ export default {
this
.
init
()
})
})
this
.
$nextTick
(
function
()
{
const
splitPane
=
this
.
$refs
.
splitPane
const
height
=
document
.
getElementById
(
'app'
).
offsetHeight
-
120
if
(
splitPane
)
{
this
.
$watch
(
function
()
{
return
splitPane
.
percent
},
(
val
,
oval
)
=>
{
this
.
autoTopHeight
=
val
/
100
*
height
-
80
+
'px'
// this.autoBottomHeight = (100 - val) / 100 * height - 270 + 'px'
}
)
}
})
},
// 组件方法
methods
:
{
...
...
@@ -71,9 +104,20 @@ export default {
height
:
100%
;
box-sizing
:
border-box
;
padding-left
:
8px
;
.sub-title
{
padding-top
:
0px
!
important
;
}
// .sub-title{
// padding-top: 10px!important;
// }
.splitter-pane-resizer.horizontal
{
opacity
:
1
;
background-color
:
#F1F4F5
;
height
:
8px
;
border-bottom
:
1px
solid
#e0e0e0
;
border-top
:
1px
solid
#e0e0e0
;
}
.detail
{
height
:
100%
;
background-color
:
#fff
;
}
.dee-table
{
.dee-tools
{
margin
:
2px
0
!
important
;
...
...
applications/dee-task-center/src/views/workflow/task-center/myPlanTask/taskList.vue
View file @
0a15c831
...
...
@@ -88,7 +88,7 @@ export default {
padding-right
:
10px
;
}
.TaskComponentView
{
height
:
calc
(
100%
-
40px
)
;
height
:
100%
;
box-sizing
:
border-box
;
overflow
:
hidden
;
}
...
...
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