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
98cfaf11
Commit
98cfaf11
authored
Feb 05, 2024
by
chenzj
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://git.local.topsunit.com/mes/mes-ui
into dev
parents
83a01479
67935d71
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
1659 additions
and
107 deletions
+1659
-107
tmToolRequest.js
src/api/mes/tm/tmToolRequest.js
+44
-0
tmToolRequestItem.js
src/api/mes/tm/tmToolRequestItem.js
+44
-0
tmToolRequestUse.js
src/api/mes/tm/tmToolRequestUse.js
+44
-0
tmToolRequestUseItem.js
src/api/mes/tm/tmToolRequestUseItem.js
+44
-0
single.vue
src/components/toolRequest/single.vue
+265
-0
Account.vue
src/views/mes/md/client/components/Account.vue
+8
-8
ClientContact.vue
src/views/mes/md/client/components/ClientContact.vue
+7
-7
PaymentRelation.vue
src/views/mes/md/client/components/PaymentRelation.vue
+9
-9
UrgeEmail.vue
src/views/mes/md/client/components/UrgeEmail.vue
+7
-7
index.vue
src/views/mes/md/client/index.vue
+86
-76
index.vue
src/views/mes/tm/toolrequest/index.vue
+441
-0
itemIndex.vue
src/views/mes/tm/toolrequest/itemIndex.vue
+175
-0
index.vue
src/views/mes/tm/toolrequestuse/index.vue
+485
-0
No files found.
src/api/mes/tm/tmToolRequest.js
0 → 100644
View file @
98cfaf11
import
request
from
'@/utils/request'
// 查询刀模板申请单列表
export
function
listTmToolRequest
(
query
)
{
return
request
({
url
:
'/tm/tmToolRequest/list'
,
method
:
'get'
,
params
:
query
})
}
// 查询刀模板申请单详细
export
function
getTmToolRequest
(
toolRequestId
)
{
return
request
({
url
:
'/tm/tmToolRequest/'
+
toolRequestId
,
method
:
'get'
})
}
// 新增刀模板申请单
export
function
addTmToolRequest
(
data
)
{
return
request
({
url
:
'/tm/tmToolRequest'
,
method
:
'post'
,
data
:
data
})
}
// 修改刀模板申请单
export
function
updateTmToolRequest
(
data
)
{
return
request
({
url
:
'/tm/tmToolRequest'
,
method
:
'put'
,
data
:
data
})
}
// 删除刀模板申请单
export
function
delTmToolRequest
(
toolRequestId
)
{
return
request
({
url
:
'/tm/tmToolRequest/'
+
toolRequestId
,
method
:
'delete'
})
}
src/api/mes/tm/tmToolRequestItem.js
0 → 100644
View file @
98cfaf11
import
request
from
'@/utils/request'
// 查询刀模板物料申请单列表
export
function
listTmToolRequestItem
(
query
)
{
return
request
({
url
:
'/tm/tmToolRequestItem/list'
,
method
:
'get'
,
params
:
query
})
}
// 查询刀模板物料申请单详细
export
function
getTmToolRequestItem
(
toolRequestItemId
)
{
return
request
({
url
:
'/tm/tmToolRequestItem/'
+
toolRequestItemId
,
method
:
'get'
})
}
// 新增刀模板物料申请单
export
function
addTmToolRequestItem
(
data
)
{
return
request
({
url
:
'/tm/tmToolRequestItem'
,
method
:
'post'
,
data
:
data
})
}
// 修改刀模板物料申请单
export
function
updateTmToolRequestItem
(
data
)
{
return
request
({
url
:
'/tm/tmToolRequestItem'
,
method
:
'put'
,
data
:
data
})
}
// 删除刀模板物料申请单
export
function
delTmToolRequestItem
(
toolRequestItemId
)
{
return
request
({
url
:
'/tm/tmToolRequestItem/'
+
toolRequestItemId
,
method
:
'delete'
})
}
src/api/mes/tm/tmToolRequestUse.js
0 → 100644
View file @
98cfaf11
import
request
from
'@/utils/request'
// 查询刀模板领用单列表
export
function
listTmToolRequestUse
(
query
)
{
return
request
({
url
:
'/tm/tmToolRequestUse/list'
,
method
:
'get'
,
params
:
query
})
}
// 查询刀模板领用单详细
export
function
getTmToolRequestUse
(
toolRequestUseId
)
{
return
request
({
url
:
'/tm/tmToolRequestUse/'
+
toolRequestUseId
,
method
:
'get'
})
}
// 新增刀模板领用单
export
function
addTmToolRequestUse
(
data
)
{
return
request
({
url
:
'/tm/tmToolRequestUse'
,
method
:
'post'
,
data
:
data
})
}
// 修改刀模板领用单
export
function
updateTmToolRequestUse
(
data
)
{
return
request
({
url
:
'/tm/tmToolRequestUse'
,
method
:
'put'
,
data
:
data
})
}
// 删除刀模板领用单
export
function
delTmToolRequestUse
(
toolRequestUseId
)
{
return
request
({
url
:
'/tm/tmToolRequestUse/'
+
toolRequestUseId
,
method
:
'delete'
})
}
src/api/mes/tm/tmToolRequestUseItem.js
0 → 100644
View file @
98cfaf11
import
request
from
'@/utils/request'
// 查询刀模板物料领用单列表
export
function
listTmToolRequestUseItem
(
query
)
{
return
request
({
url
:
'/tm/tmToolRequestUseItem/list'
,
method
:
'get'
,
params
:
query
})
}
// 查询刀模板物料领用单详细
export
function
getTmToolRequestUseItem
(
toolRequestUseItemId
)
{
return
request
({
url
:
'/tm/tmToolRequestUseItem/'
+
toolRequestUseItemId
,
method
:
'get'
})
}
// 新增刀模板物料领用单
export
function
addTmToolRequestUseItem
(
data
)
{
return
request
({
url
:
'/tm/tmToolRequestUseItem'
,
method
:
'post'
,
data
:
data
})
}
// 修改刀模板物料领用单
export
function
updateTmToolRequestUseItem
(
data
)
{
return
request
({
url
:
'/tm/tmToolRequestUseItem'
,
method
:
'put'
,
data
:
data
})
}
// 删除刀模板物料领用单
export
function
delTmToolRequestUseItem
(
toolRequestUseItemId
)
{
return
request
({
url
:
'/tm/tmToolRequestUseItem/'
+
toolRequestUseItemId
,
method
:
'delete'
})
}
src/components/toolRequest/single.vue
0 → 100644
View file @
98cfaf11
<
template
>
<el-dialog
title=
"刀模板申请单选择"
v-if=
"showFlag"
:visible
.
sync=
"showFlag"
:modal=
"false"
width=
"80%"
center
>
<el-row
:gutter=
"20"
>
<!--刀模板申请数据-->
<el-col
:span=
"20"
:xs=
"20"
>
<el-form
:model=
"queryParams"
ref=
"queryForm"
size=
"small"
:inline=
"true"
v-show=
"showSearch"
label-width=
"68px"
>
<el-form-item
label=
"作业单元"
prop=
"workunitName"
>
<el-input
v-model=
"queryParams.workunitName"
placeholder=
"请输入作业单元"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"申请时间"
prop=
"requestDate"
>
<el-date-picker
clearable
v-model=
"queryParams.requestDate"
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-table
v-loading=
"loading"
:data=
"toolRequestList"
@
current-change=
"handleCurrent"
@
row-dblclick=
"handleRowDbClick"
>
<el-table-column
width=
"50"
align=
"center"
>
<template
v-slot=
"scope"
>
<el-radio
v-model=
"selectedToolRequestId"
:label=
"scope.row.toolRequestId"
@
change=
"handleRowChange(scope.row)"
>
{{
""
}}
</el-radio
>
</
template
>
</el-table-column>
<el-table-column
label=
"申请单编码"
width=
"120"
align=
"center"
key=
"toolRequestCode"
prop=
"toolRequestCode"
v-if=
"columns[0].visible"
>
</el-table-column>
<el-table-column
label=
"工序"
min-width=
"120"
align=
"center"
key=
"processName"
prop=
"processName"
v-if=
"columns[1].visible"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"作业单元"
width=
"120"
align=
"center"
key=
"workunitName"
prop=
"workunitName"
v-if=
"columns[2].visible"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"申请时间"
align=
"center"
key=
"requestDate"
prop=
"requestDate"
v-if=
"columns[3].visible"
:show-overflow-tooltip=
"true"
>
</el-table-column>
<el-table-column
label=
"预计开始时间"
align=
"center"
key=
"startTime"
prop=
"startTime"
v-if=
"columns[4].visible"
:show-overflow-tooltip=
"true"
></el-table-column>
<el-table-column
label=
"预计结束时间"
align=
"center"
key=
"endTime"
prop=
"endTime"
v-if=
"columns[5].visible"
:show-overflow-tooltip=
"true"
></el-table-column>
<el-table-column
label=
"申请数量"
align=
"center"
key=
"requestNum"
prop=
"requestNum"
v-if=
"columns[6].visible"
:show-overflow-tooltip=
"true"
></el-table-column>
</el-table>
<pagination
v-show=
"total > 0"
:total=
"total"
:page
.
sync=
"queryParams.pageNum"
:limit
.
sync=
"queryParams.pageSize"
@
pagination=
"getList"
/>
</el-col>
</el-row>
<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
{
listTmToolRequestUse
}
from
"@/api/mes/tm/tmToolRequestUse"
;
export
default
{
name
:
"TmRequestSelectSingle"
,
components
:
{},
data
()
{
return
{
showFlag
:
false
,
// 选中数组
selectedBrandId
:
undefined
,
selectedRows
:
[],
// 非单个禁用
single
:
true
,
// 非多个禁用
multiple
:
true
,
// 显示搜索条件
showSearch
:
true
,
// 总条数
total
:
0
,
//申请表格数据
toolRequestList
:
[],
// // 品牌名称
// brandName: undefined,
defaultProps
:
{
children
:
"children"
,
label
:
"label"
,
},
// 查询参数
queryParams
:
{
pageNum
:
1
,
pageSize
:
10
,
brandCode
:
null
,
brandName
:
null
,
brandId
:
null
,
},
// 列信息
columns
:
[
{
key
:
0
,
label
:
`申请单编码`
,
visible
:
true
},
{
key
:
1
,
label
:
`工序`
,
visible
:
true
},
{
key
:
2
,
label
:
`作业单元`
,
visible
:
true
},
{
key
:
3
,
label
:
`申请时间`
,
visible
:
true
},
{
key
:
4
,
label
:
`预计开始时间`
,
visible
:
true
},
{
key
:
5
,
label
:
`预计结束时间`
,
visible
:
true
},
{
key
:
6
,
label
:
`申请数量`
,
visible
:
true
},
],
};
},
// watch: {
// // 根据名称筛选分类树
// itemTypeName(val) {
// this.$refs.tree.filter(val);
// },
// },
created
()
{
console
.
log
(
"日志:已进入brandSingle页面的列表查询方法"
);
// 在created钩子函数中输出日志
this
.
getList
();
},
methods
:
{
// /** 查询物料编码列表 */
// getList() {
// this.loading = true;
// listMdItem(this.queryParams).then((response) => {
// this.itemList = response.rows;
// this.total = response.total;
// this.loading = false;
// });
// },
/** 查询品牌列表 */
getList
()
{
this
.
loading
=
true
;
listTmToolRequestUse
(
this
.
queryParams
).
then
((
response
)
=>
{
this
.
toolRequestList
=
response
.
rows
;
this
.
total
=
response
.
total
;
this
.
loading
=
false
;
});
},
/** 搜索按钮操作 */
handleQuery
()
{
this
.
getList
();
},
/** 重置按钮操作 */
resetQuery
()
{
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
.
selectedToolRequestId
==
null
||
this
.
selectedToolRequestId
==
0
)
{
this
.
$notify
({
title
:
"提示"
,
type
:
"warning"
,
message
:
"请至少选择一条数据!"
,
});
return
;
}
this
.
$emit
(
"onSelected"
,
this
.
selectedRows
);
this
.
showFlag
=
false
;
},
},
};
</
script
>
src/views/mes/md/client/components/Account.vue
View file @
98cfaf11
...
@@ -133,7 +133,7 @@ export default {
...
@@ -133,7 +133,7 @@ export default {
name
:
'Account'
,
name
:
'Account'
,
dicts
:
[
'sys_yes_no'
],
dicts
:
[
'sys_yes_no'
],
props
:
{
props
:
{
client
Id
:
{
type
:
Number
|
undefined
,
default
:
undefined
},
client
Code
:
{
type
:
String
|
undefined
,
default
:
undefined
},
},
},
data
()
{
data
()
{
return
{
return
{
...
@@ -159,7 +159,7 @@ export default {
...
@@ -159,7 +159,7 @@ export default {
queryParams
:
{
queryParams
:
{
pageNum
:
1
,
pageNum
:
1
,
pageSize
:
10
,
pageSize
:
10
,
client
Id
:
this
.
clientId
,
bank
:
null
,
bankAccount
:
null
,
accountName
:
null
,
enableFlag
:
null
client
Code
:
this
.
clientCode
,
bank
:
null
,
bankAccount
:
null
,
accountName
:
null
,
enableFlag
:
null
},
},
// 表单参数
// 表单参数
form
:
{},
form
:
{},
...
@@ -172,7 +172,7 @@ export default {
...
@@ -172,7 +172,7 @@ export default {
getList
()
{
getList
()
{
this
.
accountList
=
[]
this
.
accountList
=
[]
this
.
total
=
0
this
.
total
=
0
if
(
!
this
.
queryParams
.
client
Id
)
return
if
(
!
this
.
queryParams
.
client
Code
)
return
this
.
loading
=
true
this
.
loading
=
true
pageAccount
(
this
.
queryParams
).
then
(
response
=>
{
pageAccount
(
this
.
queryParams
).
then
(
response
=>
{
this
.
accountList
=
response
.
data
.
records
this
.
accountList
=
response
.
data
.
records
...
@@ -189,7 +189,7 @@ export default {
...
@@ -189,7 +189,7 @@ export default {
reset
()
{
reset
()
{
this
.
form
=
{
this
.
form
=
{
id
:
null
,
id
:
null
,
client
Id
:
this
.
clientId
,
client
Code
:
this
.
clientCode
,
bank
:
null
,
bank
:
null
,
bankAccount
:
null
,
bankAccount
:
null
,
accountName
:
null
,
accountName
:
null
,
...
@@ -235,7 +235,7 @@ export default {
...
@@ -235,7 +235,7 @@ export default {
},
},
/** 提交按钮 */
/** 提交按钮 */
submitForm
()
{
submitForm
()
{
if
(
!
this
.
form
.
client
Id
)
return
this
.
$message
.
error
(
"请先创建客户"
)
if
(
!
this
.
form
.
client
Code
)
return
this
.
$message
.
error
(
"请先创建客户"
)
this
.
$refs
[
'form'
].
validate
(
valid
=>
{
this
.
$refs
[
'form'
].
validate
(
valid
=>
{
if
(
valid
)
{
if
(
valid
)
{
if
(
this
.
form
.
id
!=
null
)
{
if
(
this
.
form
.
id
!=
null
)
{
...
@@ -246,7 +246,7 @@ export default {
...
@@ -246,7 +246,7 @@ export default {
})
})
}
else
{
}
else
{
addAccount
(
this
.
form
).
then
(
response
=>
{
addAccount
(
this
.
form
).
then
(
response
=>
{
this
.
form
.
client
Id
=
this
.
clientId
this
.
form
.
client
Code
=
this
.
clientCode
this
.
$modal
.
msgSuccess
(
'新增成功'
)
this
.
$modal
.
msgSuccess
(
'新增成功'
)
this
.
open
=
false
this
.
open
=
false
this
.
getList
()
this
.
getList
()
...
@@ -273,8 +273,8 @@ export default {
...
@@ -273,8 +273,8 @@ export default {
},
`account_
${
new
Date
().
getTime
()}
.xlsx`
)
},
`account_
${
new
Date
().
getTime
()}
.xlsx`
)
},
},
init
(
form
)
{
init
(
form
)
{
if
(
!
form
.
client
Id
)
return
if
(
!
form
.
client
Code
)
return
this
.
queryParams
.
client
Id
=
form
.
clientId
this
.
queryParams
.
client
Code
=
form
.
clientCode
this
.
getList
()
this
.
getList
()
}
}
}
}
...
...
src/views/mes/md/client/components/ClientContact.vue
View file @
98cfaf11
...
@@ -137,7 +137,7 @@ import {listBrandByCondition} from '@/api/mes/md/brand'
...
@@ -137,7 +137,7 @@ import {listBrandByCondition} from '@/api/mes/md/brand'
export
default
{
export
default
{
props
:
{
props
:
{
client
Id
:
{
type
:
Number
|
undefined
,
default
:
undefined
},
client
Code
:
{
type
:
String
|
undefined
,
default
:
undefined
},
},
},
data
()
{
data
()
{
return
{
return
{
...
@@ -174,7 +174,7 @@ export default {
...
@@ -174,7 +174,7 @@ export default {
queryParams
:
{
queryParams
:
{
pageNum
:
1
,
pageNum
:
1
,
pageSize
:
10
,
pageSize
:
10
,
client
Id
:
null
,
client
Code
:
null
,
},
},
// 表单参数
// 表单参数
form
:
{},
form
:
{},
...
@@ -203,7 +203,7 @@ export default {
...
@@ -203,7 +203,7 @@ export default {
/** 查询客户联系人列表 */
/** 查询客户联系人列表 */
getList
()
{
getList
()
{
this
.
loading
=
true
this
.
loading
=
true
this
.
queryParams
.
client
Id
=
this
.
clientId
this
.
queryParams
.
client
Code
=
this
.
clientCode
listContact
(
this
.
queryParams
).
then
(
response
=>
{
listContact
(
this
.
queryParams
).
then
(
response
=>
{
console
.
log
(
response
,
111
)
console
.
log
(
response
,
111
)
this
.
contactList
=
response
.
rows
this
.
contactList
=
response
.
rows
...
@@ -219,7 +219,7 @@ export default {
...
@@ -219,7 +219,7 @@ export default {
reset
()
{
reset
()
{
this
.
form
=
{
this
.
form
=
{
id
:
null
,
id
:
null
,
client
Id
:
this
.
clientId
,
client
Code
:
this
.
clientCode
,
brandName
:
null
,
brandName
:
null
,
position
:
null
,
position
:
null
,
...
@@ -279,7 +279,7 @@ export default {
...
@@ -279,7 +279,7 @@ export default {
this
.
getList
()
this
.
getList
()
})
})
}
else
{
}
else
{
this
.
form
.
client
Id
=
this
.
clientId
this
.
form
.
client
Code
=
this
.
clientCode
addContact
(
this
.
form
).
then
(
response
=>
{
addContact
(
this
.
form
).
then
(
response
=>
{
this
.
$modal
.
msgSuccess
(
'新增成功'
)
this
.
$modal
.
msgSuccess
(
'新增成功'
)
this
.
open
=
false
this
.
open
=
false
...
@@ -307,8 +307,8 @@ export default {
...
@@ -307,8 +307,8 @@ export default {
},
`contact_
${
new
Date
().
getTime
()}
.xlsx`
)
},
`contact_
${
new
Date
().
getTime
()}
.xlsx`
)
},
},
init
(
form
)
{
init
(
form
)
{
if
(
!
form
.
client
Id
)
return
if
(
!
form
.
client
Code
)
return
this
.
queryParams
.
client
Id
=
form
.
clientId
this
.
queryParams
.
client
Code
=
form
.
clientCode
this
.
getList
()
this
.
getList
()
},
},
/** 远程搜索 */
/** 远程搜索 */
...
...
src/views/mes/md/client/components/PaymentRelation.vue
View file @
98cfaf11
...
@@ -92,7 +92,7 @@ import { listClient } from '@/api/mes/md/client'
...
@@ -92,7 +92,7 @@ import { listClient } from '@/api/mes/md/client'
export
default
{
export
default
{
name
:
"Relation"
,
name
:
"Relation"
,
props
:
{
props
:
{
client
Id
:
{
type
:
Number
|
undefined
,
default
:
undefined
},
client
Code
:
{
type
:
String
|
undefined
,
default
:
undefined
},
},
},
data
()
{
data
()
{
return
{
return
{
...
@@ -118,8 +118,8 @@ export default {
...
@@ -118,8 +118,8 @@ export default {
queryParams
:
{
queryParams
:
{
pageNum
:
1
,
pageNum
:
1
,
pageSize
:
10
,
pageSize
:
10
,
client
Id
:
null
,
client
Code
:
null
,
relatedClient
Id
:
null
,
relatedClient
Code
:
null
,
},
},
// 表单参数
// 表单参数
form
:
{},
form
:
{},
...
@@ -136,7 +136,7 @@ export default {
...
@@ -136,7 +136,7 @@ export default {
/** 查询客户付款信息关联列表 */
/** 查询客户付款信息关联列表 */
getList
()
{
getList
()
{
this
.
loading
=
true
;
this
.
loading
=
true
;
this
.
queryParams
.
client
Id
=
this
.
clientId
this
.
queryParams
.
client
Code
=
this
.
clientCode
listRelation
(
this
.
queryParams
).
then
(
response
=>
{
listRelation
(
this
.
queryParams
).
then
(
response
=>
{
this
.
relationList
=
response
.
rows
;
this
.
relationList
=
response
.
rows
;
this
.
total
=
response
.
total
;
this
.
total
=
response
.
total
;
...
@@ -152,8 +152,8 @@ export default {
...
@@ -152,8 +152,8 @@ export default {
reset
()
{
reset
()
{
this
.
form
=
{
this
.
form
=
{
id
:
null
,
id
:
null
,
client
Id
:
this
.
clientId
,
client
Code
:
this
.
clientCode
,
relatedClient
Id
:
null
,
relatedClient
Code
:
null
,
createBy
:
null
,
createBy
:
null
,
createTime
:
null
,
createTime
:
null
,
updateBy
:
null
,
updateBy
:
null
,
...
@@ -204,7 +204,7 @@ export default {
...
@@ -204,7 +204,7 @@ export default {
this
.
getList
();
this
.
getList
();
});
});
}
else
{
}
else
{
this
.
form
.
client
Id
=
this
.
clientId
this
.
form
.
client
Code
=
this
.
clientCode
addRelation
(
this
.
form
).
then
(
response
=>
{
addRelation
(
this
.
form
).
then
(
response
=>
{
this
.
$modal
.
msgSuccess
(
"新增成功"
);
this
.
$modal
.
msgSuccess
(
"新增成功"
);
this
.
open
=
false
;
this
.
open
=
false
;
...
@@ -236,8 +236,8 @@ export default {
...
@@ -236,8 +236,8 @@ export default {
listClient
({
clientName
:
key
,
pageNum
:
1
,
pageSize
:
100
}).
then
(
res
=>
this
.
clientList
=
res
.
rows
)
listClient
({
clientName
:
key
,
pageNum
:
1
,
pageSize
:
100
}).
then
(
res
=>
this
.
clientList
=
res
.
rows
)
},
},
init
(
form
)
{
init
(
form
)
{
if
(
!
form
.
client
Id
)
return
if
(
!
form
.
client
Code
)
return
this
.
queryParams
.
client
Id
=
form
.
clientId
this
.
queryParams
.
client
Code
=
form
.
clientCode
this
.
getList
()
this
.
getList
()
}
}
}
}
...
...
src/views/mes/md/client/components/UrgeEmail.vue
View file @
98cfaf11
...
@@ -108,7 +108,7 @@ export default {
...
@@ -108,7 +108,7 @@ export default {
name
:
'Email'
,
name
:
'Email'
,
dicts
:
[
'sys_yes_no'
],
dicts
:
[
'sys_yes_no'
],
props
:
{
props
:
{
client
Id
:
{
type
:
Number
|
undefined
,
default
:
undefined
},
client
Code
:
{
type
:
String
|
undefined
,
default
:
undefined
},
},
},
data
()
{
data
()
{
return
{
return
{
...
@@ -134,7 +134,7 @@ export default {
...
@@ -134,7 +134,7 @@ export default {
queryParams
:
{
queryParams
:
{
pageNum
:
1
,
pageNum
:
1
,
pageSize
:
10
,
pageSize
:
10
,
client
Id
:
null
,
client
Code
:
null
,
email
:
null
,
contact
:
null
,
enableFlag
:
null
email
:
null
,
contact
:
null
,
enableFlag
:
null
},
},
// 表单参数
// 表单参数
...
@@ -157,7 +157,7 @@ export default {
...
@@ -157,7 +157,7 @@ export default {
/** 查询催货款通知邮箱列表 */
/** 查询催货款通知邮箱列表 */
getList
()
{
getList
()
{
this
.
loading
=
true
this
.
loading
=
true
this
.
queryParams
.
client
Id
=
this
.
clientId
this
.
queryParams
.
client
Code
=
this
.
clientCode
listEmail
(
this
.
queryParams
).
then
(
response
=>
{
listEmail
(
this
.
queryParams
).
then
(
response
=>
{
this
.
emailList
=
response
.
rows
this
.
emailList
=
response
.
rows
this
.
total
=
response
.
total
this
.
total
=
response
.
total
...
@@ -173,7 +173,7 @@ export default {
...
@@ -173,7 +173,7 @@ export default {
reset
()
{
reset
()
{
this
.
form
=
{
this
.
form
=
{
id
:
null
,
id
:
null
,
client
Id
:
this
.
clientId
,
client
Code
:
this
.
clientCode
,
email
:
null
,
email
:
null
,
contact
:
null
,
contact
:
null
,
enableFlag
:
null
,
enableFlag
:
null
,
...
@@ -227,7 +227,7 @@ export default {
...
@@ -227,7 +227,7 @@ export default {
this
.
getList
()
this
.
getList
()
})
})
}
else
{
}
else
{
this
.
form
.
client
Id
=
this
.
clientId
this
.
form
.
client
Code
=
this
.
clientCode
addEmail
(
this
.
form
).
then
(
response
=>
{
addEmail
(
this
.
form
).
then
(
response
=>
{
this
.
$modal
.
msgSuccess
(
'新增成功'
)
this
.
$modal
.
msgSuccess
(
'新增成功'
)
this
.
open
=
false
this
.
open
=
false
...
@@ -255,8 +255,8 @@ export default {
...
@@ -255,8 +255,8 @@ export default {
},
`email_
${
new
Date
().
getTime
()}
.xlsx`
)
},
`email_
${
new
Date
().
getTime
()}
.xlsx`
)
},
},
init
(
form
)
{
init
(
form
)
{
if
(
!
form
.
client
Id
)
return
if
(
!
form
.
client
Code
)
return
this
.
queryParams
.
client
Id
=
form
.
clientId
this
.
queryParams
.
client
Code
=
form
.
clientCode
this
.
getList
()
this
.
getList
()
}
}
}
}
...
...
src/views/mes/md/client/index.vue
View file @
98cfaf11
This diff is collapsed.
Click to expand it.
src/views/mes/tm/toolrequest/index.vue
0 → 100644
View file @
98cfaf11
This diff is collapsed.
Click to expand it.
src/views/mes/tm/toolrequest/itemIndex.vue
0 → 100644
View file @
98cfaf11
<
template
>
<div
class=
"app-container"
>
<el-table
v-loading=
"loading"
:data=
"tmToolRequestItemList"
@
selection-change=
"handleSelectionChange"
>
<el-table-column
type=
"selection"
width=
"55"
align=
"center"
/>
<!--
<el-table-column
label=
"主键id"
align=
"center"
prop=
"toolRequestItemId"
/>
<el-table-column
label=
"刀模板申请单id"
align=
"center"
prop=
"toolRequestId"
/>
-->
<el-table-column
label=
"物料名称"
align=
"center"
prop=
"itemName"
/>
<el-table-column
label=
"总数量"
align=
"center"
prop=
"allQuantity"
/>
<el-table-column
label=
"预计使用寿命"
align=
"center"
prop=
"nextMaintenPeriod"
/>
</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=
"500px"
append-to-body
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"80px"
>
<el-form-item
label=
"刀模板申请单id"
prop=
"toolRequestId"
>
<el-input
v-model=
"form.toolRequestId"
placeholder=
"请输入刀模板申请单id"
/>
</el-form-item>
<el-form-item
label=
"物料id"
prop=
"itemId"
>
<el-input
v-model=
"form.itemId"
placeholder=
"请输入物料id"
/>
</el-form-item>
<el-form-item
label=
"总数量"
prop=
"allQuantity"
>
<el-input
v-model=
"form.allQuantity"
placeholder=
"请输入总数量"
/>
</el-form-item>
<el-form-item
label=
"预计使用寿命"
prop=
"nextMaintenPeriod"
>
<el-input
v-model=
"form.nextMaintenPeriod"
placeholder=
"请输入预计使用寿命"
/>
</el-form-item>
</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
{
listTmToolRequestItem
,
getTmToolRequestItem
,
delTmToolRequestItem
,
addTmToolRequestItem
,
updateTmToolRequestItem
}
from
"@/api/mes/tm/tmToolRequestItem"
;
export
default
{
name
:
"TmToolRequestItem"
,
data
()
{
return
{
// 遮罩层
loading
:
true
,
// 选中数组
ids
:
[],
// 非单个禁用
single
:
true
,
// 非多个禁用
multiple
:
true
,
// 显示搜索条件
showSearch
:
true
,
// 总条数
total
:
0
,
// 刀模板物料申请单表格数据
tmToolRequestItemList
:
[],
// 弹出层标题
title
:
""
,
// 是否显示弹出层
open
:
false
,
// 查询参数
queryParams
:
{
pageNum
:
1
,
pageSize
:
10
,
toolRequestId
:
null
,
itemId
:
null
,
allQuantity
:
null
,
nextMaintenPeriod
:
null
,
},
// 表单参数
form
:
{},
// 表单校验
rules
:
{
}
};
},
created
()
{
this
.
getList
();
},
methods
:
{
/** 查询刀模板物料申请单列表 */
getList
()
{
this
.
loading
=
true
;
listTmToolRequestItem
(
this
.
queryParams
).
then
(
response
=>
{
this
.
tmToolRequestItemList
=
response
.
rows
;
this
.
total
=
response
.
total
;
this
.
loading
=
false
;
});
},
// 取消按钮
cancel
()
{
this
.
open
=
false
;
this
.
reset
();
},
// 表单重置
reset
()
{
this
.
form
=
{
toolRequestItemId
:
null
,
toolRequestId
:
null
,
itemId
:
null
,
allQuantity
:
null
,
nextMaintenPeriod
:
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
.
toolRequestItemId
)
this
.
single
=
selection
.
length
!==
1
this
.
multiple
=
!
selection
.
length
},
/** 新增按钮操作 */
handleAdd
()
{
this
.
reset
();
this
.
open
=
true
;
this
.
title
=
"添加刀模板物料申请单"
;
},
/** 修改按钮操作 */
handleUpdate
(
row
)
{
this
.
reset
();
const
toolRequestItemId
=
row
.
toolRequestItemId
||
this
.
ids
getTmToolRequestItem
(
toolRequestItemId
).
then
(
response
=>
{
this
.
form
=
response
.
data
;
this
.
open
=
true
;
this
.
title
=
"修改刀模板物料申请单"
;
});
},
/** 提交按钮 */
submitForm
()
{
this
.
$refs
[
"form"
].
validate
(
valid
=>
{
if
(
valid
)
{
if
(
this
.
form
.
toolRequestItemId
!=
null
)
{
updateTmToolRequestItem
(
this
.
form
).
then
(
response
=>
{
this
.
$modal
.
msgSuccess
(
"修改成功"
);
this
.
open
=
false
;
this
.
getList
();
});
}
else
{
addTmToolRequestItem
(
this
.
form
).
then
(
response
=>
{
this
.
$modal
.
msgSuccess
(
"新增成功"
);
this
.
open
=
false
;
this
.
getList
();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete
(
row
)
{
const
toolRequestItemIds
=
row
.
toolRequestItemId
||
this
.
ids
;
this
.
$modal
.
confirm
(
'是否确认删除刀模板物料申请单编号为"'
+
toolRequestItemIds
+
'"的数据项?'
).
then
(
function
()
{
return
delTmToolRequestItem
(
toolRequestItemIds
);
}).
then
(()
=>
{
this
.
getList
();
this
.
$modal
.
msgSuccess
(
"删除成功"
);
}).
catch
(()
=>
{});
},
/** 导出按钮操作 */
handleExport
()
{
this
.
download
(
'tm/tmToolRequestItem/export'
,
{
...
this
.
queryParams
},
`tmToolRequestItem_
${
new
Date
().
getTime
()}
.xlsx`
)
}
}
};
</
script
>
src/views/mes/tm/toolrequestuse/index.vue
0 → 100644
View file @
98cfaf11
This diff is collapsed.
Click to expand it.
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