diff --git a/src/views/modules/ecss/declaration.vue b/src/views/modules/ecss/declaration.vue
index 3739a35..f6a8d72 100644
--- a/src/views/modules/ecss/declaration.vue
+++ b/src/views/modules/ecss/declaration.vue
@@ -200,6 +200,17 @@
合同
+
+
+ Hs Code
+
+
+
+
+ 中文
+ 英文
+
+
@@ -784,7 +795,10 @@
-
+
+
+
+
查询
@@ -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=='箱单'){