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
273c671d
Commit
273c671d
authored
Aug 14, 2020
by
renjintao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
工艺设置
parent
02181f3c
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
37 additions
and
13 deletions
+37
-13
base.less
assets/css/base.less
+5
-1
index.vue
pages/technology/productMix/product/index.vue
+1
-1
api.js
pages/technology/setProcess/api.js
+3
-0
set.vue
pages/technology/setProcess/set.vue
+24
-11
base.css
src/assets/css/base.css
+4
-0
No files found.
assets/css/base.less
View file @
273c671d
...
@@ -586,7 +586,11 @@ div::-webkit-scrollbar-corner {
...
@@ -586,7 +586,11 @@ div::-webkit-scrollbar-corner {
transform: scale(.96);
transform: scale(.96);
}
}
/*字体颜色*/
.font_fff
{
color:#fff;
}
/*按钮颜色*/
/*按钮颜色*/
.bluebg {
.bluebg {
...
...
pages/technology/productMix/product/index.vue
View file @
273c671d
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
<Row
class=
"row-down"
:gutter=
"10"
>
<Row
class=
"row-down"
:gutter=
"10"
>
<Col
span=
"7"
>
<Col
span=
"7"
>
<div
class=
"img-i"
>
<div
class=
"img-i"
>
<img
:src=
"downUrl +row.productUrl"
/>
<img
:src=
"downUrl +row.productUrl"
onerror=
"this.src='/imgicon/noPic_product.png';"
/>
</div>
</div>
</Col>
</Col>
<Col
span=
"17"
class=
"c"
>
<Col
span=
"17"
class=
"c"
>
...
...
pages/technology/setProcess/api.js
View file @
273c671d
...
@@ -14,4 +14,7 @@ export default {
...
@@ -14,4 +14,7 @@ export default {
ordersetroutingids
(
params
)
{
ordersetroutingids
(
params
)
{
return
Api
.
post
(
`
${
technologyUrl
}
orderrouting/ordersetroutingids`
,
params
);
return
Api
.
post
(
`
${
technologyUrl
}
orderrouting/ordersetroutingids`
,
params
);
},
},
createnew
(
params
)
{
return
Api
.
post
(
`
${
technologyUrl
}
materiallist/createnew`
,
params
);
},
}
}
pages/technology/setProcess/set.vue
View file @
273c671d
...
@@ -25,13 +25,13 @@
...
@@ -25,13 +25,13 @@
</Content>
</Content>
</Layout>
</Layout>
<FooterToolbar
extra
v-if=
"footerBar"
>
<FooterToolbar
extra
v-if=
"footerBar"
>
<
Row
class=
"footer
"
>
<
div
class=
"fr font_fff
"
>
<Checkbox
@
on-change=
"handleSelectAll(single)"
v-model=
"single"
>
全选
</Checkbox>
<Checkbox
@
on-change=
"handleSelectAll(single)"
v-model=
"single"
>
全选
</Checkbox>
<span
class=
"footerSpan"
>
已选
{{
selectCount
}}
项
</span>
<span
class=
"footerSpan"
>
已选
{{
selectCount
}}
项
</span>
<Button
type=
"primary"
@
click=
"modalDispatch"
>
设置工艺
</Button>
<Button
type=
"primary"
@
click=
"modalDispatch"
>
设置工艺
</Button>
<Button
@
click=
"canselFooter"
>
取消
</Button>
<Button
@
click=
"canselFooter"
>
取消
</Button>
</
Row
>
</
div
>
</FooterToolbar>
</FooterToolbar>
</div>
</div>
</
template
>
</
template
>
...
@@ -130,7 +130,7 @@ export default {
...
@@ -130,7 +130,7 @@ export default {
key
:
"routingType"
,
key
:
"routingType"
,
title
:
this
.
l
(
"routingType"
),
title
:
this
.
l
(
"routingType"
),
align
:
"center"
,
align
:
"center"
,
width
:
120
,
width
:
120
,
render
:
(
h
,
params
)
=>
{
render
:
(
h
,
params
)
=>
{
return
h
(
"state"
,
{
return
h
(
"state"
,
{
attrs
:
{
attrs
:
{
...
@@ -275,8 +275,14 @@ export default {
...
@@ -275,8 +275,14 @@ export default {
orderIds
:
this
.
eid
.
orderIds
,
orderIds
:
this
.
eid
.
orderIds
,
routingList
:
this
.
routingList
,
routingList
:
this
.
routingList
,
};
};
Api
.
routingset
(
data
).
then
((
r
)
=>
{
Api
.
routingset
(
data
).
then
((
r
)
=>
{
this
.
$Message
.
success
(
"工艺设置成功"
);
if
(
r
.
success
)
{
//this.$Message.success("工艺设置成功");
this
.
saveBill
();
}
else
{
this
.
$Message
.
error
(
"工艺设置失败"
);
}
});
});
},
},
onCancel
:
()
=>
{
onCancel
:
()
=>
{
...
@@ -284,17 +290,24 @@ export default {
...
@@ -284,17 +290,24 @@ export default {
},
},
});
});
},
},
saveBill
()
{
//生成料单
saveBill
()
{
//生成料单
let
temRouId
=
[];
this
.
routingList
.
forEach
((
el
)
=>
{
temRouId
.
push
(
el
.
routingHeaderId
);
});
let
params
=
{
let
params
=
{
routingHeaderId
:
t
his
.
routingList
,
routingHeaderId
:
t
emRouId
,
orderId
:
this
.
eid
.
orderIds
,
orderId
:
this
.
eid
.
orderIds
,
orderCount
:
this
.
eid
.
count
,
orderCount
:
this
.
eid
.
count
,
};
};
Api
.
post
(
`
${
technologyUrl
}
materiallist/createnew`
,
params
).
then
(
res
=>
{
Api
.
createnew
(
params
).
then
((
res
)
=>
{
if
(
res
.
success
)
{
if
(
res
.
success
)
{
//
this.$emit("on-ok");
this
.
$emit
(
"on-ok"
);
//this.loaddata(this.orderId);
//this.loaddata(this.orderId);
//this.materialBillSetStatus = 1;
//this.materialBillSetStatus = 1;
}
else
{
this
.
$Message
.
error
(
"生成料单失败"
);
}
}
});
});
},
},
...
@@ -333,9 +346,9 @@ export default {
...
@@ -333,9 +346,9 @@ export default {
margin-bottom: 10px;
margin-bottom: 10px;
}
}
}
}
.ivu-footer-toolbar-right {
//
.ivu-footer-toolbar-right {
margin-right: 72% !important;
//
margin-right: 72% !important;
}
//
}
.ivu-footer-toolbar {
.ivu-footer-toolbar {
background: rgba(0, 0, 0, 0.7) !important;
background: rgba(0, 0, 0, 0.7) !important;
.footer {
.footer {
...
...
src/assets/css/base.css
View file @
273c671d
...
@@ -450,6 +450,10 @@ div::-webkit-scrollbar-corner {
...
@@ -450,6 +450,10 @@ div::-webkit-scrollbar-corner {
.d-button
:active
{
.d-button
:active
{
transform
:
scale
(
0.96
);
transform
:
scale
(
0.96
);
}
}
/*字体颜色*/
.font_fff
{
color
:
#fff
;
}
/*按钮颜色*/
/*按钮颜色*/
.bluebg
{
.bluebg
{
background
:
#237bdf
;
background
:
#237bdf
;
...
...
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