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
9d89aaf9
Commit
9d89aaf9
authored
Feb 25, 2025
by
tanjunxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 生产工单及生产标签打印更改为多行查询
parent
5ac75dc5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
43 additions
and
22 deletions
+43
-22
index.vue
src/views/mes/pro/packageLablePrint/index.vue
+19
-8
indexApply.vue
src/views/mes/pro/workorder/indexApply.vue
+24
-14
No files found.
src/views/mes/pro/packageLablePrint/index.vue
View file @
9d89aaf9
...
@@ -11,18 +11,24 @@
...
@@ -11,18 +11,24 @@
v-show=
"showSearch"
v-show=
"showSearch"
label-width=
"70px"
label-width=
"70px"
>
>
<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
clearable
@
keyup
.
enter
.
native=
"handleQuery"
@
keyup
.
enter
.
native=
"handleQuery"
/>
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"工单编码"
prop=
"workorderCode"
>
<el-form-item
label=
"工单编码"
prop=
"workorderCode
s
"
>
<el-input
<el-input
v-model=
"queryParams.workorderCode"
v-model=
"queryParams.workorderCode
s
"
placeholder=
"请输入工单编码"
placeholder=
"请输入工单编码"
type=
"textarea"
:rows=
"2"
resize=
"none"
clearable
clearable
@
keyup
.
enter
.
native=
"handleQuery"
@
keyup
.
enter
.
native=
"handleQuery"
/>
/>
...
@@ -371,8 +377,8 @@ export default {
...
@@ -371,8 +377,8 @@ export default {
return
{
return
{
// 查询参数
// 查询参数
queryParams
:
{
queryParams
:
{
arrangeCode
:
null
,
arrangeCode
s
:
null
,
workorderCode
:
null
,
workorderCode
s
:
null
,
},
},
rules
:
{
rules
:
{
packType
:
[
packType
:
[
...
@@ -420,12 +426,17 @@ export default {
...
@@ -420,12 +426,17 @@ export default {
},
},
/** 查询工单列表 */
/** 查询工单列表 */
getList
()
{
getList
()
{
if
(
!
this
.
queryParams
.
arrangeCode
&&
!
this
.
queryParams
.
workorderCode
)
{
if
(
!
this
.
queryParams
.
arrangeCode
s
&&
!
this
.
queryParams
.
workorderCodes
)
{
this
.
$message
.
error
(
'请输入查询条件'
)
this
.
$message
.
error
(
'请输入查询条件'
)
return
return
}
}
this
.
loading
=
true
this
.
loading
=
true
workorderList
(
this
.
queryParams
).
then
((
response
)
=>
{
const
params
=
{
...
this
.
queryParams
,
arrangeCodes
:
this
.
queryParams
.
arrangeCodes
?
this
.
queryParams
.
arrangeCodes
.
split
(
/
[\n
,;,、;。
]
/
).
filter
(
item
=>
item
)
:
null
,
workorderCodes
:
this
.
queryParams
.
workorderCodes
?
this
.
queryParams
.
workorderCodes
.
split
(
/
[\n
,;,、;。
]
/
).
filter
(
item
=>
item
)
:
null
}
workorderList
(
params
).
then
((
response
)
=>
{
console
.
log
(
response
,
'response'
)
console
.
log
(
response
,
'response'
)
this
.
tableList
=
response
.
rows
this
.
tableList
=
response
.
rows
this
.
total
=
response
.
total
this
.
total
=
response
.
total
...
...
src/views/mes/pro/workorder/indexApply.vue
View file @
9d89aaf9
...
@@ -16,23 +16,26 @@
...
@@ -16,23 +16,26 @@
</el-option>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"工单编码"
prop=
"workorderCode"
>
<el-form-item
label=
"工单编码"
prop=
"workorderCode
s
"
>
<el-input
v-model=
"queryParams.workorderCode
"
placeholder=
"请输入工单编码"
clearable
<el-input
v-model=
"queryParams.workorderCode
s"
placeholder=
"请输入工单编码"
clearable
type=
"textarea"
:rows=
"2"
@
keyup
.
enter
.
native=
"handleQuery"
/>
resize=
"none"
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
</el-form-item>
<!--
<el-form-item
label=
"来源单据"
prop=
"sourceCode"
>
<!--
<el-form-item
label=
"来源单据"
prop=
"sourceCode"
>
<el-input
v-model=
"queryParams.sourceCode"
placeholder=
"请输入来源单据"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
<el-input
v-model=
"queryParams.sourceCode"
placeholder=
"请输入来源单据"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
-->
</el-form-item>
-->
<el-form-item
label=
"订单编号"
prop=
"salesVoucher"
>
<el-form-item
label=
"订单编号"
prop=
"salesVoucher
s
"
>
<el-input
v-model=
"queryParams.salesVoucher
"
placeholder=
"请输入订单编号"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
<el-input
v-model=
"queryParams.salesVoucher
s"
placeholder=
"请输入订单编号"
clearable
type=
"textarea"
:rows=
"2"
resize=
"none"
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"产品名称"
prop=
"productName"
>
<el-form-item
label=
"产品名称"
prop=
"productName"
>
<el-input
v-model=
"queryParams.productName"
placeholder=
"请输入产品名称"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
<el-input
v-model=
"queryParams.productName"
placeholder=
"请输入产品名称"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"产品编号"
prop=
"productCode"
>
<el-form-item
label=
"产品编号"
prop=
"productCode
s
"
>
<el-input
<el-input
v-model=
"queryParams.productCode"
v-model=
"queryParams.productCode
s
"
placeholder=
"请输入产品编号"
placeholder=
"请输入产品编号"
type=
"textarea"
:rows=
"2"
resize=
"none"
clearable
clearable
@
keyup
.
enter
.
native=
"handleQuery"
@
keyup
.
enter
.
native=
"handleQuery"
/>
/>
...
@@ -61,8 +64,8 @@
...
@@ -61,8 +64,8 @@
</el-option>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"编排单号"
prop=
"arrangeCode"
>
<el-form-item
label=
"编排单号"
prop=
"arrangeCode
s
"
>
<el-input
v-model=
"queryParams.arrangeCode
"
placeholder=
"请输入编排单号"
clearable
<el-input
v-model=
"queryParams.arrangeCode
s"
placeholder=
"请输入编排单号"
clearable
type=
"textarea"
:rows=
"2"
resize=
"none"
@
keyup
.
enter
.
native=
"handleQuery"
/>
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
</el-form-item>
<!--
<el-form-item
label=
"工单类型"
prop=
"workorderType"
>
<!--
<el-form-item
label=
"工单类型"
prop=
"workorderType"
>
...
@@ -729,15 +732,15 @@ export default {
...
@@ -729,15 +732,15 @@ export default {
queryParams
:
{
queryParams
:
{
pageNum
:
1
,
pageNum
:
1
,
pageSize
:
50
,
pageSize
:
50
,
workorderCode
:
null
,
workorderCode
s
:
null
,
arrangeCode
:
null
,
arrangeCode
s
:
null
,
workorderName
:
null
,
workorderName
:
null
,
orderSource
:
null
,
orderSource
:
null
,
sapItemCode
:
null
,
sapItemCode
:
null
,
// sourceCode: null,
// sourceCode: null,
salesVoucher
:
null
,
salesVoucher
s
:
null
,
productId
:
null
,
productId
:
null
,
productCode
:
null
,
productCode
s
:
null
,
productName
:
null
,
productName
:
null
,
productSpc
:
null
,
productSpc
:
null
,
routeName
:
null
,
routeName
:
null
,
...
@@ -1049,7 +1052,14 @@ export default {
...
@@ -1049,7 +1052,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];
}
}
listWorkorder(this.queryParams).then((response) => {
const params = {
...this.queryParams,
workorderCodes: this.queryParams.workorderCodes ? this.queryParams.workorderCodes.split(/[\n,;,、;。]/).filter(item => item) : null,
salesVouchers: this.queryParams.salesVouchers ? this.queryParams.salesVouchers.split(/[\n,;,、;。]/).filter(item => item) : null,
productCodes: this.queryParams.productCodes ? this.queryParams.productCodes.split(/[\n,;,、;。]/).filter(item => item) : null,
arrangeCodes: this.queryParams.arrangeCodes ? this.queryParams.arrangeCodes.split(/[\n,;,、;。]/).filter(item => item) : null
}
listWorkorder(params).then((response) => {
this.workorderList = this.handleTree(
this.workorderList = this.handleTree(
response.rows,
response.rows,
"workorderId",
"workorderId",
...
...
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