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
5ff0e107
Commit
5ff0e107
authored
May 28, 2025
by
沈翠玲
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
生产排产搜索改成多选,工序检测模版
parent
4972347a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
23 deletions
+29
-23
templateProcess.js
src/api/mes/qc/templateProcess.js
+8
-0
index.vue
src/views/mes/pro/scheduleList/index.vue
+12
-17
index.vue
src/views/mes/qc/templateProcess/index.vue
+9
-6
No files found.
src/api/mes/qc/templateProcess.js
View file @
5ff0e107
...
...
@@ -17,6 +17,14 @@ export function getTemplateProcess(recordId) {
})
}
// 获取是否选项
export
function
newProduct
(
recordId
)
{
return
request
({
url
:
'mes/qc/templateProcess/getDictList/newProduct'
,
method
:
'get'
})
}
// 新增检测模板-工序
export
function
addTemplateProcess
(
data
)
{
return
request
({
...
...
src/views/mes/pro/scheduleList/index.vue
View file @
5ff0e107
...
...
@@ -73,13 +73,9 @@
/>
</el-select>
</el-form-item>
<el-form-item
label=
"编排单号"
prop=
"arrangeCode"
>
<el-input
v-model=
"queryParams.arrangeCode"
placeholder=
"请输入编排单号"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
<el-form-item
label=
"编排单号"
prop=
"arrangeCodes"
>
<el-input
v-model=
"queryParams.arrangeCodes"
placeholder=
"请输入编排单号"
clearable
type=
"textarea"
:rows=
"2"
resize=
"none"
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"编排人员"
prop=
"arrangeUsername"
>
<el-input
...
...
@@ -89,13 +85,9 @@
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"工单编码"
prop=
"workorderCode"
>
<el-input
v-model=
"queryParams.workorderCode"
placeholder=
"请输入工单编码"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
<el-form-item
label=
"工单编码"
prop=
"workorderCodes"
>
<el-input
v-model=
"queryParams.workorderCodes"
placeholder=
"请输入工单编码"
clearable
type=
"textarea"
:rows=
"2"
resize=
"none"
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"计划开始时间段"
label-width=
"130px"
prop=
"scheduleStartDate"
>
<el-date-picker
...
...
@@ -713,9 +705,9 @@ export default {
pageNum
:
1
,
pageSize
:
10
,
taskCode
:
null
,
arrangeCode
:
null
,
arrangeCode
s
:
null
,
arrangeUsername
:
null
,
workorderCode
:
null
,
workorderCode
s
:
null
,
processName
:
null
,
statusArr
:
[
'PREPARE'
],
scheduleStartDate
:
null
,
...
...
@@ -941,7 +933,10 @@ export default {
this
.
queryParams
.
workCenterId
=
this
.
queryWorkunitParams
.
workstationId
this
.
queryParams
.
workshopId
=
this
.
queryWorkunitParams
.
workshopId
this
.
loading
=
true
;
const
params
=
{...
this
.
queryParams
}
const
params
=
{...
this
.
queryParams
,
workorderCodes
:
this
.
queryParams
.
workorderCodes
?
this
.
queryParams
.
workorderCodes
.
split
(
/
[\n
,;,、;。
]
/
).
filter
(
item
=>
item
)
:
null
,
arrangeCodes
:
this
.
queryParams
.
arrangeCodes
?
this
.
queryParams
.
arrangeCodes
.
split
(
/
[\n
,;,、;。
]
/
).
filter
(
item
=>
item
)
:
null
}
if
(
params
.
scheduleEndDate
&&
params
.
scheduleEndDate
.
length
>
0
)
{
params
.
scheduleEndDateFrom
=
params
.
scheduleEndDate
[
0
]
params
.
scheduleEndDateTo
=
params
.
scheduleEndDate
[
1
]
...
...
src/views/mes/qc/templateProcess/index.vue
View file @
5ff0e107
...
...
@@ -27,12 +27,12 @@
</el-form-item>
<el-form-item
label=
"是否质检确认"
prop=
"isConfirm"
>
<el-select
v-model=
"queryParams.isConfirm"
placeholder=
"请选择是否质检确认"
clearable
>
<el-option
label=
"请选择字典生成"
value=
"
"
/>
<el-option
:label=
"item.dictKey"
:value=
"item.dictValue"
v-for=
"item in boolOpt"
:key=
"item.dictValue
"
/>
</el-select>
</el-form-item>
<el-form-item
label=
"是否新品"
prop=
"isNewProduct"
>
<el-select
v-model=
"queryParams.isNewProduct"
placeholder=
"请选择是否新品"
clearable
>
<el-option
label=
"请选择字典生成"
value=
"
"
/>
<el-option
:label=
"item.dictKey"
:value=
"item.dictValue"
v-for=
"item in boolOpt"
:key=
"item.dictValue
"
/>
</el-select>
</el-form-item>
<el-form-item
label=
"模板类型"
prop=
"qcType"
>
...
...
@@ -195,14 +195,12 @@
</el-form-item>
<el-form-item
label=
"是否质检确认"
prop=
"isConfirm"
>
<el-select
style=
"width:100%;"
v-model=
"form.isConfirm"
placeholder=
"请选择是否质检确认"
:disabled=
"form.qcType === 'IQC'"
>
<el-option
label=
"是"
:value=
"1"
></el-option>
<el-option
label=
"否"
:value=
"0"
></el-option>
<el-option
:label=
"item.dictKey"
:value=
"item.dictValue"
v-for=
"item in boolOpt"
:key=
"item.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item
label=
"是否新品"
prop=
"isNewProduct"
>
<el-select
style=
"width:100%;"
v-model=
"form.isNewProduct"
placeholder=
"请选择是否新品"
:disabled=
"form.qcType === 'IQC'"
>
<el-option
label=
"是"
:value=
"1"
></el-option>
<el-option
label=
"否"
:value=
"0"
></el-option>
<el-option
:label=
"item.dictKey"
:value=
"item.dictValue"
v-for=
"item in boolOpt"
:key=
"item.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item
label=
"备注"
prop=
"remark"
>
...
...
@@ -265,6 +263,7 @@ import {
getTemplateProcess
,
delTemplateProcess
,
addTemplateProcess
,
newProduct
,
updateTemplateProcess
}
from
"@/api/mes/qc/templateProcess"
;
import
{
treeselect
}
from
"@/api/mes/md/itemtype"
;
...
...
@@ -298,6 +297,7 @@ export default {
total
:
0
,
// 检测模板-工序表格数据
templateProcessList
:
[],
boolOpt
:
[],
itemTypeOptions
:
undefined
,
// 弹出层标题
title
:
""
,
...
...
@@ -371,6 +371,9 @@ export default {
methods
:
{
/** 查询检测模板-工序列表 */
getList
()
{
newProduct
().
then
(
res
=>
{
this
.
boolOpt
=
res
.
data
||
[]
})
this
.
loading
=
true
;
listTemplateProcess
(
this
.
queryParams
).
then
(
response
=>
{
this
.
templateProcessList
=
response
.
rows
;
...
...
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