This commit is contained in:
linfso 2024-08-19 15:44:05 +08:00
parent 6965af1d76
commit f6dbfbd15e
4 changed files with 121 additions and 18 deletions

View File

@ -122,6 +122,26 @@ import { debounce } from 'throttle-debounce'
"taxRate": "0.00",
"withTaxFlag": "1"
},
{
"goodsName": "国际代理运输费",
"goodsCode": "30408020102",
"specType": "次",
"unit": "次",
"price": "1",
"num": "1",
"taxRate": "0.00",
"withTaxFlag": "1"
},
{
"goodsName": "国际货运代理服务费",
"goodsCode": "30408020102",
"specType": "次",
"unit": "次",
"price": "1",
"num": "1",
"taxRate": "0.00",
"withTaxFlag": "1"
},
{
"goodsName": "派送费",
"goodsCode": "304040903",

View File

@ -1,5 +1,5 @@
<template>
<div class="app-container">
<div >
<XdTable v-loading="loading"
border stripe
size="mini"

View File

@ -51,8 +51,66 @@
<el-descriptions-item label="使用的开票企业代码">{{ emisSettleInvoiceRecord.openComCode }}</el-descriptions-item>
-->
</el-descriptions>
</div>
<div>
<div>开票运单</div>
<div>
<el-table
class="cargoList"
:cell-style="{
'padding': '0px!important',
'padding-left': '0px!important',
'padding-right': '0px!important',
'font-size':'11px'
}"
:header-cell-style="{
'font-size':'11px'
}"
border
:data="emisSettleInvoiceRelList"
size="mini"
style="width: 100%"
max-height="300px"
>
<el-table-column :label="$t('序号')" align="center" width="60">
<template slot-scope="scope">
<span > {{scope.$index+1}}</span>
</template>
</el-table-column>
<el-table-column prop="billNo" :label="$t('运单号')" align="center" width="170">
<template slot-scope="scope">
<span>{{ scope.row.billNo }}</span>
</template>
</el-table-column>
<el-table-column prop="billFee" :label="$t('可开票金额')" align="center" width="100">
<template slot-scope="scope">
{{scope.row.billFee}}
</template>
</el-table-column>
<el-table-column prop="openBillMoney" :label="$t('申请开票金额')" align="center" width="120">
<template slot-scope="scope">
<el-input-number v-if="form.openBillScope==0" :min="0.00" v-model="scope.row.money" placeholder="" :controls="false" :precision="2" >
<span slot="suffix">(CNY)</span>
</el-input-number>
<span v-else> {{scope.row.billFee}}</span>
</template>
</el-table-column>
<el-table-column :label="$t('操作')" align="center">
<template slot-scope="scope">
<span class="icon iconfont"
v-if="form.openBillScope==0"
style="cursor: pointer;font-size: 21px;color: #6e6e6e;"
@click="()=>deleteFeeItem(scope.row)">&#xe7ae;</span>
</template>
</el-table-column>
</el-table>
</div>
</div>
<div v-if="emisSettleInvoiceRecord">
<InvoiceChRecordList :applyId="emisSettleInvoiceRecord.id" :applySeqNo="emisSettleInvoiceRecord.applySeqNo"></InvoiceChRecordList>
</div>
@ -61,6 +119,7 @@
</template>
<script>
import { listEmisSettleInvoiceRel, getEmisSettleInvoiceRel, delEmisSettleInvoiceRel, addEmisSettleInvoiceRel, updateEmisSettleInvoiceRel } from "@/api/emis/emisSettleInvoiceRel";
import { listEmisSettleInvoiceRecord, getEmisSettleInvoiceRecord, delEmisSettleInvoiceRecord, addEmisSettleInvoiceRecord, updateEmisSettleInvoiceRecord } from "@/api/emis/emisSettleInvoiceRecord";
import CustomerInvoiceInfoPicker from '@/views/emis/EmisBaseTools/CustomerInvoiceInfoPicker.vue';
import { parseTime,genJsSeqNo } from "@/utils/custom";
@ -81,6 +140,7 @@ export default {
return {
emisSettleInvoiceRecord:null,
emisSettleInvoiceRecordOptions: [],
emisSettleInvoiceRelList:[],
// 遮罩层
loading: true,
// 表单参数
@ -119,6 +179,16 @@ export default {
});
}
},
getInvoiceRelList(applySeqNo) {
let qParams={
pageNum:1,
pageSize:2000,
applySeqNo:applySeqNo
}
listEmisSettleInvoiceRel(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
this.emisSettleInvoiceRelList = response.rows;
});
},
// 取消按钮
cancel() {
this.reset();

View File

@ -44,9 +44,9 @@
<span style="color: red">开票范围</span>
</span>
<el-radio-group v-model="form.openBillScope" @change="calcOpenMaxLimit">
<el-radio :key="'1'" label="1">全部运单开票</el-radio>
<el-radio :key="'0'" label="0">部分运单开票</el-radio>
</el-radio-group>
<el-radio :key="'1'" label="1">全部开票</el-radio>
<el-radio :key="'0'" label="0">部分开票</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24">
@ -83,7 +83,7 @@
<span>{{ scope.row.billNo }}</span>
</template>
</el-table-column>
<el-table-column prop="billFee" :label="$t('可开票金额')" align="center" width="100">
<el-table-column prop="billFee" :label="$t('运费')" align="center" width="100">
<template slot-scope="scope">
{{scope.row.billFee}}
</template>
@ -96,6 +96,24 @@
<span v-else> {{scope.row.billFee}}</span>
</template>
</el-table-column>
<el-table-column :label="$t('寄件日期')" align="center" prop="waybillDetail.sendDate" min-width="170" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('快件类型')" align="center" prop="kjlx" width="180" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.waybillDetail.sendSiteName }}--{{ scope.row.waybillDetail.dispatchUnderlingSiteName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('发件人')" align="center" prop="waybillDetail.sendName" width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" width="150" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('支付方式')" align="center" prop="waybillDetail.paymentType" min-width="80" :show-overflow-tooltip="true" >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_payment_type" :value="scope.row.waybillDetail.paymentType" />
</template>
</el-table-column>
<el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" width="120" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('件数')" align="center" prop="waybillDetail.parcelQty" width="80" />
<el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" width="120" />
<el-table-column :label="$t('结算体积')" align="center" prop="waybillDetail.totalVolume" min-width="80" />
<el-table-column :label="$t('操作')" align="center">
<template slot-scope="scope">
<span class="icon iconfont"
@ -131,7 +149,6 @@
</el-col>
<el-col :span="12">
<el-form-item label="开票金额" prop="applyMoney">
<span slot="label">
<span style="color: red">开票金额</span>
@ -179,8 +196,7 @@ export default {
}
},
components: { CustomerInvoiceInfoPicker,SettleBillPicker },
dicts: [
],
dicts: ['emis_payment_type'],
data() {
return {
emisSettleInvoiceRecordOptions: [],
@ -276,11 +292,9 @@ export default {
console.log("===>=res==>",res)
if(res.code==200){
res.rows.forEach(itemSubBill=>{
let relItem={
billNo:itemSubBill.billNo,
billFee:itemSubBill.billFee,
money:itemSubBill.billFee
}
let relItem={...itemSubBill};
relItem.money=itemSubBill.billFee;
this.form.invoiceRelList.push(relItem);
console.log("===>===>",this.form.invoiceRelList)
@ -315,11 +329,10 @@ export default {
console.log("===>=res==>",res)
if(res.code==200){
res.rows.forEach(itemSubBill=>{
let relItem={
billNo:itemSubBill.billNo,
billFee:itemSubBill.billFee,
money:itemSubBill.billFee
}
let relItem={...itemSubBill};
relItem.money=itemSubBill.billFee;
this.form.invoiceRelList.push(relItem);
totalBillFee=totalBillFee+itemSubBill.billFee;