|
|
|
@ -200,6 +200,17 @@ |
|
|
|
<el-checkbox v-model="exportInvoice.contractFlag">合同</el-checkbox> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="8" > |
|
|
|
<el-form-item :label="''" > |
|
|
|
<el-checkbox v-model="exportInvoice.hsCodeFlag">Hs Code</el-checkbox> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="24"> |
|
|
|
<el-form-item :label="'品名类型'" > |
|
|
|
<el-radio v-model="exportInvoice.hsCodeDescType" label="Y">中文</el-radio> |
|
|
|
<el-radio style="margin-left: 50px;" v-model="exportInvoice.hsCodeDescType" label="N">英文</el-radio> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="24" style=""> |
|
|
|
<el-form-item :label="'发票备注'" > |
|
|
|
<el-input type="textarea" :rows="2" v-model="exportInvoice.fpremark"></el-input> |
|
|
|
@ -784,7 +795,10 @@ |
|
|
|
<el-dialog title="模版" @close="closeTemplateDialog" @open="openTemplateDialog" :visible.sync="templateFlag" width="559px" v-drag> |
|
|
|
<el-form inline="inline" label-position="top" :model="templateData" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form-item label="模版名称"> |
|
|
|
<el-input v-model="templateData.name" clearable style="width: 110px"></el-input> |
|
|
|
<el-input v-model="templateData.name" clearable style="width: 150px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="运输方式"> |
|
|
|
<el-input v-model="templateData.shippingMode" clearable style="width: 150px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label=" "> |
|
|
|
<el-button type="primary" style="padding: 3px 12px" @click="searchTemplateList()">查询</el-button> |
|
|
|
@ -852,7 +866,13 @@ |
|
|
|
bizhi:'', |
|
|
|
exportAllFlag:false, |
|
|
|
templateFlag:false, |
|
|
|
templateData:{}, |
|
|
|
templateData:{ |
|
|
|
type:'', |
|
|
|
buNo:'', |
|
|
|
customName:'', |
|
|
|
name:'', |
|
|
|
shippingMode:'' |
|
|
|
}, |
|
|
|
templateList:[], |
|
|
|
customerInfoList:[], |
|
|
|
notifyPartDetailList:[], |
|
|
|
@ -2121,6 +2141,7 @@ |
|
|
|
return |
|
|
|
} |
|
|
|
let exportParam=this.exportInvoice |
|
|
|
exportParam.hsCodeDescTypeInvoice=this.exportInvoice.hsCodeDescType |
|
|
|
exportParam.declarationNo = this.currentRow.declarationNo |
|
|
|
exportParam.site = this.currentRow.site |
|
|
|
exportParam.delNo = this.currentRow.delNo |
|
|
|
@ -2228,6 +2249,8 @@ |
|
|
|
exportParam.propertiesList = this.propertiesList |
|
|
|
} |
|
|
|
exportParam.hsCodeDesc = this.exportInvoice.hsCodeDesc |
|
|
|
exportParam.hsCodeDescTypeInvoice=this.exportInvoice.hsCodeDescType |
|
|
|
exportParam.hsCodeFlag=this.exportInvoice.hsCodeFlag |
|
|
|
exportParam.contractFlag = this.exportInvoice.contractFlag |
|
|
|
exportParam.fpremark = this.exportInvoice.fpremark |
|
|
|
|
|
|
|
@ -2448,6 +2471,8 @@ |
|
|
|
exportParam.propertiesList = this.propertiesList |
|
|
|
} |
|
|
|
exportParam.hsCodeDesc = this.exportInvoice.hsCodeDesc |
|
|
|
exportParam.hsCodeDescTypeInvoice=this.exportInvoice.hsCodeDescType |
|
|
|
exportParam.hsCodeFlag=this.exportInvoice.hsCodeFlag |
|
|
|
exportParam.contractFlag = this.exportInvoice.contractFlag |
|
|
|
exportParam.fpremark = this.exportInvoice.fpremark |
|
|
|
|
|
|
|
@ -2535,6 +2560,9 @@ |
|
|
|
|
|
|
|
openTemplate (type) { |
|
|
|
this.templateData.type=type; |
|
|
|
this.templateData.buNo = this.currentRow.buNo |
|
|
|
this.templateData.customName = this.currentRow.customName |
|
|
|
this.templateData.shippingMode = this.currentRow.shippingMode |
|
|
|
this.templateFlag = true; |
|
|
|
}, |
|
|
|
|
|
|
|
@ -2566,7 +2594,8 @@ |
|
|
|
this.exportInvoice.kgs=this.currentRow.kgs?this.currentRow.kgs:row.kgs |
|
|
|
this.exportInvoice.hsCode=this.currentRow.hsCode?this.currentRow.hsCode:row.hsCode |
|
|
|
this.exportInvoice.material=this.currentRow.material?this.currentRow.material:row.material |
|
|
|
this.exportInvoice.hsCodeDescType=this.currentRow.hsCodeDescType?this.currentRow.hsCodeDescType:row.hsCodeDescType |
|
|
|
this.exportInvoice.hsCodeDescType=row.hsCodeDescType |
|
|
|
this.exportInvoice.hsCodeFlag=row.hsCodeFlag |
|
|
|
this.exportInvoice.goodsLabel=this.currentRow.goodsLabel?this.currentRow.goodsLabel:row.goodsLabel |
|
|
|
this.exportInvoice.fpremark = row.remark |
|
|
|
} else if (this.templateData.type=='箱单'){ |
|
|
|
|
