diff --git a/src/api/ecss/ecss.js b/src/api/ecss/ecss.js index a195844..37ca265 100644 --- a/src/api/ecss/ecss.js +++ b/src/api/ecss/ecss.js @@ -48,3 +48,9 @@ export const savePalletHeader = data => createAPI(`/ecss/coDel/savePalletHeader` export const deletePalletHeader = data => createAPI(`/ecss/coDel/deletePalletHeader`,'post',data) export const savePalletDetail = data => createAPI(`/ecss/coDel/savePalletDetail`,'post',data) export const deletePalletDetail = data => createAPI(`/ecss/coDel/deletePalletDetail`,'post',data) +export const searchEcssCoDelNotifyHeaderForDanZheng = data => createAPI(`/ecss/coDel/searchEcssCoDelNotifyHeaderForDanZheng`,'post',data) + +export const getDeclarationDefaultData= data => createAPI(`/ecss/coDel/getDeclarationDefaultData`,'post',data) + +export const partInformationHsCode= data => createAPI(`/ecss/coDel/partInformationHsCode`,'post',data) +export const savePartHSCode= data => createAPI(`/ecss/coDel/savePartHSCode`,'post',data) diff --git a/src/views/modules/ecss/codelnotify.vue b/src/views/modules/ecss/codelnotify.vue index d488dd8..44309b5 100644 --- a/src/views/modules/ecss/codelnotify.vue +++ b/src/views/modules/ecss/codelnotify.vue @@ -149,7 +149,42 @@ + + + + + + + + + + + + + + + + + @@ -367,6 +402,7 @@ changeEcssDelStatus, updateEcssDelDetail, deleteEcssDelDetail, + searchCoDelPalletData, }from "@/api/ecss/ecss.js" import {getAllBuList}from '@/api/factory/site.js' export default { @@ -383,6 +419,7 @@ buList:[], dataList:[], dataList2:[], + dataList3:[], dataListLoading: false, searchData: { page: 1, @@ -1127,6 +1164,260 @@ columnWidth: 300 }, ], + columnList3:[ + { + userId: this.$store.state.user.name, + functionId: 801001, + serialNumber: '801001Table3ItemNo', + tableId: "801001Table3", + tableName: "装箱明细", + columnProp: "itemNo", + headerAlign: "center", + align: "right", + columnLabel: "序号", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 40 + }, + { + userId: this.$store.state.user.name, + functionId: 801001, + serialNumber: '801001Table3PalletRemark', + tableId: "801001Table3", + tableName: "装箱明细", + columnProp: "palletRemark", + headerAlign: "center", + align: "left", + columnLabel: "栈板码", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100 + }, + { + userId: this.$store.state.user.name, + functionId: 801001, + serialNumber: '801001Table3PalletQty', + tableId: "801001Table3", + tableName: "装箱明细", + columnProp: "palletQty", + headerAlign: "center", + align: "right", + columnLabel: "托数", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 40 + }, + { + userId: this.$store.state.user.name, + functionId: 801001, + serialNumber: '801001Table3PoNo', + tableId: "801001Table3", + tableName: "装箱明细", + columnProp: "poNo", + headerAlign: "center", + align: "left", + columnLabel: "PO", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100 + }, + { + userId: this.$store.state.user.name, + functionId: 801001, + serialNumber: '801001Table3PN', + tableId: "801001Table3", + tableName: "装箱明细", + columnProp: "partNo", + headerAlign: "center", + align: "left", + columnLabel: "PN", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100 + }, + { + userId: this.$store.state.user.name, + functionId: 801001, + serialNumber: '801001Table3Qty', + tableId: "801001Table3", + tableName: "装箱明细", + columnProp: "qty", + headerAlign: "center", + align: "right", + columnLabel: "数量", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 50 + }, + { + userId: this.$store.state.user.name, + functionId: 801001, + serialNumber: '801001Table3BoxQty', + tableId: "801001Table3", + tableName: "装箱明细", + columnProp: "boxQty", + headerAlign: "center", + align: "right", + columnLabel: "箱数", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 60 + }, + { + userId: this.$store.state.user.name, + functionId: 801001, + serialNumber: '801001Table3Rolls', + tableId: "801001Table3", + tableName: "装箱明细", + columnProp: "rolls", + headerAlign: "center", + align: "right", + columnLabel: "Rolls", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 50 + }, + { + userId: this.$store.state.user.name, + functionId: 801001, + serialNumber: '801001Table3Length', + tableId: "801001Table3", + tableName: "装箱明细", + columnProp: "length", + headerAlign: "center", + align: "right", + columnLabel: "长(M)", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 50 + }, + { + userId: this.$store.state.user.name, + functionId: 801001, + serialNumber: '801001Table3Width', + tableId: "801001Table3", + tableName: "装箱明细", + columnProp: "width", + headerAlign: "center", + align: "right", + columnLabel: "宽(M)", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 50 + }, + { + userId: this.$store.state.user.name, + functionId: 801001, + serialNumber: '801001Table3Height', + tableId: "801001Table3", + tableName: "装箱明细", + columnProp: "height", + headerAlign: "center", + align: "right", + columnLabel: "高(M)", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 50 + }, + { + userId: this.$store.state.user.name, + functionId: 801001, + serialNumber: '801001Table3Volume', + tableId: "801001Table3", + tableName: "装箱明细", + columnProp: "volume", + headerAlign: "center", + align: "right", + columnLabel: "体积", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 50 + }, + { + userId: this.$store.state.user.name, + functionId: 801001, + serialNumber: '801001TableGrossWeight', + tableId: "801001Table3", + tableName: "装箱明细", + columnProp: "grossWeight", + headerAlign: "center", + align: "right", + columnLabel: "毛重", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 50 + }, + { + userId: this.$store.state.user.name, + functionId: 801001, + serialNumber: '801001TableNetWeight', + tableId: "801001Table3", + tableName: "装箱明细", + columnProp: "netWeight", + headerAlign: "center", + align: "right", + columnLabel: "净重", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 50 + }, + ], currentRow:{}, // 导出 start exportData: [], @@ -1199,6 +1490,17 @@ } }); } + if(this.activeName==='pallet'){ + searchCoDelPalletData(this.currentRow).then(({data}) => { + //区分请求成功和失败的状况 + if (data && data.code == 0) { + this.dataList3 = data.rows + + } else { + this.dataList3 = []; + } + }); + } }, tabClick (tab, event) { // 刷新列表数据 diff --git a/src/views/modules/ecss/codelnotifyConfirm.vue b/src/views/modules/ecss/codelnotifyConfirm.vue index 68bfc32..72dc157 100644 --- a/src/views/modules/ecss/codelnotifyConfirm.vue +++ b/src/views/modules/ecss/codelnotifyConfirm.vue @@ -2005,7 +2005,7 @@ } }) }) - } + }, }, created() { this.getBu () diff --git a/src/views/modules/ecss/createDeclaration.vue b/src/views/modules/ecss/createDeclaration.vue new file mode 100644 index 0000000..b9de3b7 --- /dev/null +++ b/src/views/modules/ecss/createDeclaration.vue @@ -0,0 +1,1536 @@ + + + + + diff --git a/src/views/modules/ecss/partHsCode.vue b/src/views/modules/ecss/partHsCode.vue new file mode 100644 index 0000000..bba3148 --- /dev/null +++ b/src/views/modules/ecss/partHsCode.vue @@ -0,0 +1,642 @@ + + + + +