This commit is contained in:
linfso 2024-05-13 19:35:49 +08:00
parent 7885af331c
commit bb20faa94e

View File

@ -130,8 +130,8 @@
</template> </template>
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;border: 1px dotted #f5f7fa;border-radius: 5px;"> <el-row :gutter="0" style="display: flex;flex-wrap: wrap;border: 1px dotted #f5f7fa;border-radius: 5px;">
<el-col :span="12"> <el-col :span="12">
<el-row :gutter="0" style="background: #fdfdfd;padding: 10px;border-radius:10px"> <el-row :gutter="0" style="display: flex;flex-wrap: wrap;background: #fdfdfd;padding:15px">
<el-col :span="24" style="display:inline-flex;border-bottom: 1px dotted #e6ebf5"> <el-col :span="24" style="display:inline-flex; margin-bottom: 10px;border-bottom: 1px dotted #e6ebf5">
<div class="form-group-title" style="width:50%"> <div class="form-group-title" style="width:50%">
<span style="border-radius: 15px; <span style="border-radius: 15px;
padding: 5px 15px; padding: 5px 15px;
@ -151,7 +151,6 @@
</div> </div>
</el-col> </el-col>
<div class="form-row-group-panel">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="寄件人" prop="sender.name"> <el-form-item label="寄件人" prop="sender.name">
<CustomerAddressSimplePicker0 addressType="1" v-model="form.sender.name" @onChange="onChangeSelectSender"></CustomerAddressSimplePicker0> <CustomerAddressSimplePicker0 addressType="1" v-model="form.sender.name" @onChange="onChangeSelectSender"></CustomerAddressSimplePicker0>
@ -162,11 +161,6 @@
<el-input v-model="form.sender.phone" placeholder="" /> <el-input v-model="form.sender.phone" placeholder="" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="12">
<el-form-item label="国家" prop="sender.country">
<country-picker1 v-model="form.sender.country"></country-picker1>
</el-form-item>
</el-col> -->
<el-col :span="24"> <el-col :span="24">
<el-form-item label="国家地区" prop="sender.province" > <el-form-item label="国家地区" prop="sender.province" >
<div style="display:inline-flex"> <div style="display:inline-flex">
@ -197,13 +191,12 @@
<el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blMessage" :true-label="'1'" :false-label="'0'"><span style="font-size:10px">寄件/签收短信</span></el-checkbox> <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blMessage" :true-label="'1'" :false-label="'0'"><span style="font-size:10px">寄件/签收短信</span></el-checkbox>
</el-form-item> </el-form-item>
</el-col> </el-col>
</div>
</el-row> </el-row>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-row :gutter="0" style="padding: 8px;"> <el-row :gutter="0" style="display: flex;flex-wrap: wrap;padding:15px">
<el-col :span="24" style="display:inline-flex;border-bottom: 1px dotted #e6ebf5"> <el-col :span="24" style="display:inline-flex;border-bottom: 1px dotted #e6ebf5">
<div class="form-group-title" style="width:50%"> <div class="form-group-title" style="width:50%">
<span style="border-radius: 15px; <span style="border-radius: 15px;
@ -223,8 +216,6 @@
</div> </div>
</el-col> </el-col>
<div class="form-row-group-panel">
<!-- <el-col :span="12"> <!-- <el-col :span="12">
<el-form-item label="收件客户" prop="customerCode"> <el-form-item label="收件客户" prop="customerCode">
<customer-picker1 v-model="form.receiveCustomerCode"></customer-picker1> <customer-picker1 v-model="form.receiveCustomerCode"></customer-picker1>
@ -290,24 +281,33 @@
<el-input v-model="form.receivePostcode" placeholder="请输入邮编" /> <el-input v-model="form.receivePostcode" placeholder="请输入邮编" />
</el-form-item> </el-form-item>
</el-col> --> </el-col> -->
</div>
</el-row> </el-row>
</el-col> </el-col>
</el-row> </el-row>
</el-collapse-item> </el-collapse-item>
<el-row>
<el-col :span="12">
</el-col>
<el-col :span="12">
</el-col>
</el-row>
<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">{{ $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;">
<el-col :span="12"> <el-col :span="12">
</el-col> <el-row :gutter="0" style="display: flex;flex-wrap: wrap;padding: 0px 15px;">
<el-col :span="12" class="cargoList"> <el-col :span="24"><div style="font-weight:600">货物信息</div></el-col>
<div>体积信息</div> <el-col :span="24">
<el-form-item label="" prop="goodsType" label-width="0px">
<GoodsPicker v-model="form.goodsType" @onChange="onGoodsChange" placeholder="选择货物信息"></GoodsPicker>
<el-table <el-table
class="cargoList"
:cell-style="{ :cell-style="{
'padding': '0px!important', 'padding': '0px!important',
'padding-left': '0px!important', 'padding-left': '0px!important',
@ -382,9 +382,123 @@
<el-input v-model="scope.row.goodsName" size="mini" placeholder=""></el-input> <el-input v-model="scope.row.goodsName" size="mini" placeholder=""></el-input>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-input v-model="form.goodsInfo" type="textarea" placeholder="" disabled />
</el-form-item>
</el-col>
<el-col :span="24" >
</el-col>
<el-col :span="12">
<el-form-item label="包装类型" prop="packType">
<el-select v-model="form.packType" placeholder="请选择">
<el-option
v-for="dict in dict.type.emis_tab_packing_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="件数" prop="parcelQty">
<el-input v-model="form.parcelQty" style="text-align: right;" placeholder="请输入件数" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="实际重量" prop="billWeight">
<el-input v-model="form.billWeight" @blur="calcSettlementWeightByRemote()" style="text-align: right;min-width: 80px" placeholder="请输入实际重量" >
<span slot="suffix">(kg)</span>
</el-input>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="体积" prop="totalVolume" label-width="60px" >
<div style="display:inline-flex">
<el-input v-model="form.length" style="width:80px" placeholder="长" >
<span slot="suffix">(cm)</span>
</el-input>
<el-input v-model="form.width" style="margin-left:5px;width:80px" placeholder="宽" >
<span slot="suffix">(cm)</span>
</el-input>
<el-input v-model="form.height" style="margin-left:5px;width:80px" placeholder="高" >
<span slot="suffix">(cm)</span>
</el-input>
</div>
<div style="">
<el-input v-model="form.totalVolume" @blur="calcSettlementWeightByRemote()" style="text-align: right;width: 120px" placeholder="体积" >
<span slot="suffix">(m³)</span>
</el-input>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="体积重量" prop="volumeWeight">
<el-input v-model="form.volumeWeight" placeholder="" disabled>
<span slot="suffix">(kg)</span>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="结算重量" prop="settlementWeight">
<el-input v-model="form.settlementWeight" placeholder="" disabled >
<span slot="suffix">(kg)</span>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="" prop="blOverWeight">
<el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blOverWeight" :true-label="'1'" :false-label="'0'" ><span style="font-size:10px">是否超重</span></el-checkbox>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="超重件数" prop="overWeightNumber">
<el-input :disabled="!form.blOverWeight" v-model="form.overWeightNumber" placeholder="超重件数" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否生成子单" prop="blGenSubbill" label-width="120px">
<el-radio-group v-model="form.blGenSubbille">
<el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="子单号" prop="billCodeSub">
<el-input v-model="form.billCodeSub" type="textarea" placeholder="" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="合同号" prop="custOrderId">
<el-input v-model="form.custOrderId" placeholder="" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="进仓单" prop="warehouseInNo">
<WarehouseInNoPicker v-model="form.warehouseInNo"></WarehouseInNoPicker>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="运单备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="" />
</el-form-item>
</el-col>
</el-row>
</el-col>
<el-col :span="12" >
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;padding:15px">
</el-row>
</el-col> </el-col>
</el-row> </el-row>
</el-collapse-item> </el-collapse-item>
@ -763,7 +877,7 @@ methods: {
"supplier": "供应商", "supplier": "供应商",
"isSave": "是否保存 1-保存" "isSave": "是否保存 1-保存"
}; };
this.form.cargoList.push(cargo); // this.form.cargoList.push(cargo);
} }
}, },
@ -1085,8 +1199,8 @@ methods: {
// } // }
.form-row-group-panel{ .form-row-group-panel{
margin-right: 5px; // margin-right: 5px;
padding: 8px; // padding: 8px;
// border-right: 1px solid #ededed; // border-right: 1px solid #ededed;
} }