Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
mes-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
mes
mes-ui
Commits
329ca749
Commit
329ca749
authored
Dec 02, 2024
by
tanjunxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 1.刀模版台账打印字段优化; 2.刀模版领用查看详情删除申请单字段
parent
11487ea4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
6 deletions
+8
-6
index.vue
src/views/mes/tm/tool/index.vue
+6
-4
index.vue
src/views/mes/tm/toolrequestuse/index.vue
+2
-2
No files found.
src/views/mes/tm/tool/index.vue
View file @
329ca749
...
...
@@ -568,13 +568,13 @@ export default {
return
;
}
}
if
(
this
.
form
.
lifeTime
==
0
){
this
.
open
=
true
;
this
.
$modal
.
confirm
(
'请输入剩余寿命数值'
);
return
;
}
this
.
$refs
[
"form"
].
validate
(
valid
=>
{
if
(
valid
)
{
if
(
this
.
form
.
toolId
!=
null
)
{
...
...
@@ -616,12 +616,14 @@ export default {
let
detail
=
[]
this
.
selectRow
.
forEach
((
s
,
i
)
=>
{
detail
.
push
({
"barcode"
:
s
.
sapItemCode
+
'-'
+
s
.
toolCode
,
// "barcode": s.sapItemCode +'-'+ s.toolCode,
"barcode"
:
s
.
toolCode
,
"showText"
:
s
.
itemName
+
'-'
+
s
.
toolCode
,
"gp"
:
i
+
1
}
)
detail
.
push
({
"barcode"
:
s
.
sapItemCode
+
'-'
+
s
.
toolCode
,
// "barcode": s.sapItemCode +'-'+ s.toolCode,
"barcode"
:
s
.
toolCode
,
"showText"
:
s
.
itemName
+
'-'
+
s
.
toolCode
,
"gp"
:
i
+
1
}
)
...
...
src/views/mes/tm/toolrequestuse/index.vue
View file @
329ca749
...
...
@@ -222,7 +222,7 @@
/>
<
/el-form-item
>
<
/el-col
>
<
el
-
col
:
span
=
"8"
>
<
!--
<
el
-
col
:
span
=
"8"
>
<
el
-
form
-
item
label
=
"申请单"
prop
=
"toolRequestId"
>
<
el
-
input
style
=
"width: 220px;"
v
-
model
=
"form.toolRequestCode"
readonly
>
<
el
-
button
...
...
@@ -238,7 +238,7 @@
ref
=
"ToolRequestSelectRef"
@
onSelected
=
"onToolRequestSelected"
><
/ToolRequestSelect
>
<
/el-col
>
<
/el-col>
--
>
<
el
-
col
:
span
=
"8"
>
<
el
-
form
-
item
label
=
"工序"
prop
=
"processId"
>
...
...
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