This commit is contained in:
linfso 2024-12-01 20:34:23 +08:00
parent a36a1bc111
commit ed2cb3edb8

View File

@ -206,7 +206,7 @@
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;"> <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="选择线路" prop="transLine"> <el-form-item label="选择线路" prop="transLine">
<TransLinePicker v-model="form.transLine" :fromCountry="form.sender.country" :countryCode="form.reciever.country" isInitiated="true" @onChange="preCalcFee"></TransLinePicker> <TransLinePicker v-model="form.transLine" :fromCountry="form.sender.country" :countryCode="form.reciever.country" isInitiated="true" @onChange="onTransLineChange"></TransLinePicker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
@ -338,15 +338,15 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('总重量')" prop="billWeight" > <el-form-item :label="$t('总重量')" prop="billWeight" >
<el-input v-model="form.billWeight" style="text-align: right;min-width: 80px" placeholder="" @blur="preCalcFee" > <el-input v-model="form.billWeight" style="text-align: right;min-width: 80px" placeholder="" @blur="preCalcFee" @keyup.enter.native="preCalcFee" >
<span slot="suffix">(kg)</span> <span slot="suffix">(kg)</span>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('总体积')" prop="totalVolume" > <el-form-item :label="$t('总体积')" prop="totalVolume" @blur="preCalcFee" @keyup.enter.native="preCalcFee" >
<div style=""> <div style="">
<el-input v-model="form.totalVolume" style="text-align: right;width: 120px" placeholder="体积" @blur="preCalcFee"> <el-input v-model="form.totalVolume" style="text-align: right;width: 120px" placeholder="体积" >
<span slot="suffix">(m³)</span> <span slot="suffix">(m³)</span>
</el-input> </el-input>
</div> </div>
@ -421,7 +421,12 @@
<!-- v-if="needDeclare==1" --> <!-- v-if="needDeclare==1" -->
<el-collapse-item title="" name="3" > <el-collapse-item title="" name="3" >
<template slot="title"> <template slot="title">
<div class="form-group-title"><span class="title">{{ $t('货物申报信息') }}</span> <div class="form-group-title">
<span class="title" v-if="this.transType==1">{{ $t('快递货物申报信息') }}</span>
<span class="title" v-else-if="this.transType==2">{{ $t('空运货物申报信息') }}</span>
<span class="title" v-else-if="this.transType==3">{{ $t('陆运货物申报信息') }}</span>
<span class="title" v-else-if="this.transType==4">{{ $t('海运货物申报信息') }}</span>
<span class="title" v-else>{{ $t('货物申报信息') }}</span>
</div> </div>
</template> </template>
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;"> <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
@ -488,34 +493,33 @@
<el-input v-model="scope.row.volume" size="mini" placeholder="" disabled></el-input> <el-input v-model="scope.row.volume" size="mini" placeholder="" disabled></el-input>
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column v-if="this.transType==1" prop="goodsModel" label="规格型号" align="center" width="80" :show-overflow-tooltip="true">
<el-table-column prop="goodsModel" label="规格型号" align="center" width="80" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.goodsModel" size="mini" placeholder=""></el-input> <el-input v-model="scope.row.goodsModel" size="mini" placeholder=""></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="goodsName" label="品牌" align="center" width="60" :show-overflow-tooltip="true"> <el-table-column v-if="this.transType==1" prop="goodsName" label="品牌" align="center" width="60" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.brand" size="mini" placeholder=""></el-input> <el-input v-model="scope.row.brand" size="mini" placeholder=""></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="material" label="材质" align="center" width="60" :show-overflow-tooltip="true"> <el-table-column v-if="this.transType==1" prop="material" label="材质" align="center" width="60" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.material" size="mini" placeholder=""></el-input> <el-input v-model="scope.row.material" size="mini" placeholder=""></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="purpose" label="用途" align="center" width="60" :show-overflow-tooltip="true"> <el-table-column v-if="this.transType==1" prop="purpose" label="用途" align="center" width="60" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.purpose" size="mini" placeholder=""></el-input> <el-input v-model="scope.row.purpose" size="mini" placeholder=""></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="ingredients" label="成分" align="center" width="60" :show-overflow-tooltip="true"> <el-table-column v-if="this.transType==1" prop="ingredients" label="成分" align="center" width="60" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.ingredients" size="mini" placeholder=""></el-input> <el-input v-model="scope.row.ingredients" size="mini" placeholder=""></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="supplier" label="供应商" align="center" width="80" :show-overflow-tooltip="true"> <el-table-column v-if="this.transType==1" prop="supplier" label="供应商" align="center" width="80" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.supplier" size="mini" placeholder=""></el-input> <el-input v-model="scope.row.supplier" size="mini" placeholder=""></el-input>
</template> </template>
@ -526,7 +530,7 @@
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column prop="hscode" label="海关编码" align="center" width="80" :show-overflow-tooltip="true"> <el-table-column v-if="this.transType==1" prop="hscode" label="海关编码" align="center" width="80" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.hscode" size="mini" placeholder=""></el-input> <el-input v-model="scope.row.hscode" size="mini" placeholder=""></el-input>
</template> </template>
@ -605,7 +609,6 @@
</el-col> </el-col>
</el-row> </el-row>
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
<!-- <!--
@ -784,6 +787,7 @@ data() {
titleSelectAddress:'', titleSelectAddress:'',
openSelectAddress:false, openSelectAddress:false,
printerStatus:0, printerStatus:0,
transType:null,
currentSelectProduct:null, currentSelectProduct:null,
needDeclare:false, needDeclare:false,
@ -1158,6 +1162,11 @@ methods: {
} }
this.preCalcFee(); this.preCalcFee();
}, },
onTransLineChange(item){
console.log("==xxx==>",item);
this.transType=item.transType;
this.preCalcFee()
},
openCollapse(index){ openCollapse(index){
}, },
@ -1530,18 +1539,22 @@ methods: {
sendSiteCode: this.form.sendSiteCode, sendSiteCode: this.form.sendSiteCode,
dispatchUnderlingSiteCode: this.form.dispatchUnderlingSiteCode, dispatchUnderlingSiteCode: this.form.dispatchUnderlingSiteCode,
billWeight: this.form.billWeight||'1', billWeight: this.form.billWeight||'1',
totalVolume: this.form.totalVolume||'0.1', totalVolume: this.form.totalVolume||'0',
custNo: this.form.custNo||'', custNo: this.form.custNo||'',
customsClear:this.form.customsClear||'1', customsClear:this.form.customsClear||'1',
customsEclaration:this.form.customsEclaration||'1' customsEclaration:this.form.customsEclaration||'1'
} }
const loadingInstance = this.$loading({
text: '正在计算报价,请稍候...'
})
// 通过服务器其计算,保留自定义费用 // 通过服务器其计算,保留自定义费用
calcProductFee(postData).then(response => { calcProductFee(postData).then(response => {
this.productFeeList = response.data; this.productFeeList = response.data;
if(!this.productFeeList || this.productFeeList.length==0){ if(!this.productFeeList || this.productFeeList.length==0){
this.$message.error(`无报价`); this.$message.error(`无报价`);
} }
loadingInstance.close();
}); });
} }
}, },