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
d46999b0
Commit
d46999b0
authored
Dec 18, 2023
by
jingnan
👀
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
工时分配批量签审流程
parent
303b3a6a
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
286 additions
and
3 deletions
+286
-3
index.vue
...ateComponents/components/workAllocationEditList/index.vue
+5
-2
index.vue
.../workflow/task-center/myPlanTask/plannerConfirm/index.vue
+55
-0
index.vue
...flow/task-center/myPlanTask/stationMasteConfirm/index.vue
+55
-0
taskList.vue
...er/src/views/workflow/task-center/myPlanTask/taskList.vue
+6
-1
index.vue
...workflow/task-center/myPlanTask/workHourConfirm/index.vue
+55
-0
index.vue
...workflow/task-center/myPlanTask/workHourExamine/index.vue
+55
-0
index.vue
...s/workflow/task-center/myPlanTask/workerConfirm/index.vue
+55
-0
No files found.
applications/dee-mes/src/privateComponents/components/workAllocationEditList/index.vue
View file @
d46999b0
...
...
@@ -72,6 +72,8 @@ export default {
flag
()
{
if
(
this
.
itemObj
.
isProcess
)
{
return
!
this
.
itemObj
.
readOnly
}
else
if
(
this
.
basicData
.
isWorkHourConfirm
===
'workHourConfirm'
)
{
// 批量签审工时确认流程使用
return
true
}
else
{
return
this
.
basicData
.
joExecutePlan
.
state
===
'Pending_Review'
||
this
.
form
.
state
===
'Pending_Review'
}
...
...
@@ -178,8 +180,9 @@ export default {
})
const
maxSum
=
this
.
accSubtr
(
100
,
sum
)
<
0
?
0
:
this
.
accSubtr
(
100
,
sum
)
if
(
Number
(
row
.
workHourOPercent
)
>
maxSum
)
{
row
.
workHourOPercent
=
null
row
.
workHour
=
null
// row.workHourOPercent = null
// row.workHour = null
this
.
getTableData
()
// 超出时展示原来工时
this
.
$utils
.
showMessageWarning
(
`工时总和超出额定工时,工时占比最多
${
maxSum
}
`
)
return
}
else
{
...
...
applications/dee-task-center/src/views/workflow/task-center/myPlanTask/plannerConfirm/index.vue
0 → 100644
View file @
d46999b0
<!--
* @Author: gjn
* @Date: 2023-12-15 16:29:39
* @Description:批量签审_计划员确认
-->
<
template
>
<div
class=
"plannerConfirm"
>
<dee-as-com
ref=
"applyTable"
class=
"list-table"
:basic-data=
"
{ selectData,selectionRows }"
:lay-config="{ typeName: 'ProdTask', layKey: 'batchSign_hourOtherConfirm'}"
@selectionChange="selectionChange"
/>
</div>
</
template
>
<
script
>
export
default
{
name
:
'PlannerConfirm'
,
components
:
{},
props
:
{
selectData
:
{
type
:
Object
,
default
:
()
=>
{}
}
},
data
()
{
return
{
selectionRows
:
[]
}
},
computed
:
{},
watch
:
{},
created
()
{},
mounted
()
{
},
// 组件方法
methods
:
{
selectionChange
(
val
)
{
this
.
selectionRows
=
val
}
}
}
</
script
>
<
style
lang=
'scss'
>
.plannerConfirm
{
width
:
100%
;
height
:
100%
;
box-sizing
:
border-box
;
padding
:
0
4px
;
}
</
style
>
applications/dee-task-center/src/views/workflow/task-center/myPlanTask/stationMasteConfirm/index.vue
0 → 100644
View file @
d46999b0
<!--
* @Author: gjn
* @Date: 2023-12-15 16:29:39
* @Description:批量签审_站位长确认
-->
<
template
>
<div
class=
"stationMasteConfirm"
>
<dee-as-com
ref=
"applyTable"
class=
"list-table"
:basic-data=
"
{ selectData,selectionRows }"
:lay-config="{ typeName: 'ProdTask', layKey: 'batchSign_hourOtherConfirm'}"
@selectionChange="selectionChange"
/>
</div>
</
template
>
<
script
>
export
default
{
name
:
'StationMasteConfirm'
,
components
:
{},
props
:
{
selectData
:
{
type
:
Object
,
default
:
()
=>
{}
}
},
data
()
{
return
{
selectionRows
:
[]
}
},
computed
:
{},
watch
:
{},
created
()
{},
mounted
()
{
},
// 组件方法
methods
:
{
selectionChange
(
val
)
{
this
.
selectionRows
=
val
}
}
}
</
script
>
<
style
lang=
'scss'
>
.stationMasteConfirm
{
width
:
100%
;
height
:
100%
;
box-sizing
:
border-box
;
padding
:
0
4px
;
}
</
style
>
applications/dee-task-center/src/views/workflow/task-center/myPlanTask/taskList.vue
View file @
d46999b0
...
...
@@ -27,7 +27,12 @@ export default {
InStorageMatchBackConfirm
:
()
=>
import
(
'./inStorageMatchBackConfirm'
),
// 配套退库确认
InStorageUseOutBackApply
:
()
=>
import
(
'./inStorageUseOutBackApply'
),
// 领用/供外退库申请
InStorageUseOutBackExamine
:
()
=>
import
(
'./inStorageUseOutBackExamine'
),
// 领用/供外退库审核
InStorageUseOutBackConfirm
:
()
=>
import
(
'./inStorageUseOutBackConfirm'
)
// 领用/供外退库确认
InStorageUseOutBackConfirm
:
()
=>
import
(
'./inStorageUseOutBackConfirm'
),
// 领用/供外退库确认
WorkerConfirm
:
()
=>
import
(
'./workerConfirm'
),
// 工人确认
WorkHourConfirm
:
()
=>
import
(
'./workHourConfirm'
),
// 工时确认
StationMasteConfirm
:
()
=>
import
(
'./stationMasteConfirm'
),
// 站位长确认
PlannerConfirm
:
()
=>
import
(
'./plannerConfirm'
),
// 计划员确认
WorkHourExamine
:
()
=>
import
(
'./workHourExamine'
)
// 工时审核
},
props
:
{
selectData
:
{
...
...
applications/dee-task-center/src/views/workflow/task-center/myPlanTask/workHourConfirm/index.vue
0 → 100644
View file @
d46999b0
<!--
* @Author: gjn
* @Date: 2023-12-15 16:29:39
* @Description:批量签审_工时确认
-->
<
template
>
<div
class=
"workHourConfirm"
>
<dee-as-com
ref=
"applyTable"
class=
"list-table"
:basic-data=
"
{ selectData,selectionRows }"
:lay-config="{ typeName: 'ProdTask', layKey: 'batchSign_workHourConfirm'}"
@selectionChange="selectionChange"
/>
</div>
</
template
>
<
script
>
export
default
{
name
:
'WorkHourConfirm'
,
components
:
{},
props
:
{
selectData
:
{
type
:
Object
,
default
:
()
=>
{}
}
},
data
()
{
return
{
selectionRows
:
[]
}
},
computed
:
{},
watch
:
{},
created
()
{},
mounted
()
{
},
// 组件方法
methods
:
{
selectionChange
(
val
)
{
this
.
selectionRows
=
val
}
}
}
</
script
>
<
style
lang=
'scss'
>
.workHourConfirm
{
width
:
100%
;
height
:
100%
;
box-sizing
:
border-box
;
padding
:
0
4px
;
}
</
style
>
applications/dee-task-center/src/views/workflow/task-center/myPlanTask/workHourExamine/index.vue
0 → 100644
View file @
d46999b0
<!--
* @Author: gjn
* @Date: 2023-12-15 16:29:39
* @Description:批量签审_工时审核
-->
<
template
>
<div
class=
"workHourExamine"
>
<dee-as-com
ref=
"applyTable"
class=
"list-table"
:basic-data=
"
{ selectData,selectionRows }"
:lay-config="{ typeName: 'ProdTask', layKey: 'batchSign_hourOtherConfirm'}"
@selectionChange="selectionChange"
/>
</div>
</
template
>
<
script
>
export
default
{
name
:
'WorkHourExamine'
,
components
:
{},
props
:
{
selectData
:
{
type
:
Object
,
default
:
()
=>
{}
}
},
data
()
{
return
{
selectionRows
:
[]
}
},
computed
:
{},
watch
:
{},
created
()
{},
mounted
()
{
},
// 组件方法
methods
:
{
selectionChange
(
val
)
{
this
.
selectionRows
=
val
}
}
}
</
script
>
<
style
lang=
'scss'
>
.workHourExamine
{
width
:
100%
;
height
:
100%
;
box-sizing
:
border-box
;
padding
:
0
4px
;
}
</
style
>
applications/dee-task-center/src/views/workflow/task-center/myPlanTask/workerConfirm/index.vue
0 → 100644
View file @
d46999b0
<!--
* @Author: gjn
* @Date: 2023-12-15 16:29:39
* @Description:批量签审_工人确认
-->
<
template
>
<div
class=
"workerConfirm"
>
<dee-as-com
ref=
"applyTable"
class=
"list-table"
:basic-data=
"
{ selectData,selectionRows }"
:lay-config="{ typeName: 'ProdTask', layKey: 'batchSign_workerConfirm'}"
@selectionChange="selectionChange"
/>
</div>
</
template
>
<
script
>
export
default
{
name
:
'WorkerConfirm'
,
components
:
{},
props
:
{
selectData
:
{
type
:
Object
,
default
:
()
=>
{}
}
},
data
()
{
return
{
selectionRows
:
[]
}
},
computed
:
{},
watch
:
{},
created
()
{},
mounted
()
{
},
// 组件方法
methods
:
{
selectionChange
(
val
)
{
this
.
selectionRows
=
val
}
}
}
</
script
>
<
style
lang=
'scss'
>
.workerConfirm
{
width
:
100%
;
height
:
100%
;
box-sizing
:
border-box
;
padding
:
0
4px
;
}
</
style
>
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