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
0ff1d882
Commit
0ff1d882
authored
Nov 09, 2020
by
renjintao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mesplan
parent
e53a5c48
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
12 deletions
+25
-12
base.less
assets/css/base.less
+15
-5
index.vue
pages/mesPlan/index.vue
+8
-2
split.vue
pages/mesPlan/split.vue
+2
-5
No files found.
assets/css/base.less
View file @
0ff1d882
...
...
@@ -413,6 +413,21 @@ div::-webkit-scrollbar-corner {
.pr30 {
padding-right: 30px;
}
.pr50 {
padding-right: 50px;
}
.pr80 {
padding-right: 80px;
}
.pr100 {
padding-right: 100px;
}
.pr200 {
padding-right: 200px;
}
.pr240 {
padding-right: 240px;
}
.bnone {
border: none;
...
...
@@ -1002,11 +1017,6 @@ textarea::-webkit-input-placeholder {
display:block;
line-height:30px;
padding:5px 10px;
background:#f5f6fa;
border-bottom:solid 1px #ccc;
border-left:solid 1px #ccc;
border-right:solid 1px #ccc;
}
.cellInfoTitle {
padding: 0 10px;
...
...
pages/mesPlan/index.vue
View file @
0ff1d882
...
...
@@ -57,8 +57,9 @@
<Detail
:row=
"rowData"
/>
</Modal>
<Modal
v-model=
"splitModal"
title=
"订单分解"
width=
"1200"
>
<Split
:row=
"rowData"
ref=
"orderSplit"
/>
<Split
:row=
"rowData"
ref=
"orderSplit"
@
on-amount=
"getAmount"
/>
<div
slot=
"footer"
>
<span
class=
"pr240"
>
剩余产品数量:{{amountNew}}
</span>
<Button
@
click=
"splitModal = false"
>
取消
</Button>
<Button
type=
"primary"
@
click=
"orderSplitOk"
>
确定分解
</Button>
</div>
...
...
@@ -487,7 +488,8 @@ export default {
codeList
:
[],
//订单编号List
operatorIdList
:
[]
//操作员id
},
//确定后返回数据
wfstatu
:
1
//流程是否启用1 禁用 0启用
wfstatu
:
1
,
//流程是否启用1 禁用 0启用
amountNew
:
0
,
};
},
created
()
{
...
...
@@ -575,11 +577,15 @@ export default {
split
(
row
)
{
if
(
row
.
quantity
>
1
)
{
this
.
splitModal
=
true
;
this
.
amountNew
=
row
.
quantity
this
.
rowData
=
row
;
}
else
{
this
.
$Message
.
error
(
"数量为1,不能进行分解"
);
}
},
getAmount
(
val
)
{
this
.
amountNew
=
val
},
onHide
()
{
// this.$Message.info("收起左侧树")
this
.
showMenu
=
false
;
...
...
pages/mesPlan/split.vue
View file @
0ff1d882
...
...
@@ -33,7 +33,7 @@
</Col>
<Col
span=
"12"
>
<FormItem
label=
"分解数量"
style=
"width:100%"
prop=
"splitQuantity"
>
<InputNumber
:min=
"
2
"
:max=
"orderForm.quantity"
v-model=
"orderForm.splitQuantity"
style=
"width:180px"
></InputNumber>
<InputNumber
:min=
"
1
"
:max=
"orderForm.quantity"
v-model=
"orderForm.splitQuantity"
style=
"width:180px"
></InputNumber>
<Button
type=
"primary"
@
click=
"addSplitOrder"
v-noClick
>
确定
</Button>
</FormItem>
</Col>
...
...
@@ -47,10 +47,6 @@
<DatePicker
v-model=
"row.demandDate"
type=
"daterange"
placeholder=
"请选择日期"
style=
"width:240px"
:transfer=
"true"
:options=
"optionsDate"
@
on-change=
"inputOrderCat(row,index)"
></DatePicker>
</
template
>
</Table>
<div
class=
"cellblock"
>
<p
class=
"tr"
style=
"padding-right:380px;"
><span
class=
"pr20"
>
剩余产品数量:
</span>
{{amount}}
</p>
</div>
</div>
</template>
...
...
@@ -221,6 +217,7 @@ export default {
splitAmount
=
Number
(
splitAmount
)
+
Number
(
el
.
quantity
)
})
this
.
amount
=
Number
(
this
.
orderForm
.
quantity
)
-
splitAmount
this
.
$emit
(
"on-amount"
,
this
.
amount
);
},
inputFocus
(
row
,
index
)
{
this
.
amountMax
=
this
.
amount
+
Number
(
row
.
quantity
)
...
...
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