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
ximai
mes-ui
Commits
f749c937
Commit
f749c937
authored
Jul 30, 2024
by
chenzj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加工作中心发料
parent
4cefc9a3
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
1824 additions
and
0 deletions
+1824
-0
material.js
src/api/mes/pro/material.js
+44
-0
index.vue
src/views/mes/pro/request/index.vue
+12
-0
arangeSelect.vue
...ws/mes/pro/workstationRequest/components/arangeSelect.vue
+258
-0
codeSelect.vue
...iews/mes/pro/workstationRequest/components/codeSelect.vue
+257
-0
requestIndex.vue
...ws/mes/pro/workstationRequest/components/requestIndex.vue
+308
-0
taskSelect.vue
...iews/mes/pro/workstationRequest/components/taskSelect.vue
+281
-0
index.vue
src/views/mes/pro/workstationRequest/index.vue
+664
-0
No files found.
src/api/mes/pro/material.js
0 → 100644
View file @
f749c937
import
request
from
'@/utils/request'
// 查询工作中心发料申请列表
export
function
listMaterial
(
query
)
{
return
request
({
url
:
'/pro/material/list'
,
method
:
'get'
,
params
:
query
})
}
// 查询工作中心发料申请详细
export
function
getMaterial
(
workstationMaterialId
)
{
return
request
({
url
:
'/pro/material/'
+
workstationMaterialId
,
method
:
'get'
})
}
// 新增工作中心发料申请
export
function
addMaterial
(
data
)
{
return
request
({
url
:
'/pro/material'
,
method
:
'post'
,
data
:
data
})
}
// 修改工作中心发料申请
export
function
updateMaterial
(
data
)
{
return
request
({
url
:
'/pro/material'
,
method
:
'put'
,
data
:
data
})
}
// 删除工作中心发料申请
export
function
delMaterial
(
workstationMaterialId
)
{
return
request
({
url
:
'/pro/material/'
+
workstationMaterialId
,
method
:
'delete'
})
}
src/views/mes/pro/request/index.vue
View file @
f749c937
...
@@ -396,6 +396,18 @@ export default {
...
@@ -396,6 +396,18 @@ export default {
optType
:
null
,
optType
:
null
,
// 表单校验
// 表单校验
rules
:
{
rules
:
{
taskCode
:
[
{
required
:
true
,
message
:
"任务单号称不能为空"
,
trigger
:
"blur"
}
],
arrangeCode
:
[
{
required
:
true
,
message
:
"编排单号称不能为空"
,
trigger
:
"blur"
}
],
createTime
:
[
{
required
:
true
,
message
:
"编排单号称不能为空"
,
trigger
:
"blur"
}
],
}
}
};
};
},
},
...
...
src/views/mes/pro/workstationRequest/components/arangeSelect.vue
0 → 100644
View file @
f749c937
<
template
>
<el-dialog
title=
"编排单号"
v-if=
"showFlag"
:visible
.
sync=
"showFlag"
:modal=
false
width=
"80%"
center
>
<el-form
:model=
"queryParams"
ref=
"queryForm"
size=
"small"
:inline=
"true"
v-show=
"showSearch"
label-width=
"100px"
>
<el-form-item
label=
"编排单号"
prop=
"arrangeCode"
>
<el-input
v-model=
"queryParams.arrangeCode"
placeholder=
"请输入编排单号"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button
type=
"primary"
icon=
"el-icon-search"
size=
"mini"
@
click=
"handleQuery"
>
搜索
</el-button>
<el-button
icon=
"el-icon-refresh"
size=
"mini"
@
click=
"resetQuery"
>
重置
</el-button>
</el-form-item>
</el-form>
<el-table
v-loading=
"loading"
:data=
"protaskList"
@
current-change=
"handleCurrent"
@
row-dblclick=
"handleRowDbClick"
>
<el-table-column
width=
"55"
align=
"center"
>
<template
v-slot=
"scope"
>
<el-radio
v-model=
"selectedTaskId"
:label=
"scope.row.arrangeId"
@
change=
"handleRowChange(scope.row)"
>
{{
""
}}
</el-radio>
</
template
>
</el-table-column>
<el-table-column
label=
"编排单号"
align=
"center"
prop=
"arrangeCode"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"生产工单"
align=
"center"
prop=
"workorderCode"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"分组号"
align=
"center"
prop=
"groupCode"
:show-overflow-tooltip=
"true"
/>
<el-table-column
v-if=
"btnShow"
label=
"操作"
align=
"center"
width=
"100px"
class-name=
"small-padding fixed-width"
>
<
template
slot-scope=
"scope"
>
<el-button
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handleUpdate(scope.row)"
v-hasPermi=
"['mes:pro:protask:edit']"
>
修改
</el-button>
<el-button
size=
"mini"
type=
"text"
icon=
"el-icon-delete"
@
click=
"handleDelete(scope.row)"
v-hasPermi=
"['mes:pro:protask:remove']"
>
删除
</el-button>
</
template
>
</el-table-column>
</el-table>
<pagination
v-show=
"total>0"
:total=
"total"
:page
.
sync=
"queryParams.pageNum"
:limit
.
sync=
"queryParams.pageSize"
@
pagination=
"getList"
/>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
type=
"primary"
@
click=
"confirmSelect"
>
确 定
</el-button>
<el-button
@
click=
"showFlag=false"
>
取 消
</el-button>
</div>
</el-dialog>
</template>
<
script
>
import
{
listArrange
}
from
"@/api/mes/pro/arrange"
;
// import {listAllProcess} from "@/api/mes/pro/process";
export
default
{
name
:
"ProtaskSelect"
,
props
:
{
workorderId
:
null
,
workorderCode
:
null
,
processId
:
null
,
processCode
:
null
,
workstationId
:
null
,
workstationCode
:
null
,
arrangeCode
:
null
,
btnShow
:
false
},
watch
:
{
arrangeCode
(
v
){
this
.
queryParams
.
arrangeCode
=
v
;
this
.
getList
();
}
},
data
()
{
return
{
showFlag
:
false
,
selectedTaskId
:
undefined
,
selectedRow
:
undefined
,
// 遮罩层
loading
:
true
,
// 选中数组
ids
:
[],
// 非单个禁用
single
:
true
,
// 非多个禁用
multiple
:
true
,
// 显示搜索条件
showSearch
:
true
,
// 总条数
total
:
0
,
// 生产任务表格数据
protaskList
:
[],
// 弹出层标题
title
:
""
,
// 是否显示弹出层
open
:
false
,
// 查询参数
queryParams
:
{
pageNum
:
1
,
pageSize
:
10
,
arrangeCode
:
null
,
taskName
:
null
,
workorderId
:
this
.
workorderId
,
workorderCode
:
this
.
workorderCode
,
workorderName
:
null
,
workstationId
:
null
,
workstationCode
:
null
,
workstationName
:
null
,
routeId
:
null
,
processId
:
this
.
processId
,
processCode
:
null
,
processName
:
null
,
itemId
:
null
,
itemCode
:
null
,
itemName
:
null
,
specification
:
null
,
unitOfMeasure
:
null
,
quantity
:
null
,
quantityProduced
:
null
,
quantityChanged
:
null
,
clientId
:
null
,
clientCode
:
null
,
clientName
:
null
,
clientNick
:
null
,
startTime
:
null
,
duration
:
null
,
endTime
:
null
,
colorCode
:
null
,
requestDate
:
null
,
},
// 表单参数
form
:
{},
// 表单校验
rules
:
{
workstationId
:
[
{
required
:
true
,
message
:
"工作中心不能为空"
,
trigger
:
"blur"
}
],
quantity
:
[
{
required
:
true
,
message
:
"排产数量不能为空"
,
trigger
:
"blur"
}
],
startTime
:
[
{
required
:
true
,
message
:
"请选择开始生产日期"
,
trigger
:
"blur"
}
],
duration
:
[
{
required
:
true
,
message
:
"清输入估算的生产用时"
,
trigger
:
"blur"
}
]
}
};
},
created
()
{
this
.
getList
();
},
methods
:
{
/** 查询生产任务列表 */
getList
()
{
this
.
loading
=
true
;
listArrange
(
this
.
queryParams
).
then
(
response
=>
{
this
.
protaskList
=
response
.
rows
;
this
.
total
=
response
.
total
;
this
.
loading
=
false
;
});
},
/** 搜索按钮操作 */
handleQuery
()
{
this
.
queryParams
.
pageNum
=
1
;
this
.
getList
();
},
/** 重置按钮操作 */
resetQuery
()
{
this
.
queryParams
=
{
pageNum
:
1
,
pageSize
:
10
,
arrangeCode
:
null
,
taskName
:
null
,
workorderId
:
null
,
workorderCode
:
null
,
workorderName
:
null
,
workstationId
:
null
,
workstationCode
:
null
,
workstationName
:
null
,
routeId
:
null
,
processId
:
null
,
processCode
:
null
,
processName
:
null
,
itemId
:
null
,
itemCode
:
null
,
itemName
:
null
,
specification
:
null
,
unitOfMeasure
:
null
,
quantity
:
null
,
quantityProduced
:
null
,
quantityChanged
:
null
,
clientId
:
null
,
clientCode
:
null
,
clientName
:
null
,
clientNick
:
null
,
startTime
:
null
,
duration
:
null
,
endTime
:
null
,
colorCode
:
null
,
requestDate
:
null
,
}
this
.
resetForm
(
"queryForm"
);
this
.
handleQuery
();
},
handleCurrent
(
row
){
if
(
row
){
this
.
selectedRow
=
row
;
}
},
//行双击选中
handleRowDbClick
(
row
){
if
(
row
){
this
.
selectedRow
=
row
;
this
.
$emit
(
'onSelected'
,
this
.
selectedRow
);
this
.
showFlag
=
false
;
}
},
// 单选选中数据
handleRowChange
(
row
)
{
debugger
;
if
(
row
){
this
.
selectedRow
=
row
;
}
},
//确定选中
confirmSelect
(){
if
(
this
.
selectedTaskId
==
null
||
this
.
selectedTaskId
==
0
){
this
.
$notify
({
title
:
'提示'
,
type
:
'warning'
,
message
:
'请至少选择一条数据!'
});
return
;
}
this
.
$emit
(
'onSelected'
,
this
.
selectedRow
);
this
.
showFlag
=
false
;
}
}
};
</
script
>
\ No newline at end of file
src/views/mes/pro/workstationRequest/components/codeSelect.vue
0 → 100644
View file @
f749c937
<
template
>
<el-dialog
title=
"工作单元选择"
v-if=
"showFlag"
:visible
.
sync=
"showFlag"
:modal=
"false"
width=
"80%"
center
>
<el-form
:model=
"queryParams"
ref=
"queryForm"
size=
"small"
:inline=
"true"
v-show=
"showSearch"
label-width=
"90px"
>
<el-row>
<el-form-item
label=
"工作中心编号"
label-width=
"120"
prop=
"workstationCode"
>
<el-input
v-model=
"queryParams.workstationCode"
placeholder=
"请输入工作中心编号"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"工作单元名称"
label-width=
"120"
prop=
"workunitName"
>
<el-input
v-model=
"queryParams.workunitName"
placeholder=
"请输入工作单元名称"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"所属工序"
label-width=
"120"
prop=
"processName"
>
<el-input
v-model=
"queryParams.processName"
placeholder=
"请输入工作中心编号"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"所在车间"
prop=
"workshopName"
>
<el-select
v-model=
"queryParams.workshopId"
placeholder=
"请选择车间"
>
<el-option
v-for=
"item in workshopOptions"
:key=
"item.workshopId"
:label=
"item.workshopName"
:value=
"item.workshopId"
></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button
type=
"primary"
icon=
"el-icon-search"
size=
"mini"
@
click=
"handleQuery"
>
搜索
</el-button>
<el-button
icon=
"el-icon-refresh"
size=
"mini"
@
click=
"resetQuery"
>
重置
</el-button>
</el-form-item>
</el-row>
<el-row>
<el-col
:span=
"24"
>
</el-col>
</el-row>
</el-form>
<el-table
v-loading=
"loading"
:data=
"workstationList"
@
current-change=
"handleCurrent"
@
row-dblclick=
"handleRowDbClick"
>
<el-table-column
width=
"55"
align=
"center"
>
<template
v-slot=
"scope"
>
<el-radio
v-model=
"selectedWorkstationId"
:label=
"scope.row.workunitId"
@
change=
"handleRowChange(scope.row)"
>
{{
""
}}
</el-radio>
</
template
>
</el-table-column>
<el-table-column
label=
"工作单元编码"
align=
"center"
prop=
"workunitCode"
/>
<el-table-column
label=
"工作单元名称"
align=
"center"
prop=
"workunitName"
/>
<el-table-column
label=
"工作中心编号"
align=
"center"
prop=
"workstationCode"
>
</el-table-column>
<el-table-column
label=
"所在车间名称"
align=
"center"
prop=
"workshopName"
/>
</el-table>
<pagination
v-show=
"total > 0"
:total=
"total"
:page
.
sync=
"queryParams.pageNum"
:limit
.
sync=
"queryParams.pageSize"
@
pagination=
"getList"
/>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
type=
"primary"
@
click=
"confirmSelect"
>
确 定
</el-button>
<el-button
@
click=
"cancel"
>
取 消
</el-button>
</div>
</el-dialog>
</template>
<
script
>
import
{
listWorkunits
}
from
"@/api/mes/md/workunit"
;
// import { listAllProcess } from "@/api/mes/pro/process";
import
{
listAllWorkshop
}
from
"@/api/mes/md/workshop"
;
export
default
{
name
:
"WorkstationSelect"
,
dicts
:
[
"sys_yes_no"
],
data
()
{
return
{
// workstationId: this.workstationId,
showFlag
:
false
,
// 遮罩层
loading
:
true
,
// 选中数组
selectedWorkstationId
:
undefined
,
selectedRows
:
[],
// 非单个禁用
single
:
true
,
// 非多个禁用
multiple
:
true
,
// 显示搜索条件
showSearch
:
true
,
// 总条数
total
:
0
,
// 工作中心表格数据
workstationList
:
[],
//车间选项
workshopOptions
:
[],
//工序选项
processOptions
:
[],
// 弹出层标题
title
:
""
,
// 是否显示弹出层
open
:
false
,
// 查询参数
queryParams
:
{
pageNum
:
1
,
pageSize
:
10
,
workstationCode
:
null
,
workstationName
:
null
,
workstationAddress
:
null
,
workshopId
:
null
,
workshopCode
:
null
,
workshopName
:
null
,
workstationId
:
null
,
processCode
:
null
,
processName
:
null
,
enableFlag
:
null
,
stdWorkingTime
:
null
,
},
// 表单参数
form
:
{},
};
},
props
:
{
workstationId
:
{
type
:
Number
|
undefined
,
default
:
undefined
,
},
//外部传入的工序过滤条件
},
created
()
{
this
.
getList
();
this
.
getWorkshops
();
this
.
getProcess
();
},
watch
:
{
workstationId
:
{
handler
(
val
)
{
this
.
queryParams
.
workstationId
=
val
;
this
.
getList
();
},
immediate
:
true
,
},
},
methods
:
{
/** 查询工作中心列表 */
getList
()
{
this
.
loading
=
true
;
listWorkunits
(
this
.
queryParams
).
then
((
response
)
=>
{
console
.
log
(
this
.
queryParams
);
this
.
workstationList
=
response
.
rows
;
this
.
total
=
response
.
total
;
this
.
loading
=
false
;
});
},
//查询车间信息
getWorkshops
()
{
listAllWorkshop
().
then
((
response
)
=>
{
this
.
workshopOptions
=
response
.
data
;
});
},
// //查询工序信息
// getProcess() {
// listAllProcess().then((response) => {
// this.processOptions = response.data;
// });
// },
// 取消按钮
cancel
()
{
this
.
showFlag
=
false
;
this
.
resetQuery
();
},
// 表单重置
reset
()
{
this
.
form
=
{
workstationId
:
null
,
workstationCode
:
null
,
workstationName
:
null
,
workstationAddress
:
null
,
workshopId
:
null
,
workshopCode
:
null
,
workshopName
:
null
,
workstationId
:
null
,
processCode
:
null
,
processName
:
null
,
remark
:
null
,
createBy
:
null
,
createTime
:
null
,
updateBy
:
null
,
updateTime
:
null
,
stdWorkingTime
:
null
,
};
this
.
resetForm
(
"form"
);
},
/** 搜索按钮操作 */
handleQuery
()
{
this
.
queryParams
.
pageNum
=
1
;
this
.
getList
();
},
/** 重置按钮操作 */
resetQuery
()
{
this
.
queryParams
=
{
pageNum
:
1
,
pageSize
:
10
,
workstationId
:
null
,
workstationCode
:
null
,
workstationName
:
null
,
workstationAddress
:
null
,
workshopId
:
null
,
workshopCode
:
null
,
workshopName
:
null
,
workstationId
:
null
,
processCode
:
null
,
processName
:
null
,
remark
:
null
,
createBy
:
null
,
createTime
:
null
,
updateBy
:
null
,
updateTime
:
null
,
stdWorkingTime
:
null
,
};
this
.
resetForm
(
"queryForm"
);
this
.
handleQuery
();
},
handleCurrent
(
row
)
{
if
(
row
)
{
this
.
selectedRows
=
row
;
}
},
// 单选选中数据
handleRowChange
(
row
)
{
if
(
row
)
{
this
.
selectedRows
=
row
;
}
},
//双击选中
handleRowDbClick
(
row
)
{
if
(
row
)
{
this
.
selectedRows
=
row
;
this
.
$emit
(
"onSelected"
,
this
.
selectedRows
);
this
.
showFlag
=
false
;
}
},
//确定选中
confirmSelect
()
{
if
(
this
.
selectedWorkstationId
==
null
||
this
.
selectedWorkstationId
==
0
)
{
this
.
$notify
({
title
:
"提示"
,
type
:
"warning"
,
message
:
"请至少选择一条数据!"
,
});
return
;
}
this
.
$emit
(
"onSelected"
,
this
.
selectedRows
);
this
.
showFlag
=
false
;
},
},
};
</
script
>
\ No newline at end of file
src/views/mes/pro/workstationRequest/components/requestIndex.vue
0 → 100644
View file @
f749c937
<
template
>
<div
class=
"app-container"
>
<el-button
type=
"primary"
plain
icon=
"el-icon-plus"
size=
"mini"
@
click=
"handleAdd"
>
新增
</el-button>
<el-table
v-loading=
"loading"
:data=
"tableData"
@
selection-change=
"handleSelectionChange"
>
<!--
<el-table-column
type=
"selection"
width=
"55"
align=
"center"
/>
-->
<el-table-column
label=
"物料编码"
align=
"center"
prop=
"sapItemCode"
/>
<el-table-column
label=
"物料名称"
align=
"center"
prop=
"itemName"
/>
<el-table-column
label=
"申请数量"
align=
"center"
prop=
"applyNum"
/>
<el-table-column
width=
"100px"
label=
"操作"
align=
"center"
class-name=
"small-padding fixed-width"
>
<template
slot-scope=
"
{ $index}">
<el-button
size=
"mini"
type=
"text"
icon=
"el-icon-delete"
@
click=
"deleteRow($index)"
>
删除
</el-button>
</
template
>
</el-table-column>
</el-table>
<!-- 添加或修改调拨料申请对话框 -->
<el-dialog
:title=
"title"
:visible
.
sync=
"open"
width=
"960px"
append-to-body
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"100px"
>
<el-row>
<el-col
:span=
"12"
>
<el-form-item
label=
"产品编码"
prop=
"sapItemCode"
>
<el-input
v-model=
"form.sapItemCode"
placeholder=
"请输入产品编码"
>
<el-button
slot=
"append"
icon=
"el-icon-search"
@
click=
"handleItemSelect"
/>
</el-input>
<itemSelect
ref=
"brSelectpro"
@
onSelected=
"onItemSelect"
>
</itemSelect>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"产品名称"
prop=
"itemName"
>
<el-input
disabled
v-model=
"form.itemName"
placeholder=
"请输入产品名称"
/>
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>
<el-col :span="12">
<el-form-item label="工作中心编码" prop="workstationCode">
<el-input v-model="form.workstationCode" placeholder="请输入工作中心编码">
<el-button slot="append" icon="el-icon-search" @click="handleWorkstationSelect" />
</el-input>
</el-form-item>
<WorkstationSelect ref="brSelectworkstation"
@onSelected="val => onWorkstationSelect(val, 'workstation')"
:workstationCode="form.workstationCode">
</WorkstationSelect>
</el-col>
<el-col :span="12">
<el-form-item label="工作单元" prop="workunitCode">
<el-input v-model="form.workunitCode" placeholder="工作单元">
<el-button slot="append" icon="el-icon-search"
@click="$refs.codeSelect.showFlag = true"></el-button>
</el-input>
</el-form-item>
</el-col>
</el-row>
<WorkstationSelect ref="brSelectworkstation"
@onSelected="val => onWorkstationSelect(val, 'workstation')"
:workstationCode="form.workstationCode">
</WorkstationSelect>
<codeSelect ref="codeSelect" :workstationId="form.workstationId"
@onSelected="val => onWorkstationSelect(val, 'unit')"></codeSelect> -->
<el-row>
<el-col
:span=
"12"
>
<el-form-item
label=
"申请数量"
prop=
"applyNum"
>
<el-input
v-model=
"form.applyNum"
placeholder=
"请输入申请数量"
/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
type=
"primary"
@
click=
"submitForm"
>
确 定
</el-button>
<el-button
@
click=
"cancel"
>
取 消
</el-button>
</div>
</el-dialog>
<!--
<pagination v-show="total > 0 && $attrs.optType !== 'add'" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" /> -->
</div>
</template>
<
script
>
import
codeSelect
from
"./codeSelect.vue"
;
import
WorkstationSelect
from
"@/components/workstationSelect/simpletableSingle.vue"
;
import
ItemSelect
from
"@/components/itemSelect/single.vue"
;
export
default
{
name
:
"TmToolRequestItem"
,
dicts
:
[
"warehouse_desc"
],
components
:
{
ItemSelect
,
WorkstationSelect
,
codeSelect
},
props
:
{
id
:
{
type
:
String
,
default
:
''
}
},
data
()
{
return
{
// 遮罩层
loading
:
false
,
// 选中数组
ids
:
[],
/**表格数据 */
tableData
:
[],
// 非单个禁用
single
:
true
,
// 非多个禁用
multiple
:
true
,
// 显示搜索条件
showSearch
:
true
,
optType
:
"add"
,
// 总条数
total
:
0
,
// 刀模版物料申请单表格数据
tmToolRequestItemList
:
[],
// 弹出层标题
title
:
""
,
// 是否显示弹出层
open
:
false
,
// 查询参数
queryParams
:
{
itemId
:
null
,
sapItemCode
:
null
,
itemName
:
null
,
applyNum
:
null
,
workstationCode
:
null
,
workunitCode
:
null
,
workstationCode
:
null
,
workstationId
:
null
,
workstationName
:
null
,
},
// 表单参数
form
:
{
itemId
:
null
,
sapItemCode
:
null
,
itemName
:
null
,
applyNum
:
null
,
workstationCode
:
null
,
workunitCode
:
null
,
workstationCode
:
null
,
workstationId
:
null
,
workstationName
:
null
,
},
currentRowIdx
:
undefined
,
// 表单校验
rules
:
{
sapItemCode
:
[
{
required
:
true
,
message
:
"产品编码不能为空"
,
trigger
:
"blur"
}
],
workstationCode
:
[
{
required
:
true
,
message
:
"工作中心编码不能为空"
,
trigger
:
"blur"
}
],
workunitCode
:
[
{
required
:
true
,
message
:
"工作单元编码不能为空"
,
trigger
:
"blur"
}
],
applyNum
:
[
{
required
:
true
,
message
:
"申请数量不能为空"
,
trigger
:
"blur"
}
],
}
};
},
watch
:
{
},
created
()
{
if
(
this
.
$attrs
.
optType
!==
'add'
)
{
this
.
getList
();
}
},
methods
:
{
// onItemSelect(list) {
// // console.log(list, 'list')
// const datas = list.map(item => {
// return {
// toolWarehouseId: item.toolWarehouseId,
// toolMachinesId: item.toolMachinesId,
// type: item.type,
// toolCode: item.toolCode,
// toolName: item.toolName,
// itemCode: item.itemCode,
// sapItemCode: item.sapItemCode,
// itemName: item.itemName,
// local: item.local,
// processId: Number(item.processId),
// processName: item.processName,
// warehouse: item.warehouse,
// warehouseDesc: item.warehouseDesc,
// }
// })
// this.tmToolRequestItemList = this.tmToolRequestItemList.concat(datas)
// this.$emit('sum')
// },
/** 新增按钮操作 */
handleAdd
()
{
this
.
reset
();
this
.
open
=
true
;
this
.
title
=
"添加表体"
;
this
.
optType
=
"add"
;
},
handleItemSelect
()
{
this
.
$refs
.
brSelectpro
.
showFlag
=
true
;
},
onItemSelect
(
row
)
{
if
(
row
!=
undefined
&&
row
!=
null
)
{
this
.
form
.
itemId
=
row
.
itemId
;
this
.
form
.
sapItemCode
=
row
.
sapItemCode
;
this
.
form
.
itemName
=
row
.
itemName
;
}
},
/**表单提交 */
submitForm
()
{
this
.
$refs
[
"form"
].
validate
((
valid
)
=>
{
if
(
valid
)
{
if
(
this
.
optType
==
"add"
)
{
this
.
tableData
.
unshift
({
...
this
.
form
});
}
this
.
showFlag
=
false
;
}
});
this
.
open
=
false
;
},
handleWorkstationSelect
()
{
this
.
$refs
.
brSelectworkstation
.
showFlag
=
true
;
},
onWorkstationSelect
(
row
,
type
)
{
console
.
log
(
'row'
,
type
,
row
)
if
(
row
!=
undefined
&&
row
!=
null
)
{
if
(
type
===
'unit'
)
{
// this.form.workunitName = row.workunitName
this
.
$set
(
this
.
form
,
'workunitCode'
,
row
.
workunitCode
)
this
.
form
.
workstationId
=
row
.
workstationId
;
this
.
form
.
workstationCode
=
row
.
workstationCode
;
this
.
form
.
workstationName
=
row
.
workstationName
;
}
else
{
this
.
form
.
workstationId
=
row
.
workstationId
;
this
.
form
.
workstationCode
=
row
.
workstationCode
;
this
.
form
.
workstationName
=
row
.
workstationName
;
}
}
},
/**删除行 */
deleteRow
(
index
)
{
this
.
tableData
.
splice
(
index
,
1
);
},
handleRemove
(
row
,
index
)
{
console
.
log
(
row
,
index
)
// this.tags.splice(this.tags.indexOf(tag), 1)
this
.
tmToolRequestItemList
.
splice
(
this
.
tmToolRequestItemList
.
indexOf
(
row
),
1
)
this
.
$emit
(
'sum'
)
},
// 取消按钮
cancel
()
{
this
.
open
=
false
;
this
.
reset
();
},
/** 搜索按钮操作 */
handleQuery
()
{
this
.
queryParams
.
pageNum
=
1
;
this
.
getList
();
},
// 表单重置
reset
()
{
this
.
form
=
{
itemId
:
null
,
sapItemCode
:
null
,
itemName
:
null
,
applyNum
:
null
,
workunitId
:
null
,
workunitName
:
null
,
workunitCode
:
null
,
workstationCode
:
null
,
workstationId
:
null
,
workstationName
:
null
,
};
this
.
resetForm
(
"form"
);
},
/** 重置按钮操作 */
resetQuery
()
{
this
.
resetForm
(
"queryForm"
);
this
.
handleQuery
();
},
// 多选框选中数据
handleSelectionChange
(
selection
)
{
this
.
ids
=
selection
.
map
(
item
=>
item
.
toolRequestItemId
)
this
.
single
=
selection
.
length
!==
1
this
.
multiple
=
!
selection
.
length
}
}
};
</
script
>
\ No newline at end of file
src/views/mes/pro/workstationRequest/components/taskSelect.vue
0 → 100644
View file @
f749c937
<
template
>
<el-dialog
title=
"生产任务选择"
v-if=
"showFlag"
:visible
.
sync=
"showFlag"
:modal=
false
width=
"80%"
center
>
<el-form
:model=
"queryParams"
ref=
"queryForm"
size=
"small"
:inline=
"true"
v-show=
"showSearch"
label-width=
"100px"
>
<el-form-item
label=
"所属工作中心编号"
prop=
"workstationCode"
>
<el-input
v-model=
"queryParams.workstationCode"
placeholder=
"请输入工作中心编号"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"任务编号"
prop=
"taskCode"
>
<el-input
v-model=
"queryParams.taskCode"
placeholder=
"请输入生产任务编号"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button
type=
"primary"
icon=
"el-icon-search"
size=
"mini"
@
click=
"handleQuery"
>
搜索
</el-button>
<el-button
icon=
"el-icon-refresh"
size=
"mini"
@
click=
"resetQuery"
>
重置
</el-button>
</el-form-item>
</el-form>
<el-table
v-loading=
"loading"
:data=
"protaskList"
@
current-change=
"handleCurrent"
@
row-dblclick=
"handleRowDbClick"
>
<el-table-column
width=
"55"
align=
"center"
>
<template
v-slot=
"scope"
>
<el-radio
v-model=
"selectedTaskId"
:label=
"scope.row.taskWorkunitId"
@
change=
"handleRowChange(scope.row)"
>
{{
""
}}
</el-radio>
</
template
>
</el-table-column>
<el-table-column
label=
"任务编号"
align=
"center"
prop=
"taskCode"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"编排单号"
align=
"center"
prop=
"arrangeCode"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"工作中心编号"
align=
"center"
prop=
"workstationCode"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"工作中心名称"
align=
"center"
prop=
"workstationName"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"工序名称"
align=
"center"
prop=
"processName"
:show-overflow-tooltip=
"true"
/>
<el-table-column
v-if=
"btnShow"
label=
"操作"
align=
"center"
width=
"100px"
class-name=
"small-padding fixed-width"
>
<
template
slot-scope=
"scope"
>
<el-button
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handleUpdate(scope.row)"
v-hasPermi=
"['mes:pro:protask:edit']"
>
修改
</el-button>
<el-button
size=
"mini"
type=
"text"
icon=
"el-icon-delete"
@
click=
"handleDelete(scope.row)"
v-hasPermi=
"['mes:pro:protask:remove']"
>
删除
</el-button>
</
template
>
</el-table-column>
</el-table>
<pagination
v-show=
"total>0"
:total=
"total"
:page
.
sync=
"queryParams.pageNum"
:limit
.
sync=
"queryParams.pageSize"
@
pagination=
"getList"
/>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
type=
"primary"
@
click=
"confirmSelect"
>
确 定
</el-button>
<el-button
@
click=
"showFlag=false"
>
取 消
</el-button>
</div>
</el-dialog>
</template>
<
script
>
import
{
listProtasks
,
getProtask
,
delProtask
,
addProtask
,
updateProtask
}
from
"@/api/mes/pro/protask"
;
import
{
listAllProcess
}
from
"@/api/mes/pro/process"
;
import
WorkstationSelect
from
"@/components/workstationSelect/simpletableSingle.vue"
export
default
{
name
:
"ProtaskSelect"
,
components
:
{
WorkstationSelect
},
props
:
{
workorderId
:
null
,
workorderCode
:
null
,
processId
:
null
,
processCode
:
null
,
workstationId
:
null
,
workstationCode
:
null
,
arrangeCode
:
null
,
btnShow
:
false
},
watch
:
{
workorderId
(
v
){
this
.
queryParams
.
workorderId
=
v
;
},
arrangeCode
(
v
){
this
.
queryParams
.
arrangeCode
=
v
;
this
.
getList
();
}
},
data
()
{
return
{
showFlag
:
false
,
selectedTaskId
:
undefined
,
selectedRow
:
undefined
,
// 遮罩层
loading
:
true
,
// 选中数组
ids
:
[],
// 非单个禁用
single
:
true
,
// 非多个禁用
multiple
:
true
,
// 显示搜索条件
showSearch
:
true
,
// 总条数
total
:
0
,
// 生产任务表格数据
protaskList
:
[],
// 弹出层标题
title
:
""
,
// 是否显示弹出层
open
:
false
,
// 查询参数
queryParams
:
{
arrangeCode
:
null
,
pageNum
:
1
,
pageSize
:
10
,
taskCode
:
null
,
taskName
:
null
,
workorderId
:
this
.
workorderId
,
workorderCode
:
null
,
workorderName
:
null
,
workstationId
:
null
,
workstationCode
:
null
,
workstationName
:
null
,
routeId
:
null
,
processId
:
this
.
processId
,
processCode
:
null
,
processName
:
null
,
itemId
:
null
,
itemCode
:
null
,
itemName
:
null
,
specification
:
null
,
unitOfMeasure
:
null
,
quantity
:
null
,
quantityProduced
:
null
,
quantityChanged
:
null
,
clientId
:
null
,
clientCode
:
null
,
clientName
:
null
,
clientNick
:
null
,
startTime
:
null
,
duration
:
null
,
endTime
:
null
,
colorCode
:
null
,
requestDate
:
null
,
},
// 表单参数
form
:
{},
// 表单校验
rules
:
{
workstationId
:
[
{
required
:
true
,
message
:
"工作中心不能为空"
,
trigger
:
"blur"
}
],
quantity
:
[
{
required
:
true
,
message
:
"排产数量不能为空"
,
trigger
:
"blur"
}
],
startTime
:
[
{
required
:
true
,
message
:
"请选择开始生产日期"
,
trigger
:
"blur"
}
],
duration
:
[
{
required
:
true
,
message
:
"清输入估算的生产用时"
,
trigger
:
"blur"
}
]
}
};
},
created
()
{
this
.
getList
();
this
.
getProcess
();
},
methods
:
{
/** 查询生产任务列表 */
getList
()
{
this
.
loading
=
true
;
listProtasks
(
this
.
queryParams
).
then
(
response
=>
{
this
.
protaskList
=
response
.
rows
;
this
.
total
=
response
.
total
;
this
.
loading
=
false
;
});
},
//查询工序信息
getProcess
(){
listAllProcess
().
then
(
response
=>
{
this
.
processOptions
=
response
.
data
;
});
},
/** 搜索按钮操作 */
handleQuery
()
{
this
.
queryParams
.
pageNum
=
1
;
this
.
getList
();
},
/** 重置按钮操作 */
resetQuery
()
{
this
.
queryParams
=
{
arrangeCode
:
null
,
pageNum
:
1
,
pageSize
:
10
,
taskCode
:
null
,
taskName
:
null
,
workorderId
:
null
,
workorderCode
:
null
,
workorderName
:
null
,
workstationId
:
null
,
workstationCode
:
null
,
workstationName
:
null
,
routeId
:
null
,
processId
:
null
,
processCode
:
null
,
processName
:
null
,
itemId
:
null
,
itemCode
:
null
,
itemName
:
null
,
specification
:
null
,
unitOfMeasure
:
null
,
quantity
:
null
,
quantityProduced
:
null
,
quantityChanged
:
null
,
clientId
:
null
,
clientCode
:
null
,
clientName
:
null
,
clientNick
:
null
,
startTime
:
null
,
duration
:
null
,
endTime
:
null
,
colorCode
:
null
,
requestDate
:
null
,
};
this
.
resetForm
(
"queryForm"
);
this
.
handleQuery
();
},
handleCurrent
(
row
){
if
(
row
){
this
.
selectedRow
=
row
;
}
},
//行双击选中
handleRowDbClick
(
row
){
if
(
row
){
this
.
selectedRow
=
row
;
this
.
$emit
(
'onSelected'
,
this
.
selectedRow
);
this
.
showFlag
=
false
;
}
},
// 单选选中数据
handleRowChange
(
row
)
{
debugger
;
if
(
row
){
this
.
selectedRow
=
row
;
}
},
//确定选中
confirmSelect
(){
if
(
this
.
selectedTaskId
==
null
||
this
.
selectedTaskId
==
0
){
this
.
$notify
({
title
:
'提示'
,
type
:
'warning'
,
message
:
'请至少选择一条数据!'
});
return
;
}
this
.
$emit
(
'onSelected'
,
this
.
selectedRow
);
this
.
showFlag
=
false
;
}
}
};
</
script
>
src/views/mes/pro/workstationRequest/index.vue
0 → 100644
View file @
f749c937
<
template
>
<div
class=
"app-container"
>
<el-form
:model=
"queryParams"
ref=
"queryForm"
size=
"small"
:inline=
"true"
v-show=
"showSearch"
label-width=
"68px"
>
<el-form-item
label=
"产品编号"
prop=
"sapItemCode"
>
<el-input
v-model=
"queryParams.sapItemCode"
placeholder=
"请输入产品编号"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"产品名称"
prop=
"itemName"
>
<el-input
v-model=
"queryParams.itemName"
placeholder=
"请输入产品名称"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"申请单号"
prop=
"applyNo"
>
<el-input
v-model=
"queryParams.applyNo"
placeholder=
"请输入申请单号"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"申请数量"
prop=
"applyNum"
>
<el-input
v-model=
"queryParams.applyNum"
placeholder=
"请输入领用数量"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"编排单号"
prop=
"arrangeCode"
>
<el-input
v-model=
"queryParams.arrangeCode"
placeholder=
"请输入编排单号"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"创建时间"
>
<el-date-picker
v-model=
"daterangePurchaseDate"
value-format=
"yyyy-MM-dd"
type=
"daterange"
range-separator=
"-"
start-placeholder=
"开始日期"
end-placeholder=
"结束日期"
></el-date-picker>
</el-form-item>
<el-form-item>
<el-button
type=
"primary"
icon=
"el-icon-search"
size=
"mini"
@
click=
"handleQuery"
>
搜索
</el-button>
<el-button
icon=
"el-icon-refresh"
size=
"mini"
@
click=
"resetQuery"
>
重置
</el-button>
</el-form-item>
</el-form>
<el-row
:gutter=
"10"
class=
"mb8"
>
<el-col
:span=
"1.5"
>
<el-button
type=
"primary"
plain
icon=
"el-icon-plus"
size=
"mini"
@
click=
"handleAdd"
v-hasPermi=
"['pro:material:add']"
>
新增
</el-button>
</el-col>
<!--
<el-col
:span=
"1.5"
>
<el-button
type=
"success"
plain
icon=
"el-icon-edit"
size=
"mini"
:disabled=
"single"
@
click=
"handleUpdate"
v-hasPermi=
"['pro:material:edit']"
>
修改
</el-button>
</el-col>
<el-col
:span=
"1.5"
>
<el-button
type=
"danger"
plain
icon=
"el-icon-delete"
size=
"mini"
:disabled=
"multiple"
@
click=
"handleDelete"
v-hasPermi=
"['pro:material:remove']"
>
删除
</el-button>
</el-col>
<el-col
:span=
"1.5"
>
<el-button
type=
"warning"
plain
icon=
"el-icon-download"
size=
"mini"
@
click=
"handleExport"
v-hasPermi=
"['pro:material:export']"
>
导出
</el-button>
</el-col>
-->
<right-toolbar
:showSearch
.
sync=
"showSearch"
@
queryTable=
"getList"
></right-toolbar>
</el-row>
<el-table
v-loading=
"loading"
:data=
"materialList"
@
selection-change=
"handleSelectionChange"
>
<el-table-column
type=
"selection"
width=
"55"
align=
"center"
/>
<el-table-column
label=
"产品编码"
align=
"center"
width=
"150"
prop=
"sapItemCode"
/>
<el-table-column
label=
"产品名称"
align=
"center"
width=
"150"
prop=
"itemName"
/>
<el-table-column
label=
"工作中心名称"
align=
"center"
width=
"150"
prop=
"workstationName"
/>
<el-table-column
label=
"申请单号"
align=
"center"
width=
"150"
prop=
"applyNo"
/>
<el-table-column
label=
"编排单号"
align=
"center"
width=
"150"
prop=
"arrangeCode"
/>
<el-table-column
label=
"领料类型"
align=
"center"
width=
"150"
prop=
"applyType"
>
<template
slot-scope=
"scope"
>
<dict-tag
:options=
"dict.type.pro_requisition_type"
:value=
"scope.row.applyType"
/>
</
template
>
</el-table-column>
<el-table-column
label=
"申请数量"
align=
"center"
width=
"150"
prop=
"applyNum"
/>
<el-table-column
label=
"领料方式"
align=
"center"
width=
"150"
prop=
"materialType"
>
<
template
slot-scope=
"scope"
>
<dict-tag
:options=
"dict.type.pro_material_from"
:value=
"scope.row.materialType"
/>
</
template
>
</el-table-column>
<el-table-column
label=
"是否结案"
align=
"center"
prop=
"windCase"
>
<
template
slot-scope=
"scope"
>
<dict-tag
:options=
"dict.type.sys_yes_no"
:value=
"scope.row.windCase"
/>
</
template
>
</el-table-column>
<el-table-column
label=
"已发放数量"
align=
"center"
prop=
"grantNum"
/>
<el-table-column
label=
"创建时间"
align=
"center"
prop=
"createTime"
width=
"180"
>
<
template
slot-scope=
"scope"
>
<span>
{{
parseTime
(
scope
.
row
.
createTime
,
'{y
}
-{m
}
-{d
}
'
)
}}
<
/span
>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"需求日期"
align
=
"center"
prop
=
"startTime"
width
=
"180"
>
<
template
slot
-
scope
=
"scope"
>
<
span
>
{{
parseTime
(
scope
.
row
.
startTime
,
'{y
}
-{m
}
-{d
}
'
)
}}
<
/span
>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"结束时间"
align
=
"center"
prop
=
"endTime"
width
=
"180"
>
<
template
slot
-
scope
=
"scope"
>
<
span
>
{{
parseTime
(
scope
.
row
.
endTime
,
'{y
}
-{m
}
-{d
}
'
)
}}
<
/span
>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"操作"
width
=
"80"
align
=
"center"
class
-
name
=
"small-padding fixed-width"
fixed
=
"right"
>
<
template
slot
-
scope
=
"scope"
>
<
el
-
button
size
=
"mini"
type
=
"text"
icon
=
"el-icon-view"
@
click
=
"handleView(scope.row)"
v
-
hasPermi
=
"['pro:material:view']"
>
查看
<
/el-button
>
<!--
<
el
-
button
size
=
"mini"
type
=
"text"
icon
=
"el-icon-edit"
@
click
=
" handleUpdate(scope.row)"
v
-
hasPermi
=
"['pro:material:edit']"
>
修改
<
/el-button
>
<
el
-
button
size
=
"mini"
type
=
"text"
icon
=
"el-icon-delete"
@
click
=
"handleDelete(scope.row)"
v
-
hasPermi
=
"['pro:material:remove']"
>
删除
<
/el-button> --
>
<
/template
>
<
/el-table-column
>
<
/el-table
>
<
pagination
v
-
show
=
"total > 0"
:
total
=
"total"
:
page
.
sync
=
"queryParams.pageNum"
:
limit
.
sync
=
"queryParams.pageSize"
@
pagination
=
"getList"
/>
<!--
添加或修改工作中心发料申请对话框
-->
<
el
-
dialog
:
title
=
"title"
:
visible
.
sync
=
"open"
width
=
"900px"
append
-
to
-
body
>
<
el
-
form
ref
=
"form"
:
model
=
"form"
:
rules
=
"rules"
:
disabled
=
"form.workstationMaterialId && optType != 'edit'"
label
-
width
=
"100px"
>
<
el
-
row
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"申请号"
prop
=
"applyNo"
>
<
el
-
input
v
-
model
=
"form.applyNo"
placeholder
=
"请输入申请号"
/>
<
/el-form-item
>
<
/el-col
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"任务单号"
prop
=
"taskCode"
>
<
el
-
input
v
-
model
=
"form.taskCode"
placeholder
=
"请选任务单号"
readonly
=
"readonly"
>
<
el
-
button
slot
=
"append"
icon
=
"el-icon-search"
@
click
=
"handleBrandSelect"
:
disabled
=
"form.materialRequestId"
><
/el-button
>
<
/el-input
>
<
/el-form-item
>
<
/el-col
>
<
/el-row
>
<
el
-
row
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"编排单号"
prop
=
"arrangeCode"
>
<
el
-
input
v
-
model
=
"form.arrangeCode"
placeholder
=
"请输入编排单号"
>
<
el
-
button
slot
=
"append"
icon
=
"el-icon-search"
@
click
=
"$refs.arangeSelect.showFlag = true"
:
disabled
=
"form.materialRequestId"
><
/el-button
>
<
/el-input
>
<
/el-form-item
>
<
/el-col
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"产品编号"
prop
=
"sapItemCode"
>
<
el
-
input
v
-
model
=
"form.sapItemCode"
placeholder
=
"请选任务单号"
readonly
=
"readonly"
>
<
el
-
button
slot
=
"append"
icon
=
"el-icon-search"
@
click
=
"handleItemSelect"
:
disabled
=
"form.materialRequestId"
><
/el-button
>
<
/el-input
>
<
/el-form-item
>
<
/el-col
>
<
/el-row
>
<
el
-
row
>
<
ItemSelect
ref
=
"ItemSelect"
@
onSelected
=
"onItemSelected"
><
/ItemSelect
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"产品名称"
prop
=
"itemName"
>
<
el
-
input
v
-
model
=
"form.itemName"
placeholder
=
"请输入产品名称"
/>
<
/el-form-item
>
<
/el-col
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"申请数量"
prop
=
"applyNum"
>
<
el
-
input
v
-
model
=
"form.applyNum"
placeholder
=
"请输入申请数量"
/>
<
/el-form-item
>
<
/el-col
>
<
/el-row
>
<
el
-
row
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"工作中心"
prop
=
"workstationCode"
>
<
el
-
input
v
-
model
=
"form.workstationCode"
placeholder
=
"工作中心"
>
<
el
-
button
slot
=
"append"
icon
=
"el-icon-search"
@
click
=
"handleWorkstationSelect"
:
disabled
=
"form.materialRequestId"
><
/el-button
>
<
/el-input
>
<
/el-form-item
>
<
/el-col
>
<
WorkstationSelect
ref
=
"workstationSelect"
:
workstationCode
=
"form.workstationCode"
@
onSelected
=
"val => onWorkstationSelect(val, 'workstation')"
><
/WorkstationSelect
>
<
codeSelect
ref
=
"codeSelect"
:
workstationId
=
"form.workstationId"
@
onSelected
=
"val => onWorkstationSelect(val, 'unit')"
><
/codeSelect
>
<!--
<
el
-
col
:
span
=
"8"
>
<
el
-
form
-
item
label
=
"工作单元"
prop
=
"workunitCode"
>
<
el
-
input
v
-
model
=
"form.workunitCode"
placeholder
=
"工作单元"
>
<
el
-
button
slot
=
"append"
icon
=
"el-icon-search"
@
click
=
"$refs.codeSelect.showFlag = true"
:
disabled
=
"form.materialRequestId"
><
/el-button
>
<
/el-input
>
<
/el-form-item
>
<
/el-col> --
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"创建人"
prop
=
"createBy"
>
<
el
-
input
v
-
model
=
"form.createBy"
placeholder
=
"请输入创始人"
/>
<
/el-form-item
>
<
/el-col
>
<
/el-row
>
<
el
-
row
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"申请时间"
prop
=
"createTime"
>
<
el
-
date
-
picker
clearable
v
-
model
=
"form.createTime"
type
=
"datetime"
value
-
format
=
"yyyy-MM-dd HH:mm:ss"
placeholder
=
"请选择申请时间"
>
<
/el-date-picker
>
<
/el-form-item
>
<
/el-col
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"需求日期"
prop
=
"startTime"
>
<
el
-
date
-
picker
clearable
v
-
model
=
"form.startTime"
type
=
"datetime"
value
-
format
=
"yyyy-MM-dd HH:mm:ss"
placeholder
=
"请选择需求日期"
>
<
/el-date-picker
>
<
/el-form-item
>
<
/el-col
>
<
/el-row
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"预计结束时间"
prop
=
"endTime"
>
<
el
-
date
-
picker
clearable
v
-
model
=
"form.startTime"
type
=
"endTime"
value
-
format
=
"yyyy-MM-dd HH:mm:ss"
placeholder
=
"请选择需求日期"
>
<
/el-date-picker
>
<
/el-form-item
>
<
/el-col
>
<
/el-form
>
<
div
slot
=
"footer"
class
=
"dialog-footer"
>
<
el
-
button
type
=
"primary"
@
click
=
"cancel"
v
-
if
=
"optType == 'view'"
>
返回
<
/el-button
>
<
el
-
button
type
=
"primary"
@
click
=
"submitForm"
v
-
if
=
"optType != 'view'"
>
确
定
<
/el-button
>
<
el
-
button
@
click
=
"cancel"
v
-
if
=
"optType != 'view'"
>
取
消
<
/el-button
>
<
/div
>
<
/el-dialog
>
<!--
添加领料申请对话框
-->
<
el
-
dialog
:
title
=
"title"
:
visible
.
sync
=
"opens"
width
=
"900px"
append
-
to
-
body
>
<
el
-
form
ref
=
"form"
:
model
=
"form"
:
rules
=
"rules"
:
disabled
=
"form.workstationMaterialId && optType != 'edit'"
label
-
width
=
"100px"
>
<
el
-
row
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"申请号"
prop
=
"applyNo"
>
<
el
-
input
v
-
model
=
"form.applyNo"
placeholder
=
"请输入申请号"
/>
<
/el-form-item
>
<
/el-col
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"任务单号"
prop
=
"taskCode"
>
<
el
-
input
v
-
model
=
"form.taskCode"
placeholder
=
"请选任务单号"
readonly
=
"readonly"
>
<
el
-
button
slot
=
"append"
icon
=
"el-icon-search"
@
click
=
"handleBrandSelect"
:
disabled
=
"form.workstationMaterialId"
><
/el-button
>
<
/el-input
>
<
/el-form-item
>
<
/el-col
>
<
/el-row
>
<
el
-
row
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"编排单号"
prop
=
"arrangeCode"
>
<
el
-
input
v
-
model
=
"form.arrangeCode"
placeholder
=
"请输入编排单号"
>
<
el
-
button
slot
=
"append"
icon
=
"el-icon-search"
@
click
=
"$refs.arangeSelect.showFlag = true"
:
disabled
=
"form.workstationMaterialId"
><
/el-button
>
<
/el-input
>
<
/el-form-item
>
<
/el-col
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"工作中心"
prop
=
"workstationCode"
>
<
el
-
input
v
-
model
=
"form.workstationCode"
placeholder
=
"工作中心"
>
<
el
-
button
slot
=
"append"
icon
=
"el-icon-search"
@
click
=
"handleWorkstationSelect"
:
disabled
=
"form.workstationMaterialId"
><
/el-button
>
<
/el-input
>
<
/el-form-item
>
<
/el-col
>
<
WorkstationSelect
ref
=
"workstationSelect"
:
workstationCode
=
"form.workstationCode"
@
onSelected
=
"val => onWorkstationSelect(val, 'workstation')"
><
/WorkstationSelect
>
<
/el-row
>
<
BrandSelect
ref
=
"brSelect"
:
arrangeCode
=
"form.arrangeCode"
@
onSelected
=
"(row) => onSelected(row, 'BrandSelect')"
>
<
/BrandSelect
>
<
arangeSelect
ref
=
"arangeSelect"
key
=
"arangeSelect"
:
arrangeCode
=
"form.arrangeCode"
@
onSelected
=
"(row) => onSelected(row, 'arangeSelect')"
><
/arangeSelect
>
<
workorderSelect
ref
=
"workorderselect"
key
=
"workorderselect"
:
arrangeCode
=
"form.arrangeCode"
:
workorderCode
=
"form.workorderCode"
@
onSelected
=
"(row) => onSelected(row, 'workorderSelect')"
>
<
/workorderSelect
>
<
el
-
row
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"领料方式"
prop
=
"materialType"
>
<
el
-
select
:
disabled
=
"mode == 'make'"
v
-
model
=
"form.materialType"
placeholder
=
"请选择领料方式"
>
<
el
-
option
v
-
for
=
"dict in dict.type.pro_material_from"
:
key
=
"dict.value"
:
label
=
"dict.label"
:
value
=
"dict.value"
><
/el-option
>
<
/el-select
>
<
/el-form-item
>
<
/el-col
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"需求日期"
prop
=
"startTime"
>
<
el
-
date
-
picker
clearable
v
-
model
=
"form.startTime"
type
=
"datetime"
value
-
format
=
"yyyy-MM-dd HH:mm:ss"
placeholder
=
"请选择需求日期"
>
<
/el-date-picker
>
<
/el-form-item
>
<
/el-col
>
<
/el-row
>
<
el
-
row
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"预计结束时间"
prop
=
"endTime"
>
<
el
-
date
-
picker
clearable
v
-
model
=
"form.endTime"
type
=
"datetime"
value
-
format
=
"yyyy-MM-dd HH:mm:ss"
placeholder
=
"请选择需预计结束时间"
>
<
/el-date-picker
>
<
/el-form-item
>
<
/el-col
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"申请时间"
prop
=
"createTime"
>
<
el
-
date
-
picker
clearable
v
-
model
=
"form.createTime"
type
=
"datetime"
value
-
format
=
"yyyy-MM-dd HH:mm:ss"
placeholder
=
"请选择申请时间"
>
<
/el-date-picker
>
<
/el-form-item
>
<
/el-col
>
<
/el-row
>
<
/el-form
>
<
el
-
divider
content
-
position
=
"center"
>
申请单物料
<
/el-divider
>
<
el
-
card
shadow
=
"always"
class
=
"box-card"
>
<
requestIndex
v
-
if
=
"opens"
ref
=
"materialRequestRef"
:
quantity
=
"form.requestNum"
:
id
=
"form.materialRequestId"
:
optType
=
"optType"
><
/requestIndex
>
<
/el-card
>
<
div
slot
=
"footer"
class
=
"dialog-footer"
>
<
el
-
button
type
=
"primary"
@
click
=
"cancel"
v
-
if
=
"optType == 'view'"
>
返回
<
/el-button
>
<
el
-
button
type
=
"primary"
@
click
=
"submitForm"
v
-
if
=
"optType != 'view'"
>
确
定
<
/el-button
>
<
el
-
button
@
click
=
"cancels"
v
-
if
=
"optType != 'view'"
>
取
消
<
/el-button
>
<
/div
>
<
/el-dialog
>
<
/div
>
<
/template
>
<
script
>
import
{
listMaterial
,
getMaterial
,
delMaterial
,
addMaterial
,
updateMaterial
}
from
"@/api/mes/pro/material"
;
import
arangeSelect
from
"./components/arangeSelect.vue"
;
import
{
genCode
}
from
"@/api/system/autocode/rule"
;
import
codeSelect
from
"./components/codeSelect.vue"
;
import
requestIndex
from
"./components/requestIndex.vue"
;
import
BrandSelect
from
"./components/taskSelect.vue"
;
import
ItemSelect
from
"@/components/itemSelect/single.vue"
;
import
WorkstationSelect
from
"@/components/workstationSelect/simpletableSingle.vue"
;
export
default
{
components
:
{
arangeSelect
,
codeSelect
,
requestIndex
,
BrandSelect
,
ItemSelect
,
WorkstationSelect
}
,
dicts
:
[
'pro_requisition_type'
,
'pro_material_from'
,
'sys_yes_no'
],
name
:
"Material"
,
data
()
{
return
{
// 遮罩层
loading
:
true
,
// 选中数组
ids
:
[],
// 非单个禁用
single
:
true
,
// 非多个禁用
multiple
:
true
,
// 显示搜索条件
showSearch
:
true
,
itemList
:
[],
// 总条数
total
:
0
,
// 工作中心发料申请表格数据
materialList
:
[],
daterangePurchaseDate
:
[],
// 弹出层标题
title
:
""
,
// 是否显示弹出层
open
:
false
,
opens
:
false
,
// 查询参数
queryParams
:
{
pageNum
:
1
,
pageSize
:
10
,
applyNo
:
null
,
itemId
:
null
,
taskId
:
null
,
taskWorkunitId
:
null
,
applyType
:
null
,
applyNum
:
null
,
materialType
:
null
,
pickingReason
:
null
,
workstationCode
:
null
,
workstationName
:
null
,
windCase
:
null
,
grantNum
:
null
,
remak
:
null
,
attr1
:
null
,
attr2
:
null
,
attr3
:
null
,
attr4
:
null
,
workunitId
:
null
,
workunitName
:
null
,
workunitCode
:
null
,
startTime
:
null
,
endTime
:
null
}
,
// 表单参数
form
:
{
}
,
// 表单校验
rules
:
{
taskCode
:
[
{
required
:
true
,
message
:
"任务单号称不能为空"
,
trigger
:
"blur"
}
],
arrangeCode
:
[
{
required
:
true
,
message
:
"编排单号称不能为空"
,
trigger
:
"blur"
}
],
createTime
:
[
{
required
:
true
,
message
:
"编排单号称不能为空"
,
trigger
:
"blur"
}
],
}
}
;
}
,
created
()
{
this
.
getList
();
}
,
methods
:
{
handleBrandSelect
()
{
this
.
$refs
.
brSelect
.
showFlag
=
true
;
}
,
onSelected
(
row
,
type
)
{
if
(
row
!=
undefined
&&
row
!=
null
)
{
if
(
type
===
'workorderSelect'
)
{
this
.
$set
(
this
.
form
,
'workorderCode'
,
row
.
workorderCode
)
}
else
if
(
type
===
'BrandSelect'
)
{
this
.
form
.
taskId
=
row
.
taskId
;
this
.
form
.
taskCode
=
row
.
taskCode
;
this
.
form
.
arrangeCode
=
row
.
arrangeCode
;
this
.
form
.
workorderCode
=
''
this
.
form
.
taskName
=
row
.
taskName
;
this
.
form
.
startTime
=
row
.
scheduleStartDate
;
this
.
$set
(
this
.
form
,
'workstationCode'
,
row
.
workstationCode
)
this
.
$set
(
this
.
form
,
'endTime'
,
row
.
scheduleEndDate
)
}
else
if
(
type
===
'arangeSelect'
)
{
this
.
form
.
taskCode
=
''
this
.
form
.
taskId
=
''
this
.
form
.
arrangeCode
=
row
.
arrangeCode
;
this
.
form
.
taskName
=
''
;
this
.
form
.
workorderCode
=
''
}
}
}
,
handleItemSelect
()
{
this
.
$refs
.
ItemSelect
.
showFlag
=
true
;
}
,
onItemSelected
(
row
)
{
if
(
row
!=
undefined
&&
row
!=
null
)
{
this
.
form
.
itemId
=
row
.
itemId
;
this
.
form
.
sapItemCode
=
row
.
sapItemCode
;
this
.
form
.
itemName
=
row
.
itemName
;
}
}
,
handleWorkstationSelect
()
{
this
.
$refs
.
workstationSelect
.
showFlag
=
true
;
}
,
onWorkstationSelect
(
row
,
type
)
{
console
.
log
(
'row'
,
type
,
row
)
if
(
row
!=
undefined
&&
row
!=
null
)
{
if
(
type
===
'unit'
)
{
// this.form.workunitName = row.workunitName
this
.
$set
(
this
.
form
,
'workunitCode'
,
row
.
workunitCode
)
this
.
form
.
workstationId
=
row
.
workstationId
;
this
.
form
.
workstationCode
=
row
.
workstationCode
;
this
.
form
.
workstationName
=
row
.
workstationName
;
}
else
{
this
.
form
.
workstationId
=
row
.
workstationId
;
this
.
form
.
workstationCode
=
row
.
workstationCode
;
this
.
form
.
workstationName
=
row
.
workstationName
;
}
}
}
,
/** 查询工作中心发料申请列表 */
getList
()
{
this
.
loading
=
true
;
this
.
queryParams
.
params
=
{
}
;
if
(
null
!=
this
.
daterangePurchaseDate
&&
''
!=
this
.
daterangePurchaseDate
)
{
this
.
queryParams
.
params
[
"beginPurchaseDate"
]
=
this
.
daterangePurchaseDate
[
0
];
this
.
queryParams
.
params
[
"endPurchaseDate"
]
=
this
.
daterangePurchaseDate
[
1
];
}
listMaterial
(
this
.
queryParams
).
then
(
response
=>
{
this
.
materialList
=
response
.
rows
;
this
.
total
=
response
.
total
;
this
.
loading
=
false
;
}
);
}
,
gCode
()
{
genCode
(
"WORKSTATION_MATERIAL"
).
then
((
response
)
=>
{
this
.
form
.
applyNo
=
response
;
}
);
}
,
// 取消按钮
cancel
()
{
this
.
open
=
false
;
this
.
reset
();
}
,
// 取消按钮
cancels
()
{
this
.
opens
=
false
;
this
.
reset
();
}
,
// 表单重置
reset
()
{
this
.
form
=
{
workstationMaterialId
:
null
,
applyNo
:
null
,
itemId
:
null
,
taskId
:
null
,
taskWorkunitId
:
null
,
applyType
:
null
,
applyNum
:
null
,
materialType
:
null
,
pickingReason
:
null
,
workstationCode
:
null
,
workstationName
:
null
,
windCase
:
null
,
grantNum
:
null
,
remak
:
null
,
attr1
:
null
,
attr2
:
null
,
attr3
:
null
,
attr4
:
null
,
createBy
:
null
,
createTime
:
null
,
updateBy
:
null
,
updateTime
:
null
,
workunitId
:
null
,
workunitName
:
null
,
workunitCode
:
null
,
startTime
:
null
,
endTime
:
null
,
arrangeCode
:
null
,
itemName
:
null
,
taskCode
:
null
}
;
this
.
resetForm
(
"form"
);
}
,
/** 搜索按钮操作 */
handleQuery
()
{
this
.
queryParams
.
pageNum
=
1
;
this
.
getList
();
}
,
/** 重置按钮操作 */
resetQuery
()
{
this
.
resetForm
(
"queryForm"
);
this
.
daterangePurchaseDate
=
[];
this
.
handleQuery
();
}
,
// 多选框选中数据
handleSelectionChange
(
selection
)
{
this
.
ids
=
selection
.
map
(
item
=>
item
.
workstationMaterialId
)
this
.
single
=
selection
.
length
!==
1
this
.
multiple
=
!
selection
.
length
}
,
// /** 新增按钮操作 */
// handleAdd()
{
// this.reset();
// this.open = true;
// this.title = "添加工作中心发料申请";
//
}
,
/** 新增按钮操作 */
handleAdd
()
{
this
.
reset
();
this
.
opens
=
true
;
this
.
gCode
();
this
.
title
=
"添加领料申请"
;
this
.
optType
=
"add"
;
}
,
/** 修改按钮操作 */
handleUpdate
(
row
)
{
this
.
reset
();
const
workstationMaterialId
=
row
.
workstationMaterialId
||
this
.
ids
getMaterial
(
workstationMaterialId
).
then
(
response
=>
{
this
.
form
=
response
.
data
;
this
.
open
=
true
;
this
.
title
=
"修改工作中心发料申请"
;
}
);
}
,
/** 查看详情 */
handleView
(
row
)
{
this
.
reset
();
const
workstationMaterialId
=
row
.
workstationMaterialId
||
this
.
ids
getMaterial
(
workstationMaterialId
).
then
(
response
=>
{
this
.
form
=
response
.
data
;
this
.
open
=
true
;
this
.
title
=
"修改工作中心发料申请"
;
this
.
optType
=
"view"
;
}
);
}
,
/** 提交按钮 */
submitForm
()
{
this
.
$refs
[
"form"
].
validate
(
valid
=>
{
if
(
valid
)
{
{
const
itemList
=
this
.
$refs
.
materialRequestRef
.
tableData
;
const
params
=
{
...
this
.
form
,
itemList
,
}
addMaterial
(
params
).
then
(
response
=>
{
this
.
$modal
.
msgSuccess
(
"新增成功"
);
this
.
opens
=
false
;
this
.
getList
();
}
);
}
// if (this.form.workstationMaterialId != null)
{
// updateMaterial(this.form).then(response =>
{
// this.$modal.msgSuccess("修改成功");
// this.open = false;
// this.getList();
//
}
);
//
}
else
{
// addMaterial(this.form).then(response =>
{
// this.$modal.msgSuccess("新增成功");
// this.open = false;
// this.getList();
//
}
);
//
}
}
}
);
}
,
/** 删除按钮操作 */
handleDelete
(
row
)
{
const
workstationMaterialIds
=
row
.
workstationMaterialId
||
this
.
ids
;
this
.
$modal
.
confirm
(
'是否确认删除工作中心发料申请编号为"'
+
workstationMaterialIds
+
'"的数据项?'
).
then
(
function
()
{
return
delMaterial
(
workstationMaterialIds
);
}
).
then
(()
=>
{
this
.
getList
();
this
.
$modal
.
msgSuccess
(
"删除成功"
);
}
).
catch
(()
=>
{
}
);
}
,
/** 导出按钮操作 */
handleExport
()
{
this
.
download
(
'pro/material/export'
,
{
...
this
.
queryParams
}
,
`material_${new Date().getTime()
}
.xlsx`
)
}
}
}
;
<
/script>
\ No newline at end of file
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