Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-app-operator-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
lanbaoming
jiedao-app-operator-master
Commits
d29947a1
Commit
d29947a1
authored
Oct 13, 2022
by
dcy
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
parents
6c674530
1753a477
Changes
27
Hide whitespace changes
Inline
Side-by-side
Showing
27 changed files
with
802 additions
and
699 deletions
+802
-699
boxSea.js
src/api/ecw/boxSea.js
+15
-0
index.vue
src/components/OrderBaseInfo/index.vue
+1
-1
index.vue
src/components/WarehouseAreaDialog/index.vue
+1
-1
indexSea.vue
src/views/ecw/box/indexSea.vue
+1
-1
makeLadingBill.vue
src/views/ecw/box/ladingBill/makeLadingBill.vue
+1
-1
shippingDetail.vue
src/views/ecw/box/shippingDetail.vue
+1
-1
splitOrder.vue
...views/ecw/box/shippingSea/nodePage/cabinet/splitOrder.vue
+9
-9
startPacking.vue
...ews/ecw/box/shippingSea/nodePage/cabinet/startPacking.vue
+1
-1
cusDeclaration.vue
src/views/ecw/box/shippingSea/nodePage/cusDeclaration.vue
+68
-24
preinstall.vue
src/views/ecw/box/shippingSea/nodePage/preinstall.vue
+48
-28
review.vue
src/views/ecw/box/shippingSea/nodePage/review.vue
+2
-2
index.vue
src/views/ecw/box/shippingSea/nodePage/tally/index.vue
+7
-1
startUnloading.vue
...ecw/box/shippingSea/nodePage/unloading/startUnloading.vue
+1
-1
unloadingError.vue
...ecw/box/shippingSea/nodePage/unloading/unloadingError.vue
+9
-4
utils.js
src/views/ecw/box/shippingSea/utils.js
+18
-5
creatCollection.vue
src/views/ecw/financial/creatCollection.vue
+126
-126
creatPayment.vue
src/views/ecw/financial/creatPayment.vue
+71
-71
openInvoice.vue
src/views/ecw/financial/openInvoice.vue
+24
-24
payable.vue
src/views/ecw/financial/payable.vue
+40
-40
paymentDetail.vue
src/views/ecw/financial/paymentDetail.vue
+33
-33
paymentExamine.vue
src/views/ecw/financial/paymentExamine.vue
+25
-25
paymentVoucher.vue
src/views/ecw/financial/paymentVoucher.vue
+51
-51
printPaymentVoucher.vue
src/views/ecw/financial/printPaymentVoucher.vue
+26
-26
printVoucher.vue
src/views/ecw/financial/printVoucher.vue
+26
-26
receiptDetail.vue
src/views/ecw/financial/receiptDetail.vue
+116
-116
receivable.vue
src/views/ecw/financial/receivable.vue
+39
-39
voucher.vue
src/views/ecw/financial/voucher.vue
+42
-42
No files found.
src/api/ecw/boxSea.js
View file @
d29947a1
...
...
@@ -411,6 +411,21 @@ export function createSection(data) {
});
}
/**
* 创建预装部分
*
* @export
* @param {*} data
* @return {*}
*/
export
function
changeSection
(
data
)
{
return
request
({
url
:
"
/ecw/box-preload-goods/changeSection
"
,
method
:
"
post
"
,
data
,
});
}
/**
* 查询出货单下的所有部分列表
*
...
...
src/components/OrderBaseInfo/index.vue
View file @
d29947a1
...
...
@@ -7,7 +7,7 @@
<el-descriptions-item
label=
"运输方式"
>
<dict-tag
:type=
"DICT_TYPE.ECW_TRANSPORT_TYPE"
:value=
"order.logisticsInfoDto.transportId"
></dict-tag>
</el-descriptions-item>
<el-descriptions-item
label=
"始发地"
>
{{
order
.
logisticsInfoDto
.
start
AddressZh
||
''
}}
</el-descriptions-item>
<el-descriptions-item
label=
"始发地"
>
{{
order
.
logisticsInfoDto
.
start
TitleZh
||
''
}}
<span
v-if=
"order.isExternalWarehouse"
style=
"color: red"
>
(外部仓)
</span>
</el-descriptions-item>
<el-descriptions-item
label=
"目的地"
>
{{
order
.
logisticsInfoDto
.
destTitleZh
||
''
}}
</el-descriptions-item>
<el-descriptions-item
label=
"发货人姓名"
>
{{
order
.
consignorVO
&&
order
.
consignorVO
.
name
||
''
}}
</el-descriptions-item>
<el-descriptions-item
label=
"发货人公司"
>
{{
order
.
consignorVO
&&
order
.
consignorVO
.
company
||
''
}}
</el-descriptions-item>
...
...
src/components/WarehouseAreaDialog/index.vue
View file @
d29947a1
...
...
@@ -91,7 +91,7 @@ export default {
if
(
val
)
{
this
.
opened
=
true
getByWarehouseId
({
cityId
:
this
.
cityId
,
warehouseId
:
this
.
warehouseId
}).
then
(
r
=>
{
if
(
this
.
area
.
length
===
0
)
getByWarehouseId
({
cityId
:
this
.
cityId
,
warehouseId
:
this
.
warehouseId
}).
then
(
r
=>
{
const
area
=
r
.
data
area
.
forEach
(
e
=>
{
// 仓库
...
...
src/views/ecw/box/indexSea.vue
View file @
d29947a1
...
...
@@ -171,7 +171,7 @@
<dict-tag
:type=
"DICT_TYPE.BOX_SHIPPING_NOTICE_TYPE"
:value=
"String(scope.row.noticeType)"
/>
</
template
>
</el-table-column>
<el-table-column
label=
"
操作
时间"
align=
"center"
>
<el-table-column
label=
"
预计
时间"
align=
"center"
>
<
template
slot-scope=
"scope"
>
{{
formatDate
(
scope
.
row
.
createTime
)
}}
</
template
>
...
...
src/views/ecw/box/ladingBill/makeLadingBill.vue
View file @
d29947a1
...
...
@@ -169,7 +169,7 @@ export default {
orderId
:
this
.
currRow
.
orderId
,
copyUserId
:
this
.
selectedUsers
,
};
if
([
'
makeBill
'
,
'
resetBill
'
].
includes
(
this
.
dialogCfg
.
type
))
{
if
([
"
makeBill
"
,
"
resetBill
"
].
includes
(
this
.
dialogCfg
.
type
))
{
createBillService
({
...
params
,
status
:
1
}).
then
((
res
)
=>
{
serviceMsg
(
res
,
this
).
then
((
res
)
=>
{
this
.
close
(
"
query
"
);
...
...
src/views/ecw/box/shippingDetail.vue
View file @
d29947a1
...
...
@@ -164,7 +164,7 @@ export default {
calcSum
(
goodsList
)
{
let
sum
=
0
;
goodsList
.
forEach
((
element
)
=>
{
sum
=
Decimal
.
add
(
sum
,
element
.
num
);
sum
=
Decimal
.
add
(
sum
,
element
.
num
)
.
toNumber
()
;
});
return
sum
;
},
...
...
src/views/ecw/box/shippingSea/nodePage/cabinet/splitOrder.vue
View file @
d29947a1
...
...
@@ -312,7 +312,7 @@ export default {
let
_total
=
0
;
const
{
orderSplitItemBackVOList
=
[]
}
=
this
.
splitData
;
orderSplitItemBackVOList
.
forEach
((
v
)
=>
{
_total
=
Decimal
.
add
(
_total
,
Number
(
v
.
num
));
_total
=
Decimal
.
add
(
_total
,
Number
(
v
.
num
))
.
toNumber
()
;
});
return
_total
;
},
...
...
@@ -382,15 +382,15 @@ export default {
let
leviteV
=
0
;
let
leviteW
=
0
;
this
.
orderData
.
orderItemVOList
.
forEach
((
column
,
index
)
=>
{
orderSum
=
Decimal
.
add
(
orderSum
,
column
.
num
??
0
);
orderV
=
Decimal
.
add
(
orderV
,
column
.
volume
??
0
);
orderW
=
Decimal
.
add
(
orderW
,
column
.
weight
??
0
);
orderSum
=
Decimal
.
add
(
orderSum
,
column
.
num
??
0
)
.
toNumber
()
;
orderV
=
Decimal
.
add
(
orderV
,
column
.
volume
??
0
)
.
toFixed
(
2
)
;
orderW
=
Decimal
.
add
(
orderW
,
column
.
weight
??
0
)
.
toFixed
(
2
)
;
leviteSum
=
Decimal
.
add
(
leviteSum
,
column
.
warehouseInInfoVO
?.
cartonsNum
??
0
);
leviteV
+=
Decimal
.
add
(
leviteV
,
column
.
warehouseInInfoVO
?.
volume
??
0
);
leviteW
+=
Decimal
.
add
(
leviteW
,
column
.
warehouseInInfoVO
?.
weight
??
0
);
)
.
toNumber
()
;
leviteV
+=
Decimal
.
add
(
leviteV
,
column
.
warehouseInInfoVO
?.
volume
??
0
)
.
toFixed
(
2
)
;
leviteW
+=
Decimal
.
add
(
leviteW
,
column
.
warehouseInInfoVO
?.
weight
??
0
)
.
toFixed
(
2
)
;
});
sums
[
1
]
=
"
下单统计:
"
+
...
...
@@ -460,8 +460,8 @@ export default {
if
(
valid
)
{
// 输入箱数大于实装箱数
const
total
=
this
.
totalSplitNum
();
const
canSplitNum
=
Decimal
.
sub
(
this
.
currRow
.
num
,
this
.
currRow
.
installNum
);
const
remain
=
Decimal
.
sub
(
canSplitNum
,
total
);
const
canSplitNum
=
Decimal
.
sub
(
this
.
currRow
.
num
,
this
.
currRow
.
installNum
)
.
toNumber
()
;
const
remain
=
Decimal
.
sub
(
canSplitNum
,
total
)
.
toNumber
()
;
if
(
this
.
shopForm
.
num
>
remain
)
{
this
.
$message
.
error
(
"
放入箱数不能大于总箱数
"
);
return
;
...
...
src/views/ecw/box/shippingSea/nodePage/cabinet/startPacking.vue
View file @
d29947a1
...
...
@@ -642,7 +642,7 @@ export default {
this
.
listData
.
forEach
((
item
)
=>
{
const
{
sectionOrderList
=
[]
}
=
item
;
sectionOrderList
.
forEach
((
item
)
=>
{
count
=
Decimal
.
add
(
count
,
item
.
installNum
);
count
=
Decimal
.
add
(
count
,
item
.
installNum
)
.
toNumber
()
;
});
});
}
...
...
src/views/ecw/box/shippingSea/nodePage/cusDeclaration.vue
View file @
d29947a1
...
...
@@ -3,6 +3,9 @@
<el-form
ref=
"cusDeclarationForm"
:rules=
"rules"
:model=
"cusDeclarationObj"
label-width=
"120px"
>
<el-form-item
label=
"单证要求"
>
<template
v-for=
"(item, index) in cusDeclarationObj.documentInfo"
>
{{
(
index
===
0
||
index
===
cusDeclarationObj
.
documentInfo
.
length
)
?
""
:
"
/
"
}}
<dict-tag
:type=
"DICT_TYPE.ECW_CUSTOMS_TYPE"
:value=
"item"
:key=
"index"
/>
</
template
>
<el-button
type=
"primary"
style=
"margin-left:10px;"
@
click=
"downloadVGM"
>
{{getButtonLabel(cusDeclarationObj.documentInfo)}}
</el-button>
...
...
@@ -30,7 +33,7 @@
<el-date-picker
type=
"datetime"
placeholder=
"请选择日期"
v-model=
"cusDeclarationObj.dcCutOffTime"
value-format=
"yyyy-MM-dd HH:mm:ss"
></el-date-picker>
</el-form-item>
<el-form-item
label=
"状态"
prop=
"dcCustomsStatus"
>
<el-radio-group
v-model=
"cusDeclarationObj.dcCustomsStatus"
:disabled=
"inReview || isCheckDeal"
>
<el-radio-group
v-model=
"cusDeclarationObj.dcCustomsStatus"
:disabled=
"inReview || isCheckDeal
('status')
"
>
<el-radio
v-for=
"item in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_DCCUSTOMS_STATUS)"
:key=
"item.value"
:label=
"item.value"
>
{{item.label}}
</el-radio>
</el-radio-group>
</el-form-item>
...
...
@@ -38,7 +41,7 @@
<!-- 查验 -->
<div
v-show=
"cusDeclarationObj.dcCustomsStatus === '3'"
>
<el-form-item
label=
"查验"
>
<el-radio-group
v-model=
"cusDeclarationObj.dcCheckStatus"
:disabled=
"inReview || isCheckDeal"
>
<el-radio-group
v-model=
"cusDeclarationObj.dcCheckStatus"
:disabled=
"inReview || isCheckDeal
('check')
"
>
<el-radio
v-for=
"item in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_CHECK_STATUS)"
:key=
"item.value"
:label=
"item.value"
:disabled=
"disabledRadio(item)"
>
{{item.label}}
</el-radio>
</el-radio-group>
</el-form-item>
...
...
@@ -78,8 +81,8 @@
<el-button
type=
"primary"
plain
@
click=
"canclAudit"
>
{{cusDeclarationObj.dcCheckStatus === '1' ? '取消全部退场审核' : '取消部分退场审核'}}
</el-button>
</el-row>
<el-row
class=
"operate-button"
>
<el-button
type=
"primary"
@
click=
"onSubmit(1)"
:disabled=
"isCheckDeal"
>
保存
</el-button>
<el-button
type=
"success"
v-if=
"!inReview"
@
click=
"onSubmit(2)"
:disabled=
"isCheckDeal"
>
提交
</el-button>
<el-button
type=
"primary"
@
click=
"onSubmit(1)"
:disabled=
"isCheckDeal
('submit')
"
>
保存
</el-button>
<el-button
type=
"success"
v-if=
"!inReview"
@
click=
"onSubmit(2)"
:disabled=
"isCheckDeal
('submit')
"
>
提交
</el-button>
<el-button
@
click=
"cancel"
>
关闭
</el-button>
<el-button
type=
"primary"
@
click=
"extraCost"
v-show=
"cusDeclarationObj.dcCustomsStatus === '2' || cusDeclarationObj.dcCustomsStatus === '3'"
>
额外费用
</el-button>
</el-row>
...
...
@@ -156,7 +159,7 @@ import {
downloadFile
,
}
from
"
../utils
"
;
import
ImageUpload
from
"
@/components/ImageUpload
"
;
import
Decimal
from
'
decimal.js
'
import
Decimal
from
"
decimal.js
"
;
/**
* 报关
...
...
@@ -218,7 +221,7 @@ export default {
methods
:
{
getButtonLabel
(
documentInfo
=
[])
{
const
newList
=
Array
.
from
(
new
Set
(
documentInfo
));
return
newList
.
length
>
2
?
"
混合报关
"
:
"
VGM声明
"
;
return
newList
.
length
>
=
2
?
"
混合报关
"
:
"
VGM声明
"
;
},
submitCustomsCreate
(
operateType
)
{
customsCreate
({
...
...
@@ -404,7 +407,7 @@ export default {
this
.
$set
(
this
.
cusDeclarationObj
,
"
dcVgmWgt
"
,
Decimal
.
add
(
dcBoxWgtTmp
,
dcGoodsWgtTmp
)
Decimal
.
add
(
dcBoxWgtTmp
,
dcGoodsWgtTmp
)
.
toFixed
(
2
)
);
},
// 审核详情
...
...
@@ -439,6 +442,7 @@ export default {
if
(
checkExamineStatus
===
2
&&
dcCheckStatus
===
2
&&
checkDealStatus
===
0
&&
item
.
value
===
"
1
"
)
{
return
true
;
...
...
@@ -491,12 +495,16 @@ export default {
computed
:
{
/* 获取报关审核退场状态文字 */
getCheckExamineStatus
()
{
const
{
checkExamineStatus
,
customsInfo
=
{}
}
=
this
.
shipmentObj
;
const
{
checkExamineStatus
,
checkDealStatus
,
customsInfo
=
{},
}
=
this
.
shipmentObj
;
const
{
dcCheckStatus
}
=
customsInfo
;
if
(
checkExamineStatus
===
1
)
{
return
dcCheckStatus
===
1
?
"
退场审核中
"
:
"
部分退场审核中
"
;
}
if
(
checkExamineStatus
===
2
)
{
if
(
checkExamineStatus
===
2
&&
checkDealStatus
===
0
)
{
return
dcCheckStatus
===
1
?
"
审核通过,退场中
"
:
"
审核通过,部分退场中
"
;
...
...
@@ -505,21 +513,57 @@ export default {
},
/* 判断是否已处理 */
isCheckDeal
()
{
const
{
checkExamineStatus
,
checkDealStatus
,
customsInfo
=
{},
}
=
this
.
shipmentObj
;
const
{
dcCheckStatus
}
=
customsInfo
;
// 退场未处理不能操作
if
(
checkExamineStatus
===
2
&&
dcCheckStatus
===
1
&&
checkDealStatus
===
0
)
{
return
true
;
}
return
false
;
return
(
type
)
=>
{
const
{
checkExamineStatus
,
checkDealStatus
,
customsInfo
=
{},
}
=
this
.
shipmentObj
;
const
{
dcCheckStatus
}
=
customsInfo
;
// 状态
if
(
type
===
"
status
"
)
{
// 退场/部分退场 审核通过未处理,禁用
if
(
checkExamineStatus
===
2
&&
[
1
,
2
].
includes
(
dcCheckStatus
)
&&
checkDealStatus
===
0
)
{
return
true
;
}
}
// 查验
if
(
type
===
"
check
"
)
{
// 退场 审核通过未处理,禁用
// 部分退场 审核通过未处理,由 disabledRadio 方法判断
if
(
checkExamineStatus
===
2
&&
[
1
].
includes
(
dcCheckStatus
)
&&
checkDealStatus
===
0
)
{
return
true
;
}
}
// 提交/保存
if
(
type
===
"
submit
"
)
{
const
{
dcCheckStatus
:
newCheckStatus
}
=
this
.
cusDeclarationObj
;
// 退场/部分退场 审核通过未处理
if
(
checkExamineStatus
===
2
&&
checkDealStatus
===
0
)
{
// 退场,禁用
if
(
dcCheckStatus
===
1
)
return
true
;
// 部分退场
if
(
dcCheckStatus
===
2
)
{
// 修改为查验后放行,可用,其他禁用
if
(
newCheckStatus
===
"
3
"
)
return
false
;
return
true
;
}
}
}
return
false
;
};
},
},
};
...
...
src/views/ecw/box/shippingSea/nodePage/preinstall.vue
View file @
d29947a1
...
...
@@ -100,7 +100,7 @@
<p>
{{
preList
.
remainWeight
}}
kg
</p>
</div>
<div
class=
"table-button"
>
<el-button
type=
"success"
size=
"small"
@
click=
"addPart"
>
增加
</el-button>
<el-button
type=
"success"
size=
"small"
@
click=
"addPart"
:disabled=
"isAudit"
>
增加
</el-button>
</div>
</el-row>
<el-scrollbar
style=
"height:calc(100% - 43px)"
>
...
...
@@ -111,8 +111,8 @@
<p>
{{
getTotlContent
(
part
.
secStatistics
)
}}
</p>
</div>
<div
class=
"table-button"
>
<el-button
type=
"danger"
size=
"small"
@
click=
"deletePart(part)"
>
删除部分
</el-button>
<el-button
type=
"danger"
size=
"small"
@
click=
"deleteOrder('selected', part)"
>
删除订单
</el-button>
<el-button
type=
"danger"
size=
"small"
@
click=
"deletePart(part)"
:disabled=
"isAudit"
>
删除部分
</el-button>
<el-button
type=
"danger"
size=
"small"
@
click=
"deleteOrder('selected', part)"
:disabled=
"isAudit"
>
删除订单
</el-button>
<el-button
type=
"primary"
size=
"small"
@
click=
"foldTable(index, part)"
>
{{
part
.
fold
?
'
展开
'
:
'
收起
'
}}
</el-button>
</div>
</el-row>
...
...
@@ -157,13 +157,13 @@
</el-table-column>
<el-table-column
label=
"操作"
align=
"center"
width=
"160"
class-name=
"small-padding fixed-width"
fixed=
"right"
>
<
template
slot-scope=
"scope"
>
<el-dropdown
trigger=
"click"
@
command=
"(command)=>handleGoods('sing
ele',scope.row,command)
"
>
<el-button
type=
"primary"
size=
"small"
icon=
"el-icon-edit-outline"
circle
></el-button>
<el-dropdown
trigger=
"click"
@
command=
"(command)=>handleGoods('sing
le',scope.row,command)"
:disabled=
"isAudit
"
>
<el-button
type=
"primary"
size=
"small"
icon=
"el-icon-edit-outline"
circle
:disabled=
"isAudit"
></el-button>
<el-dropdown-menu
slot=
"dropdown"
>
<el-dropdown-item
:command=
"bPart"
v-for=
"(bPart, index) in preList.sectionGoodList"
:key=
"bPart.id"
v-show=
"bPart.id !== part.id"
>
第
{{
index
+
1
}}
部分
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-button
type=
"danger"
size=
"small"
icon=
"el-icon-minus"
circle
style=
"margin-left:10px;"
@
click=
"deleteOrder('row',scope.row)"
></el-button>
<el-button
type=
"danger"
size=
"small"
icon=
"el-icon-minus"
circle
style=
"margin-left:10px;"
@
click=
"deleteOrder('row',scope.row)"
:disabled=
"isAudit"
></el-button>
</
template
>
</el-table-column>
</el-table>
...
...
@@ -220,8 +220,8 @@
</div>
<div
class=
"table-button"
>
<el-dropdown
trigger=
"click"
@
command=
"(command)=>handleGoods('all',item,command)"
>
<el-button
type=
"success"
size=
"small"
>
预装全部
</el-button>
<el-dropdown-menu
slot=
"dropdown"
>
<el-button
type=
"success"
size=
"small"
:disabled=
"isAudit"
>
预装全部
</el-button>
<el-dropdown-menu
slot=
"dropdown"
v-if=
"preList.sectionGoodList"
>
<el-dropdown-item
:command=
"part"
v-for=
"(part, index) in preList.sectionGoodList"
:key=
"part.id"
>
第{{index+1}}部分
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
...
...
@@ -257,7 +257,7 @@
</el-table-column>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-dropdown trigger="click" @command="(command)=>handleGoods('sing
e
le',scope.row,command)">
<el-dropdown trigger="click" @command="(command)=>handleGoods('single',scope.row,command)">
<el-button type="primary" size="small">预装</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="part" v-for="(part, index) in preList" :key="part.id">第{{index+1}}部分</el-dropdown-item>
...
...
@@ -311,6 +311,7 @@ import {
deleteSection
,
createGoods
,
deleteGoods
,
changeSection
,
approvalCreate
,
approvalCancel
,
}
from
"
@/api/ecw/boxSea
"
;
...
...
@@ -494,18 +495,22 @@ export default {
return
;
}
if
(
column
.
property
===
"
num
"
)
{
sums
[
index
]
=
this
.
calcSum
(
column
.
property
,
data
)
??
0
;
sums
[
index
]
=
new
Decimal
(
this
.
calcSum
(
column
.
property
,
data
)
).
toNumber
();
}
if
(
column
.
property
===
"
volumeWeight
"
)
{
const
volume
=
this
.
calcSum
(
"
volume
"
,
data
);
const
weight
=
this
.
calcSum
(
"
weight
"
,
data
);
let
volume
=
this
.
calcSum
(
"
volume
"
,
data
);
let
weight
=
this
.
calcSum
(
"
weight
"
,
data
);
volume
=
volume
===
0
?
volume
:
new
Decimal
(
volume
).
toFixed
(
2
);
weight
=
weight
===
0
?
weight
:
new
Decimal
(
weight
).
toFixed
(
2
);
sums
[
index
]
=
getTotlContent
({
volume
,
weight
},
[
"
volume
"
,
"
weight
"
,
]);
sums
[
index
]
=
sums
[
index
].
replace
(
"
"
,
"
\n
"
);
}
});
return
sums
;
},
/* 计算总和 */
...
...
@@ -515,12 +520,13 @@ export default {
return
values
.
reduce
((
prev
,
curr
)
=>
{
const
value
=
Number
(
curr
);
if
(
!
isNaN
(
value
))
{
return
Decimal
.
add
(
prev
,
curr
)
;
return
prev
+
curr
;
}
else
{
return
prev
;
}
},
0
);
}
return
0
;
},
/* 待预装订单分页 */
pageChange
(
page
)
{
...
...
@@ -558,23 +564,32 @@ export default {
},
/** 预装 */
handleGoods
(
type
,
item
,
part
)
{
let
params
=
{
secId
:
part
.
id
,
shipmentId
:
this
.
shipmentObj
.
id
,
orderId
:
item
.
orderId
,
};
if
(
type
===
"
all
"
)
{
params
.
orderItemIdList
=
item
.
boxOrderItemList
.
map
(
(
data
)
=>
data
.
orderItemId
);
let
params
=
{
secId
:
part
.
id
,
shipmentId
:
this
.
shipmentObj
.
id
,
orderId
:
item
.
orderId
,
orderItemIdList
:
item
.
boxOrderItemList
.
map
(
(
data
)
=>
data
.
orderItemId
),
};
createGoods
(
params
).
then
((
res
)
=>
{
serviceMsg
(
res
,
this
).
then
(()
=>
{
this
.
queryAllData
();
});
});
}
else
{
params
.
orderItemIdList
=
[
item
.
orderItemId
];
}
createGoods
(
params
).
then
((
res
)
=>
{
serviceMsg
(
res
,
this
).
then
(()
=>
{
this
.
queryAllData
();
let
params
=
{
secId
:
part
.
id
,
id
:
item
.
id
,
};
changeSection
(
params
).
then
((
res
)
=>
{
serviceMsg
(
res
,
this
).
then
(()
=>
{
this
.
queryAllData
();
});
});
}
);
}
},
/* 删除订单 */
deleteOrder
(
type
,
data
)
{
...
...
@@ -735,6 +750,11 @@ export default {
.tobePre-row
{
margin-top
:
10px
;
.el-table
{
.cell
{
white-space
:
pre-line
;
}
}
}
}
}
...
...
src/views/ecw/box/shippingSea/nodePage/review.vue
View file @
d29947a1
...
...
@@ -6,8 +6,8 @@
</el-form-item>
</el-form>
<el-row
class=
"operate-button"
>
<el-button
type=
"success"
@
click=
"onSubmit"
:disabled=
"
isReview"
>
发起申请
</el-button>
<el-button
type=
"primary"
@
click=
"jumpReviewDetail"
:disabled=
"!
isReview"
>
审核中
</el-button>
<el-button
type=
"success"
@
click=
"onSubmit"
v-show=
"!
isReview"
>
发起申请
</el-button>
<el-button
type=
"primary"
@
click=
"jumpReviewDetail"
v-show=
"
isReview"
>
审核中
</el-button>
<el-button
@
click=
"cancel"
>
关闭
</el-button>
</el-row>
</div>
...
...
src/views/ecw/box/shippingSea/nodePage/tally/index.vue
View file @
d29947a1
...
...
@@ -46,7 +46,7 @@
</
template
>
</el-table-column>
<el-table-column
label=
"箱数"
align=
"center"
prop=
"num"
/>
<el-table-column
label=
"纸箱尺寸"
align=
"center"
prop=
"boxGauge"
>
<el-table-column
label=
"纸箱尺寸"
align=
"center"
prop=
"
warehouseInInfo.
boxGauge"
>
</el-table-column>
<el-table-column
label=
"体积"
align=
"center"
prop=
"volume"
>
</el-table-column>
...
...
@@ -130,8 +130,14 @@ export default {
let
list
=
[];
res
.
data
.
forEach
((
item
)
=>
{
item
.
orderItemList
.
forEach
((
oItem
)
=>
{
let
warehouseInInfo
=
{};
if
(
oItem
.
warehouseInInfo
)
{
warehouseInInfo
=
JSON
.
parse
(
oItem
.
warehouseInInfo
??
{});
}
list
.
push
({
...
oItem
,
warehouseInInfo
,
positionNo
:
item
.
positionNo
,
tallyStatus
:
item
.
tallyStatus
,
tallyTime
:
item
.
tallyTime
,
...
...
src/views/ecw/box/shippingSea/nodePage/unloading/startUnloading.vue
View file @
d29947a1
...
...
@@ -329,7 +329,7 @@ export default {
let
count
=
0
;
if
(
this
.
pageData
.
sectionOrderList
)
{
this
.
pageData
.
sectionOrderList
.
forEach
((
item
)
=>
{
count
=
Decimal
.
add
(
count
,
item
.
unloadNum
);
count
=
Decimal
.
add
(
count
,
item
.
unloadNum
)
.
toNumber
()
;
});
}
return
count
;
...
...
src/views/ecw/box/shippingSea/nodePage/unloading/unloadingError.vue
View file @
d29947a1
<
template
>
<div>
<el-form
ref=
"errorForm"
:model=
"errorObj"
label-width=
"100px"
>
<el-form-item
label=
"异常"
>
<el-radio-group
v-model=
"errorObj.exceptionType
"
>
<el-form
ref=
"errorForm"
:model=
"errorObj"
label-width=
"100px"
:rules=
"rules"
>
<el-form-item
label=
"异常"
prop=
"exceptionType"
>
<el-radio-group
v-model=
"errorObj.exceptionType"
>
<el-radio
v-for=
"item in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_UNLOADING_ERROR)"
:key=
"item.value"
:label=
"item.value"
>
{{
item
.
label
}}
</el-radio>
</el-radio-group>
</el-form-item>
...
...
@@ -11,7 +11,7 @@
<el-option
v-for=
"(item, index) in goodsList"
:key=
"index"
:value=
"item.orderItemId"
:label=
"item.prodTitleZh"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"件数"
>
<el-form-item
label=
"件数"
prop=
"productNum"
>
<el-input-number
v-model=
"errorObj.productNum"
controls-position=
"right"
:min=
"1"
></el-input-number>
</el-form-item>
<el-form-item
label=
"异常详情"
>
...
...
@@ -39,6 +39,11 @@ export default {
const
{
currRow
}
=
this
.
$attrs
;
return
{
// 校验
rules
:
{
exceptionType
:
[{
required
:
true
,
message
:
"
必填
"
,
trigger
:
"
change
"
}],
productNum
:
[{
required
:
true
,
message
:
"
必填
"
,
trigger
:
"
change
"
}],
},
// 异常对象
errorObj
:
{
productId
:
currRow
.
goodsList
[
0
].
orderItemId
,
...
...
src/views/ecw/box/shippingSea/utils.js
View file @
d29947a1
...
...
@@ -1415,10 +1415,14 @@ function getTotlContent(total, keys = ["num", "volume", "weight"]) {
content
.
push
(
`
${
total
?.
num
??
0
}
箱
`);
}
if (key === "volume") {
content.push(`
$
{
total
?.
volume
??
0
}
m
³
`);
let volume = total?.volume ?? 0;
volume = volume === 0 ? volume : new Decimal(volume).toFixed(2);
content.push(`
$
{
volume
}
m
³
`);
}
if (key === "weight") {
content.push(`
$
{
total
?.
weight
??
0
}
kg
`);
let weight = total?.weight ?? 0;
weight = weight === 0 ? weight : new Decimal(weight).toFixed(2);
content.push(`
$
{
weight
}
kg
`);
}
}
return content.join(" ");
...
...
@@ -1437,13 +1441,22 @@ function sumStatistics(val) {
const { secStatistics } = item;
if (secStatistics) {
if (!Number.isNaN(Number(secStatistics.num))) {
count.num = Decimal.add(count.num, Number(secStatistics.num));
count.num = Decimal.add(
count.num,
Number(secStatistics.num)
).toNumber();
}
if (!Number.isNaN(Number(secStatistics.volume))) {
count.volume = Decimal.add(count.volume, Number(secStatistics.volume));
count.volume = Decimal.add(
count.volume,
Number(secStatistics.volume)
);
}
if (!Number.isNaN(Number(secStatistics.weight))) {
count.weight = Decimal.add(count.weight, Number(secStatistics.weight));
count.weight = Decimal.add(
count.weight,
Number(secStatistics.weight)
);
}
}
});
...
...
src/views/ecw/financial/creatCollection.vue
View file @
d29947a1
...
...
@@ -7,16 +7,16 @@
label-position=
"left"
>
<el-card>
<div
v-if=
"id"
slot=
"header"
class=
"card-title"
>
修改收款单
</div>
<div
v-else
slot=
"header"
class=
"card-title"
>
新增收款单
</div>
<div
v-if=
"id"
slot=
"header"
class=
"card-title"
>
{{
$t
(
'
修改收款单
'
)
}}
</div>
<div
v-else
slot=
"header"
class=
"card-title"
>
{{
$t
(
'
新增收款单
'
)
}}
</div>
<el-descriptions
:column=
"3"
border
>
<el-descriptions-item
label=
"客户
"
>
<el-descriptions-item
:label=
"$t('客户')
"
>
<el-form-item
label=
""
label-width=
"0"
style=
"margin-bottom: 0"
prop=
"customerId"
:rules=
"
{ required: true, trigger: ['blur', 'change'], message:
'客户不能为空'
}"
:rules=
"
{ required: true, trigger: ['blur', 'change'], message:
$t('客户不能为空')
}"
>
<customer-selector
v-model=
"form.customerId"
...
...
@@ -24,18 +24,18 @@
/>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item
label=
"部门
"
>
<el-descriptions-item
:label=
"$t('部门')
"
>
<el-form-item
label=
""
label-width=
"0"
style=
"margin-bottom: 0"
prop=
"departmentId"
:rules=
"
{ required: true, trigger: ['blur', 'change'], message:
'部门不能为空'
}"
:rules=
"
{ required: true, trigger: ['blur', 'change'], message:
$t('部门不能为空')
}"
>
<el-select
v-model=
"form.departmentId"
style=
"width: 300px"
placeholder=
"请选择部门
"
:placeholder=
"$t('请选择部门')
"
>
<el-option
v-for=
"item in deptData"
...
...
@@ -46,15 +46,15 @@
</el-select>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item
label=
"业务员
"
>
<el-descriptions-item
:label=
"$t('业务员')
"
>
<el-form-item
label=
""
label-width=
"0"
style=
"margin-bottom: 0"
prop=
"salesmanId"
:rules=
"
{ required: true, trigger: ['blur', 'change'], message:
'客户不能为空'
}"
:rules=
"
{ required: true, trigger: ['blur', 'change'], message:
$t('业务员不能为空')
}"
>
<el-select
v-model=
"form.salesmanId"
placeholder=
"请选择业务员
"
@
change=
"v => form.salesmanName = creatorData.find(t => t.id === v).nickname"
>
<el-select
v-model=
"form.salesmanId"
:placeholder=
"$t('请选择业务员')
"
@
change=
"v => form.salesmanName = creatorData.find(t => t.id === v).nickname"
>
<el-option
v-for=
"item in creatorData"
:key=
"item.id"
...
...
@@ -64,34 +64,34 @@
</el-select>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item
label=
"手续费(RMB
)"
>
<el-descriptions-item
:label=
"$t('手续费(RMB)'
)"
>
<el-form-item
label=
""
label-width=
"0"
style=
"margin-bottom: 0"
prop=
"feeRate"
:rules=
"
{ required: true, trigger: ['blur', 'change'], message:
'手续费不能为空'
}"
:rules=
"
{ required: true, trigger: ['blur', 'change'], message:
$t('手续费不能为空')
}"
>
<el-input
v-model=
"form.feeRate"
placeholder=
"请输入手续费
"
:placeholder=
"$t('请输入手续费')
"
></el-input>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item
label=
"备注
"
>
<el-descriptions-item
:label=
"$t('备注')
"
>
<el-form-item
label=
""
label-width=
"0"
style=
"margin-bottom: 0"
prop=
"remark"
>
<el-input
v-model=
"form.remark"
placeholder=
"备注
"
></el-input>
<el-input
v-model=
"form.remark"
:placeholder=
"$t('备注')
"
></el-input>
</el-form-item>
</el-descriptions-item>
</el-descriptions>
</el-card>
<el-card
class=
"card amountCard"
>
<div
slot=
"header"
class=
"card-title"
>
订单信息
</div>
<div
slot=
"header"
class=
"card-title"
>
{{
$t
(
'
订单信息
'
)
}}
</div>
<el-col
:span=
"1.5"
>
<el-button
type=
"primary"
...
...
@@ -100,20 +100,20 @@
size=
"mini"
@
click=
"handleAdd"
style=
"padding: 10px; margin-bottom: 10px"
>
添加未收客户款项
</el-button
>
{{
$t
(
'
添加未收客户款项
'
)
}}
</el-button
>
</el-col>
<el-table
v-loading=
"loadings"
:data=
"list"
border
>
<el-table-column
label=
"订单号
"
align=
"center"
prop=
"orderNo"
/>
<el-table-column
label=
"唛头
"
align=
"center"
prop=
"marks"
/>
<el-table-column
label=
"品名
"
align=
"center"
prop=
"title"
>
<el-table-column
:label=
"$t('订单号')
"
align=
"center"
prop=
"orderNo"
/>
<el-table-column
:label=
"$t('唛头')
"
align=
"center"
prop=
"marks"
/>
<el-table-column
:label=
"$t('品名')
"
align=
"center"
prop=
"title"
>
<template
slot-scope=
"scope"
>
{{
scope
.
row
.
titleZh
?(
scope
.
row
.
titleZh
+
"
(
"
+
scope
.
row
.
titleEn
+
"
)
"
):
''
}}
</
template
>
</el-table-column>
<el-table-column
label=
"箱数
"
align=
"center"
prop=
"num"
/>
<el-table-column
label=
"体积/重量
"
align=
"center"
prop=
"weight"
/>
<el-table-column
label=
"收入类型
"
align=
"center"
prop=
"feeType"
>
<el-table-column
:label=
"$t('箱数')
"
align=
"center"
prop=
"num"
/>
<el-table-column
:label=
"$t('体积/重量')
"
align=
"center"
prop=
"weight"
/>
<el-table-column
:label=
"$t('收入类型')
"
align=
"center"
prop=
"feeType"
>
<
template
slot-scope=
"scope"
>
<dict-tag
:type=
"DICT_TYPE.FEE_TYPE"
...
...
@@ -121,131 +121,131 @@
></dict-tag>
</
template
>
</el-table-column>
<el-table-column
label=
"单价金额
"
align=
"center"
prop=
"unitPrice"
>
<el-table-column
:label=
"$t('单价金额')
"
align=
"center"
prop=
"unitPrice"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
unitPrice
}}
</span>
<dict-tag
:type=
"DICT_TYPE.BOX_SHIPPING_PRICE_UNIT"
:value=
"scope.row.currencyId"
/>
</
template
>
</el-table-column>
<el-table-column
label=
"总金额
"
align=
"center"
prop=
"totalAmount"
>
<el-table-column
:label=
"$t('总金额')
"
align=
"center"
prop=
"totalAmount"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
totalAmount
}}
</span>
<dict-tag
:type=
"DICT_TYPE.BOX_SHIPPING_PRICE_UNIT"
:value=
"scope.row.currencyId"
/>
</
template
>
</el-table-column>
<el-table-column
label=
"优惠金额
"
align=
"center"
>
<el-table-column
:label=
"$t('优惠金额')
"
align=
"center"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
discountTotal
?
`${scope.row.discountTotal
}
`
:
0
}}
<
/span
>
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
scope.row.currencyId
"
/>
<
span
v
-
if
=
"
scope.row.discountTotal
"
>
{{
scope
.
row
.
discountRemark
?(
'
(
'
+
scope
.
row
.
discountRemark
+
'
)
'
):
''
}}
<
/span
>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"
操作
"
align
=
"
center
"
>
<
el
-
table
-
column
:
label
=
"
$t('操作')
"
align
=
"
center
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
el
-
button
v
-
if
=
"
scope.row.type !== 'total'
"
type
=
"
text
"
@
click
=
"
addDiscount(scope.row, scope.$index)
"
>
{{
scope
.
row
.
discountTotal
?
'
修改优惠
'
:
'
新增优惠
'
}}
<
/el-button
>
<
el
-
button
v
-
if
=
"
scope.row.type !== 'total'
"
type
=
"
text
"
@
click
=
"
deleteListRow(scope.$index)
"
>
删除
<
/el-button
>
<
el
-
button
v
-
if
=
"
scope.row.type !== 'total'
"
type
=
"
text
"
@
click
=
"
addDiscount(scope.row, scope.$index)
"
>
{{
scope
.
row
.
discountTotal
?
$t
(
'
修改优惠
'
)
:
$t
(
'
新增优惠
'
)
}}
<
/el-button
>
<
el
-
button
v
-
if
=
"
scope.row.type !== 'total'
"
type
=
"
text
"
@
click
=
"
deleteListRow(scope.$index)
"
>
{{
$t
(
'
删除
'
)
}}
<
/el-button
>
<
/template
>
<
/el-table-column
>
<
/el-table
>
<
el
-
descriptions
:
column
=
"
2
"
border
class
=
"
card
"
>
<
el
-
descriptions
-
item
label
=
"
是否需要开票
"
>
<
el
-
descriptions
-
item
:
label
=
"
$t('是否需要开票')
"
>
<
el
-
form
-
item
label
=
""
label
-
width
=
"
0
"
style
=
"
margin-bottom: 0
"
prop
=
"
openInvoice
"
:
rules
=
"
{ required: true, trigger: ['blur', 'change'], message:
'请选择是否需要开票'
}
"
:
rules
=
"
{ required: true, trigger: ['blur', 'change'], message:
$t('请选择是否需要开票')
}
"
>
<
el
-
select
v
-
model
=
"
form.openInvoice
"
placeholder
=
"
请选择是否需要开票
"
:
placeholder
=
"
$t('请选择是否需要开票')
"
>
<
el
-
option
:
value
=
"
1
"
label
=
"
是
"
><
/el-option
>
<
el
-
option
:
value
=
"
0
"
label
=
"
否
"
><
/el-option
>
<
el
-
option
:
value
=
"
1
"
:
label
=
"
$t('是')
"
><
/el-option
>
<
el
-
option
:
value
=
"
0
"
:
label
=
"
$t('否')
"
><
/el-option
>
<
/el-select
>
<
/el-form-item
>
<
/el-descriptions-item
>
<
el
-
descriptions
-
item
label
=
"
核销基准币种
"
>
<
el
-
descriptions
-
item
:
label
=
"
$t('核销基准币种')
"
>
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
showCurrencyId
"
/>
<
/el-descriptions-item
>
<
/el-descriptions
>
<
/el-card
>
<
el
-
card
v
-
if
=
"
showInvoice
"
class
=
"
card
"
>
<
div
slot
=
"
header
"
class
=
"
card-title
"
>
开票资料
<
/div
>
<
div
slot
=
"
header
"
class
=
"
card-title
"
>
{{
$t
(
'
开票资料
'
)
}}
<
/div
>
<
el
-
descriptions
:
column
=
"
3
"
border
>
<
el
-
descriptions
-
item
label
=
"
发票抬头
"
>
<
el
-
descriptions
-
item
:
label
=
"
$t('发票抬头')
"
>
<
el
-
form
-
item
label
=
""
label
-
width
=
"
0
"
style
=
"
margin-bottom: 0
"
prop
=
"
invoice
"
:
rules
=
"
{ required: true, trigger: ['blur', 'change'], message:
'请输入发票抬头'
}
"
:
rules
=
"
{ required: true, trigger: ['blur', 'change'], message:
$t('请输入发票抬头')
}
"
>
<
el
-
input
v
-
model
=
"
form.invoice
"
><
/el-input
>
<
/el-form-item
>
<
/el-descriptions-item
>
<
el
-
descriptions
-
item
label
=
"
纳税人识别号
"
>
<
el
-
descriptions
-
item
:
label
=
"
$t('纳税人识别号')
"
>
<
el
-
form
-
item
label
=
""
label
-
width
=
"
0
"
style
=
"
margin-bottom: 0
"
prop
=
"
taxpayer
"
:
rules
=
"
{ required: true, trigger: ['blur', 'change'], message:
'请输入纳税人识别号'
}
"
:
rules
=
"
{ required: true, trigger: ['blur', 'change'], message:
$t('请输入纳税人识别号')
}
"
>
<
el
-
input
v
-
model
=
"
form.taxpayer
"
><
/el-input
>
<
/el-form-item
>
<
/el-descriptions-item
>
<
el
-
descriptions
-
item
label
=
"
开户行
"
>
<
el
-
descriptions
-
item
:
label
=
"
$t('开户行')
"
>
<
el
-
form
-
item
label
=
""
label
-
width
=
"
0
"
style
=
"
margin-bottom: 0
"
prop
=
"
accountBank
"
:
rules
=
"
{ required: true, trigger: ['blur', 'change'], message:
'请输入开户行'
}
"
:
rules
=
"
{ required: true, trigger: ['blur', 'change'], message:
$t('请输入开户行')
}
"
>
<
el
-
input
v
-
model
=
"
form.accountBank
"
><
/el-input
>
<
/el-form-item
>
<
/el-descriptions-item
>
<
el
-
descriptions
-
item
label
=
"
账号
"
>
<
el
-
descriptions
-
item
:
label
=
"
$t('账号')
"
>
<
el
-
form
-
item
label
=
""
label
-
width
=
"
0
"
style
=
"
margin-bottom: 0
"
prop
=
"
accountName
"
:
rules
=
"
{ required: true, trigger: ['blur', 'change'], message:
'请输入账号'
}
"
:
rules
=
"
{ required: true, trigger: ['blur', 'change'], message:
$t('请输入账号')
}
"
>
<
el
-
input
v
-
model
=
"
form.accountName
"
><
/el-input
>
<
/el-form-item
>
<
/el-descriptions-item
>
<
el
-
descriptions
-
item
label
=
"
项目
"
>
<
el
-
descriptions
-
item
:
label
=
"
$t('项目')
"
>
<
el
-
form
-
item
label
=
""
label
-
width
=
"
0
"
style
=
"
margin-bottom: 0
"
prop
=
"
projectName
"
:
rules
=
"
{ required: true, trigger: ['blur', 'change'], message:
'请输入项目'
}
"
:
rules
=
"
{ required: true, trigger: ['blur', 'change'], message:
$t('请输入项目')
}
"
>
<
el
-
input
v
-
model
=
"
form.projectName
"
><
/el-input
>
<
/el-form-item
>
<
/el-descriptions-item
>
<
el
-
descriptions
-
item
label
=
"
税率%
"
>
<
el
-
descriptions
-
item
:
label
=
"
$t('税率%')
"
>
<
el
-
form
-
item
label
=
""
label
-
width
=
"
0
"
style
=
"
margin-bottom: 0
"
prop
=
"
taxRate
"
:
rules
=
"
{ required: true, trigger: ['blur', 'change'], message:
'请输入税率'
}
"
:
rules
=
"
{ required: true, trigger: ['blur', 'change'], message:
$t('请输入税率')
}
"
>
<
el
-
input
v
-
model
=
"
form.taxRate
"
><
/el-input
>
<
/el-form-item
>
<
/el-descriptions-item
>
<
el
-
descriptions
-
item
label
=
"
开票地址/电话
"
>
<
el
-
descriptions
-
item
:
label
=
"
$t('开票地址/电话')
"
>
<
el
-
form
-
item
label
=
""
label
-
width
=
"
0
"
style
=
"
margin-bottom: 0
"
prop
=
"
addressPhone
"
:
rules
=
"
{ required: true, trigger: ['blur', 'change'], message:
'请输入开票地址/电话'
}
"
:
rules
=
"
{ required: true, trigger: ['blur', 'change'], message:
$t('请输入开票地址/电话')
}
"
>
<
el
-
input
v
-
model
=
"
form.addressPhone
"
><
/el-input
>
<
/el-form-item
>
...
...
@@ -253,21 +253,21 @@
<
/el-descriptions
>
<
/el-card
>
<
el
-
card
class
=
"
card
"
>
<
div
slot
=
"
header
"
class
=
"
card-title
"
>
应收账单
<
/div
>
<
div
slot
=
"
header
"
class
=
"
card-title
"
>
{{
$t
(
'
应收账单
'
)
}}
<
/div
>
<
el
-
table
:
data
=
"
form.receiptAccountList
"
border
:
key
=
"
form.receiptAccountList.length
"
>
<
el
-
table
-
column
label
=
"
应收币种
"
align
=
"
center
"
>
<
el
-
table
-
column
:
label
=
"
$t('应收币种')
"
align
=
"
center
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
scope.row.currencyId
"
/>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"
应收金额
"
align
=
"
center
"
prop
=
"
receivableAmount
"
>
<
el
-
table
-
column
:
label
=
"
$t('应收金额')
"
align
=
"
center
"
prop
=
"
receivableAmount
"
>
<
template
slot
-
scope
=
"
scope
"
v
-
if
=
"
scope.row.type !== 'total'
"
>
{{
`${NP.minus(scope.row.receivableAmount, scope.row.discountTotal)
}
${scope.row.discountTotal > 0 ? `
(
$
{
scope
.
row
.
receivableAmount
}
-
$
{
scope
.
row
.
discountTotal
}
)
` : ''
}
`
}}
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
align
=
"
center
"
width
=
"
220
"
>
<
template
#
header
>
核销基准币种(
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
showCurrencyId
"
/>
)汇率
{{
$t
(
'
核销基准币种
'
)
}}
(
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
showCurrencyId
"
/>
)
{{
$t
(
'
汇率
'
)
}}
<
/template
>
<
template
slot
-
scope
=
"
scope
"
>
<
template
v
-
if
=
"
scope.row.type !== 'total'
"
>
...
...
@@ -283,16 +283,16 @@
<
/el-form-item
>
<
/template
>
<
template
v
-
else
>
应收总金额
(
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
showCurrencyId
"
/>
)
{{
$t
(
'
应收总金额
'
)
}}
(
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
showCurrencyId
"
/>
)
<
/template
>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
align
=
"
center
"
prop
=
"
writeOffAmount
"
>
<
template
#
header
>
核销基准金额
(
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
showCurrencyId
"
/>
)
{{
$t
(
'
核销基准金额
'
)
}}
(
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
showCurrencyId
"
/>
)
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"
收款账户
"
align
=
"
center
"
>
<
el
-
table
-
column
:
label
=
"
$t('收款账户')
"
align
=
"
center
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
el
-
form
-
item
v
-
if
=
"
scope.row.type !== 'total'
"
...
...
@@ -303,7 +303,7 @@
>
<
el
-
select
v
-
model
=
"
scope.row.platformAccountId
"
placeholder
=
"
请选择收款账户
"
:
placeholder
=
"
$t('请选择收款账户')
"
>
<
el
-
option
v
-
for
=
"
item in bankData
"
...
...
@@ -315,7 +315,7 @@
<
/el-form-item
>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"
收款币种
"
align
=
"
center
"
>
<
el
-
table
-
column
:
label
=
"
$t('收款币种')
"
align
=
"
center
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
el
-
form
-
item
v
-
if
=
"
scope.row.type !== 'total'
"
...
...
@@ -332,7 +332,7 @@
<
/el-form-item
>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"
收款汇率
"
align
=
"
center
"
>
<
el
-
table
-
column
:
label
=
"
$t('收款汇率')
"
align
=
"
center
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
el
-
form
-
item
v
-
if
=
"
scope.row.type !== 'total'
"
...
...
@@ -343,23 +343,23 @@
>
<
el
-
input
v
-
model
=
"
scope.row.collectionRate
"
@
input
=
"
() => rateChange(scope.row, scope.$index)
"
><
/el-input
>
<
/el-form-item
>
<
span
v
-
else
>
收款总金额
<
/span
>
<
span
v
-
else
>
{{
$t
(
'
收款总金额
'
)
}}
<
/span
>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"
收款金额
"
align
=
"
center
"
prop
=
"
collectionAmount
"
>
<
el
-
table
-
column
:
label
=
"
$t('收款金额')
"
align
=
"
center
"
prop
=
"
collectionAmount
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
span
v
-
if
=
"
scope.row.type !== 'total'
"
>
{{
scope
.
row
.
collectionAmount
.
toFixed
(
6
)
}}
<
/span
>
<
div
v
-
else
>
<
div
v
-
if
=
"
scope.row.collectionAmount[0]
"
>
美元
:
{{
scope
.
row
.
collectionAmount
[
0
].
toFixed
(
6
)
}}
<
/div
>
<
div
v
-
if
=
"
scope.row.collectionAmount[1]
"
>
人民币
:
{{
scope
.
row
.
collectionAmount
[
1
].
toFixed
(
6
)
}}
<
/div
>
<
div
v
-
if
=
"
scope.row.collectionAmount[2]
"
>
奈拉
:
{{
scope
.
row
.
collectionAmount
[
2
].
toFixed
(
6
)
}}
<
/div
>
<
div
v
-
if
=
"
scope.row.collectionAmount[0]
"
>
{{
$t
(
'
美元
'
)
}}
:
{{
scope
.
row
.
collectionAmount
[
0
].
toFixed
(
6
)
}}
<
/div
>
<
div
v
-
if
=
"
scope.row.collectionAmount[1]
"
>
{{
$t
(
'
人民币
'
)
}}
:
{{
scope
.
row
.
collectionAmount
[
1
].
toFixed
(
6
)
}}
<
/div
>
<
div
v
-
if
=
"
scope.row.collectionAmount[2]
"
>
{{
$t
(
'
奈拉
'
)
}}
:
{{
scope
.
row
.
collectionAmount
[
2
].
toFixed
(
6
)
}}
<
/div
>
<
/div
>
<!--
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
scope.row.currencyId
"
/>
-->
<
/template
>
<
/el-table-column
>
<
/el-table
>
<
el
-
descriptions
:
column
=
"
2
"
border
class
=
"
card
"
>
<
el
-
descriptions
-
item
label
=
"
账单汇率有效期
"
>
<
el
-
descriptions
-
item
:
label
=
"
$t('账单汇率有效期')
"
>
<
el
-
form
-
item
label
=
""
label
-
width
=
"
0
"
...
...
@@ -370,7 +370,7 @@
v
-
model
=
"
form.rateValidateDate
"
type
=
"
datetime
"
value
-
format
=
"
yyyy-MM-dd HH:mm:ss
"
placeholder
=
"
选择日期时间
"
>
:
placeholder
=
"
$t('选择日期时间')
"
>
<
/el-date-picker
>
<
/el-form-item
>
<
/el-descriptions-item
>
...
...
@@ -378,13 +378,13 @@
<
/el-card
>
<
/el-form
>
<
div
slot
=
"
footer
"
style
=
"
margin: 20px 0
"
>
<
el
-
button
v
-
if
=
"
id==0||form.state==0
"
type
=
"
primary
"
:
loading
=
"
saveBtnLoading
"
@
click
=
"
submitForm(1)
"
>
保
存
<
/el-button
>
<
el
-
button
v
-
else
type
=
"
primary
"
:
loading
=
"
saveBtnLoading
"
@
click
=
"
$store.dispatch('tagsView/delCurrentView')
"
>
返
回
<
/el-button
>
<
el
-
button
type
=
"
primary
"
:
loading
=
"
saveBtnLoading
"
@
click
=
"
submitForm(0)
"
>
{{
id
&&
form
.
state
!=
0
?
'
修 改
'
:
'
新 增
'
}}
<
/el-button
>
<
el
-
button
v
-
if
=
"
id==0||form.state==0
"
type
=
"
primary
"
:
loading
=
"
saveBtnLoading
"
@
click
=
"
submitForm(1)
"
>
{{
$t
(
'
保存
'
)
}}
<
/el-button
>
<
el
-
button
v
-
else
type
=
"
primary
"
:
loading
=
"
saveBtnLoading
"
@
click
=
"
$store.dispatch('tagsView/delCurrentView')
"
>
{{
$t
(
'
返回
'
)
}}
<
/el-button
>
<
el
-
button
type
=
"
primary
"
:
loading
=
"
saveBtnLoading
"
@
click
=
"
submitForm(0)
"
>
{{
id
&&
form
.
state
!=
0
?
$t
(
'
修改
'
)
:
$t
(
'
新增
'
)
}}
<
/el-button
>
<
/div
>
<
el
-
dialog
:
visible
.
sync
=
"
open
"
title
=
"
添加未收客户款项
"
:
title
=
"
$t('添加未收客户款项')
"
width
=
"
80%
"
append
-
to
-
body
@
open
=
"
getList
"
...
...
@@ -400,10 +400,10 @@
label
-
width
=
"
80px
"
>
<
el
-
row
>
<
el
-
form
-
item
label
=
"
始发城市
"
>
<
el
-
form
-
item
:
label
=
"
$t('始发城市')
"
>
<
el
-
select
v
-
model
=
"
queryParams.departureId
"
placeholder
=
"
请选择始发地
"
:
placeholder
=
"
$t('请选择始发地')
"
>
<
el
-
option
v
-
for
=
"
item in expoerCityList
"
...
...
@@ -413,10 +413,10 @@
><
/el-option
>
<
/el-select
>
<
/el-form-item
>
<
el
-
form
-
item
label
=
"
目的城市
"
>
<
el
-
form
-
item
:
label
=
"
$t('目的城市')
"
>
<
el
-
select
v
-
model
=
"
queryParams.objectiveId
"
placeholder
=
"
请选择始发地
"
:
placeholder
=
"
$t('请选择始发地')
"
>
<
el
-
option
v
-
for
=
"
item in importCityList
"
...
...
@@ -426,17 +426,17 @@
><
/el-option
>
<
/el-select
>
<
/el-form-item
>
<
el
-
form
-
item
label
=
"
运输方式
"
>
<
el
-
form
-
item
:
label
=
"
$t('运输方式')
"
>
<
dict
-
selector
:
type
=
"
DICT_TYPE.ECW_TRANSPORT_TYPE
"
v
-
model
=
"
queryParams.transportId
"
formatter
=
"
number
"
/>
<
/el-form-item
>
<
el
-
form
-
item
label
=
"
出货渠道
"
>
<
el
-
form
-
item
:
label
=
"
$t('出货渠道')
"
>
<
el
-
select
v
-
model
=
"
queryParams.channelId
"
placeholder
=
"
请选择出货渠道
"
:
placeholder
=
"
$t('请选择出货渠道')
"
>
<
el
-
option
v
-
for
=
"
item in channelList
"
...
...
@@ -448,38 +448,38 @@
<
/el-form-item
>
<
/el-row
>
<
el
-
row
>
<
el
-
form
-
item
label
=
"
报关方式
"
>
<
el
-
form
-
item
:
label
=
"
$t('报关方式')
"
>
<
dict
-
selector
:
type
=
"
DICT_TYPE.ECW_CUSTOMS_TYPE
"
v
-
model
=
"
queryParams.customsType
"
/>
<
/el-form-item
>
<
el
-
form
-
item
label
=
"
控货
"
>
<
el
-
form
-
item
:
label
=
"
$t('控货')
"
>
<
dict
-
selector
:
type
=
"
DICT_TYPE.INFRA_BOOLEAN_STRING
"
v
-
model
=
"
queryParams.control
"
/>
<
/el-form-item
>
<
el
-
form
-
item
label
=
"
客户名称
"
>
<
el
-
form
-
item
:
label
=
"
$t('客户名称')
"
>
<
customer
-
selector
v
-
model
=
"
queryParams.consignorId
"
@
change
=
"
consignor = $event
"
/>
<
/el-form-item
>
<
/el-row
>
<
el
-
form
-
item
label
=
"
订单编号
"
prop
=
"
orderNo
"
>
<
el
-
form
-
item
:
label
=
"
$t('订单编号')
"
prop
=
"
orderNo
"
>
<
el
-
input
v
-
model
=
"
queryParams.orderNo
"
placeholder
=
"
请输入订单编号
"
:
placeholder
=
"
$t('请输入订单编号')
"
clearable
@
keyup
.
enter
.
native
=
"
handleQuery
"
/>
<
/el-form-item
>
<
el
-
form
-
item
label
=
"
自编号
"
prop
=
"
selfNo
"
>
<
el
-
form
-
item
:
label
=
"
$t('自编号')
"
prop
=
"
selfNo
"
>
<
el
-
input
v
-
model
=
"
queryParams.selfNo
"
placeholder
=
"
请输入自编号
"
:
placeholder
=
"
$t('请输入自编号')
"
clearable
@
keyup
.
enter
.
native
=
"
handleQuery
"
/>
...
...
@@ -487,7 +487,7 @@
<
el
-
form
-
item
>
<
el
-
button
type
=
"
primary
"
icon
=
"
el-icon-search
"
@
click
=
"
handleQuery
"
>
查询
<
/el-butto
n
>
{{
$t
(
'
查询
'
)
}}
<
/el-butto
n
>
<
/el-form-item
>
<
/el-form
>
...
...
@@ -502,18 +502,18 @@
:
key
=
"
dialogTableKey
"
>
<
el
-
table
-
column
type
=
"
selection
"
width
=
"
55
"
:
reserve
-
selection
=
"
true
"
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"
订单号
"
align
=
"
center
"
prop
=
"
orderNo
"
/>
<
el
-
table
-
column
label
=
"
唛头
"
align
=
"
center
"
prop
=
"
marks
"
/>
<
el
-
table
-
column
label
=
"
品名
"
align
=
"
center
"
prop
=
"
title
"
>
<
el
-
table
-
column
:
label
=
"
$t('订单号')
"
align
=
"
center
"
prop
=
"
orderNo
"
/>
<
el
-
table
-
column
:
label
=
"
$t('唛头')
"
align
=
"
center
"
prop
=
"
marks
"
/>
<
el
-
table
-
column
:
label
=
"
$t('品名')
"
align
=
"
center
"
prop
=
"
title
"
>
<
template
slot
-
scope
=
"
scope
"
>
{{
scope
.
row
.
titleZh
?(
scope
.
row
.
titleZh
+
"
(
"
+
scope
.
row
.
titleEn
+
"
)
"
):
''
}}
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"
箱数
"
align
=
"
center
"
prop
=
"
num
"
/>
<
el
-
table
-
column
label
=
"
体积/重量
"
align
=
"
center
"
prop
=
"
weight
"
/>
<
el
-
table
-
column
label
=
"
发货人
"
align
=
"
center
"
prop
=
"
consignorName
"
/>
<
el
-
table
-
column
label
=
"
收货人
"
align
=
"
center
"
prop
=
"
consigneeName
"
/>
<
el
-
table
-
column
label
=
"
订单状态
"
align
=
"
center
"
prop
=
"
status
"
>
<
el
-
table
-
column
:
label
=
"
$t('箱数')
"
align
=
"
center
"
prop
=
"
num
"
/>
<
el
-
table
-
column
:
label
=
"
$t('体积/重量')
"
align
=
"
center
"
prop
=
"
weight
"
/>
<
el
-
table
-
column
:
label
=
"
$t('发货人')
"
align
=
"
center
"
prop
=
"
consignorName
"
/>
<
el
-
table
-
column
:
label
=
"
$t('收货人')
"
align
=
"
center
"
prop
=
"
consigneeName
"
/>
<
el
-
table
-
column
:
label
=
"
$t('订单状态')
"
align
=
"
center
"
prop
=
"
status
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
dict
-
tag
:
type
=
"
DICT_TYPE.ORDER_STATUS
"
...
...
@@ -521,7 +521,7 @@
/>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"
收入类型
"
align
=
"
center
"
prop
=
"
feeType
"
>
<
el
-
table
-
column
:
label
=
"
$t('收入类型')
"
align
=
"
center
"
prop
=
"
feeType
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
dict
-
tag
:
type
=
"
DICT_TYPE.FEE_TYPE
"
...
...
@@ -530,13 +530,13 @@
<
/template
>
<
/el-table-column
>
<!--
<
el
-
table
-
column
label
=
"
单价美元
"
align
=
"
center
"
prop
=
"
unitPrice
"
/>
-->
<
el
-
table
-
column
label
=
"
单价
"
align
=
"
center
"
prop
=
"
unitPrice
"
>
<
el
-
table
-
column
:
label
=
"
$t('单价')
"
align
=
"
center
"
prop
=
"
unitPrice
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
span
>
{{
scope
.
row
.
unitPrice
}}
<
/span
>
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
scope.row.currencyId
"
/>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"
总金额
"
align
=
"
center
"
prop
=
"
totalAmount
"
>
<
el
-
table
-
column
:
label
=
"
$t('总金额')
"
align
=
"
center
"
prop
=
"
totalAmount
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
span
>
{{
scope
.
row
.
totalAmount
}}
<
/span
>
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
scope.row.currencyId
"
/>
...
...
@@ -552,27 +552,27 @@
/>
<!--
<
/el-card> --
>
<
div
slot
=
"
footer
"
class
=
"
dialog-footer
"
>
<
el
-
button
type
=
"
primary
"
@
click
=
"
saveSelectList
"
>
确认添加
<
/el-button
>
<
el
-
button
@
click
=
"
hiddenDialog
"
>
取
消
<
/el-button
>
<
el
-
button
type
=
"
primary
"
@
click
=
"
saveSelectList
"
>
{{
$t
(
'
确认添加
'
)
}}
<
/el-button
>
<
el
-
button
@
click
=
"
hiddenDialog
"
>
{{
$t
(
'
取消
'
)
}}
<
/el-button
>
<
/div
>
<
/div
>
<
/el-dialog
>
<
el
-
dialog
v
-
if
=
"
discountVisible
"
:
visible
.
sync
=
"
discountVisible
"
title
=
"
优惠信息确认
"
width
=
"
60%
"
append
-
to
-
body
>
<
el
-
dialog
v
-
if
=
"
discountVisible
"
:
visible
.
sync
=
"
discountVisible
"
:
title
=
"
$t('优惠信息确认')
"
width
=
"
60%
"
append
-
to
-
body
>
<
el
-
form
label
-
width
=
"
120px
"
>
<
el
-
form
-
item
v
-
if
=
"
form.receiptNo
"
label
=
"
收款单号
"
>
<
el
-
form
-
item
v
-
if
=
"
form.receiptNo
"
:
label
=
"
$t('收款单号')
"
>
{{
form
.
receiptNo
}}
<
/el-form-item
>
<
el
-
table
:
data
=
"
[selectListRow]
"
border
style
=
"
margin-bottom: 22px
"
>
<
el
-
table
-
column
label
=
"
订单号
"
align
=
"
center
"
prop
=
"
orderNo
"
/>
<
el
-
table
-
column
label
=
"
唛头
"
align
=
"
center
"
prop
=
"
marks
"
/>
<
el
-
table
-
column
label
=
"
品名
"
align
=
"
center
"
prop
=
"
title
"
>
<
el
-
table
-
column
:
label
=
"
$t('订单号')
"
align
=
"
center
"
prop
=
"
orderNo
"
/>
<
el
-
table
-
column
:
label
=
"
$t('唛头')
"
align
=
"
center
"
prop
=
"
marks
"
/>
<
el
-
table
-
column
:
label
=
"
$t('品名')
"
align
=
"
center
"
prop
=
"
title
"
>
<
template
slot
-
scope
=
"
scope
"
>
{{
scope
.
row
.
titleZh
?(
scope
.
row
.
titleZh
+
"
(
"
+
scope
.
row
.
titleEn
+
"
)
"
):
''
}}
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"
箱数
"
align
=
"
center
"
prop
=
"
num
"
/>
<
el
-
table
-
column
label
=
"
体积/重量
"
align
=
"
center
"
prop
=
"
weight
"
/>
<
el
-
table
-
column
label
=
"
收入类型
"
align
=
"
center
"
prop
=
"
feeType
"
>
<
el
-
table
-
column
:
label
=
"
$t('箱数')
"
align
=
"
center
"
prop
=
"
num
"
/>
<
el
-
table
-
column
:
label
=
"
$t('体积/重量')
"
align
=
"
center
"
prop
=
"
weight
"
/>
<
el
-
table
-
column
:
label
=
"
$t('收入类型')
"
align
=
"
center
"
prop
=
"
feeType
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
dict
-
tag
:
type
=
"
DICT_TYPE.FEE_TYPE
"
...
...
@@ -580,45 +580,45 @@
><
/dict-tag
>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"
单价金额
"
align
=
"
center
"
prop
=
"
unitPrice
"
>
<
el
-
table
-
column
:
label
=
"
$t('单价金额')
"
align
=
"
center
"
prop
=
"
unitPrice
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
span
>
{{
scope
.
row
.
unitPrice
}}
<
/span
>
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
scope.row.currencyId
"
/>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"
总金额
"
align
=
"
center
"
prop
=
"
totalAmount
"
>
<
el
-
table
-
column
:
label
=
"
$t('总金额')
"
align
=
"
center
"
prop
=
"
totalAmount
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
span
>
{{
scope
.
row
.
totalAmount
}}
<
/span
>
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
scope.row.currencyId
"
/>
<
/template
>
<
/el-table-column
>
<
/el-table
>
<
el
-
form
-
item
label
=
"
总金额
"
>
<
el
-
form
-
item
:
label
=
"
$t('总金额')
"
>
{{
selectListRow
.
totalAmount
}}
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
selectListRow.currencyId
"
/>
<
/el-form-item
>
<
el
-
form
-
item
label
=
"
优惠金额
"
>
<
el
-
form
-
item
:
label
=
"
$t('优惠金额')
"
>
<
el
-
input
v
-
model
=
"
discountForm.discountTotal
"
type
=
"
number
"
min
=
"
0
"
:
max
=
"
selectListRow.totalAmount
"
@
input
=
"
checkDiscount
"
style
=
"
width: 300px
"
><
/el-input
>
&
nbsp
;
&
nbsp
;
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
selectListRow.currencyId
"
/>
<
/el-form-item
>
<
el
-
form
-
item
label
=
"
优惠原因
"
>
<
el
-
form
-
item
:
label
=
"
$t('优惠原因')
"
>
<
el
-
input
v
-
model
=
"
discountForm.discountRemark
"
type
=
"
textarea
"
style
=
"
width: 300px
"
><
/el-input
>
<
/el-form-item
>
<
el
-
form
-
item
label
=
"
优惠后
"
>
<
el
-
form
-
item
:
label
=
"
$t('优惠后')
"
>
{{
(
selectListRow
.
totalAmount
-
(
discountForm
.
discountTotal
||
0
)).
toFixed
(
2
)
}}
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
selectListRow.currencyId
"
/>
<
/el-form-item
>
<
el
-
form
-
item
v
-
if
=
"
opnotice
"
label
=
"
操作人
"
>
<
el
-
form
-
item
v
-
if
=
"
opnotice
"
:
label
=
"
$t('操作人')
"
>
{{
discountForm
.
author
}}
<
/el-form-item
>
<
el
-
form
-
item
v
-
if
=
"
opnotice
"
label
=
"
操作时间
"
>
<
el
-
form
-
item
v
-
if
=
"
opnotice
"
:
label
=
"
$t('操作时间')
"
>
{{
discountForm
.
time
}}
<
/el-form-item
>
<
/el-form
>
<
div
slot
=
"
footer
"
class
=
"
dialog-footer
"
>
<
el
-
button
type
=
"
primary
"
@
click
=
"
saveDiscount
"
>
提
交
<
/el-button
>
<
el
-
button
@
click
=
"
cancelDiscount
"
>
取
消
<
/el-button
>
<
el
-
button
type
=
"
primary
"
@
click
=
"
saveDiscount
"
>
{{
$t
(
'
提交
'
)
}}
<
/el-button
>
<
el
-
button
@
click
=
"
cancelDiscount
"
>
{{
$t
(
'
取消
'
)
}}
<
/el-button
>
<
/div
>
<
/el-dialog
>
<
/div
>
...
...
@@ -1041,11 +1041,11 @@ export default {
console
.
log
(
this
.
discountForm
)
// this.selectListRow.id
if
(
this
.
discountForm
.
discountTotal
===
0
||!
this
.
discountForm
.
discountTotal
)
{
this
.
$modal
.
msgError
(
"
优惠金额不能为空
"
);
this
.
$modal
.
msgError
(
this
.
$t
(
'
优惠金额不能为空
'
)
);
return
}
if
(
this
.
discountForm
.
discountRemark
===
0
||!
this
.
discountForm
.
discountRemark
)
{
this
.
$modal
.
msgError
(
"
优惠原因不能为空
"
);
this
.
$modal
.
msgError
(
this
.
$t
(
'
优惠原因不能为空
'
)
);
return
}
const
params
=
{
...
...
@@ -1057,9 +1057,9 @@ export default {
}
updateReceivableDiscountById
(
params
).
then
(
res
=>
{
if
(
this
.
selectListRow
.
discountTotal
)
{
this
.
$modal
.
msgSuccess
(
"
修改成功
"
);
this
.
$modal
.
msgSuccess
(
this
.
$t
(
'
修改成功
'
)
);
}
else
{
this
.
$modal
.
msgSuccess
(
"
新增成功
"
);
this
.
$modal
.
msgSuccess
(
this
.
$t
(
'
新增成功
'
)
);
}
getReceivableInfoByIds
({
id
:
this
.
selectListRow
.
id
}
).
then
(
res
=>
{
this
.
$set
(
this
.
list
,
this
.
selectListIndex
,
{...
res
.
data
}
)
...
...
@@ -1108,7 +1108,7 @@ export default {
if
(
this
.
list
&&
this
.
list
.
length
>
0
)
{
params
.
receivableVOList
=
this
.
list
}
else
{
this
.
$modal
.
msgError
(
"
请添加未收客户款项
"
);
this
.
$modal
.
msgError
(
this
.
$t
(
'
请添加未收客户款项
'
)
);
return
}
if
(
addType
===
1
)
{
...
...
@@ -1129,14 +1129,14 @@ export default {
this
.
saveBtnLoading
=
true
if
(
this
.
id
&&
this
.
id
!==
'
0
'
)
{
updateReceipt
(
params
).
then
(
res
=>
{
this
.
$modal
.
msgSuccess
(
"
修改成功
"
);
this
.
$modal
.
msgSuccess
(
this
.
$t
(
'
修改成功
'
)
);
this
.
$router
.
back
();
}
).
finally
(()
=>
{
this
.
saveBtnLoading
=
false
}
)
}
else
{
createReceipt
(
params
).
then
(
res
=>
{
this
.
$modal
.
msgSuccess
(
"
保存成功
"
);
this
.
$modal
.
msgSuccess
(
this
.
$t
(
'
保存成功
'
)
);
this
.
$router
.
back
();
}
).
finally
(()
=>
{
this
.
saveBtnLoading
=
false
...
...
@@ -1152,14 +1152,14 @@ export default {
if
(
this
.
id
&&
this
.
id
!==
'
0
'
)
{
if
(
params
.
state
==
0
)
params
.
state
=
1
updateReceipt
(
params
).
then
(
res
=>
{
this
.
$modal
.
msgSuccess
(
"
修改成功
"
);
this
.
$modal
.
msgSuccess
(
this
.
$t
(
'
修改成功
'
)
);
this
.
$router
.
back
();
}
).
finally
(()
=>
{
this
.
saveBtnLoading
=
false
}
)
}
else
{
createReceipt
(
params
).
then
(
res
=>
{
this
.
$modal
.
msgSuccess
(
"
新增成功
"
);
this
.
$modal
.
msgSuccess
(
this
.
$t
(
'
新增成功
'
)
);
this
.
$router
.
back
();
}
).
finally
(()
=>
{
this
.
saveBtnLoading
=
false
...
...
src/views/ecw/financial/creatPayment.vue
View file @
d29947a1
<
template
>
<div
class=
"app-container"
>
<el-card>
<div
slot=
"header"
class=
"card-title"
>
请款单
</div>
<div
slot=
"header"
class=
"card-title"
>
{{
$t
(
'
请款单
'
)
}}
</div>
<el-form
ref=
"form"
:model=
"form"
...
...
@@ -9,19 +9,19 @@
label-position=
"left"
>
<el-descriptions
:column=
"3"
class=
"card"
border
>
<el-descriptions-item
label=
"供应商
"
>
<el-descriptions-item
:label=
"$t('供应商')
"
>
<el-form-item
label=
""
label-width=
"0"
style=
"margin-bottom: 0"
prop=
"supplierId"
:rules=
"
{ required: true, trigger: ['blur', 'change'] }"
error="供应商不能为空
"
:error="$t('供应商不能为空')
"
>
<!--
<customer-selector
v-model=
"form.supplierId"
@
change=
"consignor = $event"
/>
-->
<el-select
v-model=
"form.supplierId"
placeholder=
"请选择供应商
"
:placeholder=
"$t('请选择供应商')
"
@
change=
"selectChange"
>
<el-option
...
...
@@ -33,19 +33,19 @@
</el-select>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item
label=
"部门
"
>
<el-descriptions-item
:label=
"$t('部门')
"
>
<el-form-item
label=
""
label-width=
"0"
style=
"margin-bottom: 0"
prop=
"departmentId"
required
error=
"部门不能为空
"
:error=
"$t('部门不能为空')
"
>
<el-select
v-model=
"form.departmentId"
style=
"width: 300px"
placeholder=
"请选择部门
"
:placeholder=
"$t('请选择部门')
"
>
<el-option
v-for=
"item in deptData"
...
...
@@ -56,16 +56,16 @@
</el-select>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item
label=
"业务员
"
>
<el-descriptions-item
:label=
"$t('业务员')
"
>
<el-form-item
label=
""
label-width=
"0"
style=
"margin-bottom: 0"
prop=
"salesmanName"
required
error=
"业务员不能为空
"
:error=
"$t('业务员不能为空')
"
>
<el-select
v-model=
"form.salesmanName"
placeholder=
"请选择业务员
"
>
<el-select
v-model=
"form.salesmanName"
:placeholder=
"$t('请选择业务员')
"
>
<el-option
v-for=
"item in creatorData"
:key=
"item.id"
...
...
@@ -75,14 +75,14 @@
</el-select>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item
label=
"申请日期
"
>
<el-descriptions-item
:label=
"$t('申请日期')
"
>
<el-form-item
label=
""
label-width=
"0"
style=
"margin-bottom: 0"
prop=
"applicationAt"
required
error=
"申请日期不能为空
"
:error=
"$t('申请日期不能为空')
"
>
<el-date-picker
clearable
...
...
@@ -90,18 +90,18 @@
value-format=
"yyyy-MM-dd"
format=
"yyyy-MM-dd"
type=
"date"
placeholder=
"选择申请日期
"
:placeholder=
"$t('选择申请日期')
"
/>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item
label=
"供应商银行账号
"
style=
"width: 50%"
>
<el-descriptions-item
:label=
"$t('供应商银行账号')
"
style=
"width: 50%"
>
<el-form-item
label=
""
label-width=
"0"
style=
"margin-bottom: 0"
prop=
"supplierBankAccount"
>
<el-select
v-model=
"form.supplierBankAccount"
@
change=
"selectChangeBank"
placeholder=
"请选择收款账户
"
>
<el-select
v-model=
"form.supplierBankAccount"
@
change=
"selectChangeBank"
:placeholder=
"$t('请选择收款账户')
"
>
<el-option
v-for=
"item in bankData"
:key=
"item.id"
...
...
@@ -113,14 +113,14 @@
</el-descriptions-item>
</el-descriptions>
<el-descriptions
:column=
"3"
class=
"card"
border
>
<el-descriptions-item
label=
"最后付款日期
"
>
<el-descriptions-item
:label=
"$t('最后付款日期')
"
>
<el-form-item
label=
""
label-width=
"0"
style=
"margin-bottom: 0"
prop=
"latestPayAt"
required
error=
"最后付款日期不能为空
"
:error=
"$t('最后付款日期不能为空')
"
>
<el-date-picker
clearable
...
...
@@ -128,17 +128,17 @@
value-format=
"yyyy-MM-dd"
format=
"yyyy-MM-dd"
type=
"date"
placeholder=
"选择最后付款日期
"
:placeholder=
"$t('选择最后付款日期')
"
/>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item
label=
"结算方式
"
>
<el-descriptions-item
:label=
"$t('结算方式')
"
>
<el-form-item
label=
""
label-width=
"0"
style=
"margin-bottom: 0"
required
error=
"选择结算方式
"
:error=
"$t('选择结算方式')
"
prop=
"settlementType"
>
<dict-selector
...
...
@@ -151,7 +151,7 @@
</el-form>
</el-card>
<el-card
class=
"card"
>
<div
slot=
"header"
class=
"card-title"
>
费用信息
</div>
<div
slot=
"header"
class=
"card-title"
>
{{
$t
(
'
费用信息
'
)
}}
</div>
<el-col
:span=
"1.5"
>
<el-button
type=
"primary"
...
...
@@ -160,12 +160,12 @@
size=
"mini"
@
click=
"handleAdd"
style=
"padding: 10px; margin-bottom: 10px"
>
添加未付供应商款项
</el-button
>
{{
$t
(
'
添加未付供应商款项
'
)
}}
</el-button
>
</el-col>
<el-table
v-loading=
"loadings"
:data=
"list"
border
:show-summary=
"!!list.length"
:summary-method=
"getSummaries"
>
<el-table-column
label=
"自编号
"
align=
"center"
prop=
"payableNo"
/>
<el-table-column
label=
"费用类型
"
align=
"center"
prop=
"feeType"
>
<el-table-column
:label=
"$t('自编号')
"
align=
"center"
prop=
"payableNo"
/>
<el-table-column
:label=
"$t('费用类型')
"
align=
"center"
prop=
"feeType"
>
<template
slot-scope=
"scope"
>
<dict-tag
:type=
"DICT_TYPE.FEE_TYPE"
...
...
@@ -173,28 +173,28 @@
></dict-tag>
</
template
>
</el-table-column>
<el-table-column
label=
"发票号码
"
align=
"center"
prop=
"invoiceNumber"
>
<el-table-column
:label=
"$t('发票号码')
"
align=
"center"
prop=
"invoiceNumber"
>
<
template
slot-scope=
"scope"
>
<el-input
v-model=
"scope.row.invoiceNumber"
></el-input>
</
template
>
</el-table-column>
<el-table-column
label=
"应付金额
"
align=
"center"
prop=
"totalAmount"
/>
<el-table-column
label=
"币种
"
align=
"center"
prop=
"currencyId"
>
<el-table-column
:label=
"$t('应付金额')
"
align=
"center"
prop=
"totalAmount"
/>
<el-table-column
:label=
"$t('币种')
"
align=
"center"
prop=
"currencyId"
>
<
template
slot-scope=
"scope"
>
<dict-tag
:type=
"DICT_TYPE.BOX_SHIPPING_PRICE_UNIT"
:value=
"scope.row.currencyId"
/>
</
template
>
</el-table-column>
<el-table-column
label=
"汇率
"
align=
"center"
prop=
"exchangeRate"
>
<el-table-column
:label=
"$t('汇率')
"
align=
"center"
prop=
"exchangeRate"
>
<
template
slot-scope=
"scope"
>
<el-input
v-model=
"scope.row.exchangeRate"
></el-input>
</
template
>
</el-table-column>
<el-table-column
label=
"税率%
"
align=
"center"
prop=
"taxRate"
>
<el-table-column
:label=
"$t('税率%')
"
align=
"center"
prop=
"taxRate"
>
<
template
slot-scope=
"scope"
>
<el-input
v-model=
"scope.row.taxRate"
@
keyup.native=
"scope.row.taxRate = oninput(scope.row.taxRate)"
></el-input>
</
template
>
</el-table-column>
<el-table-column
label=
"价税合计(RMB
)"
align=
"center"
prop=
"total"
>
<el-table-column
:label=
"$t('价税合计(RMB)'
)"
align=
"center"
prop=
"total"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
total
=
((
scope
.
row
.
totalAmount
*
scope
.
row
.
exchangeRate
)
+
(
scope
.
row
.
totalAmount
*
scope
.
row
.
exchangeRate
)
*
(
scope
.
row
.
taxRate
/
100
)).
toFixed
(
6
)
}}
</span>
</
template
>
...
...
@@ -209,36 +209,36 @@
style=
"width: 50%"
>
<el-descriptions
:column=
"1"
class=
"card"
border
>
<el-descriptions-item
label=
"账单号
"
>
<el-descriptions-item
:label=
"$t('账单号')
"
>
<el-form-item
label=
""
label-width=
"0"
style=
"margin-bottom: 0"
required
error=
"账单号不能为空
"
:error=
"$t('账单号不能为空')
"
prop=
"accountNumber"
>
<el-input
v-model=
"form.accountNumber"
placeholder=
"请输入账单号
"
:placeholder=
"$t('请输入账单号')
"
></el-input>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item
label=
"发票
"
>
<el-descriptions-item
:label=
"$t('发票')
"
>
<el-form-item
label=
""
label-width=
"0"
style=
"margin-bottom: 0"
prop=
"invoiceStatus"
required
error=
"请选择是否开票
"
:error=
"$t('请选择是否开票')
"
>
<el-select
v-model=
"form.invoiceStatus"
placeholder=
"请选择是否开票
"
:placeholder=
"$t('请选择是否开票')
"
>
<el-option
label=
"未开票
"
value=
"0"
/>
<el-option
label=
"已开票
"
value=
"1"
/>
<el-option
:label=
"$t('未开票')
"
value=
"0"
/>
<el-option
:label=
"$t('已开票')
"
value=
"1"
/>
</el-select>
</el-form-item>
</el-descriptions-item>
...
...
@@ -251,7 +251,7 @@
</div>
<el-dialog
:visible.sync=
"open"
title=
"添加未付供应商款项
"
:title=
"$t('添加未付供应商款项')
"
width=
"80%"
append-to-body
@
open=
"openDialog"
...
...
@@ -267,16 +267,16 @@
label-width=
"80px"
>
<el-row>
<el-form-item
label=
"供应商
"
>
<el-form-item
:label=
"$t('供应商')
"
>
<customer-selector
v-model=
"queryParams.supplierId"
@
change=
"consignor = $event"
/>
</el-form-item>
<el-form-item
label=
"始发城市
"
>
<el-form-item
:label=
"$t('始发城市')
"
>
<el-select
v-model=
"queryParams.departureId"
placeholder=
"请选择始发地
"
:placeholder=
"$t('请选择始发地')
"
>
<el-option
v-for=
"item in expoerCityList"
...
...
@@ -286,10 +286,10 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"目的城市
"
>
<el-form-item
:label=
"$t('目的城市')
"
>
<el-select
v-model=
"queryParams.objectiveId"
placeholder=
"请选择始发地
"
:placeholder=
"$t('请选择始发地')
"
>
<el-option
v-for=
"item in importCityList"
...
...
@@ -299,17 +299,17 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"运输方式
"
>
<el-form-item
:label=
"$t('运输方式')
"
>
<dict-selector
:type=
"DICT_TYPE.ECW_TRANSPORT_TYPE"
v-model=
"queryParams.transportId"
formatter=
"number"
/>
</el-form-item>
<el-form-item
label=
"出货渠道
"
>
<el-form-item
:label=
"$t('出货渠道')
"
>
<el-select
v-model=
"queryParams.channelId"
placeholder=
"请选择出货渠道
"
:placeholder=
"$t('请选择出货渠道')
"
>
<el-option
v-for=
"item in channelList"
...
...
@@ -321,44 +321,44 @@
</el-form-item>
</el-row>
<el-row>
<el-form-item
label=
"报关方式
"
>
<el-form-item
:label=
"$t('报关方式')
"
>
<dict-selector
:type=
"DICT_TYPE.ECW_CUSTOMS_TYPE"
v-model=
"queryParams.customsType"
/>
</el-form-item>
<el-form-item
label=
"控货
"
>
<el-form-item
:label=
"$t('控货')
"
>
<dict-selector
:type=
"DICT_TYPE.INFRA_BOOLEAN_STRING"
v-model=
"queryParams.control"
/>
</el-form-item>
<el-form-item
label=
"客户名称
"
>
<el-form-item
:label=
"$t('客户名称')
"
>
<customer-selector
v-model=
"queryParams.consignorId"
@
change=
"consignor = $event"
/>
</el-form-item>
</el-row>
<el-form-item
label=
"订单编号
"
prop=
"orderNo"
>
<el-form-item
:label=
"$t('订单编号')
"
prop=
"orderNo"
>
<el-input
v-model=
"queryParams.orderNo"
placeholder=
"请输入订单编号
"
:placeholder=
"$t('请输入订单编号')
"
clearable
/>
</el-form-item>
<el-form-item
label=
"自编号
"
prop=
"selfNo"
>
<el-form-item
:label=
"$t('自编号')
"
prop=
"selfNo"
>
<el-input
v-model=
"queryParams.selfNo"
placeholder=
"请输入自编号
"
:placeholder=
"$t('请输入自编号')
"
clearable
/>
</el-form-item>
<el-form-item>
<el-button
type=
"primary"
icon=
"el-icon-search"
@
click=
"handleQuery"
>
查询
</el-button
>
{{ $t('查询') }}
</el-button
>
</el-form-item>
</el-form>
...
...
@@ -371,10 +371,10 @@
row-key=
"id"
>
<el-table-column
type=
"selection"
width=
"55"
:reserve-selection=
"true"
>
</el-table-column>
<el-table-column
label=
"自编号
"
align=
"center"
prop=
"payableNo"
/>
<el-table-column
label=
"货柜号
"
align=
"center"
prop=
"containerNo"
/>
<el-table-column
label=
"供应商
"
align=
"center"
prop=
"supplierName"
/>
<el-table-column
label=
"费用类型
"
align=
"center"
prop=
"feeType"
>
<el-table-column
:label=
"$t('自编号')
"
align=
"center"
prop=
"payableNo"
/>
<el-table-column
:label=
"$t('货柜号')
"
align=
"center"
prop=
"containerNo"
/>
<el-table-column
:label=
"$t('供应商')
"
align=
"center"
prop=
"supplierName"
/>
<el-table-column
:label=
"$t('费用类型')
"
align=
"center"
prop=
"feeType"
>
<
template
slot-scope=
"scope"
>
<dict-tag
:type=
"DICT_TYPE.FEE_TYPE"
...
...
@@ -382,7 +382,7 @@
></dict-tag>
</
template
>
</el-table-column>
<el-table-column
label=
"金额
"
align=
"center"
prop=
"totalAmount"
>
<el-table-column
:label=
"$t('金额')
"
align=
"center"
prop=
"totalAmount"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
totalAmount
}}
</span>
<dict-tag
:type=
"DICT_TYPE.BOX_SHIPPING_PRICE_UNIT"
:value=
"scope.row.currencyId"
/>
...
...
@@ -398,8 +398,8 @@
/>
<!-- </el-card> -->
<div
slot=
"footer"
style=
"margin: 20px 0; text-align: center;"
>
<el-button
type=
"primary"
@
click=
"saveSelectList"
>
确认添加
</el-button>
<el-button
@
click=
"hiddenDialog"
>
取 消
</el-button>
<el-button
type=
"primary"
@
click=
"saveSelectList"
>
{{ $t('确认添加') }}
</el-button>
<el-button
@
click=
"hiddenDialog"
>
{{ $t('取消') }}
</el-button>
</div>
</div>
</el-dialog>
...
...
@@ -540,7 +540,7 @@ export default {
const
{
columns
,
data
}
=
param
;
const
sums
=
new
Array
(
columns
.
length
).
map
(
v
=>
''
);
const
index
=
sums
.
length
-
1
sums
[
index
-
1
]
=
'
价税合计大写
'
sums
[
index
-
1
]
=
this
.
$t
(
'
价税合计大写
'
)
const
t
=
data
.
map
(
v
=>
v
.
total
).
reduce
((
prev
,
curr
)
=>
{
return
parseFloat
(
prev
)
+
parseFloat
(
curr
);
},
0
)
...
...
@@ -560,21 +560,21 @@ export default {
if
(
this
.
list
&&
this
.
list
.
length
>
0
)
{
params
.
payableReqVOList
=
[...
this
.
list
]
}
else
{
this
.
$modal
.
msgError
(
"
请选择供应商未付款项
"
);
this
.
$modal
.
msgError
(
this
.
$t
(
'
请选择供应商未付款项
'
)
);
return
}
if
(
!
params
.
supplierBankAccount
){
this
.
$modal
.
msgError
(
"
请选择供应商银行账号
"
);
this
.
$modal
.
msgError
(
this
.
$t
(
'
请选择供应商银行账号
'
)
);
return
}
if
(
this
.
id
&&
this
.
id
!==
'
0
'
)
{
updatePayment
(
params
).
then
(
res
=>
{
this
.
$modal
.
msgSuccess
(
"
修改成功
"
);
this
.
$modal
.
msgSuccess
(
this
.
$t
(
'
修改成功
'
)
);
this
.
$router
.
back
();
})
}
else
{
createPayment
(
params
).
then
(
res
=>
{
this
.
$modal
.
msgSuccess
(
"
新增成功
"
);
this
.
$modal
.
msgSuccess
(
this
.
$t
(
'
新增成功
'
)
);
this
.
$router
.
back
();
})
}
...
...
@@ -590,21 +590,21 @@ export default {
if
(
this
.
list
&&
this
.
list
.
length
>
0
)
{
params
.
payableReqVOList
=
[...
this
.
list
]
}
else
{
this
.
$modal
.
msgError
(
"
请选择供应商未付款项
"
);
this
.
$modal
.
msgError
(
this
.
$t
(
'
请选择供应商未付款项
'
)
);
return
}
if
(
!
params
.
supplierBankAccount
){
this
.
$modal
.
msgError
(
"
请选择供应商银行账号
"
);
this
.
$modal
.
msgError
(
this
.
$t
(
'
请选择供应商银行账号
'
)
);
return
}
if
(
this
.
id
&&
this
.
id
!==
'
0
'
)
{
updatePayment
(
params
).
then
(
res
=>
{
this
.
$modal
.
msgSuccess
(
"
修改成功
"
);
this
.
$modal
.
msgSuccess
(
this
.
$t
(
'
修改成功
'
)
);
this
.
$router
.
back
();
})
}
else
{
createPayment
(
params
).
then
(
res
=>
{
this
.
$modal
.
msgSuccess
(
"
新增成功
"
);
this
.
$modal
.
msgSuccess
(
this
.
$t
(
'
新增成功
'
)
);
this
.
$router
.
back
();
})
}
...
...
src/views/ecw/financial/openInvoice.vue
View file @
d29947a1
<
template
>
<div
class=
"app-container"
>
<div
slot=
"header"
class=
"card-title"
>
开票
</div>
<div
slot=
"header"
class=
"card-title"
>
{{
$t
(
'
开票
'
)
}}
</div>
<!-- 搜索工作栏 -->
<el-form
:model=
"invoiceData"
...
...
@@ -11,10 +11,10 @@
class=
"card"
>
<el-card
class=
"card"
>
<el-form-item
label=
"发票号码:"
prop=
"invoiceNumber"
:rules=
"
{ required: true, trigger: ['blur'], message: '发票号码不能为空'
}">
<el-form-item
:label=
"$t('发票号码')"
prop=
"invoiceNumber"
:rules=
"
{ required: true, trigger: ['blur'], message: $t('发票号码不能为空')
}">
<el-input
v-model=
"invoiceData.invoiceNumber"
></el-input>
</el-form-item>
<el-form-item
label=
"开票类型:"
prop=
"invoicingTypeId"
:rules=
"
{ required: true, trigger: ['blur', 'change'], message: '开票类型不能为空'
}">
<el-form-item
:label=
"$t('开票类型')"
prop=
"invoicingTypeId"
:rules=
"
{ required: true, trigger: ['blur', 'change'], message: $t('开票类型不能为空')
}">
<dict-selector
:type=
"DICT_TYPE.ECW_INVOICING_TYPE"
v-model=
"invoiceData.invoicingTypeId"
...
...
@@ -22,18 +22,18 @@
</el-form-item>
</el-card>
<el-card
class=
"card"
>
<div
slot=
"header"
class=
"card-title"
>
开票资料
</div>
<div
slot=
"header"
class=
"card-title"
>
{{
$t
(
'
开票资料
'
)
}}
</div>
<el-descriptions
title=
""
direction=
"vertical"
:column=
"6"
border
>
<el-descriptions-item
label=
"发票抬头
"
>
{{
invoiceData
.
invoice
}}
</el-descriptions-item>
<el-descriptions-item
label=
"纳税人识别号
"
>
{{
invoiceData
.
taxpayer
}}
</el-descriptions-item>
<el-descriptions-item
label=
"地址
"
>
{{
invoiceData
.
addressPhone
}}
</el-descriptions-item>
<el-descriptions-item
label=
"开户行
"
>
{{
invoiceData
.
accountBank
}}
</el-descriptions-item>
<el-descriptions-item
label=
"税率%
"
>
<el-descriptions-item
:label=
"$t('发票抬头')
"
>
{{
invoiceData
.
invoice
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('纳税人识别号')
"
>
{{
invoiceData
.
taxpayer
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('地址')
"
>
{{
invoiceData
.
addressPhone
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('开户行')
"
>
{{
invoiceData
.
accountBank
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('税率%')
"
>
<el-form-item
label=
""
>
<el-input
v-model=
"invoiceData.taxRate"
></el-input>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item
label=
"项目
"
>
<el-descriptions-item
:label=
"$t('项目')
"
>
<el-form-item
label=
""
>
<el-input
v-model=
"invoiceData.projectName"
></el-input>
</el-form-item>
...
...
@@ -49,15 +49,15 @@
show-summary
:summary-method=
"getSummaries"
>
<el-table-column
label=
"订单号
"
align=
"center"
prop=
"orderNo"
/>
<el-table-column
label=
"品名
"
align=
"center"
prop=
"titleZh"
>
<el-table-column
:label=
"$t('订单号')
"
align=
"center"
prop=
"orderNo"
/>
<el-table-column
:label=
"$t('品名')
"
align=
"center"
prop=
"titleZh"
>
<template
slot-scope=
"scope"
>
{{
scope
.
row
.
titleZh
||
scope
.
row
.
titleEn
?
scope
.
row
.
titleZh
+
"
(
"
+
scope
.
row
.
titleEn
+
"
)
"
:
''
}}
</
template
>
</el-table-column>
<el-table-column
label=
"箱数
"
align=
"center"
prop=
"num"
/>
<el-table-column
label=
"体积/重量
"
align=
"center"
prop=
"weight"
></el-table-column>
<el-table-column
label=
"收入类型
"
align=
"center"
prop=
"feeType"
>
<el-table-column
:label=
"$t('箱数')
"
align=
"center"
prop=
"num"
/>
<el-table-column
:label=
"$t('体积/重量')
"
align=
"center"
prop=
"weight"
></el-table-column>
<el-table-column
:label=
"$t('收入类型')
"
align=
"center"
prop=
"feeType"
>
<
template
slot-scope=
"scope"
>
<dict-tag
:type=
"DICT_TYPE.FEE_TYPE"
...
...
@@ -65,25 +65,25 @@
></dict-tag>
</
template
>
</el-table-column>
<el-table-column
label=
"单价金额
"
align=
"center"
prop=
"unitPrice"
>
<el-table-column
:label=
"$t('单价金额')
"
align=
"center"
prop=
"unitPrice"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
unitPrice
}}
</span>
<dict-tag
:type=
"DICT_TYPE.BOX_SHIPPING_PRICE_UNIT"
:value=
"scope.row.currencyId"
/>
</
template
>
</el-table-column>
<el-table-column
label=
"总金额
"
align=
"center"
prop=
"totalAmount"
>
<el-table-column
:label=
"$t('总金额')
"
align=
"center"
prop=
"totalAmount"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
totalAmount
}}
</span>
<dict-tag
:type=
"DICT_TYPE.BOX_SHIPPING_PRICE_UNIT"
:value=
"scope.row.currencyId"
/>
</
template
>
</el-table-column>
<el-table-column
label=
"税额
"
align=
"center"
prop=
"tax"
>
<el-table-column
:label=
"$t('税额')
"
align=
"center"
prop=
"tax"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
tax
}}
</span>
<dict-tag
:type=
"DICT_TYPE.BOX_SHIPPING_PRICE_UNIT"
:value=
"scope.row.currencyId"
/>
</
template
>
</el-table-column>
<el-table-column
label=
"价税合计
"
align=
"center"
prop=
"taxAndTotalAmount"
>
<el-table-column
:label=
"$t('价税合计')
"
align=
"center"
prop=
"taxAndTotalAmount"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
taxAndTotalAmount
}}
</span>
<dict-tag
:type=
"DICT_TYPE.BOX_SHIPPING_PRICE_UNIT"
:value=
"scope.row.currencyId"
/>
...
...
@@ -92,7 +92,7 @@
</el-table>
</el-card>
<el-descriptions
class=
"card"
style=
"width: 50%"
>
<el-descriptions-item
label=
"备注
"
>
<el-descriptions-item
:label=
"$t('备注')
"
>
<el-input
v-model=
"invoiceData.invoicingRemark"
type=
"text"
...
...
@@ -103,7 +103,7 @@
</el-descriptions>
</el-form>
<div
slot=
"footer"
class=
"card"
>
<el-button
type=
"primary"
@
click=
"submitForm"
>
确定
</el-button>
<el-button
type=
"primary"
@
click=
"submitForm"
>
{{ $t('确定') }}
</el-button>
</div>
</div>
</template>
...
...
@@ -147,7 +147,7 @@ export default {
v
.
taxAndTotalAmount
=
NP
.
plus
(
v
.
totalAmount
,
NP
.
times
(
v
.
totalAmount
,
this
.
invoiceData
.
taxRate
/
100
))
})
const
t
=
{
orderNo
:
'
合计
'
,
orderNo
:
this
.
$t
(
'
合计
'
)
,
totalAmount
:
res
.
data
.
reduce
((
total
,
curr
)
=>
NP
.
plus
(
total
,
curr
.
totalAmount
),
0
),
tax
:
res
.
data
.
reduce
((
total
,
curr
)
=>
NP
.
plus
(
total
,
curr
.
tax
),
0
),
taxAndTotalAmount
:
res
.
data
.
reduce
((
total
,
curr
)
=>
NP
.
plus
(
total
,
curr
.
taxAndTotalAmount
),
0
)
...
...
@@ -160,7 +160,7 @@ export default {
if
(
valid
)
{
updateReceiptInvoicing
(
this
.
invoiceData
).
then
(
res
=>
{
this
.
open
=
false
;
this
.
$modal
.
msgSuccess
(
"
操作成功
"
);
this
.
$modal
.
msgSuccess
(
this
.
$t
(
'
操作成功
'
)
);
this
.
$router
.
back
();
})
}
...
...
@@ -168,7 +168,7 @@ export default {
},
getSummaries
(
param
)
{
const
t
=
this
.
list
[
this
.
list
.
length
-
1
].
taxAndTotalAmount
return
[
'
收款人
'
,
this
.
invoiceData
.
payeeName
,
'
核销人
'
,
this
.
invoiceData
.
writeOffName
,
'
开票人
'
,
this
.
invoiceData
.
issuerName
,
''
,
'
价税合计大写
'
,
this
.
convertCurrency
(
t
)];
return
[
this
.
$t
(
'
收款人
'
),
this
.
invoiceData
.
payeeName
,
this
.
$t
(
'
核销人
'
),
this
.
invoiceData
.
writeOffName
,
this
.
$t
(
'
开票人
'
),
this
.
invoiceData
.
issuerName
,
''
,
this
.
$t
(
'
价税合计大写
'
)
,
this
.
convertCurrency
(
t
)];
},
convertCurrency
(
money
)
{
//汉字的数字
...
...
src/views/ecw/financial/payable.vue
View file @
d29947a1
<
template
>
<div
class=
"app-container"
>
<div
slot=
"header"
class=
"card-title"
>
应付款
</div>
<div
slot=
"header"
class=
"card-title"
>
{{
$t
(
'
应付款
'
)
}}
</div>
<!-- 搜索工作栏 -->
<el-card
v-show=
"showSearch"
>
<el-form
...
...
@@ -12,20 +12,20 @@
class=
"card"
>
<el-row>
<el-form-item
label=
"柜号:
"
>
<el-form-item
:label=
"$t('柜号')
"
>
<el-input
style=
"max-width: 188px"
v-model=
"queryParams.containerNo"
placeholder=
"请输入柜号
"
:placeholder=
"$t('请输入柜号')
"
clearable
@
keyup.enter.native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"自编号:
"
>
<el-form-item
:label=
"$t('自编号')
"
>
<el-input
style=
"max-width: 188px"
v-model=
"queryParams.payableNo"
placeholder=
"请输入自编号
"
:placeholder=
"$t('请输入自编号')
"
clearable
@
keyup.enter.native=
"handleQuery"
/>
...
...
@@ -33,10 +33,10 @@
<!--
<el-form-item
label=
"订单号:"
>
<el-input
style=
"max-width: 188px;"
v-model=
"queryParams.orderNo"
placeholder=
"请输入订单号"
clearable
@
keyup.enter.native=
"handleQuery"
/>
</el-form-item>
-->
<el-form-item
label=
"始发城市:
"
>
<el-form-item
:label=
"$t('始发城市')
"
>
<el-select
v-model=
"queryParams.departureId"
placeholder=
"请选择始发城市
"
:placeholder=
"$t('请选择始发城市')
"
clearable
>
<el-option
...
...
@@ -47,10 +47,10 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"目的城市:
"
>
<el-form-item
:label=
"$t('目的城市')
"
>
<el-select
v-model=
"queryParams.objectiveId"
placeholder=
"请选择目的城市
"
:placeholder=
"$t('请选择目的城市')
"
clearable
>
<el-option
...
...
@@ -61,7 +61,7 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"运输方式:
"
>
<el-form-item
:label=
"$t('运输方式')
"
>
<dict-selector
:type=
"DICT_TYPE.ECW_TRANSPORT_TYPE"
v-model=
"queryParams.transportId"
...
...
@@ -99,38 +99,38 @@
<!--
<el-form-item
label=
"商品名称:"
>
<el-input
style=
"max-width: 188px;"
v-model=
"queryParams.orderNo"
placeholder=
"请输入商品名称"
clearable
@
keyup.enter.native=
"handleQuery"
/>
</el-form-item>
-->
<el-form-item
label=
"供应商名称:
"
>
<el-form-item
:label=
"$t('供应商名称')
"
>
<el-input
style=
"max-width: 188px"
v-model=
"queryParams.orderNo"
placeholder=
"请输入供应商名称
"
:placeholder=
"$t('请输入供应商名称')
"
clearable
@
keyup.enter.native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"费用类型:
"
>
<el-form-item
:label=
"$t('费用类型')
"
>
<dict-selector
:type=
"DICT_TYPE.FEE_TYPE"
v-model=
"queryParams.feeType"
></dict-selector>
</el-form-item>
<el-form-item>
<el-button
type=
"primary"
@
click=
"handleQuery"
>
查找
</el-button>
<el-button
type=
"primary"
@
click=
"handleQuery"
>
{{
$t
(
'
查找
'
)
}}
</el-button>
<el-button
style=
"margin-left: 10px"
type=
"success"
@
click=
"handleAdd(0)"
>
新增请款单
</el-button
>
{{
$t
(
'
新增请款单
'
)
}}
</el-button
>
</el-form-item>
</el-row>
</el-form>
</el-card>
<el-table
v-loading=
"loadings"
:data=
"list"
border
class=
"card"
>
<el-table-column
label=
"自编号
"
align=
"center"
prop=
"payableNo"
/>
<el-table-column
label=
"货柜号
"
align=
"center"
prop=
"containerNo"
/>
<el-table-column
label=
"供应商
"
align=
"center"
prop=
"supplierName"
/>
<el-table-column
label=
"费用类型
"
align=
"center"
prop=
"feeType"
>
<el-table-column
:label=
"$t('自编号')
"
align=
"center"
prop=
"payableNo"
/>
<el-table-column
:label=
"$t('货柜号')
"
align=
"center"
prop=
"containerNo"
/>
<el-table-column
:label=
"$t('供应商')
"
align=
"center"
prop=
"supplierName"
/>
<el-table-column
:label=
"$t('费用类型')
"
align=
"center"
prop=
"feeType"
>
<template
slot-scope=
"scope"
>
<dict-tag
:type=
"DICT_TYPE.FEE_TYPE"
...
...
@@ -138,7 +138,7 @@
></dict-tag>
</
template
>
</el-table-column>
<el-table-column
label=
"金额
"
align=
"center"
prop=
"totalAmount"
>
<el-table-column
:label=
"$t('金额')
"
align=
"center"
prop=
"totalAmount"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
totalAmount
}}
</span>
<dict-tag
:type=
"DICT_TYPE.BOX_SHIPPING_PRICE_UNIT"
:value=
"scope.row.currencyId"
/>
...
...
@@ -147,18 +147,18 @@
<!-- <el-table-column label="创建时间" align="center" prop="channelName" />
<el-table-column label="创建人" align="center" prop="toDepartureId" /> -->
<el-table-column
label=
"操作
"
:label=
"$t('操作')
"
align=
"center"
class-name=
"small-padding fixed-width"
>
<
template
slot-scope=
"scope"
>
<el-button
size=
"mini"
type=
"text"
@
click=
"editClick(scope.row)"
>
编辑
</el-button
>
{{
$t
(
'
编辑
'
)
}}
</el-button
>
<el-button
size=
"mini"
type=
"text"
@
click=
"handleAdd(scope.row.id)"
>
请款
</el-button
>
{{
$t
(
'
请款
'
)
}}
</el-button
>
<el-button
size=
"mini"
type=
"text"
@
click=
"deleteClick(scope.row)"
>
删除
</el-button>
<el-button
size=
"mini"
type=
"text"
@
click=
"deleteClick(scope.row)"
>
{{
$t
(
'
删除
'
)
}}
</el-button>
</
template
>
</el-table-column>
</el-table>
...
...
@@ -172,50 +172,50 @@
/>
<!-- 对话框(添加 / 修改) -->
<el-dialog
title=
"费用登记
"
:title=
"$t('费用登记')
"
:visible.sync=
"open"
width=
"500px"
append-to-body
>
<el-form
ref=
"costForm"
:model=
"costObj"
label-width=
"80px"
>
<el-form-item
label=
"操作步骤
"
>
<el-select
v-model=
"costObj.stepsId"
placeholder=
"请选择操作步骤
"
>
<el-form-item
:label=
"$t('操作步骤')
"
>
<el-select
v-model=
"costObj.stepsId"
:placeholder=
"$t('请选择操作步骤')
"
>
<el-option
v-for=
"type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_PROCESS)"
:key=
"type.value"
:label=
"type.label"
:value=
"type.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"费用类型
"
>
<el-select
v-model=
"costObj.feeType"
placeholder=
"请选择费用类型
"
>
<el-form-item
:label=
"$t('费用类型')
"
>
<el-select
v-model=
"costObj.feeType"
:placeholder=
"$t('请选择费用类型')
"
>
<el-option
v-for=
"type in this.getDictDatas(DICT_TYPE.FEE_TYPE)"
:key=
"type.value"
:label=
"type.label"
:value=
"type.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"供应商
"
>
<el-select
v-model=
"costObj.supplierId"
placeholder=
"请选择供应商
"
>
<el-form-item
:label=
"$t('供应商')
"
>
<el-select
v-model=
"costObj.supplierId"
:placeholder=
"$t('请选择供应商')
"
>
<el-option
v-for=
"supplier in allSupplier"
:key=
"supplier.id"
:label=
"supplier.companyZh"
:value=
"supplier.id"
></el-option>
</el-select>
</el-form-item>
<el-row
class=
"two-element"
>
<el-form-item
label=
"金额
"
>
<el-form-item
:label=
"$t('金额')
"
>
<el-input-number
v-model=
"costObj.totalAmount"
controls-position=
"right"
:min=
"1"
></el-input-number>
</el-form-item>
<el-form-item
label=
""
label-width=
"0px"
>
<el-select
v-model=
"costObj.currencyId"
placeholder=
"请选择单位
"
>
<el-select
v-model=
"costObj.currencyId"
:placeholder=
"$t('请选择单位')
"
>
<el-option
v-for=
"type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_PRICE_UNIT)"
:key=
"type.value"
:label=
"type.label"
:value=
"type.value"
></el-option>
</el-select>
</el-form-item>
</el-row>
<el-form-item
label=
"备注
"
>
<el-input
v-model=
"costObj.remark"
type=
"textarea"
rows=
"2"
placeholder=
"请输入备注
"
></el-input>
<el-form-item
:label=
"$t('备注')
"
>
<el-input
v-model=
"costObj.remark"
type=
"textarea"
rows=
"2"
:placeholder=
"$t('请输入备注')
"
></el-input>
</el-form-item>
</el-form>
<div
slot=
"footer"
class=
"operate-button"
>
<el-button
type=
"primary"
@
click=
"submitEditForm"
>
确定
</el-button>
<el-button
@
click=
"cancelEditForm"
>
取消
</el-button>
<el-button
type=
"primary"
@
click=
"submitEditForm"
>
{{ $t('确定') }}
</el-button>
<el-button
@
click=
"cancelEditForm"
>
{{ $t('取消') }}
</el-button>
</div>
</el-dialog>
</div>
...
...
@@ -307,7 +307,7 @@ export default {
remark
:
this
.
costObj
.
remark
}
updatePayable
(
params
).
then
(
res
=>
{
this
.
$modal
.
msgSuccess
(
"
修改成功
"
);
this
.
$modal
.
msgSuccess
(
this
.
$t
(
'
修改成功
'
)
);
this
.
getList
();
this
.
open
=
false
;
})
...
...
@@ -325,11 +325,11 @@ export default {
},
deleteClick
(
row
)
{
const
id
=
row
.
id
;
this
.
$modal
.
confirm
(
'
是否确认删除该应付款?
'
).
then
(
function
()
{
this
.
$modal
.
confirm
(
this
.
$t
(
'
是否确认删除该应付款?
'
)
).
then
(
function
()
{
return
deletePayable
(
id
);
}).
then
(()
=>
{
this
.
getList
();
this
.
$modal
.
msgSuccess
(
"
删除成功
"
);
this
.
$modal
.
msgSuccess
(
this
.
$t
(
'
删除成功
'
)
);
}).
catch
(()
=>
{});
},
},
...
...
src/views/ecw/financial/paymentDetail.vue
View file @
d29947a1
<
template
>
<div
class=
"app-container"
>
<el-card>
<div
slot=
"header"
class=
"card-title"
>
付款单详情
</div>
<div
slot=
"header"
class=
"card-title"
>
{{
$t
(
'
付款单详情
'
)
}}
</div>
<el-form
ref=
"form"
:model=
"form"
...
...
@@ -9,7 +9,7 @@
label-position=
"left"
>
<el-descriptions
:column=
"3"
class=
"card"
border
>
<el-descriptions-item
label=
"供应商
"
>
<el-descriptions-item
:label=
"$t('供应商')
"
>
<el-form-item
label=
""
label-width=
"0"
...
...
@@ -19,7 +19,7 @@
<!--
<customer-selector
v-model=
"form.supplierId"
@
change=
"consignor = $event"
/>
-->
<el-select
v-model=
"form.supplierId"
placeholder=
"请选择供应商
"
:placeholder=
"$t('请选择供应商')
"
disabled
>
<el-option
...
...
@@ -31,7 +31,7 @@
</el-select>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item
label=
"部门
"
>
<el-descriptions-item
:label=
"$t('部门')
"
>
<el-form-item
label=
""
label-width=
"0"
...
...
@@ -52,7 +52,7 @@
</el-select>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item
label=
"业务员
"
>
<el-descriptions-item
:label=
"$t('业务员')
"
>
<el-form-item
label=
""
label-width=
"0"
...
...
@@ -69,7 +69,7 @@
</el-select>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item
label=
"申请日期
"
>
<el-descriptions-item
:label=
"$t('申请日期')
"
>
<el-form-item
label=
""
label-width=
"0"
...
...
@@ -86,7 +86,7 @@
/>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item
label=
"供应商银行账号
"
style=
"width: 50%"
>
<el-descriptions-item
:label=
"$t('供应商银行账号')
"
style=
"width: 50%"
>
<el-form-item
label=
""
label-width=
"0"
...
...
@@ -105,7 +105,7 @@
</el-descriptions-item>
</el-descriptions>
<el-descriptions
:column=
"3"
class=
"card"
border
>
<el-descriptions-item
label=
"最后付款日期
"
>
<el-descriptions-item
:label=
"$t('最后付款日期')
"
>
<el-form-item
label=
""
label-width=
"0"
...
...
@@ -122,7 +122,7 @@
/>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item
label=
"结算方式
"
>
<el-descriptions-item
:label=
"$t('结算方式')
"
>
<el-form-item
label=
""
label-width=
"0"
...
...
@@ -139,10 +139,10 @@
</el-form>
</el-card>
<el-card
class=
"card"
>
<div
slot=
"header"
class=
"card-title"
>
费用信息
</div>
<div
slot=
"header"
class=
"card-title"
>
{{
$t
(
'
费用信息
'
)
}}
</div>
<el-table
v-loading=
"loadings"
:data=
"list"
border
:show-summary=
"!!list.length"
:summary-method=
"getSummaries"
>
<el-table-column
label=
"自编号
"
align=
"center"
prop=
"payableNo"
/>
<el-table-column
label=
"费用类型
"
align=
"center"
prop=
"feeType"
>
<el-table-column
:label=
"$t('自编号')
"
align=
"center"
prop=
"payableNo"
/>
<el-table-column
:label=
"$t('费用类型')
"
align=
"center"
prop=
"feeType"
>
<template
slot-scope=
"scope"
>
<dict-tag
:type=
"DICT_TYPE.FEE_TYPE"
...
...
@@ -150,16 +150,16 @@
></dict-tag>
</
template
>
</el-table-column>
<el-table-column
label=
"发票号码
"
align=
"center"
prop=
"invoiceNumber"
/>
<el-table-column
label=
"应付金额
"
align=
"center"
prop=
"totalAmount"
/>
<el-table-column
label=
"币种
"
align=
"center"
prop=
"currencyId"
>
<el-table-column
:label=
"$t('发票号码')
"
align=
"center"
prop=
"invoiceNumber"
/>
<el-table-column
:label=
"$t('应付金额')
"
align=
"center"
prop=
"totalAmount"
/>
<el-table-column
:label=
"$t('币种')
"
align=
"center"
prop=
"currencyId"
>
<
template
slot-scope=
"scope"
>
<dict-tag
:type=
"DICT_TYPE.BOX_SHIPPING_PRICE_UNIT"
:value=
"scope.row.currencyId"
/>
</
template
>
</el-table-column>
<el-table-column
label=
"汇率
"
align=
"center"
prop=
"exchangeRate"
/>
<el-table-column
label=
"税率%
"
align=
"center"
prop=
"taxRate"
/>
<el-table-column
label=
"价税合计(RMB
)"
align=
"center"
prop=
"total"
>
<el-table-column
:label=
"$t('汇率')
"
align=
"center"
prop=
"exchangeRate"
/>
<el-table-column
:label=
"$t('税率%')
"
align=
"center"
prop=
"taxRate"
/>
<el-table-column
:label=
"$t('价税合计(RMB)'
)"
align=
"center"
prop=
"total"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
total
=
((
scope
.
row
.
totalAmount
*
scope
.
row
.
exchangeRate
)
+
(
scope
.
row
.
totalAmount
*
scope
.
row
.
exchangeRate
)
*
(
scope
.
row
.
taxRate
/
100
)).
toFixed
(
6
)
}}
</span>
</
template
>
...
...
@@ -174,13 +174,13 @@
style=
"width: 50%"
>
<el-descriptions
:column=
"1"
class=
"card"
border
>
<el-descriptions-item
label=
"账单号
"
>
<el-descriptions-item
:label=
"$t('账单号')
"
>
<el-form-item
label=
""
label-width=
"0"
style=
"margin-bottom: 0"
required
error=
"账单号不能为空
"
:error=
"$t('账单号不能为空')
"
prop=
"accountNumber"
>
<el-input
...
...
@@ -188,7 +188,7 @@
></el-input>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item
label=
"发票
"
>
<el-descriptions-item
:label=
"$t('发票')
"
>
<el-form-item
label=
""
label-width=
"0"
...
...
@@ -199,8 +199,8 @@
v-model=
"form.invoiceStatus"
disabled
>
<el-option
label=
"未开票
"
value=
"0"
/>
<el-option
label=
"已开票
"
value=
"1"
/>
<el-option
:label=
"$t('未开票')
"
value=
"0"
/>
<el-option
:label=
"$t('已开票')
"
value=
"1"
/>
</el-select>
</el-form-item>
</el-descriptions-item>
...
...
@@ -209,7 +209,7 @@
</el-card>
<div
slot=
"footer"
style=
"margin: 20px 0"
>
<!-- <el-button type="primary" @click="submitDraft">保 存</el-button> -->
<el-button
type=
"primary"
@
click=
"$store.dispatch('tagsView/delCurrentView')"
>
返回
</el-button>
<el-button
type=
"primary"
@
click=
"$store.dispatch('tagsView/delCurrentView')"
>
{{ $t('返回') }}
</el-button>
</div>
</div>
</template>
...
...
@@ -348,7 +348,7 @@ export default {
const
{
columns
,
data
}
=
param
;
const
sums
=
new
Array
(
columns
.
length
).
map
(
v
=>
''
);
const
index
=
sums
.
length
-
1
sums
[
index
-
1
]
=
'
价税合计大写
'
sums
[
index
-
1
]
=
this
.
$t
(
'
价税合计大写
'
)
const
t
=
data
.
map
(
v
=>
v
.
total
).
reduce
((
prev
,
curr
)
=>
{
return
parseFloat
(
prev
)
+
parseFloat
(
curr
);
},
0
)
...
...
@@ -368,21 +368,21 @@ export default {
if
(
this
.
list
&&
this
.
list
.
length
>
0
)
{
params
.
payableReqVOList
=
[...
this
.
list
]
}
else
{
this
.
$modal
.
msgError
(
"
请选择供应商未付款项
"
);
this
.
$modal
.
msgError
(
this
.
$t
(
'
请选择供应商未付款项
'
)
);
return
}
if
(
!
params
.
supplierBankAccount
){
this
.
$modal
.
msgError
(
"
请选择供应商银行账号
"
);
this
.
$modal
.
msgError
(
this
.
$t
(
'
请选择供应商银行账号
'
)
);
return
}
if
(
this
.
id
&&
this
.
id
!==
'
0
'
)
{
updatePayment
(
params
).
then
(
res
=>
{
this
.
$modal
.
msgSuccess
(
"
修改成功
"
);
this
.
$modal
.
msgSuccess
(
this
.
$t
(
'
修改成功
'
)
);
this
.
$router
.
back
();
})
}
else
{
createPayment
(
params
).
then
(
res
=>
{
this
.
$modal
.
msgSuccess
(
"
新增成功
"
);
this
.
$modal
.
msgSuccess
(
this
.
$t
(
'
新增成功
'
)
);
this
.
$router
.
back
();
})
}
...
...
@@ -398,21 +398,21 @@ export default {
if
(
this
.
list
&&
this
.
list
.
length
>
0
)
{
params
.
payableReqVOList
=
[...
this
.
list
]
}
else
{
this
.
$modal
.
msgError
(
"
请选择供应商未付款项
"
);
this
.
$modal
.
msgError
(
this
.
$t
(
'
请选择供应商未付款项
'
)
);
return
}
if
(
!
params
.
supplierBankAccount
){
this
.
$modal
.
msgError
(
"
请选择供应商银行账号
"
);
this
.
$modal
.
msgError
(
this
.
$t
(
'
请选择供应商银行账号
'
)
);
return
}
if
(
this
.
id
&&
this
.
id
!==
'
0
'
)
{
updatePayment
(
params
).
then
(
res
=>
{
this
.
$modal
.
msgSuccess
(
"
修改成功
"
);
this
.
$modal
.
msgSuccess
(
this
.
$t
(
'
修改成功
'
)
);
this
.
$router
.
back
();
})
}
else
{
createPayment
(
params
).
then
(
res
=>
{
this
.
$modal
.
msgSuccess
(
"
新增成功
"
);
this
.
$modal
.
msgSuccess
(
this
.
$t
(
'
新增成功
'
)
);
this
.
$router
.
back
();
})
}
...
...
src/views/ecw/financial/paymentExamine.vue
View file @
d29947a1
<
template
>
<div
class=
"app-container examine-wrap"
>
<el-card>
<div
slot=
"header"
class=
"card-title"
>
审核请款单
</div>
<div
slot=
"header"
class=
"card-title"
>
{{
$t
(
'
审核请款单
'
)
}}
</div>
<el-descriptions
:column=
"3"
class=
"card"
border
>
<el-descriptions-item
label=
"供应商
"
>
<el-descriptions-item
:label=
"$t('供应商')
"
>
{{
detail
.
supplierName
}}
</el-descriptions-item>
<el-descriptions-item
label=
"部门
"
>
<el-descriptions-item
:label=
"$t('部门')
"
>
{{
findDepartmentName
(
detail
.
departmentId
)
}}
</el-descriptions-item>
<el-descriptions-item
label=
"业务员
"
>
<el-descriptions-item
:label=
"$t('业务员')
"
>
{{
detail
.
salesmanName
}}
</el-descriptions-item>
<el-descriptions-item
label=
"申请日期
"
>
<el-descriptions-item
:label=
"$t('申请日期')
"
>
{{
detail
.
applicationAt
}}
</el-descriptions-item>
<el-descriptions-item
label=
"供应商银行账号
"
style=
"width: 50%"
>
<el-descriptions-item
:label=
"$t('供应商银行账号')
"
style=
"width: 50%"
>
{{
findBank
(
detail
.
supplierBankAccount
)
}}
</el-descriptions-item>
</el-descriptions>
<el-descriptions
:column=
"3"
class=
"card"
border
>
<el-descriptions-item
label=
"最后付款日期
"
>
<el-descriptions-item
:label=
"$t('最后付款日期')
"
>
{{
detail
.
latestPayAt
}}
</el-descriptions-item>
<el-descriptions-item
label=
"结算方式
"
>
<el-descriptions-item
:label=
"$t('结算方式')
"
>
<!--
{{
detail
.
settlementType
}}
-->
<dict-tag
:type=
"DICT_TYPE.CUSTOMER_BALANCE"
:value=
"detail.settlementType"
></dict-tag>
</el-descriptions-item>
</el-descriptions>
</el-card>
<el-card
class=
"card"
>
<div
slot=
"header"
class=
"card-title"
>
费用信息
</div>
<div
slot=
"header"
class=
"card-title"
>
{{
$t
(
'
费用信息
'
)
}}
</div>
<el-table
v-loading=
"loadings"
:data=
"list"
border
:show-summary=
"!!list.length"
:summary-method=
"getSummaries"
>
<el-table-column
label=
"自编号
"
align=
"center"
prop=
"payableNo"
/>
<el-table-column
label=
"费用类型
"
align=
"center"
prop=
"feeType"
>
<el-table-column
:label=
"$t('自编号')
"
align=
"center"
prop=
"payableNo"
/>
<el-table-column
:label=
"$t('费用类型')
"
align=
"center"
prop=
"feeType"
>
<template
slot-scope=
"scope"
>
<dict-tag
:type=
"DICT_TYPE.FEE_TYPE"
...
...
@@ -41,46 +41,46 @@
></dict-tag>
</
template
>
</el-table-column>
<el-table-column
label=
"发票号码
"
align=
"center"
prop=
"invoiceNumber"
>
<el-table-column
:label=
"$t('发票号码')
"
align=
"center"
prop=
"invoiceNumber"
>
<!-- <template slot-scope="scope">
<el-input v-model="scope.row.invoiceNumber"></el-input>
</template> -->
</el-table-column>
<el-table-column
label=
"应付金额
"
align=
"center"
prop=
"totalAmount"
/>
<el-table-column
label=
"币种
"
align=
"center"
prop=
"currencyId"
>
<el-table-column
:label=
"$t('应付金额')
"
align=
"center"
prop=
"totalAmount"
/>
<el-table-column
:label=
"$t('币种')
"
align=
"center"
prop=
"currencyId"
>
<
template
slot-scope=
"scope"
>
<dict-tag
:type=
"DICT_TYPE.BOX_SHIPPING_PRICE_UNIT"
:value=
"scope.row.currencyId"
/>
</
template
>
</el-table-column>
<el-table-column
label=
"汇率
"
align=
"center"
prop=
"exchangeRate"
>
<el-table-column
:label=
"$t('汇率')
"
align=
"center"
prop=
"exchangeRate"
>
<!-- <template slot-scope="scope">
<el-input v-model="scope.row.exchangeRate"></el-input>
</template> -->
</el-table-column>
<el-table-column
label=
"税率
"
align=
"center"
prop=
"taxRate"
>
<el-table-column
:label=
"$t('税率%')
"
align=
"center"
prop=
"taxRate"
>
<!-- <template slot-scope="scope">
<el-input v-model="scope.row.taxRate"></el-input>
</template> -->
</el-table-column>
<el-table-column
label=
"价税合计(RMB
)"
align=
"center"
prop=
"total"
/>
<el-table-column
:label=
"$t('价税合计(RMB)'
)"
align=
"center"
prop=
"total"
/>
</el-table>
<el-descriptions
:column=
"1"
class=
"card"
border
>
<el-descriptions-item
label=
"账单号
"
>
<el-descriptions-item
:label=
"$t('账单号')
"
>
{{ detail.accountNumber }}
</el-descriptions-item>
<el-descriptions-item
label=
"发票
"
>
{{ detail.invoiceStatus == 0 ?
'未开票' : '已开票'
}}
<el-descriptions-item
:label=
"$t('发票')
"
>
{{ detail.invoiceStatus == 0 ?
$t('未开票') : $t('已开票')
}}
</el-descriptions-item>
<el-descriptions-item
label=
"审核备注
"
>
<el-descriptions-item
:label=
"$t('审核备注')
"
>
<el-input
type=
"textarea"
:rows=
"2"
v-model=
"notes"
>
</el-input>
</el-descriptions-item>
</el-descriptions>
</el-card>
<div
slot=
"footer"
style=
"margin: 20px 0"
>
<el-button
type=
"primary"
@
click=
"examine('y')"
>
审核通过
</el-button>
<el-button
type=
"danger"
@
click=
"examine('n')"
>
审核驳回
</el-button>
<el-button
type=
"primary"
@
click=
"examine('y')"
>
{{ $t('审核通过') }}
</el-button>
<el-button
type=
"danger"
@
click=
"examine('n')"
>
{{ $t('审核驳回') }}
</el-button>
</div>
</div>
</template>
...
...
@@ -150,7 +150,7 @@ export default {
const
{
columns
,
data
}
=
param
;
const
sums
=
new
Array
(
columns
.
length
).
map
(
v
=>
''
);
const
index
=
sums
.
length
-
1
sums
[
index
-
1
]
=
'
价税合计大写
'
sums
[
index
-
1
]
=
this
.
$t
(
'
价税合计大写
'
)
const
t
=
data
.
map
(
v
=>
v
.
total
).
reduce
((
prev
,
curr
)
=>
{
return
prev
+
curr
;
},
0
)
...
...
@@ -164,7 +164,7 @@ export default {
verifyStatus
:
status
}
paymentVerify
(
params
).
then
(
res
=>
{
this
.
$modal
.
msgSuccess
(
"
操作成功
"
);
this
.
$modal
.
msgSuccess
(
this
.
$t
(
'
操作成功
'
)
);
this
.
$router
.
back
();
})
},
...
...
src/views/ecw/financial/paymentVoucher.vue
View file @
d29947a1
<
template
>
<div
class=
"app-container"
>
<div
slot=
"header"
class=
"card-title"
>
付款单
</div>
<div
slot=
"header"
class=
"card-title"
>
{{
$t
(
'
付款单
'
)
}}
</div>
<!-- 搜索工作栏 -->
<el-card
v-show=
"showSearch"
class=
"card"
>
<el-form
...
...
@@ -12,37 +12,37 @@
class=
"card"
>
<el-row
:span=
"24"
>
<el-form-item
label=
"柜号:
"
>
<el-form-item
:label=
"$t('柜号')
"
>
<el-input
style=
"max-width: 188px"
v-model=
"queryParams.receiptNo"
placeholder=
"请输入收款单号
"
:placeholder=
"$t('请输入收款单号')
"
clearable
@
keyup.enter.native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"自编号:
"
>
<el-form-item
:label=
"$t('自编号')
"
>
<el-input
style=
"max-width: 188px"
v-model=
"queryParams.receiptNo"
placeholder=
"请输入收款单号
"
:placeholder=
"$t('请输入收款单号')
"
clearable
@
keyup.enter.native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"付款单号:
"
>
<el-form-item
:label=
"$t('付款单号')
"
>
<el-input
style=
"max-width: 188px"
v-model=
"queryParams.receiptNo"
placeholder=
"请输入收款单号
"
:placeholder=
"$t('请输入付款单号')
"
clearable
@
keyup.enter.native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"供应商:
"
>
<el-form-item
:label=
"$t('供应商')
"
>
<el-select
v-model=
"queryParams.supplierId"
placeholder=
"请选择供应商
"
:placeholder=
"$t('请选择供应商')
"
>
<el-option
v-for=
"supplier in allSupplier"
...
...
@@ -52,13 +52,13 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"状态:
"
>
<el-form-item
:label=
"$t('状态')
"
>
<dict-selector
:type=
"DICT_TYPE.ECW_PAYMENT_STATE"
v-model=
"queryParams.state"
/>
</el-form-item>
</el-row>
<el-row
:span=
"24"
>
<el-form-item
label=
"业务员:
"
>
<el-select
v-model=
"form.salesmanId"
placeholder=
"请选择业务员
"
>
<el-form-item
:label=
"$t('业务员')
"
>
<el-select
v-model=
"form.salesmanId"
:placeholder=
"$t('请选择业务员')
"
>
<el-option
v-for=
"item in creatorData"
:key=
"item.id"
...
...
@@ -67,59 +67,59 @@
/>
</el-select>
</el-form-item>
<el-form-item
label=
"创建时间:
"
>
<el-form-item
:label=
"$t('创建时间')
"
>
<el-date-picker
v-model=
"queryParams.beginCreateTime"
type=
"datetimerange"
value-format=
"yyyy-MM-dd"
range-separator=
"到"
start-placeholder=
"请选择日期
"
end-placeholder=
"请选择日期
"
>
:start-placeholder=
"$t('请选择日期')
"
:end-placeholder=
"$t('请选择日期')
"
>
</el-date-picker>
</el-form-item>
<el-form-item
label=
"发票状态:
"
>
<el-form-item
:label=
"$t('发票状态')
"
>
<el-select
v-model=
"queryParams.invoiceStatus"
placeholder=
"请选择是否开票
"
:placeholder=
"$t('请选择是否开票')
"
>
<el-option
label=
"未开票
"
value=
"0"
/>
<el-option
label=
"已开票
"
value=
"1"
/>
<el-option
:label=
"$t('未开票')
"
value=
"0"
/>
<el-option
:label=
"$t('已开票')
"
value=
"1"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button
type=
"primary"
@
click=
"handleQuery"
>
查找
</el-button>
<el-button
type=
"primary"
@
click=
"handleQuery"
>
{{
$t
(
'
查找
'
)
}}
</el-button>
</el-form-item>
</el-row>
</el-form>
</el-card>
<el-table
v-loading=
"loadings"
:data=
"list"
border
class=
"card"
>
<el-table-column
label=
"序号
"
align=
"center"
prop=
"id"
type=
"index"
>
<el-table-column
:label=
"$t('序号')
"
align=
"center"
prop=
"id"
type=
"index"
>
<template
slot-scope=
"scope"
>
<span>
{{
scope
.
$index
+
1
}}
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"付款单号
"
align=
"center"
prop=
"paymentNo"
>
<el-table-column
:label=
"$t('付款单号')
"
align=
"center"
prop=
"paymentNo"
>
<
template
slot-scope=
"scope"
>
<span
style=
"color: #1890ff;"
@
click=
"paymentDetail(scope.row)"
>
{{
scope
.
row
.
paymentNo
}}
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"供应商
"
align=
"center"
prop=
"supplierName"
/>
<el-table-column
label=
"创建时间
"
align=
"center"
prop=
"createTime"
>
<el-table-column
:label=
"$t('供应商')
"
align=
"center"
prop=
"supplierName"
/>
<el-table-column
:label=
"$t('创建时间')
"
align=
"center"
prop=
"createTime"
>
<
template
slot-scope=
"scope"
>
<span>
{{
parseTime
(
scope
.
row
.
createTime
,
'
{y
}
-{m
}
-{d
}
'
)
}}
<
/span
>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"
最后付款时间
"
align
=
"
center
"
prop
=
"
latestPayAt
"
>
<
el
-
table
-
column
:
label
=
"
$t('最后付款时间')
"
align
=
"
center
"
prop
=
"
latestPayAt
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
span
>
{{
parseTime
(
scope
.
row
.
latestPayAt
,
'
{y
}
-{m
}
-{d
}
'
)
}}
<
/span
>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"
发票
"
align
=
"
center
"
prop
=
"
invoiceStatus
"
>
<
el
-
table
-
column
:
label
=
"
$t('发票')
"
align
=
"
center
"
prop
=
"
invoiceStatus
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
span
>
{{
scope
.
row
.
invoiceStatus
===
0
?
'
未开票
'
:
'
已开票
'
}}
<
/span
>
<
span
>
{{
scope
.
row
.
invoiceStatus
===
0
?
$t
(
'
未开票
'
)
:
$t
(
'
已开票
'
)
}}
<
/span
>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"
状态
"
align
=
"
center
"
>
<
el
-
table
-
column
:
label
=
"
$t('状态')
"
align
=
"
center
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
dict
-
tag
:
type
=
"
DICT_TYPE.ECW_PAYMENT_STATE
"
...
...
@@ -128,22 +128,22 @@
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"
操作
"
:
label
=
"
$t('操作')
"
align
=
"
center
"
class
-
name
=
"
small-padding fixed-width
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
el
-
button
v
-
if
=
"
scope.row.state == 1 || scope.row.state == 3
"
size
=
"
mini
"
@
click
=
"
handleAdd(scope.row.id)
"
type
=
"
text
"
>
编辑
<
/el-button
>
<
el
-
button
v
-
if
=
"
scope.row.state == 1 || scope.row.state == 3
"
size
=
"
mini
"
type
=
"
text
"
@
click
=
"
examineClick(scope.row.id)
"
>
审核
<
/el-button
>
<
el
-
button
v
-
if
=
"
scope.row.state == 1 || scope.row.state == 3
"
size
=
"
mini
"
@
click
=
"
handleAdd(scope.row.id)
"
type
=
"
text
"
>
{{
$t
(
'
编辑
'
)
}}
<
/el-button
>
<
el
-
button
v
-
if
=
"
scope.row.state == 1 || scope.row.state == 3
"
size
=
"
mini
"
type
=
"
text
"
@
click
=
"
examineClick(scope.row.id)
"
>
{{
$t
(
'
审核
'
)
}}
<
/el-button
>
<
el
-
button
v
-
if
=
"
scope.row.state == 2
"
size
=
"
mini
"
type
=
"
text
"
@
click
=
"
verifyCancelClick(scope.row)
"
>
反审核
<
/el-button
>
<
el
-
button
v
-
if
=
"
scope.row.state == 2
"
size
=
"
mini
"
type
=
"
text
"
@
click
=
"
verificationClick(scope.row)
"
>
核销
<
/el-button
>
<
el
-
button
v
-
if
=
"
scope.row.state == 2
"
size
=
"
mini
"
type
=
"
text
"
@
click
=
"
verifyCancelClick(scope.row)
"
>
{{
$t
(
'
反审核
'
)
}}
<
/el-button
>
<
el
-
button
v
-
if
=
"
scope.row.state == 2
"
size
=
"
mini
"
type
=
"
text
"
@
click
=
"
verificationClick(scope.row)
"
>
{{
$t
(
'
核销
'
)
}}
<
/el-button
>
<
el
-
button
v
-
if
=
"
scope.row.state == 4
"
size
=
"
mini
"
type
=
"
text
"
@
click
=
"
verificationCancelClick(scope.row)
"
>
反核销
<
/el-button
>
<
el
-
button
v
-
if
=
"
scope.row.state == 4
"
size
=
"
mini
"
type
=
"
text
"
@
click
=
"
verificationCancelClick(scope.row)
"
>
{{
$t
(
'
反核销
'
)
}}
<
/el-button
>
<!--
<
el
-
button
v
-
if
=
"
scope.row.state == 3
"
size
=
"
mini
"
type
=
"
text
"
>
开票
<
/el-button> --
>
<
el
-
button
size
=
"
mini
"
type
=
"
text
"
@
click
=
"
toprint(scope.row.id)
"
>
打印
<
/el-button
>
<
el
-
button
v
-
if
=
"
scope.row.state == 1 || scope.row.state == 3
"
size
=
"
mini
"
type
=
"
text
"
@
click
=
"
deleteClick(scope.row)
"
>
删除
<
/el-button
>
<
el
-
button
size
=
"
mini
"
type
=
"
text
"
@
click
=
"
toprint(scope.row.id)
"
>
{{
$t
(
'
打印
'
)
}}
<
/el-button
>
<
el
-
button
v
-
if
=
"
scope.row.state == 1 || scope.row.state == 3
"
size
=
"
mini
"
type
=
"
text
"
@
click
=
"
deleteClick(scope.row)
"
>
{{
$t
(
'
删除
'
)
}}
<
/el-button
>
<!--
<
el
-
button
size
=
"
mini
"
type
=
"
text
"
@
click
=
"
open = true
"
>
导出订单
<
/el-button> --
>
<
/template
>
<
/el-table-column
>
...
...
@@ -158,7 +158,7 @@
/>
<!--
对话框
(
添加
/
修改
)
-->
<
el
-
dialog
title
=
"
费用登记
"
:
title
=
"
$t('导出账单')
"
:
visible
.
sync
=
"
open
"
width
=
"
500px
"
style
=
"
margin-top: 20vh !important
"
...
...
@@ -169,12 +169,12 @@
class
=
"
card-title
"
style
=
"
border-bottom: 2px solid #f8f8f8
"
>
<
span
>
导出账单
<
/span
>
<
span
>
{{
$t
(
'
导出账单
'
)
}}
<
/span
>
<
i
class
=
"
el-icon-close
"
@
click
=
"
cancel
"
><
/i
>
<
/div
>
<
div
class
=
"
dialog-footer
"
>
<
el
-
button
type
=
"
primary
"
style
=
"
width: 130px
"
@
click
=
"
submitForm
"
>
国内账单
<
/el-butto
n
>
{{
$t
(
'
国内账单
'
)
}}
<
/el-butto
n
>
<
el
-
button
plain
...
...
@@ -272,13 +272,13 @@ export default {
stateMap
(
state
)
{
switch
(
state
)
{
case
1
:
return
'
待审核
'
return
this
.
$t
(
'
待审核
'
)
case
2
:
return
'
已审核待核销
'
return
this
.
$t
(
'
已审核待核销
'
)
case
3
:
return
'
审批驳回
'
return
this
.
$t
(
'
审批驳回
'
)
case
4
:
return
'
已核销
'
return
this
.
$t
(
'
已核销
'
)
}
}
,
/** 新增按钮操作 */
...
...
@@ -290,38 +290,38 @@ export default {
}
,
deleteClick
(
row
)
{
const
id
=
row
.
id
;
this
.
$modal
.
confirm
(
'
是否确认删除该付款单?
'
).
then
(
function
()
{
this
.
$modal
.
confirm
(
this
.
$t
(
'
是否确认删除该付款单?
'
)
).
then
(
function
()
{
return
deletePayment
(
id
);
}
).
then
(()
=>
{
this
.
getList
();
this
.
$modal
.
msgSuccess
(
"
删除成功
"
);
this
.
$modal
.
msgSuccess
(
this
.
$t
(
'
删除成功
'
)
);
}
).
catch
(()
=>
{
}
);
}
,
verificationClick
(
row
)
{
const
id
=
row
.
id
;
this
.
$modal
.
confirm
(
'
您确认要核销吗?
'
).
then
(
function
()
{
this
.
$modal
.
confirm
(
this
.
$t
(
'
您确认要核销吗?
'
)
).
then
(
function
()
{
return
paymentVerification
(
id
);
}
).
then
(()
=>
{
this
.
getList
();
this
.
$modal
.
msgSuccess
(
"
核销成功
"
);
this
.
$modal
.
msgSuccess
(
this
.
$t
(
'
核销成功
'
)
);
}
).
catch
(()
=>
{
}
);
}
,
verificationCancelClick
(
row
)
{
const
id
=
row
.
id
;
this
.
$modal
.
confirm
(
'
您确认要反核销吗?
'
).
then
(
function
()
{
this
.
$modal
.
confirm
(
this
.
$t
(
'
您确认要反核销吗?
'
)
).
then
(
function
()
{
return
paymentVerificationCancel
(
id
);
}
).
then
(()
=>
{
this
.
getList
();
this
.
$modal
.
msgSuccess
(
"
反核销成功
"
);
this
.
$modal
.
msgSuccess
(
this
.
$t
(
'
反核销成功
'
)
);
}
).
catch
(()
=>
{
}
);
}
,
verifyCancelClick
(
row
)
{
const
id
=
row
.
id
;
this
.
$modal
.
confirm
(
'
您确认要反审核吗?
'
).
then
(
function
()
{
this
.
$modal
.
confirm
(
this
.
$t
(
'
您确认要反审核吗?
'
)
).
then
(
function
()
{
return
paymentVerifyCancel
(
id
);
}
).
then
(()
=>
{
this
.
getList
();
this
.
$modal
.
msgSuccess
(
"
反审核成功
"
);
this
.
$modal
.
msgSuccess
(
this
.
$t
(
'
反审核成功
'
)
);
}
).
catch
(()
=>
{
}
);
}
,
toprint
(
id
)
{
...
...
src/views/ecw/financial/printPaymentVoucher.vue
View file @
d29947a1
<
template
>
<div
class=
"app-container"
>
<div
id=
"print"
style=
"font-size: 18px;"
>
<div
style=
"text-align: center;font-weight: bold;font-size: 20px;"
>
付款单
</div>
<div
style=
"text-align: center;font-weight: bold;font-size: 20px;"
>
{{
$t
(
'
付款单
'
)
}}
</div>
<div
style=
"margin-top: 20px;"
>
<div
style=
"display: flex;width: 80%;align-items: center;margin-bottom: 10px;"
>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
付款单号:
</div><span>
{{
form
.
paymentNo
||
'
无
'
}}
</span></div>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
最后付款日:
</div>
<span>
{{
form
.
latestPayAt
||
'
无
'
}}
</span></div>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
{{
$t
(
'
付款单号
'
)
}}
:
</div><span>
{{
form
.
paymentNo
||
'
-
'
}}
</span></div>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
{{
$t
(
'
最后付款日
'
)
}}
:
</div>
<span>
{{
form
.
latestPayAt
||
'
-
'
}}
</span></div>
</div>
<div
style=
"display: flex;width: 80%;align-items: center;margin-bottom: 10px;"
>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
申请日期:
</div>
<span>
{{
form
.
applicationAt
||
'
无
'
}}
</span></div>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
结算方式:
</div><span>
{{
form
.
settlementType
||
'
无
'
}}
</span></div>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
{{
$t
(
'
申请日期
'
)
}}
:
</div>
<span>
{{
form
.
applicationAt
||
'
-
'
}}
</span></div>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
{{
$t
(
'
结算方式
'
)
}}
:
</div><span>
{{
form
.
settlementType
||
'
-
'
}}
</span></div>
</div>
<div
style=
"display: flex;width: 80%;align-items: center;margin-bottom: 10px;"
>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
付款公司:
</div><span>
{{
form
.
supplierName
||
'
无
'
}}
</span></div>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
银行户名:
</div><span>
{{
findBank
(
form
.
supplierBankAccount
).
baAccountName
||
'
无
'
}}
</span></div>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
{{
$t
(
'
付款公司
'
)
}}
:
</div><span>
{{
form
.
supplierName
||
'
-
'
}}
</span></div>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
{{
$t
(
'
银行户名
'
)
}}
:
</div><span>
{{
findBank
(
form
.
supplierBankAccount
).
baAccountName
||
'
-
'
}}
</span></div>
</div>
<div
style=
"display: flex;width: 80%;align-items: center;margin-bottom: 10px;"
>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
银行名称:
</div><span>
{{
findBank
(
form
.
supplierBankAccount
).
baBankName
||
'
无
'
}}
</span></div>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
银行账号:
</div><span>
{{
findBank
(
form
.
supplierBankAccount
).
baAccountNum
||
'
无
'
}}
</span></div>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
{{
$t
(
'
银行名称
'
)
}}
:
</div><span>
{{
findBank
(
form
.
supplierBankAccount
).
baBankName
||
'
-
'
}}
</span></div>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
{{
$t
(
'
银行账号
'
)
}}
:
</div><span>
{{
findBank
(
form
.
supplierBankAccount
).
baAccountNum
||
'
-
'
}}
</span></div>
</div>
<!--
<div
style=
"display: flex;width: 80%;align-items: center;margin-bottom: 10px;"
>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;"
>
水单号:
</div><span>
{{
form
?
form
.
accountBank
:
'
无
'
}}
</span></div>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;"
>
手续费:
</div><span>
{{
form
?
form
.
accountBank
:
'
无
'
}}
</span></div>
</div>
-->
<div
style=
"display: flex;width: 80%;align-items: center;"
>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
备注:
</div><span>
{{
form
.
notes
||
'
无
'
}}
</span></div>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
{{
$t
(
'
备注
'
)
}}
:
</div><span>
{{
form
.
notes
||
'
-
'
}}
</span></div>
</div>
</div>
<table
border=
"1"
style=
"margin-top: 20px;width: 100%;text-align: center;border-collapse: collapse;line-height: 2 "
>
<tr>
<th
style=
"width: 6%;"
>
序号
</th>
<th
style=
"width: 15%;"
>
自编号
</th>
<th
style=
"width: 15%;"
>
费用类型
</th>
<th
style=
"width: 15%;"
>
币别
</th>
<th
style=
"width: 10%;"
>
汇率
</th>
<th
style=
"width: 15%;"
>
发票号
</th>
<th
style=
"width: 12%;"
>
应付金额
</th>
<th
style=
"width: 12%;"
>
申请金额
</th>
<th
style=
"width: 6%;"
>
{{
$t
(
'
序号
'
)
}}
</th>
<th
style=
"width: 15%;"
>
{{
$t
(
'
自编号
'
)
}}
</th>
<th
style=
"width: 15%;"
>
{{
$t
(
'
费用类型
'
)
}}
</th>
<th
style=
"width: 15%;"
>
{{
$t
(
'
币种
'
)
}}
</th>
<th
style=
"width: 10%;"
>
{{
$t
(
'
汇率
'
)
}}
</th>
<th
style=
"width: 15%;"
>
{{
$t
(
'
发票号
'
)
}}
</th>
<th
style=
"width: 12%;"
>
{{
$t
(
'
应付金额
'
)
}}
</th>
<th
style=
"width: 12%;"
>
{{
$t
(
'
申请金额
'
)
}}
</th>
</tr>
<tr
v-for=
"(item, index) in list"
:key=
"index"
>
<td>
{{
index
+
1
}}
</td>
...
...
@@ -56,23 +56,23 @@
<td>
{{
item
.
total
}}
</td>
</tr>
<tr>
<td
colspan=
"2"
>
合计(大写)
</td>
<td
colspan=
"2"
>
{{
$t
(
'
合计(大写)
'
)
}}
</td>
<td
colspan=
"2"
>
{{
convertCurrency
(
totalMoney
())
}}
</td>
<td
colspan=
"2"
>
合计付款
</td>
<td
colspan=
"2"
>
{{
$t
(
'
合计付款
'
)
}}
</td>
<td>
{{
totalMoney
()
}}
</td>
</tr>
</table>
<div
style=
"margin-top: 20px;"
>
<div
style=
"display: flex;width: 100%;align-items: center;"
>
<div
style=
"flex:1"
><span
style=
"width: 120px;"
>
主管
:
</span></div>
<div
style=
"flex:1"
><span
style=
"width: 120px;"
>
会计
:
</span></div>
<div
style=
"flex:1"
><span
style=
"width: 120px;"
>
出纳
:
</span></div>
<div
style=
"flex:1"
><span
style=
"width: 120px;"
>
经手人
:
</span></div>
<div
style=
"flex:1"
><span
style=
"width: 120px;"
>
{{
$t
(
'
主管
'
)
}}
:
</span></div>
<div
style=
"flex:1"
><span
style=
"width: 120px;"
>
{{
$t
(
'
会计
'
)
}}
:
</span></div>
<div
style=
"flex:1"
><span
style=
"width: 120px;"
>
{{
$t
(
'
出纳
'
)
}}
:
</span></div>
<div
style=
"flex:1"
><span
style=
"width: 120px;"
>
{{
$t
(
'
经手人
'
)
}}
:
</span></div>
</div>
</div>
</div>
<div
slot=
"footer"
class=
"card"
>
<el-button
type=
"primary"
@
click=
"print"
>
确订打印
</el-button>
<el-button
type=
"primary"
@
click=
"print"
>
{{
$t
(
'
确订打印
'
)
}}
</el-button>
</div>
</div>
</
template
>
...
...
@@ -169,7 +169,7 @@
console
.
log
(
'
打印哦
'
)
}).
catch
(
err
=>
{
console
.
error
(
'
lodop异常
'
,
err
)
alert
(
'
请检查LODOP打印控件是否安装并启动
'
);
alert
(
this
.
$t
(
'
请检查LODOP打印控件是否安装并启动
'
)
);
})
},
findBank
(
val
)
{
...
...
src/views/ecw/financial/printVoucher.vue
View file @
d29947a1
<
template
>
<div
class=
"app-container"
>
<div
id=
"print"
style=
"font-size: 18px;"
>
<div
style=
"text-align: center;font-weight: bold;font-size: 20px;"
>
收款单
</div>
<div
style=
"text-align: center;font-weight: bold;font-size: 20px;"
>
{{
$t
(
'
收款单
'
)
}}
</div>
<div
style=
"margin-top: 20px;"
>
<div
style=
"display: flex;width: 80%;align-items: center;margin-bottom: 10px;"
>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
部门:
</div><span>
{{
form
?
form
.
departmentName
:
'
无
'
}}
</span></div>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
{{
$t
(
'
部门
'
)
}}
:
</div><span>
{{
form
?
form
.
departmentName
:
'
-
'
}}
</span></div>
</div>
<div
style=
"display: flex;width: 80%;align-items: center;margin-bottom: 10px;"
>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
收款单号:
</div>
<span>
{{
form
?
form
.
receiptNo
:
'
无
'
}}
</span></div>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
收款日期:
</div><span>
{{
form
?
form
.
payedAt
:
'
无
'
}}
</span></div>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
{{
$t
(
'
收款单号
'
)
}}
:
</div>
<span>
{{
form
?
form
.
receiptNo
:
'
-
'
}}
</span></div>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
{{
$t
(
'
收款日期
'
)
}}
:
</div><span>
{{
form
?
form
.
payedAt
:
'
-
'
}}
</span></div>
</div>
<div
style=
"display: flex;width: 80%;align-items: center;margin-bottom: 10px;"
>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
客户名称:
</div><span>
{{
form
?
form
.
customerName
:
'
无
'
}}
</span></div>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
收款户名:
</div><span>
{{
form
?
form
.
payeeName
:
'
无
'
}}
</span></div>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
{{
$t
(
'
客户名称
'
)
}}
:
</div><span>
{{
form
?
form
.
customerName
:
'
-
'
}}
</span></div>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
{{
$t
(
'
收款户名
'
)
}}
:
</div><span>
{{
form
?
form
.
payeeName
:
'
-
'
}}
</span></div>
</div>
<div
style=
"display: flex;width: 80%;align-items: center;margin-bottom: 10px;"
>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
银行名称:
</div><span>
{{
form
?
form
.
accountBank
:
'
无
'
}}
</span></div>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
银行账号:
</div><span>
{{
form
?
form
.
platformAccount
:
'
无
'
}}
</span></div>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
{{
$t
(
'
银行名称
'
)
}}
:
</div><span>
{{
form
?
form
.
accountBank
:
'
-
'
}}
</span></div>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
{{
$t
(
'
银行账号
'
)
}}
:
</div><span>
{{
form
?
form
.
platformAccount
:
'
-
'
}}
</span></div>
</div>
<div
style=
"display: flex;width: 80%;align-items: center;margin-bottom: 10px;"
>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
水单号:
</div><span>
{{
form
?
form
.
waterBillNo
:
'
无
'
}}
</span></div>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
手续费:
</div><span>
{{
form
?
form
.
feeRate
:
'
无
'
}}
</span></div>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
{{
$t
(
'
水单号
'
)
}}
:
</div><span>
{{
form
?
form
.
waterBillNo
:
'
-
'
}}
</span></div>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
{{
$t
(
'
手续费
'
)
}}
:
</div><span>
{{
form
?
form
.
feeRate
:
'
-
'
}}
</span></div>
</div>
<div
style=
"display: flex;width: 80%;align-items: center;"
>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
备注:
</div><span>
{{
form
?
form
.
remark
:
'
无
'
}}
</span></div>
<div
style=
"flex:1"
><div
style=
"width: 120px;text-align: right;display:inline-block;"
>
{{
$t
(
'
备注
'
)
}}
:
</div><span>
{{
form
?
form
.
remark
:
'
-
'
}}
</span></div>
</div>
</div>
<table
border=
"1"
style=
"margin-top: 20px;width: 100%;text-align: center;border-collapse: collapse; "
>
<tr>
<th
style=
"width: 8%;"
>
序号
</th>
<th
style=
"width: 12%;"
>
订单号
</th>
<th
style=
"width: 18%;"
>
收入类型
</th>
<th
style=
"width: 22%;"
>
品名
</th>
<th
style=
"width: 8%;"
>
汇率
</th>
<th
style=
"width: 12%;"
>
总金额
</th>
<th
style=
"width: 20%;"
>
实收金额
</th>
<th
style=
"width: 8%;"
>
{{
$t
(
'
序号
'
)
}}
</th>
<th
style=
"width: 12%;"
>
{{
$t
(
'
订单号
'
)
}}
</th>
<th
style=
"width: 18%;"
>
{{
$t
(
'
收入类型
'
)
}}
</th>
<th
style=
"width: 22%;"
>
{{
$t
(
'
品名
'
)
}}
</th>
<th
style=
"width: 8%;"
>
{{
$t
(
'
汇率
'
)
}}
</th>
<th
style=
"width: 12%;"
>
{{
$t
(
'
总金额
'
)
}}
</th>
<th
style=
"width: 20%;"
>
{{
$t
(
'
实收金额
'
)
}}
</th>
</tr>
<tr
v-for=
"(item, index) in list"
:key=
"index"
>
<td>
{{
index
+
1
}}
</td>
...
...
@@ -46,23 +46,23 @@
<td>
{{
item
.
actualAmount
}}
</td>
</tr>
<tr>
<td
colspan=
"2"
>
合计(大写)
</td>
<td
colspan=
"2"
>
{{
$t
(
'
合计(大写)
'
)
}}
</td>
<td
colspan=
"2"
>
{{
convertCurrency
(
totalMoney
())
}}
</td>
<td
colspan=
"2"
>
合计实收
</td>
<td
colspan=
"2"
>
{{
$t
(
'
合计实收
'
)
}}
</td>
<td>
{{
totalMoney
()
}}
</td>
</tr>
</table>
<div
style=
"margin-top: 20px;"
>
<div
style=
"display: flex;width: 100%;align-items: center;"
>
<div
style=
"flex:1"
><span
style=
"width: 120px;"
>
主管
:
</span></div>
<div
style=
"flex:1"
><span
style=
"width: 120px;"
>
会计
:
</span></div>
<div
style=
"flex:1"
><span
style=
"width: 120px;"
>
出纳
:
</span></div>
<div
style=
"flex:1"
><span
style=
"width: 120px;"
>
经手人
:
</span></div>
<div
style=
"flex:1"
><span
style=
"width: 120px;"
>
{{
$t
(
'
主管
'
)
}}
:
</span></div>
<div
style=
"flex:1"
><span
style=
"width: 120px;"
>
{{
$t
(
'
会计
'
)
}}
:
</span></div>
<div
style=
"flex:1"
><span
style=
"width: 120px;"
>
{{
$t
(
'
出纳
'
)
}}
:
</span></div>
<div
style=
"flex:1"
><span
style=
"width: 120px;"
>
{{
$t
(
'
经手人
'
)
}}
:
</span></div>
</div>
</div>
</div>
<div
slot=
"footer"
class=
"card"
>
<el-button
type=
"primary"
@
click=
"print"
>
确订打印
</el-button>
<el-button
type=
"primary"
@
click=
"print"
>
{{
$t
(
'
确订打印
'
)
}}
</el-button>
</div>
</div>
</
template
>
...
...
@@ -156,7 +156,7 @@
console
.
log
(
'
打印哦
'
)
}).
catch
(
err
=>
{
console
.
error
(
'
lodop异常
'
,
err
)
alert
(
'
请检查LODOP打印控件是否安装并启动
'
);
alert
(
this
.
$t
(
'
请检查LODOP打印控件是否安装并启动
'
)
);
})
},
totalMoney
()
{
...
...
src/views/ecw/financial/receiptDetail.vue
View file @
d29947a1
<
template
>
<div
class=
"app-container"
>
<el-card>
<div
slot=
"header"
class=
"card-title"
>
收款单详情
</div>
<div
slot=
"header"
class=
"card-title"
>
{{
$t
(
'
收款单详情
'
)
}}
</div>
<el-descriptions
:column=
"3"
border
>
<el-descriptions-item
label=
"收款单编号
"
>
{{
form
.
receiptNo
}}
</el-descriptions-item>
<el-descriptions-item
label=
"状态
"
>
<el-descriptions-item
:label=
"$t('收款单编号')
"
>
{{
form
.
receiptNo
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('状态')
"
>
<dict-tag
:type=
"DICT_TYPE.ECW_RECEIPT_STATE"
:value=
"form.state"
/>
</el-descriptions-item>
<el-descriptions-item
label=
"客户
"
>
{{
form
.
customerName
}}
</el-descriptions-item>
<el-descriptions-item
label=
"部门
"
>
{{
form
.
departmentName
}}
</el-descriptions-item>
<el-descriptions-item
label=
"业务员
"
>
{{
form
.
salesmanName
}}
</el-descriptions-item>
<el-descriptions-item
label=
"手续费(RMB)
"
>
{{
form
.
feeRate
}}
</el-descriptions-item>
<el-descriptions-item
label=
"备注
"
>
{{
form
.
remark
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('客户')
"
>
{{
form
.
customerName
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('部门')
"
>
{{
form
.
departmentName
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('业务员')
"
>
{{
form
.
salesmanName
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('手续费(RMB)')
"
>
{{
form
.
feeRate
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('备注')
"
>
{{
form
.
remark
}}
</el-descriptions-item>
</el-descriptions>
</el-card>
<el-card
class=
"card"
>
<div
slot=
"header"
class=
"card-title"
>
订单信息
</div>
<div
slot=
"header"
class=
"card-title"
>
{{
$t
(
'
订单信息
'
)
}}
</div>
<el-table
:data=
"list"
border
>
<el-table-column
label=
"订单号
"
align=
"center"
prop=
"orderNo"
/>
<el-table-column
label=
"唛头
"
align=
"center"
prop=
"marks"
/>
<el-table-column
label=
"品名
"
align=
"center"
prop=
"title"
>
<el-table-column
:label=
"$t('订单号')
"
align=
"center"
prop=
"orderNo"
/>
<el-table-column
:label=
"$t('唛头')
"
align=
"center"
prop=
"marks"
/>
<el-table-column
:label=
"$t('品名')
"
align=
"center"
prop=
"title"
>
<template
slot-scope=
"scope"
>
{{
scope
.
row
.
titleZh
+
"
(
"
+
scope
.
row
.
titleEn
+
"
)
"
}}
</
template
>
</el-table-column>
<el-table-column
label=
"箱数
"
align=
"center"
prop=
"num"
/>
<el-table-column
label=
"体积/重量
"
align=
"center"
prop=
"weight"
/>
<el-table-column
label=
"收入类型
"
align=
"center"
prop=
"feeType"
>
<el-table-column
:label=
"$t('箱数')
"
align=
"center"
prop=
"num"
/>
<el-table-column
:label=
"$t('体积/重量')
"
align=
"center"
prop=
"weight"
/>
<el-table-column
:label=
"$t('收入类型')
"
align=
"center"
prop=
"feeType"
>
<
template
slot-scope=
"scope"
>
<dict-tag
:type=
"DICT_TYPE.FEE_TYPE"
...
...
@@ -34,19 +34,19 @@
></dict-tag>
</
template
>
</el-table-column>
<el-table-column
label=
"单价金额
"
align=
"center"
prop=
"unitPrice"
>
<el-table-column
:label=
"$t('单价金额')
"
align=
"center"
prop=
"unitPrice"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
unitPrice
}}
</span>
<dict-tag
:type=
"DICT_TYPE.BOX_SHIPPING_PRICE_UNIT"
:value=
"scope.row.currencyId"
/>
</
template
>
</el-table-column>
<el-table-column
label=
"总金额
"
align=
"center"
prop=
"totalAmount"
>
<el-table-column
:label=
"$t('总金额')
"
align=
"center"
prop=
"totalAmount"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
totalAmount
}}
</span>
<dict-tag
:type=
"DICT_TYPE.BOX_SHIPPING_PRICE_UNIT"
:value=
"scope.row.currencyId"
/>
</
template
>
</el-table-column>
<el-table-column
label=
"优惠金额
"
align=
"center"
>
<el-table-column
:label=
"$t('优惠金额')
"
align=
"center"
>
<
template
slot-scope=
"scope"
>
{{
scope
.
row
.
discountTotal
?
`${scope.row.discountTotal
}
(${scope.row.discountRemark
}
)`
:
0
}}
<
/template
>
...
...
@@ -60,8 +60,8 @@
<
/div
>
<
/el-descriptions-item
>
-->
<
el
-
descriptions
-
item
label
=
"
是否需要开票
"
>
<
span
>
{{
form
.
openInvoice
==
1
?
'
需要
'
:
'
不需要
'
}}
<
/span
>
<
el
-
descriptions
-
item
:
label
=
"
$t('是否需要开票')
"
>
<
span
>
{{
form
.
openInvoice
==
1
?
$t
(
'
需要
'
)
:
$t
(
'
不需要
'
)
}}
<
/span
>
<!--
<
el
-
select
v
-
model
=
"
form.openInvoice
"
placeholder
=
"
请选择是否需要开票
"
...
...
@@ -70,132 +70,132 @@
<
el
-
option
:
value
=
"
0
"
label
=
"
不需要
"
><
/el-option
>
<
/el-select> --
>
<
/el-descriptions-item
>
<
el
-
descriptions
-
item
label
=
"
核销基准币种
"
>
<
el
-
descriptions
-
item
:
label
=
"
$t('核销基准币种')
"
>
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
showCurrencyId
"
/>
<
/el-descriptions-item
>
<
/el-descriptions
>
<
/el-card
>
<
el
-
card
class
=
"
card
"
>
<
div
slot
=
"
header
"
class
=
"
card-title
"
>
开票资料
<
/div
>
<
div
slot
=
"
header
"
class
=
"
card-title
"
>
{{
$t
(
'
开票资料
'
)
}}
<
/div
>
<
el
-
descriptions
:
column
=
"
3
"
border
>
<
el
-
descriptions
-
item
label
=
"
发票抬头
"
>
<
el
-
descriptions
-
item
:
label
=
"
$t('发票抬头')
"
>
{{
form
.
invoice
}}
<!--
<
el
-
input
v
-
model
=
"
form.invoice
"
><
/el-input> --
>
<
/el-descriptions-item
>
<
el
-
descriptions
-
item
label
=
"
纳税人识别号
"
>
<
el
-
descriptions
-
item
:
label
=
"
$t('纳税人识别号')
"
>
{{
form
.
taxpayer
}}
<!--
<
el
-
input
v
-
model
=
"
form.taxpayer
"
><
/el-input> --
>
<
/el-descriptions-item
>
<
el
-
descriptions
-
item
label
=
"
开户行
"
>
<
el
-
descriptions
-
item
:
label
=
"
$t('开户行')
"
>
{{
form
.
accountBank
}}
<!--
<
el
-
input
v
-
model
=
"
form.accountBank
"
><
/el-input> --
>
<
/el-descriptions-item
>
<
el
-
descriptions
-
item
label
=
"
账号
"
>
<
el
-
descriptions
-
item
:
label
=
"
$t('账号')
"
>
{{
form
.
accountName
}}
<!--
<
el
-
input
v
-
model
=
"
form.accountName
"
><
/el-input> --
>
<
/el-descriptions-item
>
<
el
-
descriptions
-
item
label
=
"
项目
"
>
<
el
-
descriptions
-
item
:
label
=
"
$t('项目')
"
>
{{
form
.
projectName
}}
<!--
<
el
-
input
v
-
model
=
"
form.projectName
"
><
/el-input> --
>
<
/el-descriptions-item
>
<
el
-
descriptions
-
item
label
=
"
税率%
"
>
<
el
-
descriptions
-
item
:
label
=
"
$t('税率%')
"
>
{{
form
.
taxRate
}}
<!--
<
el
-
input
v
-
model
=
"
form.taxRate
"
><
/el-input> --
>
<
/el-descriptions-item
>
<
el
-
descriptions
-
item
label
=
"
开票地址/电话
"
>
<
el
-
descriptions
-
item
:
label
=
"
$t('开票地址/电话')
"
>
{{
form
.
addressPhone
}}
<!--
<
el
-
input
v
-
model
=
"
form.addressPhone
"
><
/el-input> --
>
<
/el-descriptions-item
>
<
/el-descriptions
>
<
/el-card
>
<
el
-
card
class
=
"
card
"
>
<
div
slot
=
"
header
"
class
=
"
card-title
"
>
银行收款明细
<
/div
>
<
div
slot
=
"
header
"
class
=
"
card-title
"
>
{{
$t
(
'
银行收款明细
'
)
}}
<
/div
>
<
div
>
<
el
-
button
type
=
"
primary
"
plain
size
=
"
mini
"
@
click
=
"
batchVerification
"
style
=
"
padding: 10px; margin-bottom: 10px
"
>
批量核销
<
/el-button
>
<
el
-
button
type
=
"
primary
"
plain
size
=
"
mini
"
@
click
=
"
handleAddReceiptItem
"
style
=
"
padding: 10px; margin-bottom: 10px
"
>
添加收款明细
<
/el-button
>
<
el
-
button
type
=
"
primary
"
plain
size
=
"
mini
"
@
click
=
"
batchVerification
"
style
=
"
padding: 10px; margin-bottom: 10px
"
>
{{
$t
(
'
批量核销
'
)
}}
<
/el-button
>
<
el
-
button
type
=
"
primary
"
plain
size
=
"
mini
"
@
click
=
"
handleAddReceiptItem
"
style
=
"
padding: 10px; margin-bottom: 10px
"
>
{{
$t
(
'
添加收款明细
'
)
}}
<
/el-button
>
<
/div
>
<
el
-
table
ref
=
"
multipleTable
"
:
data
=
"
detailed
"
border
row
-
key
=
"
id
"
@
selection
-
change
=
"
handleSelectionChange
"
>
<
el
-
table
-
column
type
=
"
selection
"
width
=
"
50
"
:
reserve
-
selection
=
"
true
"
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"
序号
"
type
=
"
index
"
align
=
"
center
"
width
=
"
50
"
><
/el-table-column
>
<
el
-
table
-
column
label
=
"
收款账户
"
align
=
"
center
"
prop
=
"
accountName
"
/>
<
el
-
table
-
column
label
=
"
实收金额
"
align
=
"
center
"
prop
=
"
amount
"
/>
<
el
-
table
-
column
label
=
"
实收币种
"
align
=
"
center
"
prop
=
"
marks
"
>
<
el
-
table
-
column
:
label
=
"
$t('序号')
"
type
=
"
index
"
align
=
"
center
"
width
=
"
50
"
><
/el-table-column
>
<
el
-
table
-
column
:
label
=
"
$t('收款账户')
"
align
=
"
center
"
prop
=
"
accountName
"
/>
<
el
-
table
-
column
:
label
=
"
$t('实收金额')
"
align
=
"
center
"
prop
=
"
amount
"
/>
<
el
-
table
-
column
:
label
=
"
$t('实收币种')
"
align
=
"
center
"
prop
=
"
marks
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
scope.row.currencyId
"
/>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"
汇率
"
align
=
"
center
"
prop
=
"
rate
"
/>
<
el
-
table
-
column
label
=
"
核销货币金额
"
align
=
"
center
"
prop
=
"
writeOffAmount
"
/>
<
el
-
table
-
column
label
=
"
实收日期
"
align
=
"
center
"
prop
=
"
amountDate
"
>
<
el
-
table
-
column
:
label
=
"
$t('汇率')
"
align
=
"
center
"
prop
=
"
rate
"
/>
<
el
-
table
-
column
:
label
=
"
$t('核销货币金额')
"
align
=
"
center
"
prop
=
"
writeOffAmount
"
/>
<
el
-
table
-
column
:
label
=
"
$t('实收日期')
"
align
=
"
center
"
prop
=
"
amountDate
"
>
<!--
<
template
slot
-
scope
=
"
scope
"
>
<
span
>
{{
parseTime
(
scope
.
row
.
amountDate
,
'
{y
}
-{m
}
-{d
}
'
)
}}
<
/span
>
<
/template> --
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"
水单号
"
align
=
"
center
"
prop
=
"
billNo
"
/>
<
el
-
table
-
column
label
=
"
水单附件
"
align
=
"
center
"
prop
=
"
attr
"
>
<
el
-
table
-
column
:
label
=
"
$t('水单号')
"
align
=
"
center
"
prop
=
"
billNo
"
/>
<
el
-
table
-
column
:
label
=
"
$t('水单附件')
"
align
=
"
center
"
prop
=
"
attr
"
>
<
template
slot
-
scope
=
"
scope
"
v
-
if
=
"
scope.row.attr
"
>
<
div
v
-
for
=
"
(v, i) in scope.row.attr
"
:
key
=
"
i
"
><
el
-
link
:
href
=
"
v.url
"
type
=
"
primary
"
target
=
"
_blank
"
>
{{
v
.
name
}}
<
/el-link></
div
>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"
状态
"
align
=
"
center
"
prop
=
"
status
"
>
<
el
-
table
-
column
:
label
=
"
$t('状态')
"
align
=
"
center
"
prop
=
"
status
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
span
>
{{
scope
.
row
.
status
==
0
?
'
待核销
'
:
'
已核销
'
}}
<
/span
>
<
span
>
{{
scope
.
row
.
status
==
0
?
$t
(
'
待核销
'
)
:
$t
(
'
已核销
'
)
}}
<
/span
>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"
操作
"
align
=
"
center
"
width
=
"
200
"
>
<
el
-
table
-
column
:
label
=
"
$t('操作')
"
align
=
"
center
"
width
=
"
200
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
el
-
button
v
-
if
=
"
scope.row.status == 0
"
type
=
"
text
"
@
click
=
"
deleteClick(scope.row)
"
>
删除
<
/el-button
>
<
el
-
button
type
=
"
text
"
@
click
=
"
detailClick(scope.row)
"
>
详情
<
/el-button
>
<
el
-
button
v
-
if
=
"
scope.row.status == 0
"
type
=
"
text
"
@
click
=
"
verificationClick(scope.row)
"
>
核销
<
/el-button
>
<
el
-
button
v
-
if
=
"
scope.row.status == 1
"
type
=
"
text
"
@
click
=
"
verificationCancelClick(scope.row)
"
>
反核销
<
/el-button
>
<
el
-
button
v
-
if
=
"
scope.row.status == 0
"
type
=
"
text
"
@
click
=
"
editClick(scope.row)
"
>
编辑
<
/el-button
>
<
el
-
button
v
-
if
=
"
scope.row.status == 0
"
type
=
"
text
"
@
click
=
"
deleteClick(scope.row)
"
>
{{
$t
(
'
删除
'
)
}}
<
/el-button
>
<
el
-
button
type
=
"
text
"
@
click
=
"
detailClick(scope.row)
"
>
{{
$t
(
'
详情
'
)
}}
<
/el-button
>
<
el
-
button
v
-
if
=
"
scope.row.status == 0
"
type
=
"
text
"
@
click
=
"
verificationClick(scope.row)
"
>
{{
$t
(
'
核销
'
)
}}
<
/el-button
>
<
el
-
button
v
-
if
=
"
scope.row.status == 1
"
type
=
"
text
"
@
click
=
"
verificationCancelClick(scope.row)
"
>
{{
$t
(
'
反核销
'
)
}}
<
/el-button
>
<
el
-
button
v
-
if
=
"
scope.row.status == 0
"
type
=
"
text
"
@
click
=
"
editClick(scope.row)
"
>
{{
$t
(
'
编辑
'
)
}}
<
/el-button
>
<
/template
>
<
/el-table-column
>
<
/el-table
>
<
/el-card
>
<
el
-
card
class
=
"
card
"
>
<
div
slot
=
"
header
"
class
=
"
card-title
"
>
应收账单
<
/div
>
<
div
slot
=
"
header
"
class
=
"
card-title
"
>
{{
$t
(
'
应收账单
'
)
}}
<
/div
>
<
el
-
table
:
data
=
"
form.receiptAccountList
"
border
>
<
el
-
table
-
column
label
=
"
应收币种
"
align
=
"
center
"
>
<
el
-
table
-
column
:
label
=
"
$t('应收币种')
"
align
=
"
center
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
scope.row.currencyId
"
/>
<
/template
>
<
/el-table-column
>
<!--
<
el
-
table
-
column
label
=
"
应收金额
"
align
=
"
center
"
prop
=
"
receivableAmount
"
/>
-->
<
el
-
table
-
column
label
=
"
应收金额
"
align
=
"
center
"
prop
=
"
receivableAmount
"
>
<
el
-
table
-
column
:
label
=
"
$t('应收金额')
"
align
=
"
center
"
prop
=
"
receivableAmount
"
>
<
template
slot
-
scope
=
"
scope
"
v
-
if
=
"
scope.row.type !== 'total'
"
>
{{
`${scope.row.receivableAmount - scope.row.discountTotal
}
(${scope.row.receivableAmount
}
- ${scope.row.discountTotal
}
)`
}}
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
align
=
"
center
"
width
=
"
220
"
>
<
template
#
header
>
核销基准币种(
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
showCurrencyId
"
/>
)汇率
{{
$t
(
'
核销基准币种
'
)
}}
(
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
showCurrencyId
"
/>
)
{{
$t
(
'
汇率
'
)
}}
<
/template
>
<
template
slot
-
scope
=
"
scope
"
>
<
template
v
-
if
=
"
scope.row.type !== 'total'
"
>
<
span
>
{{
scope
.
row
.
writeOffRate
}}
<
/span
>
<
/template
>
<
template
v
-
else
>
应收总金额
(
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
showCurrencyId
"
/>
)
{{
$t
(
'
应收总金额
'
)
}}
(
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
showCurrencyId
"
/>
)
<
/template
>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
align
=
"
center
"
prop
=
"
writeOffAmount
"
>
<
template
#
header
>
核销基准金额
(
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
showCurrencyId
"
/>
)
{{
$t
(
'
核销基准金额
'
)
}}
(
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
showCurrencyId
"
/>
)
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"
收款账户
"
align
=
"
center
"
>
<
el
-
table
-
column
:
label
=
"
$t('收款账户')
"
align
=
"
center
"
>
<
template
slot
-
scope
=
"
scope
"
v
-
if
=
"
scope.row.type !== 'total'
"
>
{{
`${bankData.find(v => v.id == scope.row.platformAccountId).baAccountName
}
(${bankData.find(v => v.id == scope.row.platformAccountId).baAccountNum
}
)`
}}
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"
收款币种
"
align
=
"
center
"
>
<
el
-
table
-
column
:
label
=
"
$t('收款币种')
"
align
=
"
center
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
scope.row.collectionCurrencyId
"
/>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"
收款汇率
"
align
=
"
center
"
>
<
el
-
table
-
column
:
label
=
"
$t('收款汇率')
"
align
=
"
center
"
>
<
template
slot
-
scope
=
"
scope
"
>
<!--
<
el
-
form
-
item
v
-
if
=
"
scope.row.type !== 'total'
"
...
...
@@ -207,23 +207,23 @@
<
el
-
input
v
-
model
=
"
scope.row.collectionRate
"
@
input
=
"
() => rateChange(scope.row, scope.$index)
"
><
/el-input
>
<
/el-form-item> --
>
<
span
v
-
if
=
"
scope.row.type !== 'total'
"
>
{{
scope
.
row
.
collectionRate
}}
<
/span
>
<
span
v
-
else
>
收款总金额
<
/span
>
<
span
v
-
else
>
{{
$t
(
'
收款总金额
'
)
}}
<
/span
>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"
收款金额
"
align
=
"
center
"
prop
=
"
collectionAmount
"
>
<
el
-
table
-
column
:
label
=
"
$t('收款金额')
"
align
=
"
center
"
prop
=
"
collectionAmount
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
span
v
-
if
=
"
scope.row.type !== 'total'
"
>
{{
scope
.
row
.
collectionAmount
}}
<
/span
>
<
div
v
-
else
>
<
div
v
-
if
=
"
scope.row.collectionAmount[0]
"
>
美元
:
{{
scope
.
row
.
collectionAmount
[
0
]
}}
<
/div
>
<
div
v
-
if
=
"
scope.row.collectionAmount[1]
"
>
人民币
:
{{
scope
.
row
.
collectionAmount
[
1
]
}}
<
/div
>
<
div
v
-
if
=
"
scope.row.collectionAmount[2]
"
>
奈拉
:
{{
scope
.
row
.
collectionAmount
[
2
]
}}
<
/div
>
<
div
v
-
if
=
"
scope.row.collectionAmount[0]
"
>
{{
$t
(
'
美元
'
)
}}
:
{{
scope
.
row
.
collectionAmount
[
0
]
}}
<
/div
>
<
div
v
-
if
=
"
scope.row.collectionAmount[1]
"
>
{{
$t
(
'
人民币
'
)
}}
:
{{
scope
.
row
.
collectionAmount
[
1
]
}}
<
/div
>
<
div
v
-
if
=
"
scope.row.collectionAmount[2]
"
>
{{
$t
(
'
奈拉
'
)
}}
:
{{
scope
.
row
.
collectionAmount
[
2
]
}}
<
/div
>
<
/div
>
<!--
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
scope.row.currencyId
"
/>
-->
<
/template
>
<
/el-table-column
>
<
/el-table
>
<
el
-
descriptions
:
column
=
"
2
"
border
class
=
"
card
"
>
<
el
-
descriptions
-
item
label
=
"
账单汇率有效期
"
>
<
el
-
descriptions
-
item
:
label
=
"
$t('账单汇率有效期')
"
>
{{
parseTime
(
form
.
rateValidateDate
)
}}
<!--
<
el
-
form
-
item
label
=
""
...
...
@@ -260,50 +260,50 @@
<
/template
>
{{
form
.
receivableTotalAmount
}}
<
/el-descriptions-item> --
>
<
el
-
descriptions
-
item
label
=
"
已核销总金额
"
>
<
el
-
tag
>
{{
verificationData
.
usCount
}}
美元
<
/el-tag
>
<
el
-
tag
>
{{
verificationData
.
rmbCount
}}
人民币
<
/el-tag
>
<
el
-
tag
>
{{
verificationData
.
nairaCount
}}
奈拉
<
/el-tag
>
<
el
-
descriptions
-
item
:
label
=
"
$t('已核销总金额')
"
>
<
el
-
tag
>
{{
verificationData
.
usCount
}}
{{
$t
(
'
美元
'
)
}}
<
/el-tag
>
<
el
-
tag
>
{{
verificationData
.
rmbCount
}}
{{
$t
(
'
人民币
'
)
}}
<
/el-tag
>
<
el
-
tag
>
{{
verificationData
.
nairaCount
}}
{{
$t
(
'
奈拉
'
)
}}
<
/el-tag
>
<
/el-descriptions-item
>
<
el
-
descriptions
-
item
>
<
template
slot
=
"
label
"
>
已核销金额
(
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
showCurrencyId
"
/>
)
{{
$t
(
'
已核销金额
'
)
}}
(
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
showCurrencyId
"
/>
)
<
/template
>
{{
verificationData
.
writtenOff
}}
<
/el-descriptions-item
>
<
el
-
descriptions
-
item
>
<
template
slot
=
"
label
"
>
已核销比例
(
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
showCurrencyId
"
/>
)
{{
$t
(
'
已核销比例
'
)
}}
(
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
showCurrencyId
"
/>
)
<
/template
>
{{
verificationData
.
WriteOffProportion
}}
%
<
/el-descriptions-item
>
<
/el-descriptions
>
<
/el-card
>
<
div
slot
=
"
footer
"
style
=
"
margin: 20px 0
"
>
<
el
-
button
type
=
"
primary
"
@
click
=
"
toEdit
"
>
编
辑
<
/el-button
>
<
el
-
button
type
=
"
primary
"
@
click
=
"
verificationAll
"
>
全部核销
<
/el-button
>
<
el
-
button
type
=
"
primary
"
@
click
=
"
toEdit
"
>
{{
$t
(
'
编辑
'
)
}}
<
/el-button
>
<
el
-
button
type
=
"
primary
"
@
click
=
"
verificationAll
"
>
{{
$t
(
'
全部核销
'
)
}}
<
/el-button
>
<
/div
>
<
el
-
dialog
v
-
if
=
"
openAddDialog
"
:
visible
.
sync
=
"
openAddDialog
"
:
title
=
"
dialogTitle
"
width
=
"
40%
"
append
-
to
-
body
>
<
div
style
=
"
padding: 0 24px
"
>
<
el
-
form
ref
=
"
addForm
"
:
model
=
"
addForm
"
label
-
width
=
"
150px
"
>
<
el
-
form
-
item
label
=
"
收款单号
"
>
{{
form
.
receiptNo
}}
<
/el-form-item
>
<
el
-
form
-
item
label
=
"
剩余应收金额
"
>
<
el
-
form
-
item
:
label
=
"
$t('收款单号')
"
>
{{
form
.
receiptNo
}}
<
/el-form-item
>
<
el
-
form
-
item
:
label
=
"
$t('剩余应收金额')
"
>
<
div
>
<
div
>
{{
remainingAmount
.
usAmount
.
toFixed
(
6
)
}}
美元
<
/div
>
<
div
>
{{
remainingAmount
.
rmbAmount
.
toFixed
(
6
)
}}
人民币
<
/div
>
<
div
>
{{
remainingAmount
.
nairaAmount
.
toFixed
(
6
)
}}
奈拉
<
/div
>
<
div
>
{{
remainingAmount
.
usAmount
.
toFixed
(
6
)
}}
{{
$t
(
'
美元
'
)
}}
<
/div
>
<
div
>
{{
remainingAmount
.
rmbAmount
.
toFixed
(
6
)
}}
{{
$t
(
'
人民币
'
)
}}
<
/div
>
<
div
>
{{
remainingAmount
.
nairaAmount
.
toFixed
(
6
)
}}
{{
$t
(
'
奈拉
'
)
}}
<
/div
>
<
/div
>
<
/el-form-item
>
<
el
-
form
-
item
label
=
"
收款账户
"
prop
=
"
accountNo
"
:
rules
=
"
{ required: true, trigger: ['blur', 'change'], message: '收款账户不能为空'
}
"
>
<
el
-
select
v
-
if
=
"
!isView
"
v
-
model
=
"
addForm.accountNo
"
placeholder
=
"
请选择收款账户
"
style
=
"
width: 220px
"
@
change
=
"
accountChange
"
>
<
el
-
form
-
item
:
label
=
"
$t('收款账户')
"
prop
=
"
accountNo
"
:
rules
=
"
{ required: true, trigger: ['blur', 'change'], message: $t('收款账户不能为空')
}
"
>
<
el
-
select
v
-
if
=
"
!isView
"
v
-
model
=
"
addForm.accountNo
"
:
placeholder
=
"
$t('请选择收款账户')
"
style
=
"
width: 220px
"
@
change
=
"
accountChange
"
>
<
el
-
option
v
-
for
=
"
item in bankData
"
:
key
=
"
item.id
"
:
label
=
"
item.baAccountName + '(' + item.baAccountNum + ')'
"
:
value
=
"
item.id
"
/>
<
/el-select
>
<
span
v
-
else
>
{{
addForm
.
accountNo
}}
<
/span
>
<
/el-form-item
>
<
el
-
form
-
item
label
=
"
实收日期
"
:
label
=
"
$t('实收日期')
"
prop
=
"
amountDate
"
:
rules
=
"
{ required: true, trigger: ['blur', 'change'], message:
'实收日期不能为空'
}
"
:
rules
=
"
{ required: true, trigger: ['blur', 'change'], message:
$t('实收日期不能为空')
}
"
>
<
el
-
date
-
picker
v
-
if
=
"
!isView
"
...
...
@@ -312,15 +312,15 @@
value
-
format
=
"
yyyy-MM-dd
"
format
=
"
yyyy-MM-dd
"
type
=
"
date
"
placeholder
=
"
选择实收日期
"
:
placeholder
=
"
$t('选择实收日期')
"
/>
<
span
v
-
else
>
{{
addForm
.
amountDate
}}
<
/span
>
<
/el-form-item
>
<
div
style
=
"
display: flex;
"
>
<
el
-
form
-
item
label
=
"
实收
"
:
label
=
"
$t('实收')
"
prop
=
"
amount
"
:
rules
=
"
{ required: true, trigger: ['blur', 'change'], message:
'实收不能为空'
}
"
:
rules
=
"
{ required: true, trigger: ['blur', 'change'], message:
$t('实收不能为空')
}
"
>
<
el
-
input
v
-
if
=
"
!isView
"
v
-
model
=
"
addForm.amount
"
style
=
"
width: 220px; margin-right: 12px
"
@
input
=
"
setWriteOffAmount
"
><
/el-input
>
<
span
v
-
else
>
{{
addForm
.
amount
}}
<
/span
>
...
...
@@ -328,7 +328,7 @@
<
el
-
form
-
item
label
-
width
=
"
0px
"
prop
=
"
currencyId
"
:
rules
=
"
{ required: true, trigger: ['blur', 'change'], message:
'币种不能为空'
}
"
:
rules
=
"
{ required: true, trigger: ['blur', 'change'], message:
$t('币种不能为空')
}
"
>
<
dict
-
selector
v
-
if
=
"
!isView
"
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
v
-
model
=
"
addForm.currencyId
"
@
change
=
"
val => currencyIdChange(val)
"
/>
<!--
<
span
v
-
else
>
{{
addForm
.
currencyId
}}
<
/span> --
>
...
...
@@ -338,10 +338,10 @@
<
el
-
form
-
item
v
-
if
=
"
showCurrencyId != addForm.currencyId
"
prop
=
"
rate
"
:
rules
=
"
{ required: true, trigger: ['blur', 'change'], message:
'汇率不能为空'
}
"
:
rules
=
"
{ required: true, trigger: ['blur', 'change'], message:
$t('汇率不能为空')
}
"
>
<
template
slot
=
"
label
"
>
汇率
(
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
showCurrencyId
"
/>
)
{{
$t
(
'
汇率
'
)
}}
(
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
showCurrencyId
"
/>
)
<
/template
>
<
el
-
input
v
-
if
=
"
!isView
"
v
-
model
=
"
addForm.rate
"
style
=
"
width: 220px
"
><
/el-input
>
<
span
v
-
else
>
{{
addForm
.
rate
}}
<
/span
>
...
...
@@ -350,12 +350,12 @@
v
-
if
=
"
showCurrencyId != addForm.currencyId
"
>
<
template
slot
=
"
label
"
>
金额
(
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
showCurrencyId
"
/>
)
{{
$t
(
'
金额
'
)
}}
(
<
dict
-
tag
:
type
=
"
DICT_TYPE.BOX_SHIPPING_PRICE_UNIT
"
:
value
=
"
showCurrencyId
"
/>
)
<
/template
>
<
span
>
{{
addForm
.
writeOffAmount
?
parseFloat
(
addForm
.
writeOffAmount
).
toFixed
(
6
):
''
}}
<
/span
>
<
/el-form-item
>
<
el
-
form
-
item
label
=
"
水单附件
"
:
label
=
"
$t('水单附件')
"
prop
=
"
attr
"
>
<
el
-
upload
...
...
@@ -370,16 +370,16 @@
:
file
-
list
=
"
addForm.attr
"
multiple
>
<
el
-
button
size
=
"
small
"
type
=
"
primary
"
>
上传附件
<
/el-button
>
<
el
-
button
size
=
"
small
"
type
=
"
primary
"
>
{{
$t
(
'
上传附件
'
)
}}
<
/el-button
>
<
/el-upload
>
<
div
v
-
else
>
<
div
v
-
for
=
"
(v, i) in addForm.attr
"
:
key
=
"
i
"
><
el
-
link
:
href
=
"
v.url
"
type
=
"
primary
"
target
=
"
_blank
"
>
{{
v
.
name
}}
<
/el-link></
div
>
<
/div
>
<
/el-form-item
>
<
el
-
form
-
item
label
=
"
水单号
"
:
label
=
"
$t('水单号')
"
prop
=
"
billNo
"
:
rules
=
"
{ required: true, trigger: ['blur', 'change'], message:
'水单号不能为空'
}
"
:
rules
=
"
{ required: true, trigger: ['blur', 'change'], message:
$t('水单号不能为空')
}
"
>
<
el
-
input
v
-
if
=
"
!isView
"
v
-
model
=
"
addForm.billNo
"
style
=
"
width: 220px
"
><
/el-input
>
<
span
v
-
else
>
{{
addForm
.
billNo
}}
<
/span
>
...
...
@@ -387,7 +387,7 @@
<
/el-form
>
<
div
slot
=
"
footer
"
v
-
if
=
"
!isView
"
>
<
el
-
button
type
=
"
primary
"
@
click
=
"
saveFrom
"
>
{{
saveBtnText
}}
<
/el-button
>
<
el
-
button
@
click
=
"
hiddenDialog
"
>
取
消
<
/el-button
>
<
el
-
button
@
click
=
"
hiddenDialog
"
>
{{
$t
(
'
取消
'
)
}}
<
/el-button
>
<
/div
>
<
/div
>
<
/el-dialog
>
...
...
@@ -433,8 +433,8 @@ export default {
}
,
addForm
:
{
}
,
detailed
:
[],
dialogTitle
:
'
添加银行实收明细
'
,
saveBtnText
:
'
添 加
'
,
dialogTitle
:
this
.
$t
(
'
添加银行实收明细
'
)
,
saveBtnText
:
this
.
$t
(
'
添加
'
)
,
isView
:
false
,
multipleSelection
:
[],
currencyList
:
[],
...
...
@@ -652,7 +652,7 @@ export default {
const
params
=
{...
this
.
addForm
}
params
.
attr
&&
(
params
.
attr
=
params
.
attr
.
map
(
v
=>
v
.
url
).
join
(
'
,
'
))
updateReceiptItem
(
params
).
then
(
res
=>
{
this
.
$modal
.
msgSuccess
(
"
修改成功
"
);
this
.
$modal
.
msgSuccess
(
this
.
$t
(
'
修改成功
'
)
);
this
.
openAddDialog
=
false
this
.
getList
()
}
)
...
...
@@ -662,7 +662,7 @@ export default {
params
.
attr
&&
(
params
.
attr
=
params
.
attr
.
map
(
v
=>
v
.
url
).
join
(
'
,
'
))
params
.
receiptId
=
this
.
id
receiptItemCreate
(
params
).
then
(
res
=>
{
this
.
$modal
.
msgSuccess
(
"
新增成功
"
);
this
.
$modal
.
msgSuccess
(
this
.
$t
(
'
新增成功
'
)
);
this
.
openAddDialog
=
false
this
.
getList
()
}
)
...
...
@@ -675,7 +675,7 @@ export default {
}
,
detailClick
(
row
)
{
this
.
openAddDialog
=
true
this
.
dialogTitle
=
'
银行实收明细详情
'
this
.
dialogTitle
=
this
.
$t
(
'
银行实收明细详情
'
)
this
.
isView
=
true
setTimeout
(()
=>
{
this
.
addForm
=
{
...
row
}
...
...
@@ -684,8 +684,8 @@ export default {
}
,
editClick
(
row
)
{
this
.
openAddDialog
=
true
this
.
dialogTitle
=
'
编辑银行实收明细
'
this
.
saveBtnText
=
'
提 交
'
this
.
dialogTitle
=
this
.
$t
(
'
编辑银行实收明细
'
)
this
.
saveBtnText
=
this
.
$t
(
'
提交
'
)
this
.
isView
=
false
setTimeout
(()
=>
{
this
.
addForm
=
{
...
row
}
...
...
@@ -694,36 +694,36 @@ export default {
}
,
deleteClick
(
row
)
{
const
id
=
row
.
id
;
this
.
$modal
.
confirm
(
'
是否确认删除该收款单?
'
).
then
(
function
()
{
this
.
$modal
.
confirm
(
this
.
$t
(
'
是否确认删除该收款单?
'
)
).
then
(
function
()
{
return
deleteReceiptItem
(
id
);
}
).
then
(()
=>
{
this
.
getList
();
this
.
$modal
.
msgSuccess
(
"
删除成功
"
);
this
.
$modal
.
msgSuccess
(
this
.
$t
(
'
删除成功
'
)
);
}
).
catch
(()
=>
{
}
);
}
,
verificationClick
(
row
)
{
const
id
=
row
.
id
;
this
.
$modal
.
confirm
(
"
您确认要核销吗?
"
)
.
confirm
(
this
.
$t
(
'
您确认要核销吗?
'
)
)
.
then
(
function
()
{
return
receiptItemVerification
(
id
);
}
)
.
then
(()
=>
{
this
.
getList
();
this
.
$modal
.
msgSuccess
(
"
核销成功
"
);
this
.
$modal
.
msgSuccess
(
this
.
$t
(
'
核销成功
'
)
);
}
)
.
catch
(()
=>
{
}
);
}
,
verificationCancelClick
(
row
)
{
const
id
=
row
.
id
;
this
.
$modal
.
confirm
(
"
您确认要反核销吗?
"
)
.
confirm
(
this
.
$t
(
'
您确认要反核销吗?
'
)
)
.
then
(
function
()
{
return
receiptItemVerificationCancel
(
id
);
}
)
.
then
(()
=>
{
this
.
getList
();
this
.
$modal
.
msgSuccess
(
"
反核销成功
"
);
this
.
$modal
.
msgSuccess
(
this
.
$t
(
'
反核销成功
'
)
);
}
)
.
catch
(()
=>
{
}
);
}
,
...
...
@@ -732,12 +732,12 @@ export default {
}
,
batchVerification
()
{
if
(
this
.
multipleSelection
.
length
===
0
)
{
this
.
$modal
.
msgError
(
"
请选择需要核销的收款明细!
"
);
this
.
$modal
.
msgError
(
this
.
$t
(
'
请选择需要核销的收款明细!
'
)
);
return
}
const
params
=
{
ids
:
this
.
multipleSelection
.
map
(
v
=>
v
.
id
).
join
(
'
,
'
)
}
this
.
$modal
.
confirm
(
"
您确认要核销吗?
"
)
.
confirm
(
this
.
$t
(
'
您确认要核销吗?
'
)
)
.
then
(
function
()
{
return
receiptItemBatchVerification
(
params
);
}
)
...
...
@@ -746,18 +746,18 @@ export default {
this
.
$refs
.
multipleTable
.
toggleRowSelection
(
row
);
}
);
this
.
getList
();
this
.
$modal
.
msgSuccess
(
"
核销成功
"
);
this
.
$modal
.
msgSuccess
(
this
.
$t
(
'
核销成功
'
)
);
}
)
.
catch
(()
=>
{
}
);
}
,
verificationAll
()
{
this
.
$modal
.
confirm
(
"
您确认要全部核销吗?
"
)
.
confirm
(
this
.
$t
(
'
您确认要全部核销吗?
'
)
)
.
then
(()
=>
{
return
receiptItemAllVerification
(
this
.
id
);
}
)
.
then
(()
=>
{
this
.
$modal
.
msgSuccess
(
"
核销成功
"
);
this
.
$modal
.
msgSuccess
(
this
.
$t
(
'
核销成功
'
)
);
this
.
$router
.
back
();
}
)
.
catch
(()
=>
{
}
);
...
...
@@ -769,8 +769,8 @@ export default {
this
.
addForm
=
{
}
this
.
openAddDialog
=
true
this
.
isView
=
false
this
.
dialogTitle
=
'
添加银行实收明细
'
this
.
saveBtnText
=
'
添 加
'
this
.
dialogTitle
=
this
.
$t
(
'
添加银行实收明细
'
)
this
.
saveBtnText
=
this
.
$t
(
'
添加
'
)
}
,
handleUploadSuccess
(
res
,
file
,
fileList
)
{
var
arr
=
[];
...
...
@@ -785,19 +785,19 @@ export default {
handleBeforeUpload
()
{
this
.
loading
=
this
.
$loading
({
lock
:
true
,
text
:
"
上传中
"
,
text
:
this
.
$t
(
'
上传中
'
)
,
background
:
"
rgba(0, 0, 0, 0.7)
"
,
}
);
}
,
handleUploadError
()
{
this
.
$message
({
type
:
"
error
"
,
message
:
"
上传失败
"
,
message
:
this
.
$t
(
'
上传失败
'
)
,
}
);
this
.
loading
.
close
();
}
,
beforeRemove
(
file
,
fileList
)
{
return
this
.
$confirm
(
`确定移除?`
).
then
(
res
=>
{
return
this
.
$confirm
(
this
.
$t
(
'
确定移除?
'
)
).
then
(
res
=>
{
setTimeout
(()
=>
{
this
.
addForm
.
attr
=
fileList
.
map
(
v
=>
({
name
:
v
.
name
,
url
:
v
.
response
?
v
.
response
.
data
:
v
.
url
}
))
}
,
300
)
...
...
src/views/ecw/financial/receivable.vue
View file @
d29947a1
<
template
>
<div
class=
"app-container"
>
<div
slot=
"header"
class=
"card-title"
>
待收款
</div>
<div
slot=
"header"
class=
"card-title"
>
{{
$t
(
'
待收款
'
)
}}
</div>
<!-- 操作工具栏 -->
<el-row
:gutter=
"10"
class=
"mb8"
style=
"margin-right: 60px"
>
<el-button
...
...
@@ -8,7 +8,7 @@
type=
"primary"
size=
"mini"
@
click=
"handleAdd(0)"
>
新增收款单
</el-button
>
{{
$t
(
'
新增收款单
'
)
}}
</el-button
>
<el-button
v-if=
"showSearch"
...
...
@@ -38,10 +38,10 @@
class=
"card"
>
<el-row>
<el-form-item
label=
"始发城市:
"
>
<el-form-item
:label=
"$t('始发城市')
"
>
<el-select
v-model=
"queryParams.departureId"
placeholder=
"请选择始发城市
"
:placeholder=
"$t('请选择始发城市')
"
clearable
>
<el-option
...
...
@@ -52,10 +52,10 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"目的城市:
"
>
<el-form-item
:label=
"$t('目的城市')
"
>
<el-select
v-model=
"queryParams.objectiveId"
placeholder=
"请选择目的城市
"
:placeholder=
"$t('请选择目的城市')
"
clearable
>
<el-option
...
...
@@ -66,7 +66,7 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"运输方式:
"
>
<el-form-item
:label=
"$t('运输方式')
"
>
<dict-selector
:type=
"DICT_TYPE.ECW_TRANSPORT_TYPE"
v-model=
"queryParams.transportId"
...
...
@@ -74,7 +74,7 @@
clearable
/>
</el-form-item>
<el-form-item
label=
"控货:
"
>
<el-form-item
:label=
"$t('控货')
"
>
<dict-selector
:type=
"DICT_TYPE.INFRA_BOOLEAN_STRING"
v-model=
"queryParams.isCargoControl"
...
...
@@ -83,66 +83,66 @@
</el-form-item>
</el-row>
<el-row>
<el-form-item
label=
"订单状态:
"
>
<el-form-item
:label=
"$t('订单状态')
"
>
<dict-selector
:type=
"DICT_TYPE.ORDER_STATUS"
v-model=
"queryParams.status"
clearable
/>
</el-form-item>
<el-form-item
label=
"报关方式:
"
>
<el-form-item
:label=
"$t('报关方式')
"
>
<dict-selector
:type=
"DICT_TYPE.ECW_CUSTOMS_TYPE"
v-model=
"queryParams.customsType"
clearable
/>
</el-form-item>
<el-form-item
label=
"订单号:
"
>
<el-form-item
:label=
"$t('订单号')
"
>
<el-input
style=
"max-width: 188px"
v-model=
"queryParams.orderNo"
placeholder=
"请输入订单编号
"
:placeholder=
"$t('请输入订单编号')
"
clearable
@
keyup.enter.native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"品名:
"
>
<el-form-item
:label=
"$t('品名')
"
>
<el-input
style=
"max-width: 188px"
v-model=
"queryParams.title"
placeholder=
"请输入品名
"
:placeholder=
"$t('请输入品名')
"
clearable
@
keyup.enter.native=
"handleQuery"
/>
</el-form-item>
</el-row>
<el-row>
<el-form-item
label=
"提单号:
"
>
<el-form-item
:label=
"$t('提单号')
"
>
<el-input
style=
"max-width: 188px"
v-model=
"queryParams.tidanNo"
placeholder=
"请输入提单号
"
:placeholder=
"$t('请输入提单号')
"
clearable
@
keyup.enter.native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"唛头:
"
>
<el-form-item
:label=
"$t('唛头')
"
>
<el-input
style=
"max-width: 188px"
v-model=
"queryParams.marks"
placeholder=
"请输入唛头
"
:placeholder=
"$t('请输入唛头')
"
clearable
@
keyup.enter.native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"费用类型:
"
>
<el-form-item
:label=
"$t('费用类型')
"
>
<dict-selector
:type=
"DICT_TYPE.FEE_TYPE"
v-model=
"queryParams.feeType"
clearable
></dict-selector>
</el-form-item>
<el-form-item
label=
"发货人:
"
>
<el-form-item
:label=
"$t('发货人')
"
>
<customer-selector
v-model=
"queryParams.consignorNameOrPhone"
@
change=
"consignor = $event"
...
...
@@ -154,7 +154,7 @@
</el-form-item>
-->
</el-row>
<el-row>
<el-form-item
label=
"收货人:
"
>
<el-form-item
:label=
"$t('收货人')
"
>
<!--
<el-input
style=
"max-width: 188px;"
v-model=
"queryParams.consigneeNameOrPhone"
placeholder=
"请输入收货人"
clearable
@
keyup.enter.native=
"handleQuery"
/>
-->
<customer-selector
v-model=
"queryParams.consigneeNameOrPhone"
...
...
@@ -162,24 +162,24 @@
clearable
/>
</el-form-item>
<el-form-item
label=
"自编号:
"
>
<el-form-item
:label=
"$t('自编号')
"
>
<el-input
style=
"max-width: 188px"
v-model=
"queryParams.selfNo"
placeholder=
"请输入自编号
"
:placeholder=
"$t('请输入自编号')
"
clearable
@
keyup.enter.native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"创建时间:
"
>
<el-form-item
:label=
"$t('创建时间')
"
>
<!--
<dict-selector
:type=
"DICT_TYPE.BEGINTIME_TYPE_ENDTIME"
v-model=
"queryParams.date"
></dict-selector>
-->
<el-date-picker
v-model=
"dateType"
type=
"datetimerange"
range-separator=
"-"
value-format=
"yyyy-MM-dd"
start-placeholder=
"请选择日期
"
end-placeholder=
"请选择日期
"
:start-placeholder=
"$t('请选择日期')
"
:end-placeholder=
"$t('请选择日期')
"
>
</el-date-picker>
</el-form-item>
...
...
@@ -194,23 +194,23 @@
</el-form>
</el-card>
<el-table
v-loading=
"loadings"
:data=
"list"
border
class=
"card"
>
<el-table-column
label=
"订单号
"
align=
"center"
prop=
"orderNo"
/>
<el-table-column
label=
"唛头
"
align=
"center"
prop=
"marks"
/>
<el-table-column
label=
"品名
"
align=
"center"
prop=
"title"
>
<el-table-column
:label=
"$t('订单号')
"
align=
"center"
prop=
"orderNo"
/>
<el-table-column
:label=
"$t('唛头')
"
align=
"center"
prop=
"marks"
/>
<el-table-column
:label=
"$t('品名')
"
align=
"center"
prop=
"title"
>
<template
slot-scope=
"scope"
>
{{
scope
.
row
.
titleZh
?
(
scope
.
row
.
titleZh
+
"
(
"
+
scope
.
row
.
titleEn
+
"
)
"
):
''
}}
</
template
>
</el-table-column>
<el-table-column
label=
"箱数
"
align=
"center"
prop=
"num"
/>
<el-table-column
label=
"体积/重量
"
align=
"center"
prop=
"weight"
/>
<el-table-column
label=
"发货人
"
align=
"center"
prop=
"consignorName"
/>
<el-table-column
label=
"收货人
"
align=
"center"
prop=
"consigneeName"
/>
<el-table-column
label=
"订单状态
"
align=
"center"
prop=
"status"
>
<el-table-column
:label=
"$t('箱数')
"
align=
"center"
prop=
"num"
/>
<el-table-column
:label=
"$t('体积/重量')
"
align=
"center"
prop=
"weight"
/>
<el-table-column
:label=
"$t('发货人')
"
align=
"center"
prop=
"consignorName"
/>
<el-table-column
:label=
"$t('收货人')
"
align=
"center"
prop=
"consigneeName"
/>
<el-table-column
:label=
"$t('订单状态')
"
align=
"center"
prop=
"status"
>
<
template
slot-scope=
"scope"
>
<dict-tag
:type=
"DICT_TYPE.ORDER_STATUS"
:value=
"scope.row.status"
/>
</
template
>
</el-table-column>
<el-table-column
label=
"收入类型
"
align=
"center"
prop=
"feeType"
>
<el-table-column
:label=
"$t('收入类型')
"
align=
"center"
prop=
"feeType"
>
<
template
slot-scope=
"scope"
>
<dict-tag
:type=
"DICT_TYPE.FEE_TYPE"
...
...
@@ -218,26 +218,26 @@
></dict-tag>
</
template
>
</el-table-column>
<el-table-column
label=
"单价
"
align=
"center"
prop=
"unitPrice"
>
<el-table-column
:label=
"$t('单价')
"
align=
"center"
prop=
"unitPrice"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
unitPrice
}}
</span>
<dict-tag
:type=
"DICT_TYPE.BOX_SHIPPING_PRICE_UNIT"
:value=
"scope.row.currencyId"
/>
</
template
>
</el-table-column>
<el-table-column
label=
"总金额
"
align=
"center"
prop=
"totalAmount"
>
<el-table-column
:label=
"$t('总金额')
"
align=
"center"
prop=
"totalAmount"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
totalAmount
}}
</span>
<dict-tag
:type=
"DICT_TYPE.BOX_SHIPPING_PRICE_UNIT"
:value=
"scope.row.currencyId"
/>
</
template
>
</el-table-column>
<el-table-column
label=
"操作
"
:label=
"$t('操作')
"
align=
"center"
class-name=
"small-padding fixed-width"
>
<
template
slot-scope=
"scope"
>
<el-button
size=
"mini"
type=
"text"
@
click=
"handleAdd(scope.row.id)"
>
收款
</el-button
>
{{
$t
(
'
收款
'
)
}}
</el-button
>
</
template
>
</el-table-column>
...
...
src/views/ecw/financial/voucher.vue
View file @
d29947a1
<
template
>
<div
class=
"app-container"
>
<div
slot=
"header"
class=
"card-title"
>
收款单
</div>
<div
slot=
"header"
class=
"card-title"
>
{{
$t
(
'
收款单
'
)
}}
</div>
<!-- 搜索工作栏 -->
<el-card
v-show=
"showSearch"
class=
"card"
>
<el-form
...
...
@@ -12,31 +12,31 @@
class=
"card"
>
<el-row
:span=
"24"
>
<el-form-item
label=
"收款单号:
"
>
<el-form-item
:label=
"$t('收款单号')
"
>
<el-input
style=
"max-width: 188px"
v-model=
"queryParams.receiptNo"
placeholder=
"请输入收款单号
"
:placeholder=
"$t('请输入收款单号')
"
clearable
@
keyup.enter.native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"客户名称:
"
>
<el-form-item
:label=
"$t('客户名称')
"
>
<customer-selector
v-model=
"queryParams.customerId"
@
change=
"consignor = $event"
/>
</el-form-item>
<el-form-item
label=
"状态:
"
>
<el-form-item
:label=
"$t('状态')
"
>
<dict-selector
:type=
"DICT_TYPE.ECW_RECEIPT_STATE"
v-model=
"queryParams.state"
/>
</el-form-item>
<el-form-item
label=
"业务员:
"
>
<el-form-item
:label=
"$t('业务员')
"
>
<el-select
v-model=
"queryParams.salesmanId"
placeholder=
"请选择业务员
"
:placeholder=
"$t('请选择业务员')
"
>
<el-option
v-for=
"item in creatorData"
...
...
@@ -49,71 +49,71 @@
</el-row>
<el-row
:span=
"24"
>
<el-col
style=
"width: 592px"
>
<el-form-item
label=
"创建时间:
"
>
<el-form-item
:label=
"$t('创建时间')
"
>
<el-date-picker
v-model=
"queryParams.beginCreateTime"
type=
"datetimerange"
range-separator=
"
到
"
start-placeholder=
"请选择日期
"
end-placeholder=
"请选择日期
"
range-separator=
"
-
"
:start-placeholder=
"$t('请选择日期')
"
:end-placeholder=
"$t('请选择日期')
"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-form-item
label=
"自编号:
"
>
<el-form-item
:label=
"$t('自编号')
"
>
<el-input
style=
"max-width: 188px"
v-model=
"queryParams.orderNo"
placeholder=
"请输入自编号
"
:placeholder=
"$t('请输入自编号')
"
clearable
@
keyup.enter.native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"订单号:
"
>
<el-form-item
:label=
"$t('订单号')
"
>
<el-input
style=
"max-width: 188px"
v-model=
"queryParams.orderNo"
placeholder=
"请输入订单号
"
:placeholder=
"$t('请输入订单号')
"
clearable
@
keyup.enter.native=
"handleQuery"
/>
</el-form-item>
</el-row>
<el-row
:span=
"24"
>
<el-form-item
label=
"商品名称:
"
>
<el-form-item
:label=
"$t('商品名称')
"
>
<el-input
style=
"max-width: 188px"
v-model=
"queryParams.orderNo"
placeholder=
"请输入商品名称
"
:placeholder=
"$t('请输入商品名称')
"
clearable
@
keyup.enter.native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"费用类型:
"
>
<el-form-item
:label=
"$t('费用类型')
"
>
<dict-selector
:type=
"DICT_TYPE.FEE_TYPE"
v-model=
"queryParams.feeType"
></dict-selector>
</el-form-item>
<el-form-item
label=
"收款类型:
"
>
<el-form-item
:label=
"$t('收款类型')
"
>
<dict-selector
:type=
"DICT_TYPE.PAYMENT_TYPE"
v-model=
"queryParams.paymentType"
></dict-selector>
</el-form-item>
<el-form-item>
<el-button
type=
"primary"
@
click=
"handleQuery"
>
查找
</el-button>
<el-button
type=
"primary"
@
click=
"handleQuery"
>
{{
$t
(
'
查找
'
)
}}
</el-button>
</el-form-item>
</el-row>
</el-form>
</el-card>
<el-table
v-loading=
"loadings"
:data=
"list"
border
class=
"card"
>
<el-table-column
label=
"序号
"
align=
"center"
prop=
"id"
type=
"index"
>
<el-table-column
:label=
"$t('序号')
"
align=
"center"
prop=
"id"
type=
"index"
>
<template
slot-scope=
"scope"
>
<span>
{{
scope
.
$index
+
1
}}
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"收款单号
"
align=
"center"
prop=
"receiptNo"
>
<el-table-column
:label=
"$t('收款单号')
"
align=
"center"
prop=
"receiptNo"
>
<
template
slot-scope=
"scope"
>
<span
style=
"color: #1890ff;"
@
click=
"verificationCancelClick(scope.row)"
>
{{
scope
.
row
.
receiptNo
}}
</span>
<!--
<el-button
size=
"mini"
type=
"text"
@
click=
"verificationCancelClick(scope.row)"
>
{{
scope
.
row
.
receiptNo
}}
</el-button>
-->
...
...
@@ -126,8 +126,8 @@
<!-- <el-button size="mini" type="text" @click="verificationCancelClick(scope.row)">{{ scope.row.receiptNo }}</el-button> -->
<!-- </template> -->
<!-- </el-table-column> -->
<el-table-column
label=
"客户名称
"
align=
"center"
prop=
"customerName"
/>
<el-table-column
label=
"创建日期
"
align=
"center"
prop=
"createTime"
>
<el-table-column
:label=
"$t('客户名称')
"
align=
"center"
prop=
"customerName"
/>
<el-table-column
:label=
"$t('创建日期')
"
align=
"center"
prop=
"createTime"
>
<
template
slot-scope=
"scope"
>
<span>
{{
parseTime
(
scope
.
row
.
createTime
,
'
{y
}
-{m
}
-{d
}
'
)
}}
<
/span
>
<
/template
>
...
...
@@ -138,13 +138,13 @@
<
/template
>
<
/el-table-column> --
>
<!--
<
el
-
table
-
column
label
=
"
汇率
"
align
=
"
center
"
prop
=
"
totalAmount
"
/>
-->
<
el
-
table
-
column
label
=
"
实收日期
"
align
=
"
center
"
prop
=
"
payedAt
"
>
<
el
-
table
-
column
:
label
=
"
$t('实收日期')
"
align
=
"
center
"
prop
=
"
payedAt
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
span
>
{{
parseTime
(
scope
.
row
.
payedAt
,
'
{y
}
-{m
}
-{d
}
'
)
}}
<
/span
>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"
业务员
"
align
=
"
center
"
prop
=
"
salesmanName
"
/>
<
el
-
table
-
column
label
=
"
状态
"
align
=
"
center
"
>
<
el
-
table
-
column
:
label
=
"
$t('业务员')
"
align
=
"
center
"
prop
=
"
salesmanName
"
/>
<
el
-
table
-
column
:
label
=
"
$t('状态')
"
align
=
"
center
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
dict
-
tag
:
type
=
"
DICT_TYPE.ECW_RECEIPT_STATE
"
...
...
@@ -152,13 +152,13 @@
/>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"
是否开票
"
align
=
"
center
"
>
<
el
-
table
-
column
:
label
=
"
$t('是否开票')
"
align
=
"
center
"
>
<
template
slot
-
scope
=
"
scope
"
>
{{
scope
.
row
.
openInvoice
===
0
?
'
否
'
:
'
是
'
}}
{{
scope
.
row
.
openInvoice
===
0
?
$t
(
'
否
'
)
:
$t
(
'
是
'
)
}}
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"
操作
"
:
label
=
"
$t('操作')
"
align
=
"
center
"
class
-
name
=
"
small-padding fixed-width
"
>
...
...
@@ -168,7 +168,7 @@
size
=
"
mini
"
type
=
"
text
"
@
click
=
"
handleAdd(scope.row.id)
"
>
编辑
<
/el-butto
n
>
{{
$t
(
'
编辑
'
)
}}
<
/el-butto
n
>
<!--
<
el
-
button
v
-
if
=
"
scope.row.state ==
"
...
...
@@ -182,30 +182,30 @@
size
=
"
mini
"
type
=
"
text
"
@
click
=
"
verificationCancelClick(scope.row)
"
>
反核销
<
/el-butto
n
>
{{
$t
(
'
反核销
'
)
}}
<
/el-butto
n
>
<
el
-
button
v
-
if
=
"
scope.row.state == 5
"
size
=
"
mini
"
type
=
"
text
"
@
click
=
"
openInvoice(scope.row.id)
"
>
开票
<
/el-butto
n
>
{{
$t
(
'
开票
'
)
}}
<
/el-butto
n
>
<
el
-
button
v
-
if
=
"
scope.row.state == 1 || scope.row.state == 2 || scope.row.state == 3
"
size
=
"
mini
"
type
=
"
text
"
@
click
=
"
verificationCancelClick(scope.row)
"
>
收款
<
/el-button
>
<
el
-
button
v
-
if
=
"
scope.row.state == 0 || scope.row.state == 1
"
size
=
"
mini
"
type
=
"
text
"
@
click
=
"
deleteClick(scope.row)
"
>
删除
<
/el-button
>
<
el
-
button
v
-
if
=
"
scope.row.state == 1 || scope.row.state == 2 || scope.row.state == 3
"
size
=
"
mini
"
type
=
"
text
"
@
click
=
"
verificationCancelClick(scope.row)
"
>
{{
$t
(
'
收款
'
)
}}
<
/el-button
>
<
el
-
button
v
-
if
=
"
scope.row.state == 0 || scope.row.state == 1
"
size
=
"
mini
"
type
=
"
text
"
@
click
=
"
deleteClick(scope.row)
"
>
{{
$t
(
'
删除
'
)
}}
<
/el-button
>
<
el
-
button
v
-
if
=
"
scope.row.state != 0
"
size
=
"
mini
"
type
=
"
text
"
@
click
=
"
toprint(scope.row.id)
"
>
打印
<
/el-butto
n
>
{{
$t
(
'
打印
'
)
}}
<
/el-butto
n
>
<
el
-
button
v
-
if
=
"
scope.row.state != 0
"
size
=
"
mini
"
type
=
"
text
"
@
click
=
"
exportReceipt(scope.row.id)
"
>
导出账单
<
/el-butto
n
>
{{
$t
(
'
导出账单
'
)
}}
<
/el-butto
n
>
<
/template
>
<
/el-table-column
>
...
...
@@ -220,7 +220,7 @@
/>
<!--
对话框
(
添加
/
修改
)
-->
<
el
-
dialog
title
=
"
导出账单
"
:
title
=
"
$t('导出账单')
"
:
visible
.
sync
=
"
open
"
width
=
"
500px
"
style
=
"
margin-top: 20vh !important
"
...
...
@@ -232,7 +232,7 @@
<
/div> --
>
<
div
class
=
"
dialog-footer
"
>
<
el
-
button
type
=
"
primary
"
style
=
"
width: 130px
"
@
click
=
"
submitForm(1)
"
>
国内账单
<
/el-butto
n
>
{{
$t
(
'
国内账单
'
)
}}
<
/el-butto
n
>
<
el
-
button
plain
...
...
@@ -349,11 +349,11 @@ export default {
}
,
deleteClick
(
row
)
{
const
id
=
row
.
id
;
this
.
$modal
.
confirm
(
'
是否确认删除该收款单?
'
).
then
(
function
()
{
this
.
$modal
.
confirm
(
this
.
$t
(
'
是否确认删除该收款单?
'
)
).
then
(
function
()
{
return
deleteReceipt
(
id
);
}
).
then
(()
=>
{
this
.
getList
();
this
.
$modal
.
msgSuccess
(
"
删除成功
"
);
this
.
$modal
.
msgSuccess
(
this
.
$t
(
'
删除成功
'
)
);
}
).
catch
(()
=>
{
}
);
}
,
/** 搜索按钮操作 */
...
...
@@ -377,7 +377,7 @@ export default {
}
,
submitForm
(
type
)
{
receiptExportExcel
({
id
:
this
.
exportId
,
billType
:
type
}
).
then
((
response
)
=>
{
this
.
$download
.
excel
(
response
,
`${type === 1 ?
"国内账单"
: "Debite_note"
}
.xls`
);
this
.
$download
.
excel
(
response
,
`${type === 1 ?
this.$t('国内账单')
: "Debite_note"
}
.xls`
);
this
.
open
=
false
;
}
);
...
...
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