This commit is contained in:
linfso 2024-05-13 20:54:28 +08:00
parent 795ad66b77
commit e7c28736de

View File

@ -287,7 +287,7 @@
</el-collapse-item>
<el-collapse-item title="" name="3">
<template slot="title">
<div class="form-group-title"><span class="title">{{ $t('货物重量信息') }}</span>
<div class="form-group-title"><span class="title">{{ $t('重量收费信息') }}</span>
</div>
</template>
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
@ -314,6 +314,7 @@
:data="form.cargoList"
size="mini"
style="width: 100%"
max-height="100px"
@cell-mouse-enter="handleGoodsCellEnter"
@cell-mouse-leave="handleGoodsCellLeave"
>
@ -488,43 +489,59 @@
stripe
:data="form.feeItems"
size="mini"
max-height="100px"
style="width: 100%"
>
<!-- @cell-mouse-enter="handleCellEnter"
@cell-mouse-leave="handleCellLeave" -->
<!--
<el-table-column label="序号" align="center" width="50">
<template slot-scope="scope">
<span>{{ scope.$index+1 }} </span>
</template>
</el-table-column>
<!-- <el-table-column type="selection" width="55" align="center" /> -->
</el-table-column> -->
<el-table-column type="selection" width="55" align="center" />
<!-- v-if="scope.row.isEdit" -->
<!-- <div v-else class="txt">{{scope.row.goodsName}}</div> -->
<!--
"feeCode": "费用类型 eg:1001",
"feeName": "费用名称:保险费",
"fee": 10,
"currency": "币种 CNY",
"quoteId": "报价ID",
"orderNum": "序号: 1",
"calcExp": "计算公式",
"addWeightPrice": "续重",
"remark": "费用条码描述" -->
<el-table-column prop="length" label="收费项" align="center" width="60">
<el-table-column prop="length" label="收费项" align="center" min-width="100">
<template slot-scope="scope">
<span>{{ scope.row.feeType }}</span>
<span>{{ scope.row.feeName }}</span>
</template>
</el-table-column>
<el-table-column prop="volumn" label="应收" align="center" width="80">
<el-table-column prop="fee" label="应收" align="center" width="50">
<template slot-scope="scope">
<el-input v-model="scope.row.volumn" size="mini" placeholder="" disabled></el-input>
<span>{{ scope.row.fee }}</span>
</template>
</el-table-column>
<el-table-column prop="goodsName" label="实收" align="center" min-width="100">
<el-table-column prop="initWeight" label="首重费" align="center" width="60">
<template slot-scope="scope">
<el-input v-model="scope.row.goodsName" size="mini" placeholder=""></el-input>
<el-input v-model="scope.row.initWeight" size="mini" placeholder=""></el-input>
</template>
</el-table-column>
<el-table-column prop="goodsName" label="首重费" align="center" min-width="100">
<el-table-column prop="addWeightPrice" label="续重单价" align="center" min-width="80">
<template slot-scope="scope">
<el-input v-model="scope.row.goodsName" size="mini" placeholder=""></el-input>
<el-input v-model="scope.row.addWeightPrice" size="mini" placeholder=""></el-input>
</template>
</el-table-column>
<el-table-column prop="goodsName" label="续重单价" align="center" min-width="100">
<el-table-column prop="realFee" label="实收" align="center" width="50">
<template slot-scope="scope">
<el-input v-model="scope.row.goodsName" size="mini" placeholder=""></el-input>
<el-input v-model="scope.row.realFee" size="mini" placeholder=""></el-input>
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" align="center" min-width="50">
<template slot-scope="scope">
<div> (计算说明:{{scope.row.calcExp}},续重单价:{{scope.row.addWeightPrice}}) }} </div>
</template>
</el-table-column>
</el-table>
@ -1166,12 +1183,6 @@ methods: {
},
calcBillFee(){
console.log("hello=>"+this.form.settlementWeight);
console.log("hello=>"+this.form.totalVolume);
console.log("hello=>"+this.form.productType);
console.log("hello=>"+this.form.sendSiteCode);
console.log("hello=>"+this.form.dispatchUnderlingSiteCode);
console.log("hello=>"+this.form.calcFeeType);
if(this.form.settlementWeight
&& this.form.totalVolume
@ -1217,7 +1228,7 @@ methods: {
"goodsCode": item.goodsCode,
"goodsName": item.goodsName,
"cargoQty": 1,
"lenght": 0,
"length": 0,
"width": 0,
"height": 0,
}