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
17fcbf84
Commit
17fcbf84
authored
Feb 10, 2025
by
tanjunxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 1.增加刀模版配送配置字段; 2.领料申请计算精度丢失问题优化
parent
91086728
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
47 additions
and
17 deletions
+47
-17
requestItem.vue
src/components/request/requestItem.vue
+3
-2
index.vue
src/views/mes/md/workunit/index.vue
+18
-1
line.vue
src/views/mes/wm/issue/line.vue
+3
-2
index.vue
src/views/system/user/index.vue
+23
-12
No files found.
src/components/request/requestItem.vue
View file @
17fcbf84
...
...
@@ -274,9 +274,10 @@
if
(
index
===
1
)
{
sums
[
index
]
=
'总数量'
}
else
if
(
column
.
label
===
'领用数量'
)
{
sums
[
index
]
=
data
.
reduce
((
prev
,
curr
)
=>
{
const
temp
=
data
.
reduce
((
prev
,
curr
)
=>
{
return
prev
+
Number
(
curr
.
applyNum
);
},
0
);
},
0
)
sums
[
index
]
=
Number
.
isInteger
(
temp
)
?
temp
:
temp
.
toFixed
(
3
);
}
else
{
sums
[
index
]
=
''
}
...
...
src/views/mes/md/workunit/index.vue
View file @
17fcbf84
...
...
@@ -481,7 +481,23 @@
</el-form>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"12"
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"120px"
>
<el-form-item
label=
"配送刀模版"
>
<el-radio-group
v-model=
"form.toolDelivery"
>
<el-radio
:label=
"'1'"
>
是
</el-radio>
<el-radio
:label=
"'0'"
>
否
</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
</el-col>
</el-row>
<el-form-item>
<el-checkbox
v-model=
"form.sacmForEdgeOpening"
...
...
@@ -706,6 +722,7 @@ export default {
sacmForThermalSelfFusion
:
""
,
sacmForMolarTooth
:
""
,
sacmForSlitting
:
""
,
toolDelivery
:
"0"
};
this
.
autoGenFlag
=
false
;
this
.
resetForm
(
"form"
);
...
...
src/views/mes/wm/issue/line.vue
View file @
17fcbf84
...
...
@@ -299,9 +299,10 @@ export default {
if
(
index
===
1
)
{
sums
[
index
]
=
'总数量'
}
else
if
(
column
.
label
===
'领料数量'
)
{
sums
[
index
]
=
data
.
reduce
((
prev
,
curr
)
=>
{
const
temp
=
data
.
reduce
((
prev
,
curr
)
=>
{
return
prev
+
Number
(
curr
.
quantityIssued
);
},
0
);
},
0
)
sums
[
index
]
=
Number
.
isInteger
(
temp
)
?
temp
:
temp
.
toFixed
(
3
);
}
else
{
sums
[
index
]
=
''
}
...
...
src/views/system/user/index.vue
View file @
17fcbf84
...
...
@@ -272,6 +272,21 @@
</el-select>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"岗位"
>
<el-select
v-model=
"form.postIds"
multiple
placeholder=
"请选择岗位"
>
<el-option
v-for=
"item in postOptions"
:key=
"item.postId"
:label=
"item.postName"
:value=
"item.postId"
:disabled=
"item.status == 1"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"12"
>
<el-form-item
label=
"状态"
>
<el-radio-group
v-model=
"form.status"
>
...
...
@@ -283,21 +298,16 @@
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"12"
>
<el-form-item
label=
"岗位"
>
<el-select
v-model=
"form.postIds"
multiple
placeholder=
"请选择岗位"
>
<el-option
v-for=
"item in postOptions"
:key=
"item.postId"
:label=
"item.postName"
:value=
"item.postId"
:disabled=
"item.status == 1"
></el-option>
</el-select>
<el-form-item
label=
"刀模版管理员"
>
<el-radio-group
v-model=
"form.toolIdentity"
>
<el-radio
:label=
"'1'"
>
是
</el-radio>
<el-radio
:label=
"'0'"
>
否
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"12"
>
<el-form-item
label=
"角色"
>
<el-select
v-model=
"form.roleIds"
multiple
placeholder=
"请选择角色"
>
...
...
@@ -586,6 +596,7 @@ export default {
email
:
undefined
,
sex
:
undefined
,
status
:
"0"
,
toolIdentity
:
"0"
,
remark
:
undefined
,
postIds
:
[],
roleIds
:
[]
...
...
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