Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
P
pda-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
pda
pda-ui
Commits
5339d3ab
Commit
5339d3ab
authored
May 14, 2024
by
chenzj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增调拨了页面
parent
7656995e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
432 additions
and
2 deletions
+432
-2
proAllocationMaterial.js
src/api/mes/pro/proAllocationMaterial.js
+44
-0
single.vue
src/components/itemSelect/single.vue
+0
-1
index.vue
src/views/mes/pro/allocation/index.vue
+387
-0
index.vue
src/views/mes/pro/request/index.vue
+1
-1
No files found.
src/api/mes/pro/proAllocationMaterial.js
0 → 100644
View file @
5339d3ab
import
request
from
'@/utils/request'
// 查询调拨料申请列表
export
function
listProAllocationMaterial
(
query
)
{
return
request
({
url
:
'/pro/ProAllocationMaterial/list'
,
method
:
'get'
,
params
:
query
})
}
// 查询调拨料申请详细
export
function
getProAllocationMaterial
(
allocationMaterialId
)
{
return
request
({
url
:
'/pro/ProAllocationMaterial/'
+
allocationMaterialId
,
method
:
'get'
})
}
// 新增调拨料申请
export
function
addProAllocationMaterial
(
data
)
{
return
request
({
url
:
'/pro/ProAllocationMaterial'
,
method
:
'post'
,
data
:
data
})
}
// 修改调拨料申请
export
function
updateProAllocationMaterial
(
data
)
{
return
request
({
url
:
'/pro/ProAllocationMaterial'
,
method
:
'put'
,
data
:
data
})
}
// 删除调拨料申请
export
function
delProAllocationMaterial
(
allocationMaterialId
)
{
return
request
({
url
:
'/pro/ProAllocationMaterial/'
+
allocationMaterialId
,
method
:
'delete'
})
}
src/components/itemSelect/single.vue
View file @
5339d3ab
...
@@ -27,7 +27,6 @@
...
@@ -27,7 +27,6 @@
:expand-on-click-node=
"false"
:expand-on-click-node=
"false"
:filter-node-method=
"filterNode"
:filter-node-method=
"filterNode"
ref=
"tree"
ref=
"tree"
default-expand-all
@
node-click=
"handleNodeClick"
@
node-click=
"handleNodeClick"
/>
/>
</div>
</div>
...
...
src/views/mes/pro/allocation/index.vue
0 → 100644
View file @
5339d3ab
<
template
>
<div
class=
"app-container"
>
<el-form
:model=
"queryParams"
ref=
"queryForm"
size=
"small"
:inline=
"true"
v-show=
"showSearch"
label-width=
"100px"
>
<el-form-item
label=
"申请单号"
prop=
"allocationMaterialCode"
>
<el-input
v-model=
"queryParams.allocationMaterialCode"
placeholder=
"请输入申请单号"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<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=
"workstationCode"
>
<el-input
v-model=
"queryParams.workstationCode"
placeholder=
"请输入工作中心编码"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"任务单编码"
width=
"150"
prop=
"taskCode"
>
<el-input
v-model=
"queryParams.taskCode"
placeholder=
"请输入任务单编码"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"需求日期"
prop=
"endTime"
>
<el-date-picker
clearable
v-model=
"queryParams.endTime"
type=
"date"
value-format=
"yyyy-MM-dd"
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=
"['allocation:ProAllocationMaterial: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=
"['allocation:ProAllocationMaterial: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=
"['allocation:ProAllocationMaterial: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=
"['allocation:ProAllocationMaterial:export']"
>
导出
</el-button>
</el-col>
<right-toolbar
:showSearch
.
sync=
"showSearch"
@
queryTable=
"getList"
></right-toolbar>
</el-row>
<el-table
v-loading=
"loading"
:data=
"ProAllocationMaterialList"
@
selection-change=
"handleSelectionChange"
>
<el-table-column
type=
"selection"
width=
"55"
align=
"center"
/>
<el-table-column
label=
"申请单号"
align=
"center"
prop=
"allocationMaterialCode"
/>
<el-table-column
label=
"产品编码"
align=
"center"
prop=
"sapItemCode"
/>
<el-table-column
label=
"产品名称"
align=
"center"
prop=
"itemName"
/>
<el-table-column
label=
"工作中心编码"
align=
"center"
prop=
"workstationCode"
/>
<el-table-column
label=
"任务单编码"
align=
"center"
prop=
"taskCode"
/>
<el-table-column
label=
"申请数量"
align=
"center"
prop=
"applyNum"
/>
<el-table-column
label=
"已调拨料"
align=
"center"
prop=
"allocationNum"
/>
<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=
"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
=
"操作"
align
=
"center"
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
=
"['allocation:ProAllocationMaterial:edit']"
>
修改
<
/el-button
>
<
el
-
button
size
=
"mini"
type
=
"text"
icon
=
"el-icon-delete"
@
click
=
"handleDelete(scope.row)"
v
-
hasPermi
=
"['allocation:ProAllocationMaterial: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
=
"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
=
"allocationMaterialCode"
>
<
el
-
input
disabled
v
-
model
=
"form.allocationMaterialCode"
placeholder
=
"自动生成"
/>
<
/el-form-item
>
<
/el-col
>
<
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-row
>
<
el
-
row
>
<
el
-
col
span
=
"12"
>
<
el
-
form
-
item
label
=
"产品名称"
prop
=
"itemName"
>
<
el
-
input
disabled
v
-
model
=
"form.itemName"
placeholder
=
"请输入产品名称"
/>
<
/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"
/>
<
/el-input
>
<
taskSelect
ref
=
"brSelectworkstation"
@
onSelected
=
"onWorkstationSelect"
>
<
/taskSelect
>
<
/el-form-item
>
<
/el-col
>
<
/el-row
>
<
el
-
row
>
<
el
-
col
span
=
"12"
>
<
el
-
form
-
item
label
=
"任务单编码"
prop
=
"taskCode"
>
<
el
-
input
v
-
model
=
"form.taskCode"
placeholder
=
"请输入任务单编码"
>
<
el
-
button
slot
=
"append"
icon
=
"el-icon-search"
@
click
=
"handleTaskSelect"
/>
<
/el-input
>
<
taskSelect
ref
=
"brSelectTask"
@
onSelected
=
"onTaskSelect"
>
<
/taskSelect
>
<
/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
=
"windCase"
>
<
el
-
radio
-
group
v
-
model
=
"form.windCase"
disabled
v
-
if
=
"optType == 'view'"
>
<
el
-
radio
v
-
for
=
"dict in dict.type.sys_yes_no"
:
key
=
"dict.value"
:
label
=
"dict.value"
>
{{
dict
.
label
}}
<
/el-radio
>
<
/el-radio-group
>
<
el
-
radio
-
group
v
-
model
=
"form.windCase"
v
-
else
>
<
el
-
radio
v
-
for
=
"dict in dict.type.sys_yes_no"
:
key
=
"dict.value"
:
label
=
"dict.value"
>
{{
dict
.
label
}}
<
/el-radio
>
<
/el-radio-group
>
<
/el-form-item
>
<
/el-col
>
<
el
-
col
span
=
"12"
>
<
el
-
form
-
item
label
=
"需求日期"
prop
=
"startTime"
>
<
el
-
date
-
picker
clearable
v
-
model
=
"form.startTime"
type
=
"date"
value
-
format
=
"yyyy-MM-dd"
placeholder
=
"请选择需求日期"
>
<
/el-date-picker
>
<
/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
>
<
/div
>
<
/template
>
<
script
>
import
{
genCode
}
from
"@/api/system/autocode/rule"
;
import
ItemSelect
from
"@/components/itemSelect/single.vue"
;
import
TaskSelect
from
"@/components/TaskSelect/taskSelectSingle.vue"
;
import
WorkstationSelect
from
"@/components/workstationSelect/simpletableSingle.vue"
;
import
{
listProAllocationMaterial
,
getProAllocationMaterial
,
delProAllocationMaterial
,
addProAllocationMaterial
,
updateProAllocationMaterial
}
from
"@/api/mes/pro/proAllocationMaterial"
;
export
default
{
name
:
"ProAllocationMaterial"
,
components
:
{
ItemSelect
,
TaskSelect
,
WorkstationSelect
}
,
dicts
:
[
'sys_yes_no'
],
data
()
{
return
{
// 遮罩层
loading
:
true
,
// 选中数组
ids
:
[],
// 非单个禁用
single
:
true
,
// 非多个禁用
multiple
:
true
,
// 显示搜索条件
showSearch
:
true
,
// 总条数
total
:
0
,
// 调拨料申请表格数据
ProAllocationMaterialList
:
[],
// 弹出层标题
title
:
""
,
// 是否显示弹出层
open
:
false
,
// 查询参数
queryParams
:
{
pageNum
:
1
,
pageSize
:
10
,
allocationMaterialCode
:
null
,
sapItemCode
:
null
,
itemName
:
null
,
workstationId
:
null
,
workstationCode
:
null
,
taskId
:
null
,
taskCode
:
null
,
applyNum
:
null
,
allocationNum
:
null
,
windCase
:
null
,
endTime
:
null
,
startTime
:
null
,
}
,
// 表单参数
form
:
{
}
,
// 表单校验
rules
:
{
}
}
;
}
,
created
()
{
this
.
getList
();
}
,
methods
:
{
/** 查询调拨料申请列表 */
getList
()
{
this
.
loading
=
true
;
listProAllocationMaterial
(
this
.
queryParams
).
then
(
response
=>
{
this
.
ProAllocationMaterialList
=
response
.
rows
;
this
.
total
=
response
.
total
;
this
.
loading
=
false
;
}
);
}
,
// 取消按钮
cancel
()
{
this
.
open
=
false
;
this
.
reset
();
}
,
/** 生成编码 */
gCode
()
{
genCode
(
"ALLOCATION_CODE"
).
then
((
response
)
=>
{
this
.
form
.
allocationMaterialCode
=
response
;
}
);
}
,
handleWorkstationSelect
()
{
this
.
$refs
.
brSelectworkstation
.
showFlag
=
true
;
}
,
onWorkstationSelect
(
row
)
{
if
(
row
!=
undefined
&&
row
!=
null
)
{
this
.
form
.
workstationeId
=
row
.
workstationeId
;
this
.
form
.
workstationCode
=
row
.
workstationCode
;
}
}
,
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
;
}
}
,
handleTaskSelect
()
{
this
.
$refs
.
brSelectTask
.
showFlag
=
true
;
}
,
onTaskSelect
(
row
)
{
if
(
row
!=
undefined
&&
row
!=
null
)
{
this
.
form
.
taskId
=
row
.
taskId
;
this
.
form
.
taskCode
=
row
.
taskCode
;
}
}
,
// 表单重置
reset
()
{
this
.
form
=
{
allocationMaterialId
:
null
,
allocationMaterialCode
:
null
,
sapItemCode
:
null
,
itemName
:
null
,
workstationId
:
null
,
workstationCode
:
null
,
taskId
:
null
,
taskCode
:
null
,
applyNum
:
null
,
allocationNum
:
null
,
windCase
:
null
,
endTime
:
null
,
startTime
:
null
,
createBy
:
null
,
createTime
:
null
,
updateBy
:
null
,
updateTime
:
null
}
;
this
.
resetForm
(
"form"
);
}
,
/** 搜索按钮操作 */
handleQuery
()
{
this
.
queryParams
.
pageNum
=
1
;
this
.
getList
();
}
,
/** 重置按钮操作 */
resetQuery
()
{
this
.
resetForm
(
"queryForm"
);
this
.
handleQuery
();
}
,
// 多选框选中数据
handleSelectionChange
(
selection
)
{
this
.
ids
=
selection
.
map
(
item
=>
item
.
allocationMaterialId
)
this
.
single
=
selection
.
length
!==
1
this
.
multiple
=
!
selection
.
length
}
,
/** 新增按钮操作 */
handleAdd
()
{
this
.
reset
();
this
.
open
=
true
;
this
.
gCode
();
this
.
title
=
"添加调拨料申请"
;
}
,
/** 修改按钮操作 */
handleUpdate
(
row
)
{
this
.
reset
();
const
allocationMaterialId
=
row
.
allocationMaterialId
||
this
.
ids
getProAllocationMaterial
(
allocationMaterialId
).
then
(
response
=>
{
this
.
form
=
response
.
data
;
this
.
open
=
true
;
this
.
title
=
"修改调拨料申请"
;
}
);
}
,
/** 提交按钮 */
submitForm
()
{
this
.
$refs
[
"form"
].
validate
(
valid
=>
{
if
(
valid
)
{
if
(
this
.
form
.
allocationMaterialId
!=
null
)
{
updateProAllocationMaterial
(
this
.
form
).
then
(
response
=>
{
this
.
$modal
.
msgSuccess
(
"修改成功"
);
this
.
open
=
false
;
this
.
getList
();
}
);
}
else
{
addProAllocationMaterial
(
this
.
form
).
then
(
response
=>
{
this
.
$modal
.
msgSuccess
(
"新增成功"
);
this
.
open
=
false
;
this
.
getList
();
}
);
}
}
}
);
}
,
/** 删除按钮操作 */
handleDelete
(
row
)
{
const
allocationMaterialIds
=
row
.
allocationMaterialId
||
this
.
ids
;
this
.
$modal
.
confirm
(
'是否确认删除调拨料申请编号为"'
+
allocationMaterialIds
+
'"的数据项?'
).
then
(
function
()
{
return
delProAllocationMaterial
(
allocationMaterialIds
);
}
).
then
(()
=>
{
this
.
getList
();
this
.
$modal
.
msgSuccess
(
"删除成功"
);
}
).
catch
(()
=>
{
}
);
}
,
/** 导出按钮操作 */
handleExport
()
{
this
.
download
(
'allocation/ProAllocationMaterial/export'
,
{
...
this
.
queryParams
}
,
`ProAllocationMaterial_${new Date().getTime()
}
.xlsx`
)
}
}
}
;
<
/script>
\ No newline at end of file
src/views/mes/pro/request/index.vue
View file @
5339d3ab
...
@@ -150,7 +150,7 @@
...
@@ -150,7 +150,7 @@
<span>{{ parseTime(scope.row.CreateTime, '{y}-{m}-{d}') }}</span>
<span>{{ parseTime(scope.row.CreateTime, '{y}-{m}-{d}') }}</span>
</template> -->
</template> -->
</el-table-column>
</el-table-column>
<el-table-column
label=
"
预开始时间
"
align=
"center"
prop=
"startTime"
width=
"180"
/>
<el-table-column
label=
"
需求日期
"
align=
"center"
prop=
"startTime"
width=
"180"
/>
<el-table-column
label=
"预结束时间"
align=
"center"
prop=
"endTime"
width=
"180"
/>
<el-table-column
label=
"预结束时间"
align=
"center"
prop=
"endTime"
width=
"180"
/>
<el-table-column
label=
"操作"
width=
"80"
align=
"center"
class-name=
"small-padding fixed-width"
fixed=
"right"
>
<el-table-column
label=
"操作"
width=
"80"
align=
"center"
class-name=
"small-padding fixed-width"
fixed=
"right"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
...
...
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