Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
P
pda-ui
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
pda
pda-ui
Commits
3dda0835
Commit
3dda0835
authored
Jan 27, 2024
by
chenzj
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://git.local.topsunit.com/mes/mes-ui
into dev
parents
30598894
a3938166
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
70 additions
and
64 deletions
+70
-64
index.vue
src/components/TmTool/index.vue
+2
-1
index.vue
src/components/routesProcessSelect/index.vue
+2
-1
prototypeMakeInfo.vue
src/views/mes/pro/prototypeMake/prototypeMakeInfo.vue
+56
-54
ProogingProcess.vue
src/views/mes/proofing/components/ProogingProcess.vue
+2
-5
proofingInfo.vue
src/views/mes/proofing/proofingInfo.vue
+8
-3
No files found.
src/components/TmTool/index.vue
View file @
3dda0835
...
...
@@ -4,7 +4,8 @@
v-if=
"showFlag"
:visible
.
sync=
"showFlag"
:modal=
"true"
width=
"700"
width=
"900"
append-to-body
center
>
<el-form
...
...
src/components/routesProcessSelect/index.vue
View file @
3dda0835
...
...
@@ -5,13 +5,14 @@
:visible
.
sync=
"showFlag"
:modal=
"true"
width=
"80%"
append-to-body
center
>
<el-form
:model=
"queryParams"
ref=
"queryForm"
size=
"small"
:inline=
"true"
inline
v-show=
"showSearch"
label-width=
"110px"
>
...
...
src/views/mes/pro/prototypeMake/prototypeMakeInfo.vue
View file @
3dda0835
This diff is collapsed.
Click to expand it.
src/views/mes/proofing/components/ProogingProcess.vue
View file @
3dda0835
...
...
@@ -15,12 +15,12 @@
v-if=
"mode != 'info'"
label=
"操作"
align=
"center"
width=
"150"
width=
"300"
fixed=
"right"
>
<template
slot-scope=
"
{ row, $index }">
<el-button
type=
"text"
icon=
"el-icon-edit"
size=
"small"
@
click=
"openSetProd(row, $index)"
>
...
...
@@ -28,7 +28,6 @@
</el-button>
<el-button
type=
"text"
icon=
"el-icon-edit"
size=
"small"
@
click=
"openSetQrindex(row, $index)"
>
...
...
@@ -36,7 +35,6 @@
</el-button>
<el-button
type=
"text"
icon=
"el-icon-edit"
size=
"small"
@
click=
"openSetTool(row, $index)"
>
...
...
@@ -44,7 +42,6 @@
</el-button>
<el-button
type=
"text"
icon=
"el-icon-edit"
size=
"small"
@
click=
"updateRow(row, $index)"
>
修改
</el-button
...
...
src/views/mes/proofing/proofingInfo.vue
View file @
3dda0835
...
...
@@ -228,7 +228,7 @@ import {
export
default
{
components
:
{
ProogingBom
,
ProogingProcess
,
ItemSelect
,
RoutesProcessSelect
},
dicts
:
[
'pro_proof_form'
,
'pro_distribution_profing'
],
dicts
:
[
"pro_proof_form"
,
"pro_distribution_profing"
],
provide
()
{
return
{
mode
:
this
.
mode
,
...
...
@@ -352,8 +352,13 @@ export default {
this
.
loading
=
false
;
this
.
$modal
.
msgSuccess
(
"提交成功!"
);
// 关闭页签
tabPlugins
.
closeOpenPage
();
this
.
$nextTick
(()
=>
{
// 关闭页签
tabPlugins
.
closeOpenPage
();
this
.
$router
.
replace
({
path
:
'/mes/proofing/query'
})
})
})
.
catch
(()
=>
{
this
.
loading
=
false
;
...
...
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