This commit is contained in:
linfso 2025-01-11 08:00:52 +08:00
parent ded0eb623f
commit e5f0f3e656

View File

@ -110,8 +110,8 @@
</el-descriptions>
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;margin-top: 10px;">
<el-col :span="24">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;margin-top: 10px;">
<el-col :span="12">
<el-descriptions :title="$t('货物信息')" size="small" :column="4" style="margin-top:10px">
<el-descriptions-item label="货物名称" :span="4">{{ form.goodsInfo }}</el-descriptions-item>
<el-descriptions-item label="件数">{{ form.parcelQty }}件</el-descriptions-item>
@ -121,7 +121,7 @@
<el-descriptions-item label="实际重量">{{ form.billWeight }}(kg)</el-descriptions-item>
<el-descriptions-item label="体积">{{ form.totalVolume }}(m³)</el-descriptions-item>
<el-descriptions-item label="体积重量" :span="4">{{ form.volumeWeight }}(kg)</el-descriptions-item>
<el-descriptions-item label="申报信息" :span="4">
<el-descriptions-item label="包裹明细" :span="4">
<el-table
class="cargoList"
:cell-style="{
@ -146,12 +146,12 @@
<span > {{scope.$index+1}}</span>
</template>
</el-table-column>
<el-table-column prop="goodsName" :label="$t('货物名称')" align="center" width="80" :show-overflow-tooltip="true">
<!-- <el-table-column prop="goodsName" :label="$t('货物名称')" align="center" width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.goodsName }}
</template>
</el-table-column>
<!-- <el-table-column prop="length" :label="$t('长(cm)')" align="center" width="60">
</el-table-column> -->
<el-table-column prop="length" :label="$t('长(cm)')" align="center" width="60">
<template slot-scope="scope">
{{ scope.row.length }}
</template>
@ -165,73 +165,17 @@
<template slot-scope="scope">
{{ scope.row.height }}
</template>
</el-table-column> -->
</el-table-column>
<el-table-column prop="cargoQty" :label="$t('件数')" align="center" width="60">
<template slot-scope="scope">
{{ scope.row.cargoQty }}
</template>
</el-table-column>
<!-- <el-table-column prop="volume" :label="$t('体积(m³)')" align="center" width="80">
<el-table-column prop="volume" :label="$t('体积(m³)')" align="center" width="80">
<template slot-scope="scope">
{{ scope.row.volume }}
</template>
</el-table-column> -->
<el-table-column prop="price" label="单价" align="center" width="60" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.price }}
</template>
</el-table-column>
<!-- <el-table-column prop="volume" :label="$t('体积(m³)')" align="center" width="80">
<template slot-scope="scope">
<el-input v-model="scope.row.volume" size="mini" placeholder="" disabled></el-input>
</template>
</el-table-column> -->
<el-table-column prop="goodsModel" label="规格型号" align="center" width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.goodsModel }}
</template>
</el-table-column>
<el-table-column prop="goodsName" label="品牌" align="center" width="60" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.brand }}
</template>
</el-table-column>
<!-- <el-table-column prop="hscode" label="海关编码" align="center" width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model="scope.row.hscode" size="mini" placeholder=""></el-input>
</template>
</el-table-column> -->
<el-table-column prop="material" label="材质" align="center" width="60" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.material }}
</template>
</el-table-column>
<el-table-column prop="purpose" label="用途" align="center" width="60" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.purpose }}
</template>
</el-table-column>
<el-table-column prop="ingredients" label="成分" align="center" width="60" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.ingredients }}
</template>
</el-table-column>
<el-table-column prop="supplier" label="供应商" align="center" width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.supplier }}
</template>
</el-table-column>
<!-- <el-table-column prop="volume" :label="$t('描述')" align="center" width="80">
<template slot-scope="scope">
{{ scope.row.goodsName }}
</template>
</el-table-column> -->
</el-table>
@ -239,31 +183,18 @@
<el-descriptions-item label="结算重量" :span="4">{{ form.settlementWeight }}(kg)</el-descriptions-item>
</el-descriptions>
</el-col>
<el-col :span="24">
<el-col :span="12">
<el-descriptions :title="$t('收费信息')" size="small" :column="4" style="margin-top:10px">
<!-- <el-descriptions-item label="计费方式" :span="4">
<dict-tag :options="dict.type.emis_calc_fee_type" :value="form.calcFeeType"/>
</el-descriptions-item> -->
<!-- <el-descriptions-item label="是否特殊报价" :span="1">
<span v-if="form.blSpecialQuote == 1"> 是 </span>
<span v-else> 否 </span>
</el-descriptions-item>
<el-descriptions-item label="是否敏感物" :span="4">
<span v-if="form.blSensitive == 1"> 是 </span>
<span v-else> 否 </span>
</el-descriptions-item> -->
<el-descriptions-item label="支付方式" :span="4">
<dict-tag :options="dict.type.emis_payment_type" :value="form.paymentType"/>
</el-descriptions-item>
<!-- <el-descriptions-item label="费用币种">{{ form.currency }}</el-descriptions-item> -->
<el-descriptions-item v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" label="月结客户" :span="4">{{ form.custName }}</el-descriptions-item>
<!-- <el-descriptions-item label="回款联系人">{{ form.payee }}</el-descriptions-item>
<el-descriptions-item label="销售联系人" :span="3">{{ form.salesmen }}</el-descriptions-item> -->
<el-descriptions-item v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" label="月结客户" :span="4">
{{ form.custName }}
</el-descriptions-item>
<el-descriptions-item label="回款联系人">{{ form.payee }}</el-descriptions-item>
<el-descriptions-item label="销售联系人" :span="3">{{ form.salesmen }}</el-descriptions-item>
<el-descriptions-item label="费用明细" :span="4">
<el-table
class="cargoList"
@ -287,7 +218,7 @@
<el-table-column prop="feeName" :label="$t('收费项')" align="center" width="70">
<template slot-scope="scope">
<span style="font-weight:600;color:red">{{ scope.row.feeName }}</span>
<span style="font-weight:600;color:red">{{ scope.row.feeName }}({{scope.row.currency}})</span>
</template>
</el-table-column>
<el-table-column prop="fee" :label="$t('应收')" align="center" width="50">
@ -319,13 +250,128 @@
</el-table>
</el-descriptions-item>
<el-descriptions-item label="运费" :span="4"><span style="color:red;font-weight:bold;font-size:15px">{{ form.freight }}</span></el-descriptions-item>
<!-- <el-descriptions-item label="费用备注" :span="4">{{ form.feeRemark }}</el-descriptions-item> -->
<el-descriptions-item label="总运费(CNY)" :span="4"><span style="color:red;font-weight:bold;font-size:15px">{{ form.freight }}</span></el-descriptions-item>
<el-descriptions-item label="费用备注" :span="4">{{ form.feeRemark }}</el-descriptions-item>
</el-descriptions>
</el-col>
</el-row>
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;margin-top: 10px;" v-if="form.carryType==1">
<el-col :span="24">
<el-descriptions :title="$t('快递申报货物信息')" size="small" :column="1" style="margin-top:10px">
</el-descriptions>
<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
stripe
:data="form.declareGoodsList"
size="small"
style="width: 100%"
max-height="300px"
>
<el-table-column :label="$t('序号')" align="center" width="30">
<template slot-scope="scope">
<span > {{scope.$index+1}}</span>
</template>
</el-table-column>
<el-table-column prop="goodsName" :label="$t('货物名称')" align="center" width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.goodsName }}
</template>
</el-table-column>
<el-table-column prop="cargoQty" :label="$t('数量')" align="center" width="60">
<template slot-scope="scope">
{{ scope.row.cargoQty }}
</template>
</el-table-column>
<el-table-column prop="price" label="单价" align="center" width="60" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.price }}
</template>
</el-table-column>
<el-table-column prop="goodsName" label="品牌" align="center" width="60" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.brand }}
</template>
</el-table-column>
<el-table-column prop="material" label="材质" align="center" width="60" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.material }}
</template>
</el-table-column>
<el-table-column prop="purpose" label="用途" align="center" width="60" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.purpose }}
</template>
</el-table-column>
<el-table-column prop="ingredients" label="成分" align="center" width="60" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.ingredients }}
</template>
</el-table-column>
<el-table-column prop="supplier" label="供应商" align="center" width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.supplier }}
</template>
</el-table-column>
<el-table-column prop="hscode" label="海关编码" align="center" width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model="scope.row.hscode" size="mini" placeholder=""></el-input>
</template>
</el-table-column>
</el-table>
</el-col>
</el-row>
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;margin-top: 10px;" v-if="form.carryType!=1">
<el-col :span="24">
<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
stripe
:data="form.declareAttachmentList"
size="small"
style="width: 100%"
max-height="300px"
>
<el-table-column :label="$t('序号')" align="center" width="30">
<template slot-scope="scope">
<span > {{scope.$index+1}}</span>
</template>
</el-table-column>
<el-table-column prop="goodsName" :label="$t('文件下载')" align="center" width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.file_url }}
</template>
</el-table-column>
</el-table>
</el-col>
</el-row>
<el-descriptions title="" size="small" :column="1" style="margin-top:10px;margin-bottom: 30px;">
<el-descriptions-item label="订单备注" :span="4">{{ form.orderRemark }}</el-descriptions-item>
</el-descriptions>