md
This commit is contained in:
linfso
parent
4f02592915
commit
f30baa7bef
@ -312,6 +312,122 @@
|
|||||||
</el-descriptions>
|
</el-descriptions>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</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 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-item label="订单备注" :span="4">{{ form.orderRemark }}</el-descriptions-item>
|
||||||
<el-descriptions-item label="录单备注" :span="4">{{ form.remark }}</el-descriptions-item>
|
<el-descriptions-item label="录单备注" :span="4">{{ form.remark }}</el-descriptions-item>
|
||||||
|
|||||||
@ -696,12 +696,6 @@
|
|||||||
</el-table>
|
</el-table>
|
||||||
</div>
|
</div>
|
||||||
</el-col>
|
</el-col>
|
||||||
<!-- <el-col :span="18">
|
|
||||||
<div>申报文件</div>
|
|
||||||
<div>
|
|
||||||
<FileUpload :showTip="true" :fileSize="10" v-model="form.filePath" :isNeedUpload="true" :fileType="['pdf','xlsx','xls','jpg','bmp','png']" :limit="10"></FileUpload>
|
|
||||||
</div>
|
|
||||||
</el-col> -->
|
|
||||||
</el-row>
|
</el-row>
|
||||||
</el-collapse-item>
|
</el-collapse-item>
|
||||||
|
|
||||||
@ -712,9 +706,46 @@
|
|||||||
</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="18">
|
<el-col :span="18">
|
||||||
<div>
|
<el-table
|
||||||
<FileUpload :showTip="true" :fileSize="10" v-model="form.filePath" :isNeedUpload="true" :fileType="['pdf','xlsx','xls','jpg','bmp','png']" :limit="10"></FileUpload>
|
:cell-style="{
|
||||||
</div>
|
'font-size':'13px'
|
||||||
|
}"
|
||||||
|
:header-cell-style="{
|
||||||
|
'font-size':'13x'
|
||||||
|
}"
|
||||||
|
border
|
||||||
|
stripe
|
||||||
|
:data="form.declareGoodsList"
|
||||||
|
size="small"
|
||||||
|
style="width: 100%"
|
||||||
|
max-height="300px"
|
||||||
|
>
|
||||||
|
<el-table-column :label="$t('序号')" align="center" width="60">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span > {{scope.$index+1}}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column prop="goodsName" label="附件名称" align="center" width="120" :show-overflow-tooltip="true">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<el-input v-model="scope.row.goodsName" size="mini" placeholder=""></el-input>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column prop="supplier" label="附件文件" align="center" width="150" :show-overflow-tooltip="true">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<FileUpload :showTip="false" :fileSize="1" v-model="scope.row.supplier" :isNeedUpload="true" :fileType="['pdf','xlsx','xls','jpg','bmp','png']" :limit="10"></FileUpload>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column :label="$t('操作')" align="left" min-width="100">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span class="icon iconfont"
|
||||||
|
style="cursor: pointer;font-size: 21px;color: #6e6e6e;"
|
||||||
|
@click="()=>deleteDeclareGoodsItem(scope.row,scope.$index)"></span>
|
||||||
|
<span class="icon iconfont"
|
||||||
|
style="cursor: pointer;font-size: 21px;color: #6e6e6e;"
|
||||||
|
@click="()=>copyDeclareGoodsItem(scope.row,scope.$index)"></span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
</el-collapse-item>
|
</el-collapse-item>
|
||||||
@ -726,8 +757,7 @@
|
|||||||
</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="18">
|
<el-col :span="18">
|
||||||
<el-form-item label="给快递员捎话" prop="orderRemark" >
|
<el-form-item label="" prop="orderRemark" label-width="0px" >
|
||||||
<!-- <CustomerPrivEmpSimplePicker :placeholder="$t('专属业务员')" v-model="form.operateEmployeeCode" postCode="OP" ></CustomerPrivEmpSimplePicker> -->
|
|
||||||
<div style="width:100%;margin-bottom:5px">
|
<div style="width:100%;margin-bottom:5px">
|
||||||
<span class="goods-tag" @click="onQuickRemark($event)">请带纸箱</span>
|
<span class="goods-tag" @click="onQuickRemark($event)">请带纸箱</span>
|
||||||
<span class="goods-tag" @click="onQuickRemark($event)">需要爬楼</span>
|
<span class="goods-tag" @click="onQuickRemark($event)">需要爬楼</span>
|
||||||
@ -1054,54 +1084,10 @@ computed: {
|
|||||||
watch: {
|
watch: {
|
||||||
"$route": {
|
"$route": {
|
||||||
handler (newValue, oldValue) {
|
handler (newValue, oldValue) {
|
||||||
|
|
||||||
console.log("===>routeParams==>",this.$route.query.routeParams);
|
|
||||||
/*
|
|
||||||
// 选择产品后报价
|
|
||||||
if(this.$route.query.action=="preOrderByProd"){
|
|
||||||
this.reset();
|
|
||||||
this.initData();
|
|
||||||
|
|
||||||
let routeParams=this.$route.query.routeParams;
|
|
||||||
let postForm=JSON.parse(routeParams);
|
|
||||||
|
|
||||||
console.log("===>postForm==>",postForm);
|
|
||||||
|
|
||||||
this.form.transLine=postForm.transLine;
|
|
||||||
this.form.billWeight=postForm.billWeight;
|
|
||||||
this.form.totalVolume=postForm.totalVolume;
|
|
||||||
this.form.productType=postForm.productType;
|
|
||||||
this.form.reciever.country=postForm.reciever.country;
|
|
||||||
this.form.productTypeSelArr=[this.form.transLine,this.form.productType];
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
else if(this.$route.query.action=="modify"){
|
|
||||||
this.action=this.$route.query.action;
|
|
||||||
this.billCode=this.$route.query.billCode;
|
|
||||||
this.initData();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
else if(this.$route.query.action=="add"){
|
|
||||||
this.action=this.$route.query.action;
|
|
||||||
this.billCode=null;
|
|
||||||
this.initData();
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
},
|
},
|
||||||
deep: true
|
deep: true
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
// beforeRouteEnter:(to,from,next) => {
|
|
||||||
// if(to.query.action=="modify") {
|
|
||||||
// to.meta.title = '修改'
|
|
||||||
// }else if(to.query.type == 'copyOrder') {
|
|
||||||
// to.meta.title = '再来一单'
|
|
||||||
// }
|
|
||||||
// next()
|
|
||||||
// },
|
|
||||||
created() {
|
created() {
|
||||||
if(this.$route.query.action=="copyOrder"){
|
if(this.$route.query.action=="copyOrder"){
|
||||||
this.action=this.$route.query.action;
|
this.action=this.$route.query.action;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user