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
974fc4e8
Commit
974fc4e8
authored
Apr 14, 2020
by
仇晓婷
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
报价bug
parent
f94fa56e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
419 additions
and
407 deletions
+419
-407
metalQuotation.vue
pages/order/quotation/components/metalQuotation.vue
+159
-155
photosensitive.vue
pages/order/quotation/components/photosensitive.vue
+94
-90
quotationBox.vue
pages/order/quotation/components/quotationBox.vue
+165
-161
index.vue
pages/order/quotation/index.vue
+1
-1
No files found.
pages/order/quotation/components/metalQuotation.vue
View file @
974fc4e8
...
...
@@ -5,6 +5,7 @@
title=
"订单报价"
width=
"90%"
:mask-closable=
"false"
@
on-cancel=
"cancel"
fullscreen
footer-hide
>
...
...
@@ -107,12 +108,12 @@
</template>
<
script
>
import
MetalQuotationGeneration
from
'../components/metalQuotationGeneration.vue'
//生成报价单弹框
import
MetalQuotationGeneration
from
"../components/metalQuotationGeneration.vue"
;
//生成报价单弹框
export
default
{
components
:
{
MetalQuotationGeneration
},
name
:
''
,
name
:
""
,
props
:
{
gmData
:
Array
},
...
...
@@ -122,172 +123,172 @@ export default {
result
:
[]
},
row
:
{},
index
:
''
,
index
:
""
,
newList
:
[],
formItem
:
{
postCompany
:
''
,
contactUser
:
''
,
contactTel
:
''
,
quotationType
:
'AlSi10Mg'
,
remark
:
''
postCompany
:
""
,
contactUser
:
""
,
contactTel
:
""
,
quotationType
:
"AlSi10Mg"
,
remark
:
""
},
values1
:
''
,
values2
:
''
,
values3
:
''
,
values1
:
""
,
values2
:
""
,
values3
:
""
,
modalShow
:
false
,
columns
:
[
{
title
:
'序号'
,
type
:
'index'
,
title
:
"序号"
,
type
:
"index"
,
width
:
50
,
align
:
'center'
align
:
"center"
},
// { type: 'selection', width: 60, align: 'center' },
{
title
:
'订单编号'
,
key
:
'mesCode'
,
align
:
'center'
,
title
:
"订单编号"
,
key
:
"mesCode"
,
align
:
"center"
,
minWidth
:
120
},
{
title
:
'产品名称'
,
key
:
'productName'
,
align
:
'center'
,
title
:
"产品名称"
,
key
:
"productName"
,
align
:
"center"
,
minWidth
:
80
},
{
title
:
'重量(g)'
,
key
:
'materialWeight'
,
align
:
'center'
,
title
:
"重量(g)"
,
key
:
"materialWeight"
,
align
:
"center"
,
minWidth
:
80
,
slot
:
'slot1'
slot
:
"slot1"
},
{
title
:
'单价(元/g)'
,
key
:
'materialUnitPrice'
,
align
:
'center'
,
title
:
"单价(元/g)"
,
key
:
"materialUnitPrice"
,
align
:
"center"
,
minWidth
:
80
,
slot
:
'slot2'
slot
:
"slot2"
},
{
title
:
'材料费'
,
key
:
'materialCost'
,
align
:
'center'
,
title
:
"材料费"
,
key
:
"materialCost"
,
align
:
"center"
,
minWidth
:
80
,
slot
:
'slot3'
//计算
slot
:
"slot3"
//计算
},
{
title
:
'3D打印费'
,
align
:
'center'
,
key
:
'printPrice'
,
title
:
"3D打印费"
,
align
:
"center"
,
key
:
"printPrice"
,
minWidth
:
60
,
slot
:
'slot4'
slot
:
"slot4"
},
{
title
:
'后处理加工费'
,
align
:
'center'
,
key
:
'afterProcessPrice'
,
title
:
"后处理加工费"
,
align
:
"center"
,
key
:
"afterProcessPrice"
,
minWidth
:
60
,
slot
:
'slot5'
slot
:
"slot5"
},
{
title
:
'线切割费'
,
align
:
'center'
,
key
:
'wrieCutPrice'
,
title
:
"线切割费"
,
align
:
"center"
,
key
:
"wrieCutPrice"
,
minWidth
:
60
,
slot
:
'slot6'
slot
:
"slot6"
},
{
title
:
'加工费单价'
,
align
:
'center'
,
key
:
'ProcessPrice'
,
title
:
"加工费单价"
,
align
:
"center"
,
key
:
"ProcessPrice"
,
minWidth
:
60
,
slot
:
'slot7'
//计算
slot
:
"slot7"
//计算
},
{
title
:
'尺寸检测费'
,
key
:
'sizeCheckPrice'
,
align
:
'center'
,
title
:
"尺寸检测费"
,
key
:
"sizeCheckPrice"
,
align
:
"center"
,
minWidth
:
60
,
slot
:
'slot8'
slot
:
"slot8"
},
{
title
:
'理化检测费'
,
key
:
'physicCheckPrice'
,
align
:
'center'
,
title
:
"理化检测费"
,
key
:
"physicCheckPrice"
,
align
:
"center"
,
minWidth
:
60
,
slot
:
'slot9'
slot
:
"slot9"
},
{
title
:
'包装费'
,
key
:
'packingPrice'
,
align
:
'center'
,
title
:
"包装费"
,
key
:
"packingPrice"
,
align
:
"center"
,
minWidth
:
60
,
slot
:
'slot10'
slot
:
"slot10"
},
{
title
:
'单价(元)'
,
key
:
'unitPrice'
,
align
:
'center'
,
title
:
"单价(元)"
,
key
:
"unitPrice"
,
align
:
"center"
,
minWidth
:
60
,
slot
:
'slot11'
slot
:
"slot11"
},
{
title
:
'数量'
,
key
:
'num'
,
align
:
'center'
,
title
:
"数量"
,
key
:
"num"
,
align
:
"center"
,
minWidth
:
70
// slot: 'slot12'
},
{
title
:
'热处理'
,
key
:
'heatTreatPrice'
,
align
:
'center'
,
title
:
"热处理"
,
key
:
"heatTreatPrice"
,
align
:
"center"
,
minWidth
:
70
,
slot
:
'slot13'
slot
:
"slot13"
},
{
title
:
'价格(元)'
,
key
:
'price'
,
align
:
'center'
,
title
:
"价格(元)"
,
key
:
"price"
,
align
:
"center"
,
minWidth
:
80
,
slot
:
'slot14'
slot
:
"slot14"
},
{
title
:
'备注'
,
key
:
'remark'
,
align
:
'center'
,
title
:
"备注"
,
key
:
"remark"
,
align
:
"center"
,
minWidth
:
200
,
slot
:
'slot15'
,
slot
:
"slot15"
,
tooltip
:
true
}
]
}
}
;
},
mounted
()
{},
watch
:
{
gmData
:
{
handler
(
newName
,
oldName
)
{
newName
.
forEach
(
(
data
)
=>
{
data
.
materialCost
=
0
data
.
materialWeight
=
0
data
.
materialUnitPrice
=
0
newName
.
forEach
(
data
=>
{
data
.
materialCost
=
0
;
data
.
materialWeight
=
0
;
data
.
materialUnitPrice
=
0
;
data
.
ProcessPrice
=
0
data
.
printPrice
=
0
data
.
afterProcessPrice
=
0
data
.
wrieCutPrice
=
0
data
.
ProcessPrice
=
0
;
data
.
printPrice
=
0
;
data
.
afterProcessPrice
=
0
;
data
.
wrieCutPrice
=
0
;
data
.
unitPrice
=
0
data
.
sizeCheckPrice
=
0
data
.
physicCheckPrice
=
0
data
.
packingPrice
=
0
data
.
unitPrice
=
0
;
data
.
sizeCheckPrice
=
0
;
data
.
physicCheckPrice
=
0
;
data
.
packingPrice
=
0
;
data
.
price
=
0
data
.
heatTreatPrice
=
0
})
return
newName
data
.
price
=
0
;
data
.
heatTreatPrice
=
0
;
})
;
return
newName
;
},
deep
:
true
}
...
...
@@ -297,14 +298,14 @@ export default {
//计算材料费=重量(g)*单价(元/g)
return
(
this
.
row
.
materialCost
=
parseInt
(
this
.
row
.
materialWeight
)
*
parseInt
(
this
.
row
.
materialUnitPrice
))
parseInt
(
this
.
row
.
materialUnitPrice
))
;
},
jgD
()
{
//加工费单价=加工费单价=3D打印+后处理加+线切割加工;
return
(
this
.
row
.
ProcessPrice
=
parseInt
(
this
.
row
.
printPrice
)
+
parseInt
(
this
.
row
.
afterProcessPrice
)
+
parseInt
(
this
.
row
.
wrieCutPrice
))
parseInt
(
this
.
row
.
wrieCutPrice
))
;
},
unitP
()
{
//加工费单价=加工费单价=3D打印+后处理加+线切割加工;
...
...
@@ -313,170 +314,173 @@ export default {
parseInt
(
this
.
row
.
ProcessPrice
)
+
parseInt
(
this
.
row
.
sizeCheckPrice
)
+
parseInt
(
this
.
row
.
physicCheckPrice
)
+
parseInt
(
this
.
row
.
packingPrice
))
parseInt
(
this
.
row
.
packingPrice
))
;
},
unitPrices
()
{
//单价=单件材料费+加工费单价+其他;
return
(
this
.
row
.
unitPrice
=
parseInt
(
this
.
row
.
materialCost
)
+
parseInt
(
this
.
row
.
ProcessPrice
))
parseInt
(
this
.
row
.
materialCost
)
+
parseInt
(
this
.
row
.
ProcessPrice
))
;
},
priceKey
()
{
// 价格=单价*数量+热处理
return
(
this
.
row
.
price
=
parseInt
(
this
.
row
.
unitPrice
)
*
parseInt
(
this
.
row
.
num
)
+
parseInt
(
this
.
row
.
heatTreatPrice
))
parseInt
(
this
.
row
.
heatTreatPrice
))
;
}
},
methods
:
{
previousStep
()
{
this
.
modalShow
=
false
this
.
modalShow
=
false
;
},
quotationBox
()
{
//订单报价
// console.log(this.newList)
let
item
=
[]
let
quotationMain
=
{}
let
item
=
[]
;
let
quotationMain
=
{}
;
let
data
=
{
quotationMain
:
this
.
formItem
,
item
:
this
.
gmData
}
var
url
=
`
${
PlanUrl
}
/quotationmain/createorupdate`
}
;
var
url
=
`
${
PlanUrl
}
/quotationmain/createorupdate`
;
this
.
$api
.
post
(
url
,
data
)
.
then
(
(
res
)
=>
{
.
then
(
res
=>
{
if
(
res
.
success
)
{
this
.
$Message
.
success
(
'保存成功'
)
this
.
$refs
.
photosensitive
.
modalShow
=
true
let
id
=
res
.
result
.
id
this
.
$Message
.
success
(
"保存成功"
);
this
.
$refs
.
photosensitive
.
modalShow
=
true
;
let
id
=
res
.
result
.
id
;
this
.
$http
.
quotation
.
orderList
({
id
:
id
})
.
then
(
(
res
)
=>
{
.
then
(
res
=>
{
res
.
result
.
forEach
((
data
,
index
)
=>
{
res
.
result
[
index
].
quotationId
=
id
})
this
.
zPhotosensitive
.
result
=
res
.
result
})
.
catch
((
error
)
=>
{
this
.
$Message
.
error
(
'请求失败'
)
res
.
result
[
index
].
quotationId
=
id
;
});
this
.
zPhotosensitive
.
result
=
res
.
result
;
})
.
catch
(
error
=>
{
this
.
$Message
.
error
(
"请求失败"
);
});
}
})
.
catch
(
(
error
)
=>
{
this
.
$Message
.
error
(
'保存失败'
)
})
.
catch
(
error
=>
{
this
.
$Message
.
error
(
"保存失败"
);
})
;
},
close
()
{
this
.
modalShow
=
false
;
this
.
$emit
(
"update"
)
this
.
$emit
(
"update"
)
;
},
//表格输入
show1
(
row
,
index
)
{
this
.
row
=
row
this
.
row
=
row
;
this
.
gmData
.
forEach
((
data
,
index
)
=>
{
if
(
this
.
gmData
[
index
].
mesCode
===
row
.
mesCode
)
{
this
.
gmData
[
index
]
=
row
this
.
gmData
[
index
]
=
row
;
}
})
})
;
},
show2
(
row
,
index
)
{
this
.
row
=
row
this
.
row
=
row
;
this
.
gmData
.
forEach
((
data
,
index
)
=>
{
if
(
this
.
gmData
[
index
].
mesCode
===
row
.
mesCode
)
{
this
.
gmData
[
index
]
=
row
this
.
gmData
[
index
]
=
row
;
}
})
})
;
},
show4
(
row
,
index
)
{
this
.
row
=
row
this
.
row
=
row
;
this
.
gmData
.
forEach
((
data
,
index
)
=>
{
if
(
this
.
gmData
[
index
].
mesCode
===
row
.
mesCode
)
{
this
.
gmData
[
index
]
=
row
this
.
gmData
[
index
]
=
row
;
}
})
})
;
},
show5
(
row
,
index
)
{
this
.
row
=
row
this
.
row
=
row
;
this
.
gmData
.
forEach
((
data
,
index
)
=>
{
if
(
this
.
gmData
[
index
].
mesCode
===
row
.
mesCode
)
{
this
.
gmData
[
index
]
=
row
this
.
gmData
[
index
]
=
row
;
}
})
})
;
},
show6
(
row
,
index
)
{
this
.
row
=
row
this
.
row
=
row
;
this
.
gmData
.
forEach
((
data
,
index
)
=>
{
if
(
this
.
gmData
[
index
].
mesCode
===
row
.
mesCode
)
{
this
.
gmData
[
index
]
=
row
this
.
gmData
[
index
]
=
row
;
}
})
})
;
},
show8
(
row
,
index
)
{
this
.
row
=
row
this
.
row
=
row
;
this
.
gmData
.
forEach
((
data
,
index
)
=>
{
if
(
this
.
gmData
[
index
].
mesCode
===
row
.
mesCode
)
{
this
.
gmData
[
index
]
=
row
this
.
gmData
[
index
]
=
row
;
}
})
})
;
},
show9
(
row
,
index
)
{
this
.
row
=
row
this
.
row
=
row
;
this
.
gmData
.
forEach
((
data
,
index
)
=>
{
if
(
this
.
gmData
[
index
].
mesCode
===
row
.
mesCode
)
{
this
.
gmData
[
index
]
=
row
this
.
gmData
[
index
]
=
row
;
}
})
})
;
},
show10
(
row
,
index
)
{
this
.
row
=
row
this
.
row
=
row
;
this
.
gmData
.
forEach
((
data
,
index
)
=>
{
if
(
this
.
gmData
[
index
].
mesCode
===
row
.
mesCode
)
{
this
.
gmData
[
index
]
=
row
this
.
gmData
[
index
]
=
row
;
}
})
})
;
},
show11
(
row
,
index
)
{
this
.
row
=
row
this
.
row
=
row
;
this
.
gmData
.
forEach
((
data
,
index
)
=>
{
if
(
this
.
gmData
[
index
].
mesCode
===
row
.
mesCode
)
{
this
.
gmData
[
index
]
=
row
this
.
gmData
[
index
]
=
row
;
}
})
})
;
},
show13
(
row
,
index
)
{
this
.
row
=
row
this
.
row
=
row
;
this
.
gmData
.
forEach
((
data
,
index
)
=>
{
if
(
this
.
gmData
[
index
].
mesCode
===
row
.
mesCode
)
{
this
.
gmData
[
index
]
=
row
this
.
gmData
[
index
]
=
row
;
}
})
})
;
},
show15
(
row
,
index
)
{
this
.
row
=
row
this
.
row
=
row
;
this
.
gmData
.
forEach
((
data
,
index
)
=>
{
if
(
this
.
gmData
[
index
].
mesCode
===
row
.
mesCode
)
{
this
.
gmData
[
index
]
=
row
this
.
gmData
[
index
]
=
row
;
}
})
});
},
cancel
()
{
this
.
$emit
(
'update'
)
}
}
}
}
;
</
script
>
<
style
lang=
"less"
scoped
>
.footers {
...
...
pages/order/quotation/components/photosensitive.vue
View file @
974fc4e8
...
...
@@ -7,6 +7,7 @@
:mask-closable=
"false"
fullscreen
footer-hide
@
on-cancel=
"cancel"
>
<Form
:model=
"formItem"
:label-width=
"80"
>
<Row
type=
"flex"
justify=
"space-between"
>
...
...
@@ -70,12 +71,12 @@
</template>
<
script
>
import
PhotosensitiveGeneration
from
'../components/photosensitiveGeneration.vue'
//生成报价单弹框
import
PhotosensitiveGeneration
from
"../components/photosensitiveGeneration.vue"
;
//生成报价单弹框
export
default
{
components
:
{
PhotosensitiveGeneration
},
name
:
''
,
name
:
""
,
props
:
{
gmData
:
Array
},
...
...
@@ -85,98 +86,98 @@ export default {
result
:
[]
},
row
:
{},
index
:
''
,
index
:
""
,
newList
:
[],
formItem
:
{
postCompany
:
''
,
contactUser
:
''
,
contactTel
:
''
,
quotationType
:
'光敏树脂'
,
remark
:
''
postCompany
:
""
,
contactUser
:
""
,
contactTel
:
""
,
quotationType
:
"光敏树脂"
,
remark
:
""
},
values1
:
''
,
values2
:
''
,
values3
:
''
,
values1
:
""
,
values2
:
""
,
values3
:
""
,
modalShow
:
false
,
columns
:
[
{
title
:
'序号'
,
type
:
'index'
,
title
:
"序号"
,
type
:
"index"
,
width
:
50
,
align
:
'center'
align
:
"center"
},
{
title
:
'订单编号'
,
key
:
'mesCode'
,
align
:
'center'
,
title
:
"订单编号"
,
key
:
"mesCode"
,
align
:
"center"
,
minWidth
:
120
},
{
title
:
'产品名称'
,
key
:
'productName'
,
align
:
'center'
,
title
:
"产品名称"
,
key
:
"productName"
,
align
:
"center"
,
minWidth
:
80
},
{
title
:
'重量(g)'
,
key
:
'materialWeight'
,
align
:
'center'
,
title
:
"重量(g)"
,
key
:
"materialWeight"
,
align
:
"center"
,
minWidth
:
80
,
slot
:
'slot1'
slot
:
"slot1"
},
{
title
:
'单价(元/g)'
,
key
:
'materialUnitPrice'
,
align
:
'center'
,
title
:
"单价(元/g)"
,
key
:
"materialUnitPrice"
,
align
:
"center"
,
minWidth
:
80
,
slot
:
'slot2'
slot
:
"slot2"
},
{
title
:
'3D打印费'
,
align
:
'center'
,
key
:
'printPrice'
,
title
:
"3D打印费"
,
align
:
"center"
,
key
:
"printPrice"
,
minWidth
:
60
,
slot
:
'slot3'
slot
:
"slot3"
},
{
title
:
'尺寸检测费'
,
key
:
'sizeCheckPrice'
,
align
:
'center'
,
title
:
"尺寸检测费"
,
key
:
"sizeCheckPrice"
,
align
:
"center"
,
minWidth
:
60
,
slot
:
'slot4'
slot
:
"slot4"
},
{
title
:
'单价(元)'
,
key
:
'unitPrice'
,
align
:
'center'
,
title
:
"单价(元)"
,
key
:
"unitPrice"
,
align
:
"center"
,
minWidth
:
60
,
slot
:
'slot6'
slot
:
"slot6"
},
{
title
:
'数量'
,
key
:
'num'
,
align
:
'center'
,
title
:
"数量"
,
key
:
"num"
,
align
:
"center"
,
minWidth
:
70
},
{
title
:
'价格(元)'
,
key
:
'price'
,
align
:
'center'
,
title
:
"价格(元)"
,
key
:
"price"
,
align
:
"center"
,
minWidth
:
80
,
slot
:
'slot7'
slot
:
"slot7"
},
{
title
:
'备注'
,
key
:
'remark1'
,
align
:
'center'
,
title
:
"备注"
,
key
:
"remark1"
,
align
:
"center"
,
minWidth
:
200
,
slot
:
'slot5'
,
slot
:
"slot5"
,
tooltip
:
true
}
]
}
}
;
},
// watch: {
// row: {
...
...
@@ -195,102 +196,105 @@ export default {
//计算3D打印费=重量(g)*单价(元/g)
return
(
this
.
row
.
printPrice
=
parseInt
(
this
.
row
.
materialWeight
)
*
parseInt
(
this
.
row
.
materialUnitPrice
))
parseInt
(
this
.
row
.
materialUnitPrice
))
;
},
unitPrices
()
{
//单价=3D打印费+尺寸检测费
return
(
this
.
row
.
unitPrice
=
parseInt
(
this
.
row
.
printPrice
)
+
parseInt
(
this
.
row
.
sizeCheckPrice
))
parseInt
(
this
.
row
.
printPrice
)
+
parseInt
(
this
.
row
.
sizeCheckPrice
))
;
},
prices
()
{
// 价格=单价*数量
return
(
this
.
row
.
price
=
parseInt
(
this
.
row
.
unitPrice
)
*
parseInt
(
this
.
row
.
num
))
parseInt
(
this
.
row
.
unitPrice
)
*
parseInt
(
this
.
row
.
num
))
;
}
},
methods
:
{
previousStep
()
{
this
.
modalShow
=
false
this
.
modalShow
=
false
;
},
quotationBox
()
{
//订单报价
let
item
=
[]
let
quotationMain
=
{}
let
item
=
[]
;
let
quotationMain
=
{}
;
let
data
=
{
quotationMain
:
this
.
formItem
,
item
:
this
.
gmData
}
var
url
=
`
${
PlanUrl
}
/quotationmain/createorupdate`
}
;
var
url
=
`
${
PlanUrl
}
/quotationmain/createorupdate`
;
this
.
$api
.
post
(
url
,
data
)
.
then
(
(
res
)
=>
{
.
then
(
res
=>
{
if
(
res
.
success
)
{
this
.
$Message
.
success
(
'保存成功'
)
this
.
$refs
.
photosensitive
.
modalShow
=
true
let
id
=
res
.
result
.
id
this
.
$Message
.
success
(
"保存成功"
);
this
.
$refs
.
photosensitive
.
modalShow
=
true
;
let
id
=
res
.
result
.
id
;
this
.
$http
.
quotation
.
orderList
({
id
:
id
})
.
then
(
(
res
)
=>
{
console
.
log
(
res
)
.
then
(
res
=>
{
console
.
log
(
res
)
;
res
.
result
.
forEach
((
data
,
index
)
=>
{
res
.
result
[
index
].
quotationId
=
id
})
this
.
zPhotosensitive
.
result
=
res
.
result
})
.
catch
((
error
)
=>
{
this
.
$Message
.
error
(
'请求失败'
)
res
.
result
[
index
].
quotationId
=
id
;
});
this
.
zPhotosensitive
.
result
=
res
.
result
;
})
.
catch
(
error
=>
{
this
.
$Message
.
error
(
"请求失败"
);
});
}
})
.
catch
(
(
error
)
=>
{
this
.
$Message
.
error
(
'保存失败'
)
})
.
catch
(
error
=>
{
this
.
$Message
.
error
(
"保存失败"
);
})
;
},
close
()
{
this
.
modalShow
=
false
this
.
$emit
(
'update'
)
this
.
modalShow
=
false
;
this
.
$emit
(
"update"
);
},
show1
(
row
,
index
)
{
this
.
row
=
row
this
.
row
=
row
;
this
.
gmData
.
forEach
((
data
,
index
)
=>
{
if
(
this
.
gmData
[
index
].
mesCode
===
row
.
mesCode
)
{
this
.
gmData
[
index
]
=
row
this
.
gmData
[
index
]
=
row
;
}
})
})
;
},
show2
(
row
,
index
)
{
this
.
row
=
row
this
.
row
=
row
;
this
.
gmData
.
forEach
((
data
,
index
)
=>
{
if
(
this
.
gmData
[
index
].
mesCode
===
row
.
mesCode
)
{
this
.
gmData
[
index
]
=
row
this
.
gmData
[
index
]
=
row
;
}
})
})
;
},
show3
(
row
,
index
)
{
this
.
row
=
row
this
.
row
=
row
;
this
.
gmData
.
forEach
((
data
,
index
)
=>
{
if
(
this
.
gmData
[
index
].
mesCode
===
row
.
mesCode
)
{
this
.
gmData
[
index
]
=
row
this
.
gmData
[
index
]
=
row
;
}
})
})
;
},
//备注
show4
(
row
,
index
)
{
this
.
row
=
row
this
.
row
=
row
;
this
.
gmData
.
forEach
((
data
,
index
)
=>
{
if
(
this
.
gmData
[
index
].
mesCode
===
row
.
mesCode
)
{
this
.
gmData
[
index
]
=
row
this
.
gmData
[
index
]
=
row
;
}
})
});
},
cancel
()
{
this
.
$emit
(
"update"
);
}
}
}
}
;
</
script
>
<
style
lang=
"less"
scoped
>
.footers {
...
...
pages/order/quotation/components/quotationBox.vue
View file @
974fc4e8
...
...
@@ -5,6 +5,7 @@
title=
"订单报价"
width=
"90%"
:mask-closable=
"false"
@
on-cancel=
"cancel"
fullscreen
footer-hide
>
...
...
@@ -55,32 +56,32 @@
</template>
<
script
>
import
GenerateQuotation
from
'../components/generateQuotation.vue'
//生成报价单弹框
import
GenerateQuotation
from
"../components/generateQuotation.vue"
;
//生成报价单弹框
export
default
{
components
:
{
GenerateQuotation
},
name
:
''
,
name
:
""
,
props
:
{
bjData
:
Array
},
data
()
{
return
{
values1
:
''
,
values2
:
''
,
values3
:
''
,
values1
:
""
,
values2
:
""
,
values3
:
""
,
modalShow
:
false
,
columns
:
[
{
title
:
'序号'
,
type
:
'index'
,
title
:
"序号"
,
type
:
"index"
,
width
:
50
,
align
:
'center'
align
:
"center"
},
{
title
:
'订单编号'
,
key
:
'name'
,
align
:
'center'
,
title
:
"订单编号"
,
key
:
"name"
,
align
:
"center"
,
minWidth
:
120
},
// {
...
...
@@ -90,286 +91,289 @@ export default {
// minWidth: 60
// },
{
title
:
'产品名称'
,
key
:
'name2'
,
align
:
'center'
,
title
:
"产品名称"
,
key
:
"name2"
,
align
:
"center"
,
minWidth
:
80
},
{
title
:
'规格'
,
key
:
'name4'
,
align
:
'center'
,
title
:
"规格"
,
key
:
"name4"
,
align
:
"center"
,
minWidth
:
80
},
{
title
:
'材料牌号'
,
key
:
'name5'
,
align
:
'center'
,
title
:
"材料牌号"
,
key
:
"name5"
,
align
:
"center"
,
minWidth
:
80
,
slot
:
'slot6'
slot
:
"slot6"
},
{
title
:
'材料重量'
,
key
:
'name6'
,
align
:
'center'
,
title
:
"材料重量"
,
key
:
"name6"
,
align
:
"center"
,
minWidth
:
80
,
slot
:
'slot7'
slot
:
"slot7"
},
{
title
:
'材料单价'
,
key
:
'name7'
,
align
:
'center'
,
title
:
"材料单价"
,
key
:
"name7"
,
align
:
"center"
,
minWidth
:
80
,
slot
:
'slot8'
slot
:
"slot8"
},
{
title
:
'材料费/件(元)'
,
key
:
'name8'
,
align
:
'center'
,
title
:
"材料费/件(元)"
,
key
:
"name8"
,
align
:
"center"
,
minWidth
:
70
},
{
title
:
'3D打印费'
,
align
:
'center'
,
title
:
"3D打印费"
,
align
:
"center"
,
children
:
[
{
// title: '1600/H',
key
:
'name9'
,
align
:
'center'
,
key
:
"name9"
,
align
:
"center"
,
minWidth
:
60
,
className
:
'conciseContent'
,
slot
:
'slot1'
,
className
:
"conciseContent"
,
slot
:
"slot1"
,
renderHeader
:
(
h
,
params
)
=>
{
return
h
(
'div'
,
[
h
(
'Input'
,
{
return
h
(
"div"
,
[
h
(
"Input"
,
{
props
:
{
value
:
'1600'
,
placeholder
:
'请输入'
value
:
"1600"
,
placeholder
:
"请输入"
},
on
:
{
'on-change'
:
(
value
)
=>
{
console
.
log
(
value
)
"on-change"
:
value
=>
{
console
.
log
(
value
)
;
}
}
}),
h
(
'span'
,
' /H'
)
])
h
(
"span"
,
" /H"
)
])
;
}
}
]
},
{
title
:
'后处理费'
,
align
:
'center'
,
title
:
"后处理费"
,
align
:
"center"
,
children
:
[
{
// title: '200/H',
key
:
'name10'
,
align
:
'center'
,
key
:
"name10"
,
align
:
"center"
,
minWidth
:
60
,
className
:
'conciseContent'
,
slot
:
'slot2'
,
className
:
"conciseContent"
,
slot
:
"slot2"
,
renderHeader
:
(
h
,
params
)
=>
{
return
h
(
'div'
,
[
h
(
'Input'
,
{
return
h
(
"div"
,
[
h
(
"Input"
,
{
props
:
{
value
:
'200'
,
placeholder
:
'请输入'
value
:
"200"
,
placeholder
:
"请输入"
},
on
:
{
'on-change'
:
(
value
)
=>
{
console
.
log
(
value
)
"on-change"
:
value
=>
{
console
.
log
(
value
)
;
}
}
}),
h
(
'span'
,
' /H'
)
])
h
(
"span"
,
" /H"
)
])
;
}
}
]
},
{
title
:
'线切割费'
,
align
:
'center'
,
title
:
"线切割费"
,
align
:
"center"
,
children
:
[
{
title
:
'100/H'
,
key
:
'name11'
,
align
:
'center'
,
title
:
"100/H"
,
key
:
"name11"
,
align
:
"center"
,
minWidth
:
60
,
className
:
'conciseContent'
,
slot
:
'slot3'
,
className
:
"conciseContent"
,
slot
:
"slot3"
,
renderHeader
:
(
h
,
params
)
=>
{
return
h
(
'div'
,
[
h
(
'Input'
,
{
return
h
(
"div"
,
[
h
(
"Input"
,
{
props
:
{
value
:
'100'
,
placeholder
:
'请输入'
value
:
"100"
,
placeholder
:
"请输入"
},
on
:
{
'on-change'
:
(
value
)
=>
{
console
.
log
(
value
)
"on-change"
:
value
=>
{
console
.
log
(
value
)
;
}
}
}),
h
(
'span'
,
' /H'
)
])
h
(
"span"
,
" /H"
)
])
;
}
}
]
},
{
title
:
'加工费单价'
,
key
:
'name12'
,
align
:
'center'
,
title
:
"加工费单价"
,
key
:
"name12"
,
align
:
"center"
,
minWidth
:
60
},
{
title
:
'其它'
,
key
:
'name13'
,
align
:
'center'
,
title
:
"其它"
,
key
:
"name13"
,
align
:
"center"
,
minWidth
:
80
,
slot
:
'slot4'
slot
:
"slot4"
},
{
title
:
'单价'
,
key
:
'name14'
,
align
:
'center'
,
title
:
"单价"
,
key
:
"name14"
,
align
:
"center"
,
minWidth
:
60
},
{
title
:
'数量'
,
key
:
'name3'
,
align
:
'center'
,
title
:
"数量"
,
key
:
"name3"
,
align
:
"center"
,
minWidth
:
70
},
{
title
:
'热处理'
,
key
:
'name15'
,
align
:
'center'
,
title
:
"热处理"
,
key
:
"name15"
,
align
:
"center"
,
minWidth
:
80
,
slot
:
'slot5'
slot
:
"slot5"
},
{
title
:
'合计'
,
key
:
'name16'
,
align
:
'center'
,
title
:
"合计"
,
key
:
"name16"
,
align
:
"center"
,
minWidth
:
80
},
{
title
:
'调度'
,
key
:
'name17'
,
align
:
'center'
,
title
:
"调度"
,
key
:
"name17"
,
align
:
"center"
,
minWidth
:
60
}
],
data
:
[
{
name
:
'a1233_155111_20192010'
,
name1
:
'a002'
,
name2
:
'W123'
,
name3
:
'250'
,
name4
:
'2019-1'
,
name5
:
''
,
name6
:
''
,
name7
:
''
,
name8
:
'100'
,
name9
:
'2'
,
name10
:
'3'
,
name11
:
'5'
,
name12
:
'100'
,
name13
:
''
,
name14
:
''
,
name15
:
''
,
name16
:
''
,
name17
:
'小明'
name
:
"a1233_155111_20192010"
,
name1
:
"a002"
,
name2
:
"W123"
,
name3
:
"250"
,
name4
:
"2019-1"
,
name5
:
""
,
name6
:
""
,
name7
:
""
,
name8
:
"100"
,
name9
:
"2"
,
name10
:
"3"
,
name11
:
"5"
,
name12
:
"100"
,
name13
:
""
,
name14
:
""
,
name15
:
""
,
name16
:
""
,
name17
:
"小明"
},
{
name
:
'a1233'
,
name1
:
'a002'
,
name2
:
'W123'
,
name3
:
'10000'
,
name4
:
'2019-1'
,
name5
:
''
,
name6
:
''
,
name7
:
''
,
name8
:
'200'
,
name9
:
'2'
,
name10
:
'3'
,
name11
:
'5'
,
name12
:
'200'
,
name13
:
''
,
name14
:
''
,
name15
:
''
,
name16
:
''
,
name17
:
'小明'
name
:
"a1233"
,
name1
:
"a002"
,
name2
:
"W123"
,
name3
:
"10000"
,
name4
:
"2019-1"
,
name5
:
""
,
name6
:
""
,
name7
:
""
,
name8
:
"200"
,
name9
:
"2"
,
name10
:
"3"
,
name11
:
"5"
,
name12
:
"200"
,
name13
:
""
,
name14
:
""
,
name15
:
""
,
name16
:
""
,
name17
:
"小明"
},
{
name
:
'a1233'
,
name1
:
'b452'
,
name2
:
'W123'
,
name3
:
'200000'
,
name4
:
'2019-1'
,
name5
:
''
,
name6
:
''
,
name7
:
''
,
name8
:
'200'
,
name9
:
'2'
,
name10
:
'3'
,
name11
:
'5'
,
name12
:
'100'
,
name13
:
''
,
name14
:
''
,
name15
:
''
,
name16
:
''
,
name17
:
'小明'
name
:
"a1233"
,
name1
:
"b452"
,
name2
:
"W123"
,
name3
:
"200000"
,
name4
:
"2019-1"
,
name5
:
""
,
name6
:
""
,
name7
:
""
,
name8
:
"200"
,
name9
:
"2"
,
name10
:
"3"
,
name11
:
"5"
,
name12
:
"100"
,
name13
:
""
,
name14
:
""
,
name15
:
""
,
name16
:
""
,
name17
:
"小明"
}
]
}
}
;
},
mounted
()
{},
methods
:
{
quotationBox
()
{
this
.
$refs
.
generateQuotation
.
modalShow
=
true
this
.
$refs
.
generateQuotation
.
modalShow
=
true
;
},
previousStep
()
{
this
.
modalShow
=
false
this
.
modalShow
=
false
;
},
//3D打印费
showPrinting
(
row
,
index
)
{
return
(
row
.
name12
=
parseInt
(
row
.
name9
)
*
1600
+
parseInt
(
row
.
name10
)
*
200
+
parseInt
(
row
.
name11
)
*
100
)
//加工费单价=3D打印时间*小时费用+后处理*小时费用+线切*小时费用
parseInt
(
row
.
name11
)
*
100
)
;
//加工费单价=3D打印时间*小时费用+后处理*小时费用+线切*小时费用
},
//后处理费
showPostProcessing
(
row
,
index
)
{
return
(
row
.
name12
=
parseInt
(
row
.
name9
)
*
1600
+
parseInt
(
row
.
name10
)
*
200
+
parseInt
(
row
.
name11
)
*
100
)
//加工费单价=3D打印时间*小时费用+后处理*小时费用+线切*小时费用
parseInt
(
row
.
name11
)
*
100
)
;
//加工费单价=3D打印时间*小时费用+后处理*小时费用+线切*小时费用
},
//线切割费
showWireCutting
(
row
,
index
)
{
return
(
row
.
name12
=
parseInt
(
row
.
name9
)
*
1600
+
parseInt
(
row
.
name10
)
*
200
+
parseInt
(
row
.
name11
)
*
100
)
//加工费单价=3D打印时间*小时费用+后处理*小时费用+线切*小时费用
parseInt
(
row
.
name11
)
*
100
)
;
//加工费单价=3D打印时间*小时费用+后处理*小时费用+线切*小时费用
},
//其它
showOther
(
row
,
index
)
{
return
(
row
.
name14
=
parseInt
(
row
.
name8
)
+
parseInt
(
row
.
name12
)
+
parseInt
(
row
.
name13
))
//单价=材料费/件(元)+加工费单价+其它
parseInt
(
row
.
name8
)
+
parseInt
(
row
.
name12
)
+
parseInt
(
row
.
name13
))
;
//单价=材料费/件(元)+加工费单价+其它
},
//热处理
showHeatTreatment
(
row
,
index
)
{
return
(
row
.
name16
=
parseInt
(
row
.
name14
)
*
parseInt
(
row
.
name3
)
+
parseInt
(
row
.
name15
))
//合计=单价*数量+热处理
parseInt
(
row
.
name14
)
*
parseInt
(
row
.
name3
)
+
parseInt
(
row
.
name15
));
//合计=单价*数量+热处理
},
cancel
()
{
this
.
$emit
(
'update'
)
}
}
}
}
;
</
script
>
<
style
lang=
"less"
scoped
>
.footers {
...
...
pages/order/quotation/index.vue
View file @
974fc4e8
...
...
@@ -120,7 +120,7 @@
<!-- 高级搜索弹框 -->
<Search-Box
ref=
"searchBox"
@
heightSearch=
"gSearch"
></Search-Box>
<!-- 订单报价 -->
<Quotation-Box
ref=
"quotationBox"
:bjData=
"newJsData"
></Quotation-Box>
<Quotation-Box
ref=
"quotationBox"
:bjData=
"newJsData"
@
update=
"update"
></Quotation-Box>
<Metal-Quotation
ref=
"metalQuotation"
:gmData=
"newJsData"
@
update=
"update"
></Metal-Quotation>
<Photosensitive
ref=
"photosensitive"
:gmData=
"newJsData"
@
update=
"update"
></Photosensitive>
<Metal-Details
ref=
"metalDetail"
:resultDetils=
"resultDetils"
></Metal-Details>
...
...
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