|
|
@@ -410,6 +410,7 @@
|
|
|
<el-tab-pane label="核销明细" name="first">
|
|
|
<finstlbillsitems :tableData="tableData"
|
|
|
:handleSelectionData="handleSelectionData"
|
|
|
+ :whetherAuditing="whetherAuditing"
|
|
|
@handleSelectionChange="handleSelectionChange">
|
|
|
</finstlbillsitems>
|
|
|
</el-tab-pane>
|
|
|
@@ -436,7 +437,7 @@
|
|
|
finstlbillsSubmit
|
|
|
} from '@/api/iosBasicData/finstlbills'
|
|
|
import expand from "@/components/basic-container/expand.vue";
|
|
|
- import finstlbillsitems from "@/views/iosBasicData/PaymentApplication/assembly/finstlbillsitems.vue";
|
|
|
+ import finstlbillsitems from "@/views/iosBasicData/PaymentSettlement/assembly/finstlbillsitems.vue";
|
|
|
import {isProcurement} from "@/api/basicData/configuration";
|
|
|
|
|
|
export default {
|
|
|
@@ -547,46 +548,49 @@
|
|
|
return;
|
|
|
}
|
|
|
}
|
|
|
- for (let item of this.handleSelectionData) {
|
|
|
- if (!item.currentStlCurCode) {
|
|
|
- this.$message.warning('请选择本次结算币种');
|
|
|
- return;
|
|
|
- }
|
|
|
- if (!item.currentStlAmount) {
|
|
|
- this.$message.warning('请选择本次结算金额');
|
|
|
- return;
|
|
|
- }
|
|
|
- }
|
|
|
this.saveLoading = true // 加载动画
|
|
|
- this.form.billNoFormat = 'HYDZ'
|
|
|
- this.form.businessTypeCode = 'HYDZ'
|
|
|
+ this.form.billNoFormat = 'HYFF'
|
|
|
+ this.form.businessTypeCode = 'HYFF'
|
|
|
this.form.businessType = 'STL' // 结算单
|
|
|
this.form.dc = 'C' // 付
|
|
|
|
|
|
- if (!this.form.id) {
|
|
|
- this.form.finStlBillsItemsList = this.handleSelectionData.map((item,index)=>{
|
|
|
- item.lineNo = index
|
|
|
- item.pType = item.businessType
|
|
|
- item.accBillId = item.id
|
|
|
- item.accBillNo = item.billNo
|
|
|
- item.accDate = item.billDate
|
|
|
- item.dc = item.accountDc // 收付
|
|
|
- if (item.currentStlCurCode == 'CNY') {
|
|
|
- item.currentStlAmount = item.currentStlAmountRMB
|
|
|
- }else {
|
|
|
- item.currentStlAmount = item.currentStlAmountUSD
|
|
|
+ if (this.whetherAuditing == '0') {
|
|
|
+ for (let item of this.handleSelectionData) {
|
|
|
+ if (!item.currentStlCurCode) {
|
|
|
+ this.$message.warning('请选择本次结算币种');
|
|
|
+ return;
|
|
|
}
|
|
|
- delete item.businessType
|
|
|
- if (!this.form.id) {
|
|
|
- delete item.id
|
|
|
+ if (!item.currentStlAmount) {
|
|
|
+ this.$message.warning('请选择本次结算金额');
|
|
|
+ return;
|
|
|
}
|
|
|
- delete item.billNo
|
|
|
- delete item.billDate
|
|
|
- delete item.accountDc
|
|
|
- return item
|
|
|
- })
|
|
|
+ }
|
|
|
+ if (!this.form.id) {
|
|
|
+ this.form.finStlBillsItemsList = this.handleSelectionData.map((item,index)=>{
|
|
|
+ item.lineNo = index
|
|
|
+ item.pType = item.businessType
|
|
|
+ item.accBillId = item.id
|
|
|
+ item.accBillNo = item.billNo
|
|
|
+ item.accDate = item.billDate
|
|
|
+ item.dc = item.accountDc // 收付
|
|
|
+ if (item.currentStlCurCode == 'CNY') {
|
|
|
+ item.currentStlAmount = item.currentStlAmountRMB
|
|
|
+ }else {
|
|
|
+ item.currentStlAmount = item.currentStlAmountUSD
|
|
|
+ }
|
|
|
+ delete item.businessType
|
|
|
+ if (!this.form.id) {
|
|
|
+ delete item.id
|
|
|
+ }
|
|
|
+ delete item.billNo
|
|
|
+ delete item.billDate
|
|
|
+ delete item.accountDc
|
|
|
+ return item
|
|
|
+ })
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ this.form.finStlBillsItemsList = this.handleSelectionData
|
|
|
}
|
|
|
-
|
|
|
finstlbillsSubmit(this.form).then(res=>{
|
|
|
this.saveLoading = false
|
|
|
this.$message.success('操作成功');
|
|
|
@@ -596,7 +600,11 @@
|
|
|
// 申请单号
|
|
|
approveDetailfun(billNo){
|
|
|
approveDetail({billNo}).then(res=>{
|
|
|
- console.log(res,587)
|
|
|
+ this.tableData = res.data.data.finStlBillsItemsList.map(item=>{
|
|
|
+ item.id = ''
|
|
|
+ item.pid = ''
|
|
|
+ return item
|
|
|
+ })
|
|
|
})
|
|
|
},
|
|
|
// 判断检索
|
|
|
@@ -681,6 +689,7 @@
|
|
|
obj.receivableAdvance = this.form.receivableAdvance // 预收帐款
|
|
|
obj.voyageNo = this.form.voyageNo // 航次
|
|
|
obj.signforDateList = this.form.signforDateList // 签收日期
|
|
|
+ obj.billNo = this.form.billNo // 申请单号
|
|
|
// 审核期间
|
|
|
if (this.form.approvedDate) {
|
|
|
obj.approveTimeList = this.form.approvedDate
|
|
|
@@ -691,7 +700,7 @@
|
|
|
}
|
|
|
|
|
|
if (this.whetherAuditing == '1') {
|
|
|
- this.approveDetailfun()
|
|
|
+ this.approveDetailfun(obj.billNo)
|
|
|
}else {
|
|
|
finstlbillslistAccBillV1(obj).then(res=>{
|
|
|
this.tableData = res.data.data.map(item=>{
|
|
|
@@ -765,51 +774,6 @@
|
|
|
this.$emit('goBack')
|
|
|
},
|
|
|
// 请求的接口
|
|
|
- // 确认签收接口
|
|
|
- finstlbillsConfirmSignForfun(){
|
|
|
- this.form.billNoFormat = 'HYDZ'
|
|
|
- this.form.businessTypeCode = 'HYDZ'
|
|
|
- this.form.businessType = 'STL' // 结算单
|
|
|
- // 保留id
|
|
|
- this.form.finStlBillsItemsList = this.handleSelectionData.map((item,index)=>{
|
|
|
- item.lineNo = index
|
|
|
- item.pType = item.businessType
|
|
|
- item.accBillId = item.id
|
|
|
- item.accBillNo = item.billNo
|
|
|
- item.accDate = item.billDate
|
|
|
- delete item.businessType
|
|
|
- delete item.billNo
|
|
|
- delete item.billDate
|
|
|
- return item
|
|
|
- })
|
|
|
- finstlbillsConfirmSignFor(this.form).then(res=>{
|
|
|
- this.$message.success('操作成功');
|
|
|
- this.finstlbillsDetailfun(res.data.data.id)
|
|
|
- })
|
|
|
- },
|
|
|
- // 撤销签收接口
|
|
|
- finstlbillsRevokeSignForfun(){
|
|
|
- this.form.billNoFormat = 'HYDZ'
|
|
|
- this.form.businessTypeCode = 'HYDZ'
|
|
|
- this.form.businessType = 'STL' // 结算单
|
|
|
-
|
|
|
- this.form.finStlBillsItemsList = this.handleSelectionData.map((item,index)=>{
|
|
|
- item.lineNo = index
|
|
|
- item.pType = item.businessType
|
|
|
- item.accBillId = item.id
|
|
|
- item.accBillNo = item.billNo
|
|
|
- item.accDate = item.billDate
|
|
|
- delete item.businessType
|
|
|
- delete item.billNo
|
|
|
- delete item.billDate
|
|
|
- return item
|
|
|
- })
|
|
|
- finstlbillsRevokeSignFor(this.form).then(res=>{
|
|
|
- this.$message.success('操作成功');
|
|
|
- this.finstlbillsDetailfun(res.data.data.id)
|
|
|
- })
|
|
|
- },
|
|
|
-
|
|
|
// 获取币别数据
|
|
|
getRateListfun(cnName){
|
|
|
getRateList({current:1,size:10,cnName}).then(res=>{
|
caojunjie