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
e55e8597
Commit
e55e8597
authored
Jun 20, 2022
by
秦嘉
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
90f37dca
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
139 additions
and
8 deletions
+139
-8
workOrder.vue
src/views/ProductionProcess/workOrder.vue
+42
-4
packing.vue
src/views/productTraceability/packing.vue
+97
-4
No files found.
src/views/ProductionProcess/workOrder.vue
View file @
e55e8597
<
template
>
<div
class=
"app-container"
>
<div
class=
"workOrderSearch"
style=
"margin-left: 10px"
>
<el-form
v-show=
"showSearch"
ref=
"queryForm"
:model=
"queryParams"
:inline=
"true"
>
<el-form
ref=
"queryForm"
:model=
"queryParams"
:inline=
"true"
>
<el-form-item
label=
"工单编号"
prop=
"orderNo"
>
<div
slot=
"label"
class=
"labelClass"
>
<div>
工单编号
</div>
...
...
@@ -212,7 +212,7 @@
<span>
{{form.modelType1}}
</span>
</el-form-item>
</el-col>
<el-col
:span=
"
24
"
>
<el-col
:span=
"
8
"
>
<el-form-item
class=
"labelHeight"
label=
"创建时间"
prop=
"createDate"
>
<div
slot=
"label"
class=
"labelClass"
>
<div
class=
"labelName"
>
创建时间
</div>
...
...
@@ -221,6 +221,46 @@
<span>
{{form.createDate}}
</span>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
class=
"labelHeight"
label=
"计划开工时间"
prop=
"revisedStartDate"
>
<div
slot=
"label"
class=
"labelClass"
>
<div
class=
"labelName"
>
计划开工时间
</div>
<div
class=
"labelName"
>
Start Time
</div>
</div>
<span>
{{form.revisedStartDate}}
</span>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
class=
"labelHeight"
label=
"计划完工时间"
prop=
"revisedDueDate"
>
<div
slot=
"label"
class=
"labelClass"
>
<div
class=
"labelName"
>
计划完工时间
</div>
<div
class=
"labelName"
>
End Time
</div>
</div>
<span>
{{form.revisedDueDate}}
</span>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
class=
"labelHeight"
label=
"工厂"
prop=
"contract"
>
<div
slot=
"label"
class=
"labelClass"
>
<div
class=
"labelName"
>
工厂
</div>
<div
class=
"labelName"
>
Factory
</div>
</div>
<span
v-if=
"form.contract === 'NB'"
>
北京
</span>
<span
v-else-if=
"form.contract === 'NOSZ'"
>
苏州
</span>
<span
v-else
>
-
</span>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
class=
"labelHeight"
label=
"工单类型"
prop=
"type"
>
<div
slot=
"label"
class=
"labelClass"
>
<div
class=
"labelName"
>
工单类型
</div>
<div
class=
"labelName"
>
Order Type
</div>
</div>
<span
v-if=
"form.type === '1'"
>
装配线
</span>
<span
v-else-if=
"form.type === '2'"
>
包装线
</span>
<span
v-else
>
-
</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div>
...
...
@@ -451,8 +491,6 @@ export default {
name
:
'WorkOrder'
,
data
()
{
return
{
// 搜索栏显示(默认显示)
showSearch
:
true
,
// tabs默认选中
tabsName
:
'bom'
,
// 搜索框参数
...
...
src/views/productTraceability/packing.vue
View file @
e55e8597
<
template
>
<div>
包装追溯
</div>
<div
class=
"app-container"
>
<div
class=
"packingSearch"
style=
"margin-left: 10px"
>
<el-form
ref=
"queryForm"
:model=
"queryParams"
:inline=
"true"
>
<el-form-item
label=
"包装追溯号"
prop=
"orderNo"
>
<div
slot=
"label"
class=
"labelClass"
>
<div>
包装追溯号
</div>
<!--
<div>
Order No.
</div>
-->
</div>
<el-input
v-model=
"queryParams.orderNo"
:maxlength=
"30"
placeholder=
"请输入包装追溯号"
clearable
size=
"small"
/>
</el-form-item>
<el-form-item
label=
"计划开工时间"
prop=
"orderNo"
>
<div
slot=
"label"
class=
"labelClass"
>
<div>
计划开工时间
</div>
<!--
<div>
Order No.
</div>
-->
</div>
<el-date-picker
v-model=
"queryParams.revisedStartDate"
type=
"date"
placeholder=
"选择日期"
:editable=
"false"
:clearable=
"false"
format=
"yyyy/MM/dd"
value-format=
"yyyy/MM/dd"
>
</el-date-picker>
<span>
-
</span>
<el-date-picker
v-model=
"queryParams.revisedStartDate"
type=
"date"
placeholder=
"选择日期"
:editable=
"false"
:clearable=
"false"
format=
"yyyy/MM/dd"
value-format=
"yyyy/MM/dd"
>
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button
class=
"redBtn"
type=
"danger"
size=
"small"
style=
"margin-left: 30px"
@
click=
"handleQuery"
>
查询 Query
</el-button>
<el-button
class=
"resetBtn"
size=
"small"
@
click=
"resetQuery"
>
重置 Reset
</el-button>
</el-form-item>
</el-form>
</div>
<div
class=
"placeholder"
/>
<div
style=
"padding:10px"
></div>
</div>
</
template
>
<
script
>
export
default
{
name
:
'Packing'
name
:
'Packing'
,
created
()
{
},
data
()
{
return
{
queryParams
:
{}
}
},
methods
:
{
handleQuery
()
{},
resetQuery
()
{},
}
}
</
script
>
<
style
scoped
>
<
style
lang=
"scss"
>
.app-container
{
font-size
:
18px
;
padding
:
0
;
.packingSearch
{
.el-form-item--small
.el-form-item__label
{
line-height
:
17px
;
}
.labelClass
{
text-align
:
center
;
}
}
.placeholder
{
height
:
1
.3vh
;
background-color
:
#F4F4F4
;
margin-bottom
:
10px
}
.el-table
th
.cell
{
display
:
inline-block
!
important
;
}
.table-drop
{
vertical-align
:
2px
;
line-height
:
20px
;
margin-left
:
15px
}
.el-switch
{
margin-left
:
15px
;
}
}
</
style
>
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