This commit is contained in:
linfso 2025-07-11 07:43:14 +08:00
parent 4a1b1b24d3
commit 99eae53b3e
3 changed files with 10 additions and 2 deletions

View File

@ -173,7 +173,7 @@
<span v-else>否</span> <span v-else>否</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('运输总重量')" align="center" prop="transWeight" min-width="120" /> <el-table-column :label="$t('计算总重量')" align="center" prop="transWeight" min-width="120" />
<el-table-column :label="$t('分摊总费用')" align="center" prop="transCostFee" min-width="120" /> <el-table-column :label="$t('分摊总费用')" align="center" prop="transCostFee" min-width="120" />
<el-table-column :label="$t('计算公式')" align="center" prop="calcExpr" min-width="150" :show-overflow-tooltip="true"/> <el-table-column :label="$t('计算公式')" align="center" prop="calcExpr" min-width="150" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('计算备注')" align="center" prop="calcRemark" min-width="150" :show-overflow-tooltip="true"/> <el-table-column :label="$t('计算备注')" align="center" prop="calcRemark" min-width="150" :show-overflow-tooltip="true"/>

View File

@ -40,7 +40,7 @@
<dict-tag :options="dict.type.emis_cost_split_type" :value="scope.row.splitType"/> <dict-tag :options="dict.type.emis_cost_split_type" :value="scope.row.splitType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('承运重量')" align="center" prop="transWeight" min-width="100" /> <el-table-column :label="$t('计算总重量')" align="center" prop="transWeight" min-width="100" />
<el-table-column :label="$t('分摊重量')" align="center" prop="billWeight" min-width="100" /> <el-table-column :label="$t('分摊重量')" align="center" prop="billWeight" min-width="100" />
<el-table-column :label="$t('计算公式')" align="center" prop="calcExpr" min-width="100" :show-overflow-tooltip="true"/> <el-table-column :label="$t('计算公式')" align="center" prop="calcExpr" min-width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('计算备注')" align="center" prop="calcRemark" min-width="150" :show-overflow-tooltip="true"/> <el-table-column :label="$t('计算备注')" align="center" prop="calcRemark" min-width="150" :show-overflow-tooltip="true"/>

View File

@ -154,6 +154,11 @@
<span>{{$t('总体积') + ': ' + (form.totalVolume || 0)}}</span> <span>{{$t('总体积') + ': ' + (form.totalVolume || 0)}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<el-form-item style="font-weight:600;" label-width="0px">
<span>{{$t('总结算重量') + ': ' + (form.totalSettlementWeight || 0)}}</span>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-col> </el-col>
@ -949,10 +954,12 @@ export default {
let totalParcelQty=0; let totalParcelQty=0;
let totalWeight=0; let totalWeight=0;
let totalVolume=0; let totalVolume=0;
let totalSettlementWeight=0;
this.waitBatchDtlList.forEach(item =>{ this.waitBatchDtlList.forEach(item =>{
totalParcelQty +=item.parcelQty; totalParcelQty +=item.parcelQty;
totalWeight +=item.billWeight; totalWeight +=item.billWeight;
totalVolume +=item.totalVolume; totalVolume +=item.totalVolume;
totalSettlementWeight +=item.settlementWeight;
item.destCountry = this.form.destCountry; item.destCountry = this.form.destCountry;
// item.sendSiteCode = this.form.sendSiteCode; // item.sendSiteCode = this.form.sendSiteCode;
item.startSiteCode = this.form.startSiteCode; item.startSiteCode = this.form.startSiteCode;
@ -966,6 +973,7 @@ export default {
this.form.totalParcelQty=totalParcelQty; this.form.totalParcelQty=totalParcelQty;
this.form.totalWeight=totalWeight.toFixed(2); this.form.totalWeight=totalWeight.toFixed(2);
this.form.totalVolume=totalVolume.toFixed(4); this.form.totalVolume=totalVolume.toFixed(4);
this.form.totalSettlementWeight=totalSettlementWeight.toFixed(2);
}, },
// 排序 查询字段是表格中字段名字 动态取值排序顺序 // 排序 查询字段是表格中字段名字 动态取值排序顺序
handleSortChange(column) { handleSortChange(column) {