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
e0784b7f
Commit
e0784b7f
authored
Feb 29, 2024
by
jingnan
👀
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://94.191.100.41/tfmom/tf-mom-web
into dev
parents
0a16dd0d
b15e72f7
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
2 deletions
+11
-2
AppMain.vue
...ations/architecture-dee/src/layout/components/AppMain.vue
+9
-0
index.vue
...omponents/components/TempWorkAllocationEditList/index.vue
+1
-1
index.vue
applications/dee-mes/src/views/taskReception/index.vue
+1
-1
No files found.
applications/architecture-dee/src/layout/components/AppMain.vue
View file @
e0784b7f
...
...
@@ -23,6 +23,15 @@ export default {
return
this
.
$route
.
fullPath
}
},
watch
:
{
'$route'
(
route
)
{
// 缓存任务接收页面
if
(
route
.
name
===
'DeeMesTaskReception'
)
{
console
.
log
(
454554
)
this
.
$store
.
dispatch
(
'tagsView/addView'
,
route
)
}
}
},
methods
:
{
}
...
...
applications/dee-mes/src/privateComponents/components/TempWorkAllocationEditList/index.vue
View file @
e0784b7f
...
...
@@ -36,7 +36,7 @@
<span
v-else
>
{{
scope
.
row
.
dxUserInfo
.
name
}}
</span>
</
template
>
</el-table-column>
<el-table-column
prop=
"workHour"
label=
"工时分配(
min
)"
>
<el-table-column
prop=
"workHour"
label=
"工时分配(
h
)"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
workHour
}}
</span>
...
...
applications/dee-mes/src/views/taskReception/index.vue
View file @
e0784b7f
...
...
@@ -10,7 +10,7 @@ import TaskReceiveCard from './components/taskReceiveCard/index'
import
TaskReceiveTable
from
'./components/taskReceiveTable/index'
export
default
{
name
:
'
TaskReceive
'
,
name
:
'
DeeMesTaskReception
'
,
components
:
{
TaskReceiveCard
,
TaskReceiveTable
...
...
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