Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
NLT-e-cigarette
Project
Project
Details
Activity
Releases
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
张伯涛
NLT-e-cigarette
Commits
083f68d7
Commit
083f68d7
authored
Jun 13, 2022
by
zhangyichen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
生产模型提交
parent
e0c716fd
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
363 additions
and
112 deletions
+363
-112
model.js
src/api/model.js
+9
-0
MaterialFile.vue
src/views/productionInfo/MaterialFile.vue
+191
-107
ModelDetails.vue
src/views/productionInfo/ModelDetails.vue
+3
-1
ProductionModel.vue
src/views/productionInfo/ProductionModel.vue
+160
-4
No files found.
src/api/model.js
View file @
083f68d7
...
@@ -17,3 +17,12 @@ export function deleteLogicalId(data) {
...
@@ -17,3 +17,12 @@ export function deleteLogicalId(data) {
method
:
'delete'
,
method
:
'delete'
,
})
})
}
}
// 复制
export
function
queryCopyNltModels
(
params
)
{
return
request
({
url
:
'/nltmodel/queryCopyNltModels'
,
method
:
'get'
,
params
})
}
src/views/productionInfo/MaterialFile.vue
View file @
083f68d7
This diff is collapsed.
Click to expand it.
src/views/productionInfo/ModelDetails.vue
View file @
083f68d7
...
@@ -657,6 +657,9 @@ export default {
...
@@ -657,6 +657,9 @@ export default {
if
(
this
.
type
===
'2'
)
{
if
(
this
.
type
===
'2'
)
{
this
.
materQueryType
=
''
this
.
materQueryType
=
''
}
}
if
(
this
.
type
===
'1'
)
{
str
=
this
.
materIdListType1
.
join
(
','
)
}
const
params
=
{
const
params
=
{
...
this
.
queryParams
,
...
this
.
queryParams
,
businessIdList
:
str
,
businessIdList
:
str
,
...
@@ -1045,7 +1048,6 @@ export default {
...
@@ -1045,7 +1048,6 @@ export default {
})
})
},
},
initData
()
{
initData
()
{
for
(
let
i
=
0
;
i
<
this
.
positionList
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
this
.
positionList
.
length
;
i
++
)
{
console
.
log
(
i
)
console
.
log
(
i
)
this
.
positionList
[
i
].
sort
=
i
this
.
positionList
[
i
].
sort
=
i
...
...
src/views/productionInfo/ProductionModel.vue
View file @
083f68d7
...
@@ -126,7 +126,7 @@
...
@@ -126,7 +126,7 @@
size=
"mini"
size=
"mini"
type=
"danger"
type=
"danger"
style=
"margin-left: 10px"
style=
"margin-left: 10px"
@
click=
"handle
Delete
(scope.row)"
@
click=
"handle
Copy
(scope.row)"
>
复制
</el-link>
>
复制
</el-link>
<el-link
<el-link
size=
"mini"
size=
"mini"
...
@@ -153,25 +153,114 @@
...
@@ -153,25 +153,114 @@
</el-col>
</el-col>
</el-row>
</el-row>
</div>
</div>
<!-- 选择成品料号 物料料号-->
<el-dialog
:close-on-click-modal=
"false"
class=
"modelDialog"
:title=
"'选择复制料号'"
:visible
.
sync=
"openPartNo"
width=
"70%"
:append-to-body=
"false"
>
<el-form
ref=
"form2"
:model=
"queryParam"
label-width=
"auto"
:inline=
"true"
>
<el-form-item
label=
"成品料号"
prop=
"materCode"
>
<div
slot=
"label"
>
<div
class=
"labelName"
>
成品料号
</div>
<div
class=
"labelName"
>
Part Number
</div>
</div>
<el-input
v-model=
"queryParam.materCode"
placeholder=
"请输入料号名称"
clearable
:maxlength=
"30"
size=
"small"
style=
"width: 200px"
/>
</el-form-item>
<el-form-item>
<el-button
class=
"redBtn"
type=
"danger"
size=
"small"
@
click=
"queryCode"
>
查询 Query
</el-button>
<el-button
class=
"resetBtn"
size=
"small"
@
click=
"resetCode"
>
重置 Reset
</el-button>
</el-form-item>
<el-row
:gutter=
"20"
>
<!--选择成品料号数据-->
<el-col
:span=
"24"
:xs=
"24"
style=
"height: 300px"
>
<el-table
v-loading=
"loadingCode"
border
ref=
"materTable"
:header-row-class-name=
"cellClassMater"
style=
"padding-right: 10px;padding-left: 10px;margin-top: 10px"
:data=
"selectPartNum"
@
selection-change=
"handleSelectionChangeMaterial"
@
select=
"handleSelectionMaterial"
>
<el-table-column
type=
"selection"
width=
"50"
/>
<el-table-column
type=
"index"
label=
"序号"
width=
"50"
/>
<el-table-column
align=
"center"
prop=
"materCode"
width=
"200"
:show-overflow-tooltip=
"true"
>
<
template
slot=
"header"
>
<div>
料号
</div>
<div>
Part No.
</div>
</
template
>
<
template
v-slot:default=
"scope"
>
{{
scope
.
row
.
materCode
||
'-'
}}
</
template
>
</el-table-column>
<el-table-column
align=
"center"
prop=
"materDesc"
:show-overflow-tooltip=
"true"
>
<
template
slot=
"header"
>
<div>
物料描述
</div>
<div>
Description
</div>
</
template
>
<
template
slot-scope=
"scope"
>
{{
scope
.
row
.
materDesc
||
'-'
}}
</
template
>
</el-table-column>
<el-table-column
align=
"center"
width=
"200"
prop=
"materUnit"
:show-overflow-tooltip=
"true"
>
<
template
slot=
"header"
>
<div>
单位
</div>
<!--
<div>
Position Type
</div>
-->
</
template
>
<
template
slot-scope=
"scope"
>
{{
scope
.
row
.
materUnit
||
'-'
}}
</
template
>
</el-table-column>
</el-table>
<pagination
v-show=
"totalMater>0"
:total=
"totalMater"
:page
.
sync=
"queryParam.page"
:limit
.
sync=
"queryParam.rows"
@
pagination=
"partNum"
/>
</el-col>
</el-row>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
class=
"canleBtn"
@
click=
"cancelChoicePart"
>
取 消 Cancel
</el-button>
<el-button
class=
"redBtn"
type=
"danger"
@
click=
"submitChoicePart"
>
确 定 Confirm
</el-button>
</div>
</el-dialog>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
import
{
listModel
,
deleteLogicalId
}
from
'@/api/model'
import
{
listModel
,
deleteLogicalId
,
queryCopyNltModels
}
from
'@/api/model'
import
{
listMaterial
}
from
'@/api/material'
export
default
{
export
default
{
name
:
'ProductionModel'
,
name
:
'ProductionModel'
,
data
()
{
data
()
{
return
{
return
{
addMaterialList
:
[],
loadingCode
:
false
,
loading
:
false
,
loading
:
false
,
selectPartNum
:
[],
modelList
:
[],
modelList
:
[],
total
:
0
,
total
:
0
,
totalMater
:
0
,
queryParams
:
{
queryParams
:
{
page
:
1
,
page
:
1
,
rows
:
10
,
rows
:
10
,
modelType
:
undefined
,
modelType
:
undefined
,
partNo
:
undefined
partNo
:
undefined
},
},
queryParam
:
{
page
:
1
,
rows
:
10
,
materCode
:
''
},
openPartNo
:
false
,
// 新增模型弹窗
// 新增模型弹窗
openModel
:
false
,
openModel
:
false
,
// 添加工站弹窗
// 添加工站弹窗
...
@@ -183,6 +272,41 @@ export default {
...
@@ -183,6 +272,41 @@ export default {
this
.
getList
()
this
.
getList
()
},
},
methods
:
{
methods
:
{
// 确定关闭选择成品料号弹窗
submitChoicePart
()
{
if
(
this
.
addMaterialList
.
length
<
1
)
{
this
.
$message
.
error
(
'请选择一条物料'
)
return
}
const
params
=
{
businessId
:
this
.
businessId
,
materId
:
this
.
addMaterialList
[
0
].
businessId
}
queryCopyNltModels
(
params
).
then
(
res
=>
{
this
.
$message
.
success
(
'复制成功'
)
this
.
openPartNo
=
false
this
.
getList
()
})
},
// 关闭选择成品料号弹窗
cancelChoicePart
()
{
this
.
openPartNo
=
false
},
// 工单表样式
cellClassMater
(
row
)
{
return
'disabledSelection'
},
// 配置物料选择框
handleSelectionChangeMaterial
(
data
)
{
this
.
addMaterialList
=
data
},
// 单选
handleSelectionMaterial
(
selection
,
row
)
{
if
(
selection
.
length
>
1
)
{
const
del_row
=
selection
.
shift
()
this
.
$refs
.
materTable
.
toggleRowSelection
(
del_row
,
false
)
//
}
},
/** 列表获取 */
/** 列表获取 */
getList
()
{
getList
()
{
this
.
loading
=
true
this
.
loading
=
true
...
@@ -224,6 +348,22 @@ export default {
...
@@ -224,6 +348,22 @@ export default {
}
}
})
})
},
},
handleCopy
(
row
)
{
this
.
businessId
=
row
.
businessId
this
.
queryParam
.
materCode
=
''
this
.
queryParam
.
page
=
1
this
.
queryParam
.
rows
=
10
this
.
openPartNo
=
true
this
.
partNum
()
},
partNum
()
{
this
.
loadingCode
=
true
listMaterial
(
this
.
queryParam
).
then
(
res
=>
{
this
.
selectPartNum
=
res
.
rows
this
.
totalMater
=
res
.
total
this
.
loadingCode
=
false
})
},
// 删除生产模型
// 删除生产模型
handleDelete
(
row
)
{
handleDelete
(
row
)
{
this
.
$confirm
(
'确定删除该生产模型?'
,
'提示'
,
{
this
.
$confirm
(
'确定删除该生产模型?'
,
'提示'
,
{
...
@@ -250,13 +390,29 @@ export default {
...
@@ -250,13 +390,29 @@ export default {
type
:
'4'
type
:
'4'
}
}
})
})
}
},
// 成品料号表格查询
queryCode
()
{
this
.
queryParam
.
page
=
1
this
.
partNum
()
},
// 重置按钮
resetCode
()
{
this
.
queryParam
.
materCode
=
''
this
.
queryParam
.
page
=
1
this
.
queryParam
.
rows
=
10
this
.
partNum
()
},
}
}
}
}
</
script
>
</
script
>
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
scoped
>
.product_model
{
.product_model
{
::v-deep
.el-table
.disabledSelection
.cell
.el-checkbox__inner
{
display
:
none
;
position
:
relative
;
}
font-size
:
18px
;
font-size
:
18px
;
.placeholder
{
.placeholder
{
height
:
14px
;
height
:
14px
;
...
...
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