diff --git a/src/api/ecss/ecss.js b/src/api/ecss/ecss.js
index b61dca4..8297d68 100644
--- a/src/api/ecss/ecss.js
+++ b/src/api/ecss/ecss.js
@@ -85,4 +85,20 @@ export const saveOneClickPacking = data => createAPI(`/ecss/coDel/saveOneClickPa
export const getCustomerInfo = data => createAPI(`/ecss/coDel/getCustomerInfo`,'post',data)
+export const searchEcssTemplateData = data => createAPI(`/ecss/coDel/searchEcssTemplateData`,'post',data)
+
+export const saveEcssTemplateData = data => createAPI(`/ecss/coDel/saveEcssTemplateData`,'post',data)
+
+export const deleteEcssTemplate= data => createAPI(`/ecss/coDel/deleteEcssTemplate`,'post',data)
+
+export const searchTemplateList = data => createAPI(`/select/ecssMapper/searchTemplateList/list`,'post',data)
+
+export const searchWalMartOrderData = data => createAPI(`/ecss/coDel/searchWalMartOrderData`,'post',data)
+
+export const saveWalMartOrderData = data => createAPI(`/ecss/coDel/saveWalMartOrderData`,'post',data)
+
+export const deleteWalMartOrder= data => createAPI(`/ecss/coDel/deleteWalMartOrder`,'post',data)
+
+export const saveWalMartOrderByExcel = data => createAPI(`/ecss/coDel/saveWalMartOrderByExcel`,'post',data)
+
diff --git a/src/views/modules/ecss/codelnotify.vue b/src/views/modules/ecss/codelnotify.vue
index fd14d84..ec3be68 100644
--- a/src/views/modules/ecss/codelnotify.vue
+++ b/src/views/modules/ecss/codelnotify.vue
@@ -86,7 +86,7 @@
label="操作">
修改
- 下达
+ 下达
取消下达
删除
@@ -189,8 +189,8 @@
-
-
+
+
@@ -379,7 +379,22 @@
关闭
-
+
+
+
+
+
+ 是
+ 否
+
+
+
+
+
+ 确定
+ 关闭
+
+
@@ -414,6 +429,8 @@
pageSize: 100,
totalPage: 0,
height: 200,
+ walMartOrderFlag: 'N',
+ walMartOrderDialog:false,
buList:[],
dataList:[],
dataList2:[],
@@ -1570,11 +1587,20 @@
})
})
},
- xiadaEcssDel(row){
+ xiadaChoose(){
+ if (this.currentRow.buNo=='03-RFID') {
+ this.walMartOrderDialog=true;
+ this.walMartOrderFlag='N';
+ } else {
+ this.xiadaEcssDel()
+ }
+ },
+ xiadaEcssDel(){
let inData={
- site:row.site,
- delNo:row.delNo,
- notifyStatus:'已下达'
+ site:this.currentRow.site,
+ delNo:this.currentRow.delNo,
+ notifyStatus:'已下达',
+ walMartOrderFlag:this.walMartOrderFlag
}
this.$confirm('确认下达吗？', '提示').then(() => {
changeEcssDelStatus(inData).then(({data}) => {
@@ -1593,6 +1619,7 @@
}
})
})
+ this.walMartOrderDialog=false;
},
jihuaEcssDel(row){
let inData={
diff --git a/src/views/modules/ecss/codelnotifyConfirm.vue b/src/views/modules/ecss/codelnotifyConfirm.vue
index ab5c84c..0e89779 100644
--- a/src/views/modules/ecss/codelnotifyConfirm.vue
+++ b/src/views/modules/ecss/codelnotifyConfirm.vue
@@ -183,6 +183,16 @@
border
v-loading="dataListLoading"
style="width: 100%; ">
+
+
+ 修改
+
+
- 修改
+ 修改
删除
@@ -322,7 +332,7 @@
-
+
@@ -332,12 +342,17 @@
-
+
-
+
+
+
+
+
+
@@ -345,13 +360,25 @@
-
+
+
+ 复制
+ 删除
+
+
+
+
+ {{scope.row.qty}}
+
-
+ {{scope.row.nocartons}}
+
@@ -390,33 +422,33 @@
关闭
-
+
-
-
- 物料编码
-
+
+
+ 物料编码
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -445,6 +477,11 @@
+
+
+
+
+
@@ -603,6 +640,7 @@
dataList4:[],
dataList5:[],
dataList8:[],
+ notifyDetailMap: new Map(),
boxDetailData:{
site:'',
buNo:'',
@@ -623,7 +661,12 @@
username:this.$store.state.user.name,
},
oneClickPackingModelFlag:false,
- oneClickPackingModelData:{},
+ oneClickPackingModelData:{
+ pallet:'',
+ palletRemark:'',
+ height:'',
+ palletQty:'',
+ },
palletModelFlag:false,
palletModelData:{
addFlag:0,
@@ -1846,6 +1889,17 @@
this.height = (window.innerHeight - 260)/2;
})
},
+ watch: {
+ dataList8: {
+ handler() {
+ this.$nextTick(() => {
+ if(this.currentRow.buNo==='03-RFID' && this.currentRow.walMartOrderFlag==='Y') {
+ this.toggleSelection(this.dataList8)
+ }
+ })
+ },
+ }
+ },
methods: {
openPartDialog () {
this.searchPartList();
@@ -2135,6 +2189,11 @@
} else {
o.nativeNocartons = o.nocartons;
}
+ if (this.notifyDetailMap.has(o.pn)) {
+ this.notifyDetailMap.get(o.pn).qty=parseInt(this.notifyDetailMap.get(o.pn).qty)+parseInt(o.qty);
+ } else {
+ this.notifyDetailMap.set(o.pn, JSON.parse(JSON.stringify(o)));
+ }
});
this.dataList8 = this.dataList8.filter(o => parseInt(o.nocartons)>0);
} else {
@@ -2146,8 +2205,26 @@
handleSelectionChange(val) {
this.multipleSelection = val;
},
+ toggleSelection(rows) {
+ rows.forEach(row => {
+ this.$refs.partTableRef.toggleRowSelection(row,true);
+ });
+ },
+ // 装箱复制明细行
+ copyColumn(row){
+ let copyrow = JSON.parse(JSON.stringify(row));
+ copyrow.qty=0;
+ copyrow.nocartons=0;
+ copyrow.newRow=1;
+ this.dataList8.push(copyrow);
+ this.toggleSelection(this.dataList8)
+ },
+ deleteColumn(index){
+ this.dataList8.splice(index,1);
+ this.toggleSelection(this.dataList8)
+ },
savePalletHeader(){
- if (this.multipleSelection.length===0) {
+ if (this.palletModelData.addFlag===0 && this.multipleSelection.length===0) {
this.$alert('请选择装箱物料！', '错误', {
confirmButtonText: '确定'
})
@@ -2159,10 +2236,37 @@
})
return false
}
- this.multipleSelection.forEach(o => {
- o.qty = o.nocartons*o.rollqty*o.boxrolls;
- o.nocartons = o.nativeNocartons - o.nocartons;
- });
+ let qtyNoMatch = false;
+ let pn='';
+ if (this.currentRow.buNo==='03-RFID' && this.currentRow.walMartOrderFlag==='Y') {
+ let mulMap = new Map();
+ this.multipleSelection.forEach(o => {
+ o.nocartons = Math.ceil(o.qty/(o.rollqty*o.boxrolls));
+ if (mulMap.has(o.pn)) {
+ mulMap.get(o.pn).qty=parseInt(mulMap.get(o.pn).qty)+parseInt(o.qty);
+ } else {
+ mulMap.set(o.pn, JSON.parse(JSON.stringify(o)));
+ }
+ });
+ mulMap.forEach((value, key) => {
+ if (parseInt(this.notifyDetailMap.get(key).qty)!==parseInt(value.qty)) {
+ qtyNoMatch = true;
+ pn = pn+(pn?',':'')+value.pn;
+ }
+ })
+ } else {
+ this.multipleSelection.forEach(o => {
+ o.qty = o.nocartons*o.rollqty*o.boxrolls;
+ o.nocartons = o.nativeNocartons - o.nocartons;
+ });
+ }
+ if (qtyNoMatch) {
+ this.$alert('PN['+pn+']原始数量和输入总数不相等！', '错误', {
+ confirmButtonText: '确定'
+ })
+ return false
+ }
+ this.palletModelData.walMartOrderFlag = this.currentRow.walMartOrderFlag;
this.palletModelData.notifyDetailList = this.multipleSelection;
savePalletHeader(this.palletModelData).then(({data}) => {
if (data && data.code === 0) {
@@ -2202,9 +2306,10 @@
})
},
- updateBoxModel(row){
+ updateBoxModel(row,type){
this.boxModelData=JSON.parse(JSON.stringify(row))
this.boxModelData.addFlag=1
+ this.boxModelData.type=type
this.boxModelFlag=true
},
newBoxModel(){
@@ -2221,6 +2326,7 @@
poNo:'',
boxQty:'',
rolls:'',
+ type:0
}
this.boxModelFlag=true
},
diff --git a/src/views/modules/ecss/declaration.vue b/src/views/modules/ecss/declaration.vue
index 055948f..2cc18d1 100644
--- a/src/views/modules/ecss/declaration.vue
+++ b/src/views/modules/ecss/declaration.vue
@@ -40,10 +40,10 @@
{{'导出报关要素'}}
- {{'导出报关单'}}
+ {{'导出报关单'}}
- {{'导出发票'}}
+ {{'导出发票'}}
{{'导出箱单'}}
@@ -134,7 +134,7 @@
-
+
@@ -143,6 +143,12 @@
无品牌
+
+
+ 中文
+ 英文
+
+
@@ -150,9 +156,136 @@
关闭
-
+
+
+
+
+ 中文
+ 英文
+
+
+
+
+
+ 确定
+ 关闭
+
+
+
+
+
+
+
+
+
+
+ 发票模版
+
+
+
+
+
+
+
+ 品名
+
+
+
+
+ 中文
+ 英文
+
+
+
+
+ 合同
+
+
+
+
+ 货物明细
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确定
+ 关闭
+
+
+
+
+
+
+
+
+
+
+ 箱单模版
+
+
+
+
+
序号
@@ -160,8 +293,19 @@
-
-
+
+ 中文
+ 英文
+
+
+
+
+ 显示箱数零头
+
+
+
+
+ 货物明细
@@ -174,9 +318,9 @@
SO
-
-
-
+
+
+
@@ -184,7 +328,6 @@
-
@@ -205,6 +348,11 @@
+
+
+
+
+
-
+
+
+
+ 中文
+ 英文
+
+
@@ -296,6 +450,41 @@
关闭
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+ 关闭
+
+
@@ -308,7 +497,8 @@
deleteDeclaration,
downloadDeclarationElements,
getNotifyPartDetail,
- getCustomerInfo
+ getCustomerInfo,
+ searchTemplateList
}from "@/api/ecss/ecss.js"
import {EventBus} from "../../../main";
import ExportUtil from "@/utils/export";
@@ -319,6 +509,9 @@
},
data() {
return {
+ templateFlag:false,
+ templateData:{},
+ templateList:[],
customerInfoList:[],
notifyPartDetailList:[],
currentRow:{},
@@ -331,18 +524,48 @@
deliveryGoodsDate:'',
voyage :'',
shippingDate:'',
+ hsCodeDescType:'Y',
shipper:'Checkpoint Commercial (Shanghai) Co., Ltd. 保点贸易（上海）有限公司\t\t\t\t\t\t\n' +
'Room 1411, No. 31, Lane 2419, Hunan Road, Pudong New Area, Shanghai\t\t\t\t\t\t\n' +
'电话/Tel: (86-21)38112888 传真/Fax: (86-21)38112990\t\t\t\t\t\t\n' +
'上海市浦东新区沪南路2419弄31号1411室\t\t\t\t\t\t\n'
},
brandTypeFlag:false,
+ declarationFlag:false,
+ exportInvoiceFlag:false,
+ exportInvoice:{
+ origin:"made in china",
+ templateName:'',
+ hsCodeDesc:'',
+ contractFlag:'',
+ packaging:'',
+ kgs:'',
+ hsCode:'',
+ material:'',
+ hsCodeDescType:'',
+ goodsLabel:'',
+ },
exportPakingFlag:false,
exportPaking:{
origin:"made in china",
- itemNo:''
+ itemNo:'',
+ upc:'',
+ so:'',
+ shippingMark:'',
+ palletWeight:'',
+ templateName:'',
+ hsCodeDesc:'',
+ contractFlag:'',
+ packaging:'',
+ kgs:'',
+ hsCode:'',
+ material:'',
+ hsCodeDescType:'',
+ goodsLabel:'',
+ boxChange:''
},
brandType:'',
+ hsCodeDescType:'Y',
exportParam: {},
pageIndex: 1,
pageSize: 100,
@@ -1348,25 +1571,91 @@
this.currentRow = val;
},
chooseBrandType() {
- if (!this.currentRow) {
+ if (!this.currentRow || !this.currentRow.buNo) {
this.$message.warning('请选择报关单！')
return
}
this.brandType='境外品牌（其他）'
+ //this.hsCodeDescType=''
this.brandTypeFlag = true
},
+ chooseHsCodeDescType() {
+ if (!this.currentRow || !this.currentRow.buNo) {
+ this.$message.warning('请选择报关单！')
+ return
+ }
+ //this.hsCodeDescType=''
+ this.declarationFlag = true
+ },
+ exportInvoiceList() {
+ if (!this.currentRow || !this.currentRow.buNo) {
+ this.$message.warning('请选择报关单！')
+ return
+ }
+ this.exportInvoice.templateName=''
+ this.exportInvoice.hsCodeDesc=this.currentRow.hsCodeDesc
+ this.exportInvoice.contractFlag=this.currentRow.contractFlag
+ this.exportInvoice.packaging=this.currentRow.packaging
+ this.exportInvoice.kgs=this.currentRow.kgs
+ this.exportInvoice.hsCode=this.currentRow.hsCode
+ this.exportInvoice.material=this.currentRow.material
+ this.exportInvoice.hsCodeDescType=this.currentRow.hsCodeDescType
+ this.exportInvoice.goodsLabel=this.currentRow.goodsLabel
+ this.exportInvoice.origin="made in china"
+ //this.exportInvoice = this.currentRow
+ if (!this.exportInvoice.origin) {
+ this.exportInvoice.origin = 'made in china'
+ }
+ if (!this.exportInvoice.itemNo) {
+ this.exportInvoice.itemNo = 'Y'
+ }
+ this.notifyPartDetailList = [];
+ this.exportInvoiceFlag = true
+ if (this.currentRow.buNo==='03-RFID') {
+ getNotifyPartDetail(this.currentRow).then(({data}) => {
+ //区分请求成功和失败的状况
+ if (data && data.code == 0) {
+ this.notifyPartDetailList = data.rows
+ this.notifyPartDetailList.forEach(o => {
+ if (!o.lossratio) {
+ o.lossratio = '1.2';
+ }
+ });
+ } else {
+ this.notifyPartDetailList = [];
+ }
+ });
+ }
+ },
exportPakingList() {
- if (!this.currentRow) {
+ if (!this.currentRow || !this.currentRow.buNo) {
this.$message.warning('请选择报关单！')
return
}
- this.exportPaking = this.currentRow
+ this.exportPaking.origin='made in china'
+ this.exportPaking.itemNo=this.currentRow.itemNo
+ this.exportPaking.upc=this.currentRow.upc
+ this.exportPaking.so=this.currentRow.so
+ this.exportPaking.shippingMark=this.currentRow.shippingMark
+ this.exportPaking.palletWeight=this.currentRow.palletWeight
+ this.exportPaking.hsCodeDesc=this.currentRow.hsCodeDesc
+ this.exportPaking.contractFlag=this.currentRow.contractFlag
+ this.exportPaking.packaging=this.currentRow.packaging
+ this.exportPaking.kgs=this.currentRow.kgs
+ this.exportPaking.hsCode=this.currentRow.hsCode
+ this.exportPaking.material=this.currentRow.material
+ this.exportPaking.hsCodeDescType=this.currentRow.hsCodeDescType
+ this.exportPaking.goodsLabel=this.currentRow.goodsLabel
+ this.exportPaking.boxChange=this.currentRow.boxChange
+ //this.exportPaking = this.currentRow
if (!this.exportPaking.origin) {
this.exportPaking.origin = 'made in china'
}
if (!this.exportPaking.itemNo) {
this.exportPaking.itemNo = 'Y'
}
+ this.notifyPartDetailList = [];
+ this.exportPaking.templateName=''
this.exportPakingFlag = true
if (this.currentRow.buNo==='03-RFID') {
getNotifyPartDetail(this.currentRow).then(({data}) => {
@@ -1385,7 +1674,7 @@
}
},
exportGoodsList() {
- if (!this.currentRow) {
+ if (!this.currentRow || !this.currentRow.buNo) {
this.$message.warning('请选择报关单！')
return
}
@@ -1400,7 +1689,7 @@
},
// 导出
downloadDeclarationElements() {
- if (!this.currentRow) {
+ if (!this.currentRow || !this.currentRow.buNo) {
this.$message.warning('请选择报关单！')
return
}
@@ -1409,6 +1698,7 @@
exportParam.site = this.currentRow.site
exportParam.delNo = this.currentRow.delNo
exportParam.brandType = this.brandType
+ exportParam.hsCodeDescType=this.hsCodeDescType
let error;
ExportUtil.export(
"/ecss/coDel/downloadDeclarationElements",
@@ -1417,7 +1707,7 @@
this.brandTypeFlag = false
},
downloadDeclaration() {
- if (!this.currentRow) {
+ if (!this.currentRow || !this.currentRow.buNo) {
this.$message.warning('请选择报关单！')
return
}
@@ -1425,27 +1715,32 @@
exportParam.declarationNo = this.currentRow.declarationNo
exportParam.site = this.currentRow.site
exportParam.delNo = this.currentRow.delNo
+ exportParam.hsCodeDescType=this.hsCodeDescType
ExportUtil.export(
"/ecss/coDel/downloadDeclaration",
exportParam, this.currentRow.declarationNo+"报关单.xlsx"
);
+ this.declarationFlag = false
},
downloadInvoice() {
- if (!this.currentRow) {
+ if (!this.currentRow || !this.currentRow.buNo) {
this.$message.warning('请选择报关单！')
return
}
- let exportParam={}
+ let exportParam=this.exportInvoice
exportParam.declarationNo = this.currentRow.declarationNo
exportParam.site = this.currentRow.site
exportParam.delNo = this.currentRow.delNo
+ exportParam.notifyPartDetailList = this.notifyPartDetailList
ExportUtil.export(
"/ecss/coDel/downloadInvoice",
exportParam, this.currentRow.declarationNo+"发票.xlsx"
);
+ this.exportInvoiceFlag=false
+ this.searchTable()
},
downloadPackingList() {
- if (!this.currentRow) {
+ if (!this.currentRow || !this.currentRow.buNo) {
this.$message.warning('请选择报关单！')
return
}
@@ -1477,9 +1772,10 @@
exportParam, this.currentRow.declarationNo+"箱单.xlsx"
);
this.exportPakingFlag = false;
+ this.searchTable()
},
downloadExportGoods() {
- if (!this.currentRow) {
+ if (!this.currentRow || !this.currentRow.buNo) {
this.$message.warning('请选择报关单！')
return
}
@@ -1492,6 +1788,7 @@
exportParam, this.currentRow.declarationNo+"出口货物委托书.xlsx"
);
this.exportGoodsFlag = false;
+ this.searchTable()
},
getCustomerInfo() {
getCustomerInfo(this.currentRow).then(({data}) => {
@@ -1503,6 +1800,60 @@
}
});
},
+
+ openTemplate (type) {
+ this.templateData.type=type;
+ this.templateFlag = true;
+ },
+
+ openTemplateDialog () {
+ //请求
+ this.searchTemplateList();
+ },
+ closeTemplateDialog () {
+ this.templateList = []
+ this.templateFlag = false
+ },
+ searchTemplateList () {
+ this.templateData.buNo = this.currentRow.buNo
+ searchTemplateList(this.templateData).then(({data}) => {
+ if (data && data.code === 0){
+ this.templateList = data.rows;
+ }
+ })
+ },
+ templateRowDblclick (row) {
+ if (this.templateData.type=='发票') {
+ this.exportInvoice.templateName=row.name
+ this.exportInvoice.hsCodeDesc=row.hsCodeDesc
+ this.exportInvoice.contractFlag=row.contractFlag
+
+ this.exportInvoice.origin=this.currentRow.origin?this.currentRow.origin:row.origin
+ this.exportInvoice.packaging=this.currentRow.packaging?this.currentRow.packaging:row.packaging
+ 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.goodsLabel=this.currentRow.goodsLabel?this.currentRow.goodsLabel:row.goodsLabel
+ } else {
+ this.exportPaking.templateName=row.name
+ this.exportPaking.upc=row.upc
+ this.exportPaking.so=row.so
+ this.exportPaking.shippingMark=row.shippingMark
+ this.exportPaking.palletWeight=row.palletWeight
+ this.exportPaking.boxChange=row.boxChange
+ this.exportPaking.itemNo=row.itemNo
+
+ this.exportPaking.origin=this.currentRow.origin?this.currentRow.origin:row.origin
+ this.exportPaking.packaging=this.currentRow.packaging?this.currentRow.packaging:row.packaging
+ this.exportPaking.kgs=this.currentRow.kgs?this.currentRow.kgs:row.kgs
+ this.exportPaking.hsCode=this.currentRow.hsCode?this.currentRow.hsCode:row.hsCode
+ this.exportPaking.material=this.currentRow.material?this.currentRow.material:row.material
+ this.exportPaking.hsCodeDescType=this.currentRow.hsCodeDescType?this.currentRow.hsCodeDescType:row.hsCodeDescType
+ this.exportPaking.goodsLabel=this.currentRow.goodsLabel?this.currentRow.goodsLabel:row.goodsLabel
+ }
+ this.templateFlag = false
+ },
},
created() {
diff --git a/src/views/modules/ecss/ecssTemplate.vue b/src/views/modules/ecss/ecssTemplate.vue
new file mode 100644
index 0000000..3065e9d
--- /dev/null
+++ b/src/views/modules/ecss/ecssTemplate.vue
@@ -0,0 +1,608 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{'查询'}}
+ {{'新增'}}
+
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+ {{scope.row[item.columnProp]}}
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 中文
+ 英文
+
+
+
+
+ 品名
+
+
+
+
+ 合同
+
+
+
+
+ UPC
+
+
+
+
+ SO
+
+
+
+
+ 显示箱数零头
+
+
+
+
+ 货物明细
+
+
+
+
+ 序号
+ 栈板号
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{'查询'}}
+ {{'导入'}}
+
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+ {{scope.row[item.columnProp]}}
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 将文件拖到此处，或点击上传
+
+
+
+
+
+
+