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
0bf0bc1f
Commit
0bf0bc1f
authored
Jan 21, 2025
by
tanjunxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 生产领料页面优化
parent
4494fbbb
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
70 additions
and
15 deletions
+70
-15
requestItem.vue
src/components/request/requestItem.vue
+0
-1
index.vue
src/views/mes/wm/issue/index.vue
+53
-13
line.vue
src/views/mes/wm/issue/line.vue
+17
-1
No files found.
src/components/request/requestItem.vue
View file @
0bf0bc1f
...
@@ -269,7 +269,6 @@
...
@@ -269,7 +269,6 @@
},
},
getSummaries
(
param
){
getSummaries
(
param
){
const
{
columns
,
data
}
=
param
const
{
columns
,
data
}
=
param
console
.
log
(
data
);
const
sums
=
[]
const
sums
=
[]
columns
.
forEach
((
column
,
index
)
=>
{
columns
.
forEach
((
column
,
index
)
=>
{
if
(
index
===
1
)
{
if
(
index
===
1
)
{
...
...
src/views/mes/wm/issue/index.vue
View file @
0bf0bc1f
<
template
>
<
template
>
<div
class=
"app-container"
>
<div
class=
"app-container"
>
<el-form
:model=
"queryParams"
@
submit
.
native
.
prevent
ref=
"queryForm"
size=
"small"
:inline=
"true"
v-show=
"showSearch"
label-width=
"100px"
>
<el-form
:model=
"queryParams"
@
submit
.
native
.
prevent
ref=
"queryForm"
size=
"small"
:inline=
"true"
v-show=
"showSearch"
label-width=
"100px"
>
<el-form-item
label=
"领料单编号"
prop=
"issueCode"
>
<el-form-item
label=
"领料单编号"
prop=
"issueCode
s
"
>
<el-input
<el-input
v-model=
"queryParams.issueCode"
v-model=
"queryParams.issueCode
s
"
placeholder=
"请输入领料单编号"
placeholder=
"请输入领料单编号"
type=
"textarea"
:rows=
"2"
resize=
"none"
clearable
clearable
@
keyup
.
enter
.
native=
"handleQuery"
@
keyup
.
enter
.
native=
"handleQuery"
/>
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"申请单号"
prop=
"applyNo"
>
<el-form-item
label=
"申请单号"
prop=
"applyNo
s
"
>
<el-input
<el-input
v-model=
"queryParams.applyNo"
v-model=
"queryParams.applyNos"
placeholder=
"请输入领料单编号"
placeholder=
"请输入申请单号"
type=
"textarea"
:rows=
"2"
resize=
"none"
clearable
clearable
@
keyup
.
enter
.
native=
"handleQuery"
@
keyup
.
enter
.
native=
"handleQuery"
/>
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"编排单号"
prop=
"arrangeCode"
>
<el-form-item
label=
"编排单号"
prop=
"arrangeCode
s
"
>
<el-input
<el-input
v-model=
"queryParams.arrangeCode"
v-model=
"queryParams.arrangeCode
s
"
placeholder=
"请输入编排单号"
placeholder=
"请输入编排单号"
type=
"textarea"
:rows=
"2"
resize=
"none"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"物料编号"
prop=
"sapItemCodes"
>
<el-input
v-model=
"queryParams.sapItemCodes"
placeholder=
"请输入物料编号"
type=
"textarea"
:rows=
"2"
resize=
"none"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"产品物料名称"
prop=
"itemNames"
>
<el-input
v-model=
"queryParams.itemNames"
placeholder=
"请输入产品物料名称"
clearable
clearable
@
keyup
.
enter
.
native=
"handleQuery"
@
keyup
.
enter
.
native=
"handleQuery"
/>
/>
...
@@ -274,8 +302,11 @@ export default {
...
@@ -274,8 +302,11 @@ export default {
areaName
:
null
,
areaName
:
null
,
issueDate
:
null
,
issueDate
:
null
,
status
:
'PREPARE'
,
status
:
'PREPARE'
,
applyNo
:
null
,
issueCodes
:
null
,
arrangeCode
:
null
,
applyNos
:
null
,
arrangeCodes
:
null
,
sapItemCodes
:
null
,
itemNames
:
null
},
},
// 表单参数
// 表单参数
form
:
{},
form
:
{},
...
@@ -309,7 +340,14 @@ export default {
...
@@ -309,7 +340,14 @@ export default {
this
.
queryParams
.
params
[
"beginPurchaseDate"
]
=
this
.
daterangePurchaseDate
[
0
];
this
.
queryParams
.
params
[
"beginPurchaseDate"
]
=
this
.
daterangePurchaseDate
[
0
];
this
.
queryParams
.
params
[
"endPurchaseDate"
]
=
this
.
daterangePurchaseDate
[
1
];
this
.
queryParams
.
params
[
"endPurchaseDate"
]
=
this
.
daterangePurchaseDate
[
1
];
}
}
listIssueheader
(
this
.
queryParams
).
then
(
response
=>
{
const
params
=
{
...
this
.
queryParams
,
issueCodes
:
this
.
queryParams
.
issueCodes
?
this
.
queryParams
.
issueCodes
.
split
(
/
[\n
,;,、;。
]
/
).
filter
(
item
=>
item
)
:
null
,
applyNos
:
this
.
queryParams
.
applyNos
?
this
.
queryParams
.
applyNos
.
split
(
/
[\n
,;,、;。
]
/
).
filter
(
item
=>
item
)
:
null
,
arrangeCodes
:
this
.
queryParams
.
arrangeCodes
?
this
.
queryParams
.
arrangeCodes
.
split
(
/
[\n
,;,、;。
]
/
).
filter
(
item
=>
item
)
:
null
,
sapItemCodes
:
this
.
queryParams
.
sapItemCodes
?
this
.
queryParams
.
sapItemCodes
.
split
(
/
[\n
,;,、;。
]
/
).
filter
(
item
=>
item
)
:
null
}
listIssueheader
(
params
).
then
(
response
=>
{
this
.
issueheaderList
=
response
.
rows
;
this
.
issueheaderList
=
response
.
rows
;
this
.
total
=
response
.
total
;
this
.
total
=
response
.
total
;
this
.
loading
=
false
;
this
.
loading
=
false
;
...
@@ -327,10 +365,8 @@ export default {
...
@@ -327,10 +365,8 @@ export default {
let
lstr
=
JSON
.
stringify
(
l
.
children
).
replace
(
/locationId/g
,
'lId'
).
replace
(
/areaId/g
,
'pId'
).
replace
(
/areaName/g
,
'pName'
);
let
lstr
=
JSON
.
stringify
(
l
.
children
).
replace
(
/locationId/g
,
'lId'
).
replace
(
/areaId/g
,
'pId'
).
replace
(
/areaName/g
,
'pName'
);
l
.
children
=
JSON
.
parse
(
lstr
);
l
.
children
=
JSON
.
parse
(
lstr
);
});
});
let
wstr
=
JSON
.
stringify
(
w
.
children
).
replace
(
/warehouseId/g
,
'wId'
).
replace
(
/locationId/g
,
'pId'
).
replace
(
/locationName/g
,
'pName'
);
let
wstr
=
JSON
.
stringify
(
w
.
children
).
replace
(
/warehouseId/g
,
'wId'
).
replace
(
/locationId/g
,
'pId'
).
replace
(
/locationName/g
,
'pName'
);
w
.
children
=
JSON
.
parse
(
wstr
);
w
.
children
=
JSON
.
parse
(
wstr
);
});
});
let
ostr
=
JSON
.
stringify
(
this
.
warehouseOptions
).
replace
(
/warehouseId/g
,
'pId'
).
replace
(
/warehouseName/g
,
'pName'
);
let
ostr
=
JSON
.
stringify
(
this
.
warehouseOptions
).
replace
(
/warehouseId/g
,
'pId'
).
replace
(
/warehouseName/g
,
'pName'
);
this
.
warehouseOptions
=
JSON
.
parse
(
ostr
);
this
.
warehouseOptions
=
JSON
.
parse
(
ostr
);
...
@@ -378,7 +414,11 @@ export default {
...
@@ -378,7 +414,11 @@ export default {
createTime
:
null
,
createTime
:
null
,
updateBy
:
null
,
updateBy
:
null
,
updateTime
:
null
,
updateTime
:
null
,
applyNo
:
null
,
issueCodes
:
null
,
applyNos
:
null
,
arrangeCodes
:
null
,
sapItemCodes
:
null
,
itemNames
:
null
};
};
this
.
autoGenFlag
=
false
;
this
.
autoGenFlag
=
false
;
this
.
resetForm
(
"form"
);
this
.
resetForm
(
"form"
);
...
...
src/views/mes/wm/issue/line.vue
View file @
0bf0bc1f
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
<right-toolbar
:showSearch
.
sync=
"showSearch"
@
queryTable=
"getList"
></right-toolbar>
<right-toolbar
:showSearch
.
sync=
"showSearch"
@
queryTable=
"getList"
></right-toolbar>
</el-row>
</el-row>
<el-table
v-loading=
"loading"
:data=
"issuelineList"
@
selection-change=
"handleSelectionChange"
>
<el-table
v-loading=
"loading"
:data=
"issuelineList"
:summary-method=
"getSummaries"
show-summary
@
selection-change=
"handleSelectionChange"
>
<el-table-column
type=
"selection"
width=
"55"
align=
"center"
/>
<el-table-column
type=
"selection"
width=
"55"
align=
"center"
/>
<el-table-column
label=
"产品物料编码"
width=
"120px"
align=
"center"
prop=
"itemCode"
/>
<el-table-column
label=
"产品物料编码"
width=
"120px"
align=
"center"
prop=
"itemCode"
/>
<el-table-column
label=
"产品物料名称"
width=
"120px"
align=
"center"
prop=
"itemName"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"产品物料名称"
width=
"120px"
align=
"center"
prop=
"itemName"
:show-overflow-tooltip=
"true"
/>
...
@@ -292,6 +292,22 @@ export default {
...
@@ -292,6 +292,22 @@ export default {
this
.
single
=
selection
.
length
!==
1
this
.
single
=
selection
.
length
!==
1
this
.
multiple
=
!
selection
.
length
this
.
multiple
=
!
selection
.
length
},
},
getSummaries
(
param
){
const
{
columns
,
data
}
=
param
const
sums
=
[]
columns
.
forEach
((
column
,
index
)
=>
{
if
(
index
===
1
)
{
sums
[
index
]
=
'总数量'
}
else
if
(
column
.
label
===
'领料数量'
)
{
sums
[
index
]
=
data
.
reduce
((
prev
,
curr
)
=>
{
return
prev
+
Number
(
curr
.
quantityIssued
);
},
0
);
}
else
{
sums
[
index
]
=
''
}
})
return
sums
},
/** 新增按钮操作 */
/** 新增按钮操作 */
handleAdd
()
{
handleAdd
()
{
this
.
reset
();
this
.
reset
();
...
...
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