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
7adf03c4
Commit
7adf03c4
authored
Aug 20, 2024
by
沈翠玲
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
生产工单增加查看委外
parent
1d3a6d1c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
4 deletions
+28
-4
ProogingProcess.vue
src/views/mes/pro/workorder/components/ProogingProcess.vue
+26
-4
proofingInfo.vue
src/views/mes/pro/workorder/proofingInfo.vue
+2
-0
No files found.
src/views/mes/pro/workorder/components/ProogingProcess.vue
View file @
7adf03c4
...
...
@@ -106,9 +106,9 @@
<el-button
type=
"text"
size=
"small"
@
click=
"searchTool(row, $index)"
>
查看工装量具
</el-button>
<
!--
<el-button
type=
"text"
size=
"small"
@
click=
"searchRow(row, $index)
"
>
查看
工序信息
</el-button
>
-->
<
el-button
type=
"text"
size=
"small"
@
click=
"clickAssi(row, $index)"
v-if=
"row.proTaskAssistProcessList && row.proTaskAssistProcessList.length > 0
"
>
查看
委外
</el-button
>
</
template
>
</el-table-column>
</el-table>
...
...
@@ -128,7 +128,22 @@
:workstationName=
"form.workstationName"
@
onSelected=
"onWorkunitSelect"
/>
<el-dialog
v-dialogDrag
:visible
.
sync=
"assiVisible"
width=
"800px"
title=
"委外详情"
>
<el-table
:data=
"proTaskAssistProcessList"
>
<el-table-column
label=
"外协单号"
prop=
"assistProcessCode"
align=
"center"
/>
<el-table-column
label=
"外协项次"
prop=
"assistProcessItemCode"
align=
"center"
/>
<el-table-column
label=
"供应商"
prop=
"supplierName"
align=
"center"
/>
<el-table-column
label=
"数量"
prop=
"quantity"
align=
"center"
/>
<el-table-column
label=
"单位"
prop=
"unit"
align=
"center"
/>
<el-table-column
label=
"需求到货时间"
prop=
"scheduleEndDate"
align=
"center"
/>
<el-table-column
label=
"实际到货时间"
prop=
"returnTime"
align=
"center"
/>
</el-table>
</el-dialog>
<el-dialog
v-dialogDrag
:visible
.
sync=
"showFlag"
...
...
@@ -211,6 +226,7 @@ export default {
return
{
/**弹窗状态 */
showFlag
:
false
,
assiVisible
:
false
,
/**表格数据 */
tableData
:
[],
/**表单规则 */
...
...
@@ -230,6 +246,7 @@ export default {
stdWorkingTime
:
""
,
lineBreakTime
:
""
,
},
proTaskAssistProcessList
:
[],
currentRow
:
{},
currentRowIndex
:
undefined
,
};
...
...
@@ -346,6 +363,11 @@ export default {
this
.
currentRowIndex
=
idx
;
this
.
$refs
[
"ProcessToolRef"
].
showProcessProd
=
true
;
},
// 查看委外
clickAssi
(
row
,
idx
)
{
this
.
proTaskAssistProcessList
=
row
.
proTaskAssistProcessList
this
.
assiVisible
=
true
},
/**查看工装 */
searchTool
(
row
,
idx
)
{
this
.
currentRow
=
row
;
...
...
src/views/mes/pro/workorder/proofingInfo.vue
View file @
7adf03c4
...
...
@@ -615,6 +615,8 @@ export default {
this
.
bomList
=
data
.
bomList
;
// 设置组件数据
this
.
$refs
[
"ProogingBomRef"
].
tableData
=
data
.
bomList
;
console
.
log
(
'生产工单'
,
data
.
processList
)
this
.
$refs
[
"ProogingProcessRef"
].
tableData
=
data
.
processList
;
this
.
$refs
[
"WorkOrderSaleRef"
].
tableData
=
data
.
saleDirectiveList
;
this
.
$refs
[
"WorkOrderSizeRef"
].
tableData
=
data
.
sizeList
;
...
...
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