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
ae470113
Commit
ae470113
authored
Dec 12, 2023
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
0c486281
c05eb0b5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
11 deletions
+19
-11
index.vue
...rivateComponents/components/AoProcessDetailEdit/index.vue
+1
-1
unit.vue
...-mes/src/privateComponents/components/MBOMConfig/unit.vue
+4
-3
index.vue
...ews/assemblyPlanManagement/instructionsDispatch/index.vue
+8
-2
index.vue
applications/dee-mes/src/views/taskExecution/index.vue
+4
-3
index.vue
.../views/taskReception/components/taskReceiveCard/index.vue
+2
-2
No files found.
applications/dee-mes/src/privateComponents/components/AoProcessDetailEdit/index.vue
View file @
ae470113
...
...
@@ -33,7 +33,7 @@ export default {
layConfig
()
{
return
{
typeName
:
'ExtProcessPlan'
,
layKey
:
'instructEdit'
layKey
:
'instruct
Process
Edit'
}
}
},
...
...
applications/dee-mes/src/privateComponents/components/MBOMConfig/unit.vue
View file @
ae470113
...
...
@@ -608,19 +608,20 @@ export default {
}
})
this
.
$api
.
recursion
(
'ExtProcessExecutorRoute'
,
params
,
true
).
then
(
res
=>
{
this
.
getData
()
this
.
saveDuration
()
})
},
saveDuration
()
{
const
params
=
this
.
modifyData
.
tasks
.
map
(
task
=>
{
const
params
=
this
.
params
.
data
.
filter
(
p
=>
p
.
type
===
'project'
)
.
map
(
task
=>
{
return
{
id
:
task
.
id
,
workHour
:
task
.
duration
,
workHour
:
Number
((
task
.
duration
||
0
)
/
180
)
,
operator
:
'MODIFY'
}
})
this
.
$api
.
recursion
(
'ExtProcessPlan'
,
params
,
true
).
then
(
res
=>
{
this
.
getData
()
})
}
}
...
...
applications/dee-mes/src/views/assemblyPlanManagement/instructionsDispatch/index.vue
View file @
ae470113
...
...
@@ -14,7 +14,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col
:span=
"
8
"
>
<el-col
:span=
"
6
"
>
<el-form-item
label=
"班组:"
>
<el-select
v-model=
"searchFormData.group"
placeholder=
"班组"
@
change=
"changeGroup"
>
<el-option
...
...
@@ -28,9 +28,15 @@
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"AO(号/名称):"
>
<el-input
v-model=
"searchFormData.aoName"
clearable
placeholder=
"请输入AO(号/名称)"
@
clear=
"getTableData"
@
keyup
.
enter
.
native=
"getTableData"
/>
<el-input
v-model=
"searchFormData.aoName"
clearable
placeholder=
"请输入AO(号/名称)"
/>
</el-form-item>
</el-col>
<el-col
:span=
"2"
>
<el-button
type=
"primary"
@
click=
"getTableData"
>
查询
</el-button>
</el-col>
</el-form>
</div>
<split-pane
...
...
applications/dee-mes/src/views/taskExecution/index.vue
View file @
ae470113
...
...
@@ -352,7 +352,7 @@
/>
</el-badge>
</a>
<a
<
!--
<
a
href=
"javascript:void(0)"
class=
"gooey-menu-item"
:disabled=
"isOK"
...
...
@@ -376,7 +376,7 @@
<use
xlink:href=
"#icon-tiaoshi"
/>
</svg>
</el-badge>
</a>
</a>
-->
<a
href=
"javascript:void(0)"
class=
"gooey-menu-item"
...
...
@@ -493,8 +493,9 @@
class=
"js-signature"
data-width=
"600"
data-height=
"200"
data-line-width=
"10"
data-border=
"1px solid black"
data-line-color=
"#
bc
0000"
data-line-color=
"#
00
0000"
data-auto-fit=
"true"
>
<p>
提示: 请在红线方框内用正楷签名!
</p>
...
...
applications/dee-mes/src/views/taskReception/components/taskReceiveCard/index.vue
View file @
ae470113
...
...
@@ -102,10 +102,10 @@
<i
class=
"icon el-icon-collection"
/>
<p>
视图切换
</p>
</dd>
<dd
@
click=
"$refs.TimeToSee.open()"
>
<
!--
<
dd
@
click=
"$refs.TimeToSee.open()"
>
<span
class=
"iconfont icon-view-mode"
/>
<p>
工时查看
</p>
</dd>
</dd>
-->
</dl>
</div>
<TimeToSee
ref=
"TimeToSee"
/>
...
...
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