This commit is contained in:
linfso 2024-05-13 17:59:59 +08:00
parent cdd50c385b
commit 7885af331c
9 changed files with 257 additions and 78 deletions

View File

@ -54,6 +54,30 @@
<div class="content unicode" style="display: block;">
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont">&#xe653;</span>
<div class="name">收</div>
<div class="code-name">&amp;#xe653;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe654;</span>
<div class="name">寄</div>
<div class="code-name">&amp;#xe654;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe691;</span>
<div class="name">收</div>
<div class="code-name">&amp;#xe691;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe655;</span>
<div class="name">寄</div>
<div class="code-name">&amp;#xe655;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe651;</span>
<div class="name">dizhibao</div>
@ -2250,9 +2274,9 @@
<pre><code class="language-css"
>@font-face {
font-family: 'iconfont';
src: url('iconfont.woff2?t=1714125383903') format('woff2'),
url('iconfont.woff?t=1714125383903') format('woff'),
url('iconfont.ttf?t=1714125383903') format('truetype');
src: url('iconfont.woff2?t=1715591649936') format('woff2'),
url('iconfont.woff?t=1715591649936') format('woff'),
url('iconfont.ttf?t=1715591649936') format('truetype');
}
</code></pre>
<h3 id="-iconfont-">第二步:定义使用 iconfont 的样式</h3>
@ -2278,6 +2302,42 @@
<div class="content font-class">
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont icon-shou"></span>
<div class="name">
收
</div>
<div class="code-name">.icon-shou
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-ji"></span>
<div class="name">
寄
</div>
<div class="code-name">.icon-ji
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-shou1"></span>
<div class="name">
收
</div>
<div class="code-name">.icon-shou1
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-ji1"></span>
<div class="name">
寄
</div>
<div class="code-name">.icon-ji1
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-dizhibao"></span>
<div class="name">
@ -5572,6 +5632,38 @@
<div class="content symbol">
<ul class="icon_lists dib-box">
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-shou"></use>
</svg>
<div class="name">收</div>
<div class="code-name">#icon-shou</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-ji"></use>
</svg>
<div class="name">寄</div>
<div class="code-name">#icon-ji</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-shou1"></use>
</svg>
<div class="name">收</div>
<div class="code-name">#icon-shou1</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-ji1"></use>
</svg>
<div class="name">寄</div>
<div class="code-name">#icon-ji1</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-dizhibao"></use>

View File

@ -1,8 +1,8 @@
@font-face {
font-family: "iconfont"; /* Project id 1592989 */
src: url('iconfont.woff2?t=1714125383903') format('woff2'),
url('iconfont.woff?t=1714125383903') format('woff'),
url('iconfont.ttf?t=1714125383903') format('truetype');
src: url('iconfont.woff2?t=1715591649936') format('woff2'),
url('iconfont.woff?t=1715591649936') format('woff'),
url('iconfont.ttf?t=1715591649936') format('truetype');
}
.iconfont {
@ -13,6 +13,22 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-shou:before {
content: "\e653";
}
.icon-ji:before {
content: "\e654";
}
.icon-shou1:before {
content: "\e691";
}
.icon-ji1:before {
content: "\e655";
}
.icon-dizhibao:before {
content: "\e651";
}

File diff suppressed because one or more lines are too long

View File

@ -5,6 +5,34 @@
"css_prefix_text": "icon-",
"description": "",
"glyphs": [
{
"icon_id": "6334001",
"name": "收",
"font_class": "shou",
"unicode": "e653",
"unicode_decimal": 58963
},
{
"icon_id": "7945718",
"name": "寄",
"font_class": "ji",
"unicode": "e654",
"unicode_decimal": 58964
},
{
"icon_id": "10715991",
"name": "收",
"font_class": "shou1",
"unicode": "e691",
"unicode_decimal": 59025
},
{
"icon_id": "25151894",
"name": "寄",
"font_class": "ji1",
"unicode": "e655",
"unicode_decimal": 58965
},
{
"icon_id": "25775765",
"name": "dizhibao",

View File

@ -71,7 +71,7 @@ export default {
else if(level==1){
let obj = {
value: item.prodCode,
label: item.prodName,
label: item.prodName+"("+item.agingDesc+")",
leaf: true,
};
nodes.push(obj);

View File

@ -7,19 +7,21 @@
<div class="form-group-title"><span class="title">{{ $t('基础信息') }}</span></div>
</template>
<div>
<el-row :gutter="0" >
<!-- <el-col :span="24">
</el-col> -->
<el-col :span="7">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="6">
<el-form-item :label="$t('发货时间')" prop="sendDate">
<el-input v-model="form.sendDate" placeholder="" readonly="" disabled />
</el-form-item>
</el-col>
<el-col :span="18">
<el-form-item label="运单号" prop="billCode" >
<div style="display:inline-flex">
<!-- @keyup.enter.native="initData" -->
<div><el-input v-model="form.billCode" placeholder="运单号" style="font-weight:600;color:black" /></div>
<div style="padding-left:5px"> <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" @change="checked=>handleBillCodeChange(checked)"><span style="font-size:10px">电子主单</span></el-checkbox></div>
</div>
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="6">
<el-form-item label="目的国" prop="reciever.country">
<CountryPicker0 v-model="form.reciever.country"></CountryPicker0>
</el-form-item>
@ -29,16 +31,13 @@
<TransLinePicker v-model="form.transLine" :countryCode="form.reciever.country" @onChange="onTransLineChange"></TransLinePicker>
</el-form-item>
</el-col> -->
<el-col :span="6">
<el-col :span="12">
<el-form-item label="产品类型" prop="productType">
<TransProductCasPicker v-model="form.productTypeSelArr" :countryCode="form.reciever.country" @onChange="onProductChange" ></TransProductCasPicker>
<!-- <trans-product-picker v-model="form.productType" :transLineCode="form.transLine"></trans-product-picker> -->
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('发货时间')" prop="sendDate">
<el-input v-model="form.sendDate" placeholder="" readonly="" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="报关方式" prop="customsEclaration">
@ -64,9 +63,8 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="取件类型" prop="pickupMethod">
<el-form-item label="取件方式" prop="pickupMethod">
<el-select v-model="form.pickupMethod" placeholder="请选择">
<el-option
v-for="dict in dict.type.emis_qujian_fangshi"
@ -77,30 +75,31 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('取件员')" prop="takePieceEmployeeCode">
<EmisUserSimplePicker0 :placeholder="$t('取件员')" v-model="form.takePieceEmployeeCode" postCode="RSD" ></EmisUserSimplePicker0>
<el-col :span="6" v-if="form.pickupMethod==2">
<el-form-item :label="$t('取件员')" prop="takePieceEmployeeCode" >
<EmisUserSimplePicker0 :placeholder="$t('取件员')" v-model="form.takePieceEmployeeCode" postCode="RSD" ></EmisUserSimplePicker0>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('操作员')" prop="operateEmployeeCode">
<el-col :span="6" v-if="form.pickupMethod==1">
<el-form-item :label="$t('操作员')" prop="operateEmployeeCode" >
<EmisUserSimplePicker1 :placeholder="$t('操作员')" v-model="form.operateEmployeeCode" postCode="OP" ></EmisUserSimplePicker1>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="派件方式" prop="dispatchMethod">
<el-radio-group v-model="form.dispatchMethod">
<el-radio
v-for="dict in dict.type.emis_tab_dispatch_mode"
:key="dict.value"
:label="dict.value"
>
<span style="font-size:10px" >{{dict.label}}</span>
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="派件方式" prop="dispatchMethod">
<el-radio-group v-model="form.dispatchMethod">
<el-radio
v-for="dict in dict.type.emis_tab_dispatch_mode"
:key="dict.value"
:label="dict.value"
>
<!-- style="font-size:10px" -->
<span >{{dict.label}}</span>
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<div style="display:flex;padding-left: 30px;">
@ -129,17 +128,23 @@
<template slot="title">
<div class="form-group-title"><span class="title">{{ $t('收寄件信息') }}</span></div>
</template>
<el-row :gutter="0" style="border: 1px dotted #f5f7fa;border-radius: 5px;margin-top:10px">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;border: 1px dotted #f5f7fa;border-radius: 5px;">
<el-col :span="12">
<el-row :gutter="0" style="background: #fdfdfd;padding: 10px;border-radius:10px">
<el-col :span="24" style="display:inline-flex">
<div class="form-group-title" style="width:50%">寄件人</div>
<el-col :span="24" style="display:inline-flex;border-bottom: 1px dotted #e6ebf5">
<div class="form-group-title" style="width:50%">
<span style="border-radius: 15px;
padding: 5px 15px;
background: black;
font-size: 13px;
color: white;">寄件</span>
</div>
<div style="width:50%;text-align:right;padding-right: 15px;">
<!-- icon="el-icon-edit" -->
<el-button
size="mini"
type="text"
style="cursor:hand;font-weight:700;border:1px dotted #e2d8d8;padding: 2px 5px;"
style="cursor:hand;font-weight:700;border:1px dotted #e2d8d8;padding: 2px 5px;color: black;"
class="iconfont icon-dizhibao"
@click="handleSelectCustomerAddress(1)"
>寄件地址薄</el-button>
@ -199,8 +204,14 @@
<el-col :span="12">
<el-row :gutter="0" style="padding: 8px;">
<el-col :span="24" style="display:inline-flex">
<div class="form-group-title" style="width:50%">收件人</div>
<el-col :span="24" style="display:inline-flex;border-bottom: 1px dotted #e6ebf5">
<div class="form-group-title" style="width:50%">
<span style="border-radius: 15px;
padding: 5px 15px;
background: #b12e29;
font-size: 13px;
color: white;">收件</span>
</div>
<div style="width:50%;text-align:right;padding-right: 15px;">
<el-button
size="mini"
@ -239,12 +250,6 @@
<el-input v-model="form.reciever.phone" placeholder="请输入收件人手机号" />
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item label="国家" prop="reciever.country">
<country-picker2 v-model="form.reciever.country"></country-picker2>
</el-form-item>
</el-col> -->
<el-col :span="24">
<el-form-item label="国家地区" prop="reciever.province">
<div style="display:inline-flex">
@ -293,18 +298,24 @@
</el-collapse-item>
<el-collapse-item title="" name="3">
<template slot="title">
<div class="form-group-title"><span class="title">{{ $t('货物信息') }}</span></div>
<div class="form-group-title"><span class="title">{{ $t('货物信息') }}</span>
</div>
</template>
<el-row>
<el-col :span="12">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="12">
</el-col>
<el-col :span="12" class="cargoList">
<div>体积信息</div>
<el-table
:cell-style="{
'padding': '0px!important',
'padding-left': '0px!important',
'padding-right': '0px!important',
'font-size':'11px'
}"
:header-cell-style="{
'background':'gray'
'font-size':'11px'
}"
border
stripe
@ -332,52 +343,55 @@
"supplier": "供应商",
"isSave": "是否保存 1-保存"
-->
<el-table-column type="selection" width="55" align="center" />
<el-table-column prop="goodsName" label="货物名称" align="center" min-width="100">
<template slot-scope="scope">
<el-input v-model="scope.row.goodsName" size="mini" placeholder=""></el-input>
<!-- v-if="scope.row.isEdit" -->
<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" /> -->
<!-- v-if="scope.row.isEdit" -->
<!-- <div v-else class="txt">{{scope.row.goodsName}}</div> -->
</template>
</el-table-column>
<el-table-column prop="cargoQty" label="件数" align="center" min-width="50">
<template slot-scope="scope">
<el-input v-model="scope.row.cargoQty" size="mini" placeholder=""></el-input>
</template>
</el-table-column>
<el-table-column prop="length" label="长(cm)" align="center" min-width="50">
<el-table-column prop="length" label="长(cm)" align="center" width="60">
<template slot-scope="scope">
<el-input v-model="scope.row.length" size="mini" placeholder=""></el-input>
</template>
</el-table-column>
<el-table-column prop="width" label="宽(cm)" align="center" min-width="50">
<el-table-column prop="width" label="宽(cm)" align="center" width="60">
<template slot-scope="scope">
<el-input v-model="scope.row.width" size="mini" placeholder=""></el-input>
</template>
</el-table-column>
<el-table-column prop="height" label="高(cm)" align="center" min-width="50">
<el-table-column prop="height" label="高(cm)" align="center" width="60">
<template slot-scope="scope">
<el-input v-model="scope.row.width" size="mini" placeholder=""></el-input>
<el-input v-model="scope.row.height" size="mini" placeholder=""></el-input>
</template>
</el-table-column>
<el-table-column prop="volumn" label="体积(m³)" align="center" min-width="80">
<el-table-column prop="cargoQty" label="件数" align="center" width="60">
<template slot-scope="scope">
<el-input v-model="scope.row.volumn" size="mini" placeholder=""></el-input>
<el-input v-model="scope.row.cargoQty" size="mini" placeholder=""></el-input>
</template>
</el-table-column>
<el-table-column prop="volumn" label="体积(m³)" align="center" width="80">
<template slot-scope="scope">
<el-input v-model="scope.row.volumn" size="mini" placeholder="" disabled></el-input>
</template>
</el-table-column>
<el-table-column prop="goodsName" label="描述" align="center" min-width="100">
<template slot-scope="scope">
<el-input v-model="scope.row.goodsName" size="mini" placeholder=""></el-input>
</template>
</el-table-column>
</el-table>
</el-col>
<el-col :span="12">
</el-col>
</el-row>
</el-collapse-item>
<el-collapse-item title="" name="4">
<template slot="title">
<div class="form-group-title"><span class="title">{{ $t('收费信息') }}</span></div>
</template>
</el-collapse-item>
</el-collapse>
@ -487,7 +501,7 @@ dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_calc_fee_type','emis_print_type'],
data() {
return {
activeNames:[0, 1, 2,3,4],
activeNames:['1','2','3','4'],
billCode:null,
emisWaybillOptions: [],
addressType:null,
@ -709,6 +723,9 @@ created() {
this.initData();
},
methods: {
openCollapse(index){
},
initData() {
this.reset();
// this.timer=setInterval(this.showLocalTime, 1000);
@ -1070,7 +1087,7 @@ methods: {
.form-row-group-panel{
margin-right: 5px;
padding: 8px;
border-right: 1px solid #ededed;
// border-right: 1px solid #ededed;
}
@ -1103,6 +1120,32 @@ methods: {
padding: 0px;
}
.cargoList{
.el-input__inner {
height: 28px;
line-height: 28px;
border: none;
background: #ffffcd;
font-size: 10px;
padding: 0px;
text-align: center;
}
}
.el-collapse-item__content {
padding-bottom: 0px;
}
.el-collapse-item__header{
pointer-events: none;
}
.el-collapse-item__arrow {
pointer-events: auto;
}
</style>