Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mes-ui
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
周远喜
mes-ui
Commits
f3cf84a3
Commit
f3cf84a3
authored
Oct 20, 2020
by
仇晓婷
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
669c07ff
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
885 additions
and
802 deletions
+885
-802
index.vue
pages/aps/complete/index.vue
+108
-95
index.vue
pages/aps/stream/index.vue
+160
-149
add.vue
pages/qc/certificate/waitOpened/add.vue
+4
-2
index.vue
pages/resource/resource/index.vue
+604
-547
index.vue
pages/technology/details/routingsupporting/index.vue
+9
-9
No files found.
pages/aps/complete/index.vue
View file @
f3cf84a3
<
template
>
<div
class=
"scheduling"
>
<div
class=
"aps-l"
>
<Row
class=
"row-p"
>
<Col
:span=
"10"
class=
"chan-chi"
>
整机排产-排产池
</Col>
<Col
:span=
"14"
class=
"l-ringht"
>
<!--
<RadioGroup
v-model=
"status"
type=
"button"
@
on-change=
"changeStatus"
size=
"small"
>
<div>
<div
class=
"back-href"
>
<a
@
click=
"viewClose"
>
<Icon
type=
"ios-undo-outline"
size=
"24"
/>
返回计划管理
</a>
</div>
<div
class=
"scheduling"
>
<div
class=
"aps-l"
>
<Row
class=
"row-p"
>
<Col
:span=
"10"
class=
"chan-chi"
>
整机排产-排产池
</Col>
<Col
:span=
"14"
class=
"l-ringht"
>
<!--
<RadioGroup
v-model=
"status"
type=
"button"
@
on-change=
"changeStatus"
size=
"small"
>
<Radio
label=
"0"
>
未排产
</Radio>
-->
<!--
<Radio
label=
"2"
>
已排查
</Radio>
-->
<!--
<Radio
label=
"-1"
>
全部
</Radio>
-->
<!--
</RadioGroup>
-->
</Col>
</Row>
<div
class=
"left-down"
>
<div
class=
"left-body"
v-for=
"(li, index) in list"
:key=
"index"
:class=
"li.checked == true ? 'addclass' : ''"
>
<Row
class=
"title-i"
>
<Col
:span=
"20"
class=
"order-code"
>
<Checkbox
v-model=
"li.checked"
@
on-change=
"checkData(li)"
:disabled=
"li.status == 0 ? false : true"
>
订单号:
{{
li
.
mesCode
}}
</Checkbox
>
</Col>
<Col
:span=
"4"
class=
"order-ringht"
>
<Icon
type=
"md-close"
@
click=
"close(li.id)"
/>
</Col>
</Row>
<div
class=
"fa"
>
产品名称:
{{
li
.
productName
}}
</div>
<div
class=
"time-s"
>
产品数量:
{{
li
.
quantity
}}
</div>
<!--
<div
class=
"time-s"
>
<!--
<Radio
label=
"2"
>
已排查
</Radio>
-->
<!--
<Radio
label=
"-1"
>
全部
</Radio>
-->
<!--
</RadioGroup>
-->
</Col>
</Row>
<div
class=
"left-down"
>
<div
class=
"left-body"
v-for=
"(li, index) in list"
:key=
"index"
:class=
"li.checked == true ? 'addclass' : ''"
>
<Row
class=
"title-i"
>
<Col
:span=
"20"
class=
"order-code"
>
<Checkbox
v-model=
"li.checked"
@
on-change=
"checkData(li)"
:disabled=
"li.status == 0 ? false : true"
>
订单号:
{{
li
.
mesCode
}}
</Checkbox
>
</Col>
<Col
:span=
"4"
class=
"order-ringht"
>
<Icon
type=
"md-close"
@
click=
"close(li.id)"
/>
</Col>
</Row>
<div
class=
"fa"
>
产品名称:
{{
li
.
productName
}}
</div>
<div
class=
"time-s"
>
产品数量:
{{
li
.
quantity
}}
</div>
<!--
<div
class=
"time-s"
>
<span>
工序:
{{
li
.
drawnNumber
}}
</span>
</div>
-->
<div
class=
"time-s"
>
{{
li
.
demandFinishDate
}}
~
{{
li
.
demandStartDate
}}
<div
class=
"time-s"
>
{{
li
.
demandFinishDate
}}
~
{{
li
.
demandStartDate
}}
</div>
</div>
</div>
</div>
</div
>
<div
class=
"aps-r"
v-show=
"showSet"
>
<div
class=
"r-title"
>
排产设置盘
</div
>
<Form
:model=
"formItem"
:label-width=
"100
"
>
<FormItem
label=
"工时"
>
<DatePicker
type=
"datetimerange
"
format=
"yyyy-MM-dd HH:mm:ss
"
placeholder=
"请选择工时
"
@
on-change=
"changeFormat
"
v-model=
"formItem.time
"
style=
"width: 300px"
></DatePicker
>
</FormItem
>
<FormItem
label=
"类型
"
>
<RadioGroup
v-model=
"formItem.radio"
>
<Radio
label=
"0"
>
人员
</Radio>
<
Radio
label=
"1"
>
班组
</Radio
>
</
RadioGroup
>
</FormItem
>
<FormItem
v-if=
"formItem.radio == 0"
>
<
UserSelect
v-model=
"user"
:multiple=
"true"
/
>
</FormItem
>
<FormItem
label=
"班组"
v-if=
"formItem.radio == 1"
>
<!--
<DepartmentSelect
:type=
"3"
v-model=
"formItem.shopId"
/>
-->
<Select
v-model=
"formItem.shopId
"
placeholder=
"请选择
"
style=
"width: 300px"
>
<Option
v-for=
"(item, index) in listClass
"
:key=
"index
"
:value=
"item.value
"
:label=
"item.label
"
style=
"display: none"
></Option>
<Tree
key=
"mytree
"
:data=
"workShop
"
ref=
"mytree
"
:render=
"renderContent"
></Tree
>
</
Select
>
</FormItem
>
<FormItem
label=
"备注"
>
<Input
v-model=
"formItem.remark
"
type=
"textarea
"
:autosize=
"
{ minRows: 2, maxRows: 5 }
"
placeholder="请输入备注信息"
>
</Input
>
</
FormItem>
<FormItem
>
<Button
style=
"margin-left: 8px"
@
click=
"closeOk"
>
取消
</Button>
<
Button
type=
"primary"
@
click=
"lowerHair"
v-noClick
>
下发
</Button
>
</Form
Item
>
</
Form
>
<div
class=
"aps-r"
v-show=
"showSet"
>
<div
class=
"r-title"
>
排产设置盘
</div
>
<Form
:model=
"formItem"
:label-width=
"100"
>
<FormItem
label=
"工时
"
>
<DatePicker
type=
"datetimerange"
format=
"yyyy-MM-dd HH:mm:ss
"
placeholder=
"请选择工时
"
@
on-change=
"changeFormat
"
v-model=
"formItem.time
"
style=
"width: 300px
"
></DatePicker>
</FormItem
>
<FormItem
label=
"类型"
>
<RadioGroup
v-model=
"formItem.radio
"
>
<Radio
label=
"0"
>
人员
</Radio
>
<Radio
label=
"1"
>
班组
</Radio>
<
/RadioGroup
>
</
FormItem
>
<FormItem
v-if=
"formItem.radio == 0"
>
<UserSelect
v-model=
"user"
:multiple=
"true"
/
>
<
/FormItem
>
<FormItem
label=
"班组"
v-if=
"formItem.radio == 1"
>
<!--
<DepartmentSelect
:type=
"3"
v-model=
"formItem.shopId"
/>
--
>
<Select
v-model=
"formItem.shopId"
placeholder=
"请选择
"
style=
"width: 300px
"
>
<Option
v-for=
"(item, index) in listClass"
:key=
"index
"
:value=
"item.value
"
:label=
"item.label
"
style=
"display: none
"
></Option>
<Tree
key=
"mytree"
:data=
"workShop
"
ref=
"mytree
"
:render=
"renderContent
"
></Tree>
</Select
>
</
FormItem
>
<FormItem
label=
"备注"
>
<Input
v-model=
"formItem.remark"
type=
"textarea
"
:autosize=
"
{ minRows: 2, maxRows: 5 }
"
placeholder="请输入备注信息
"
>
</Input>
</FormItem
>
<
FormItem>
<Button
style=
"margin-left: 8px"
@
click=
"closeOk"
>
取消
</Button
>
<Button
type=
"primary"
@
click=
"lowerHair"
v-noClick
>
下发
</Button>
<
/FormItem
>
</Form>
</
div
>
</div>
</div>
</
template
>
...
...
@@ -126,7 +133,7 @@ export default {
showSet
:
false
,
// userName: ""
},
user
:
''
,
user
:
""
,
showSet
:
false
,
// listGroup: [
// {
...
...
@@ -169,6 +176,9 @@ export default {
this
.
orderlist
(
0
);
},
methods
:
{
viewClose
()
{
this
.
$router
.
push
(
"/aps/plan"
);
},
// 过滤条件
changeStatus
(
name
)
{
this
.
status
=
name
;
...
...
@@ -338,6 +348,9 @@ export default {
</
script
>
<
style
lang=
"less"
scoped
>
@import "../../../assets/css/custom.less";
.back-href {
height: 35px;
}
.addclass {
border-color: rgba(38, 128, 235, 0.2) !important;
.title-i {
...
...
pages/aps/stream/index.vue
View file @
f3cf84a3
This diff is collapsed.
Click to expand it.
pages/qc/certificate/waitOpened/add.vue
View file @
f3cf84a3
...
...
@@ -211,7 +211,7 @@ export default {
disabled
:
false
,
entity
:
{
id
:
0
,
status
:
""
,
status
:
0
,
items
:
[],
},
rules
:
{
...
...
@@ -225,6 +225,7 @@ export default {
columns
:
[
{
title
:
"序号"
,
// key: "index",
type
:
"index"
,
width
:
80
,
align
:
"center"
,
...
...
@@ -308,7 +309,8 @@ export default {
let
item
=
[];
item
=
this
.
checkList
;
if
(
item
)
{
item
.
forEach
((
c
)
=>
{
item
.
forEach
((
c
,
index
)
=>
{
c
.
index
=
index
;
return
delete
c
.
id
;
});
}
...
...
pages/resource/resource/index.vue
View file @
f3cf84a3
This diff is collapsed.
Click to expand it.
pages/technology/details/routingsupporting/index.vue
View file @
f3cf84a3
...
...
@@ -94,15 +94,15 @@ export default {
import
:
true
,
},
{
key
:
"materialType"
,
title
:
this
.
l
(
"materialType"
),
align
:
"center"
,
easy
:
true
,
high
:
true
,
code
:
"mes_xingchi_resource.material.materialReType"
,
width
:
100
,
},
//
{
//
key: "materialType",
//
title: this.l("materialType"),
//
align: "center",
//
easy: true,
//
high: true,
//
code: "mes_xingchi_resource.material.materialReType",
//
width: 100,
//
},
{
key
:
"materialNumber"
,
title
:
this
.
l
(
"materialNumber"
),
...
...
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