From 304d957441f2c0430eb417e8e133fb32ce5c5c5b Mon Sep 17 00:00:00 2001 From: "han\\hanst" Date: Thu, 3 Apr 2025 09:08:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E5=8A=A1=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ecss/ecss.js | 26 + src/main.js | 4 +- src/utils/ajax.js | 33 + src/utils/export.js | 40 ++ src/views/modules/ecss/codelnotify.vue | 37 +- src/views/modules/ecss/codelnotifyConfirm.vue | 446 +++++++++--- src/views/modules/ecss/createDeclaration.vue | 79 ++- src/views/modules/ecss/declaration.vue | 385 ++++++++++- src/views/modules/ecss/del_upload_excel.vue | 16 +- src/views/modules/ecss/hsCode.vue | 52 +- src/views/modules/ecss/package.vue | 641 ++++++++++++++++++ src/views/modules/ecss/pallet.vue | 633 +++++++++++++++++ .../modules/ecss/pallet_upload_excel.vue | 6 +- src/views/modules/ecss/partHsCode.vue | 295 +++++++- 14 files changed, 2518 insertions(+), 175 deletions(-) create mode 100644 src/utils/ajax.js create mode 100644 src/utils/export.js create mode 100644 src/views/modules/ecss/package.vue create mode 100644 src/views/modules/ecss/pallet.vue diff --git a/src/api/ecss/ecss.js b/src/api/ecss/ecss.js index 4efce24..d46439f 100644 --- a/src/api/ecss/ecss.js +++ b/src/api/ecss/ecss.js @@ -58,3 +58,29 @@ export const saveDeclaration= data => createAPI(`/ecss/coDel/saveDeclaration`,'p export const searchDeclarationHeader= data => createAPI(`/ecss/coDel/searchDeclarationHeader`,'post',data) export const searchDeclarationDetail= data => createAPI(`/ecss/coDel/searchDeclarationDetail`,'post',data) export const deleteDeclaration= data => createAPI(`/ecss/coDel/deleteDeclaration`,'post',data) + +export const searchPalletData = data => createAPI(`/ecss/coDel/searchPalletData`,'post',data) + +export const savePalletData = data => createAPI(`/ecss/coDel/savePalletData`,'post',data) + +export const deletePallet= data => createAPI(`/ecss/coDel/deletePallet`,'post',data) + +export const searchPackageData = data => createAPI(`/ecss/coDel/searchPackageData`,'post',data) + +export const savePackageData = data => createAPI(`/ecss/coDel/savePackageData`,'post',data) + +export const deletePackage= data => createAPI(`/ecss/coDel/deleteEcssPackage`,'post',data) + +export const searchHsCodeList = data => createAPI(`/ecss/coDel/searchHsCodeList`,'post',data) + +export const searchPalletList = data => createAPI(`/ecss/coDel/searchPalletList`,'post',data) + +export const searchPackageList = data => createAPI(`/ecss/coDel/searchPackageList`,'post',data) + +export const getNotifyPartDetail = data => createAPI(`/ecss/coDel/getNotifyPartDetail`,'post',data) + +export const saveOneClickPacking = data => createAPI(`/ecss/coDel/saveOneClickPacking`,'post',data) + +export const getCustomerInfo = data => createAPI(`/ecss/coDel/getCustomerInfo`,'post',data) + + diff --git a/src/main.js b/src/main.js index 88a22d9..4526a03 100644 --- a/src/main.js +++ b/src/main.js @@ -12,6 +12,8 @@ import 'element-ui/lib/theme-chalk/icon.css' import '@/assets/scss/index.scss' import httpRequest from '@/utils/httpRequest' // api: https://github.com/axios/axios +import Ajax from "./utils/ajax.js"; + import cloneDeep from 'lodash/cloneDeep' import JsonExcel from 'vue-json-excel' import i18n from '@/i18n/i18n' @@ -54,7 +56,7 @@ Vue.prototype.decimalUtil = decimalUtil // 计算 Vue.prototype.dayjs = dayjs //时间格式化插件 2021-11-02 Vue.prototype.debounce = debounce // 防抖 Vue.prototype.throttle = throttle // 限流 - +window.ajax = Ajax; // 保存整站vuex本地储存初始状态 window.SITE_CONFIG['storeState'] = cloneDeep(store.state) diff --git a/src/utils/ajax.js b/src/utils/ajax.js new file mode 100644 index 0000000..81bc39a --- /dev/null +++ b/src/utils/ajax.js @@ -0,0 +1,33 @@ +import Vue from "vue"; + +var apiServer = (process.env.NODE_ENV !== 'production' && process.env.OPEN_PROXY ? '/proxyApi/' : window.SITE_CONFIG.baseUrl); + +export default { + file:(url, data, succ, err )=>{ + let requestUrl = apiServer + url; + var xhr = new XMLHttpRequest(); + xhr.open('POST', requestUrl, true); + xhr.responseType = "blob"; + xhr.withCredentials = true; + xhr.setRequestHeader("X-API", "true"); + xhr.setRequestHeader("Content-Type", "application/json;charset=UTF-8"); + xhr.setRequestHeader("token", Vue.cookie.get('token') ); + xhr.onreadystatechange = function (e) { + if (xhr.readyState === 4) { + if (xhr.status === 200) { + succ(xhr.response) + } else { + var fr = new FileReader(); + fr.onload = function(e) { + var text = fr.result; + console.log(text); + err ? err(text) : alert("请求发生错误:" + text) + }; + fr.readAsText(xhr.response); + } + } + }; + xhr.send(data); + }, + apiServer: apiServer +}; diff --git a/src/utils/export.js b/src/utils/export.js new file mode 100644 index 0000000..585ced3 --- /dev/null +++ b/src/utils/export.js @@ -0,0 +1,40 @@ +export default { + export(url, searchParameter, filenameRep) { + ajax.file(url, JSON.stringify(searchParameter), + resp => { + var filename = filenameRep || "export.xls"; + var linkelem = document.createElement("a"); + try { + var blob = new Blob([resp], { + type: "application/octet-stream" + }); + if (typeof window.navigator.msSaveBlob !== "undefined") { + window.navigator.msSaveBlob(blob, filename); + } else { + var URL = window.URL || window.webkitURL; + var downloadUrl = URL.createObjectURL(blob); + if (filename) { + var a = document.createElement("a"); + if (typeof a.download === "undefined") { + window.location = downloadUrl; + } else { + a.href = downloadUrl; + a.download = filename; + document.body.appendChild(a); + a.target = "_blank"; + a.click(); + } + } else { + window.location = downloadUrl; + } + } + } catch (ex) { + console.log(ex); + } + }, + error => { + console.error(error); + } + ); + }, +}; diff --git a/src/views/modules/ecss/codelnotify.vue b/src/views/modules/ecss/codelnotify.vue index accb206..cd695d5 100644 --- a/src/views/modules/ecss/codelnotify.vue +++ b/src/views/modules/ecss/codelnotify.vue @@ -37,7 +37,7 @@ placeholder="选择日期"> - + {{'查询'}} + + {{'导入'}} - - PN - + + + - + @@ -280,8 +282,6 @@ - - @@ -302,8 +302,6 @@ - - @@ -324,8 +322,6 @@ - - @@ -346,8 +342,6 @@ - - @@ -368,14 +362,12 @@ - - - + @@ -409,7 +401,7 @@ deleteEcssDelDetail, searchCoDelPalletData, }from "@/api/ecss/ecss.js" - import {getAllBuList}from '@/api/factory/site.js' + import {getBuList}from '@/api/factory/site.js' export default { name: "null", components:{ @@ -480,6 +472,7 @@ so:'', upc:'', remark:'', + pn:'', }, activeName:'detail', columnList1: [ @@ -571,7 +564,7 @@ sortLv: 0, status: true, fixed: '', - columnWidth: 120 + columnWidth: 220 }, { userId: this.$store.state.user.name, @@ -779,7 +772,7 @@ serialNumber: '801001Table2PartNo', tableId: "801001Table2", tableName: "关务系统发货通知单明细", - columnProp: "partNo", + columnProp: "pn", headerAlign: "center", align: "left", columnLabel: "PN", @@ -807,7 +800,7 @@ sortLv: 0, status: true, fixed: '', - columnWidth: 100 + columnWidth: 300 }, { userId: this.$store.state.user.name, @@ -1688,9 +1681,9 @@ let tempData = { username: this.$store.state.user.name, } - getAllBuList(tempData).then(({data}) => { + getBuList(tempData).then(({data}) => { if (data.code === 0) { - this.buList = data.rows + this.buList = data.row2 } }) }, diff --git a/src/views/modules/ecss/codelnotifyConfirm.vue b/src/views/modules/ecss/codelnotifyConfirm.vue index c52d0bb..ae773cf 100644 --- a/src/views/modules/ecss/codelnotifyConfirm.vue +++ b/src/views/modules/ecss/codelnotifyConfirm.vue @@ -36,7 +36,7 @@ placeholder="选择日期"> - + --> - - {{'导入装箱单'}} + + + {{'一键装箱'}} + {{'导入装箱单'}} + {{'装箱'}} - - - - - - - + + + - - - {{'创建栈板'}} + + - - - + @@ -303,51 +296,72 @@ 关闭 - - + + - + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + 保存 关闭 @@ -358,7 +372,7 @@ - 物料编码 + 物料编码 @@ -389,6 +403,126 @@ 关闭 + + + + + + + + + + + + + + + + + + + + + + + + 保存 + 关闭 + + + + + + + + + + + + + + 关闭 + + + + + + + + + + 查询 + + + + + + + + + + + + + + + + + + 关闭 + + @@ -412,8 +546,11 @@ deletePalletHeader, savePalletDetail, deletePalletDetail, + saveOneClickPacking, + getNotifyPartDetail, + searchPalletList }from "@/api/ecss/ecss.js" - import {getAllBuList}from '@/api/factory/site.js' + import {getBuList}from '@/api/factory/site.js' export default { name: "null", components:{ @@ -422,6 +559,15 @@ }, data() { return { + multipleSelection: [], + oneOrAll:'1', + palletFlag:false, + palletList:[], + palletData:{}, + partFlag:false, + partData:{}, + partList:[], + pageIndex: 1, pageSize: 100, totalPage: 0, @@ -432,6 +578,7 @@ dataList3:[], dataList4:[], dataList5:[], + dataList8:[], boxDetailData:{ site:'', buNo:'', @@ -451,6 +598,8 @@ endDate:'', username:this.$store.state.user.name, }, + oneClickPackingModelFlag:false, + oneClickPackingModelData:{}, palletModelFlag:false, palletModelData:{ addFlag:0, @@ -590,7 +739,7 @@ sortLv: 0, status: true, fixed: '', - columnWidth: 120 + columnWidth: 220 }, { userId: this.$store.state.user.name, @@ -798,7 +947,7 @@ serialNumber: '801002Table2PartNo', tableId: "801002Table2", tableName: "关务系统发货通知单明细", - columnProp: "partNo", + columnProp: "pn", headerAlign: "center", align: "left", columnLabel: "PN", @@ -826,7 +975,7 @@ sortLv: 0, status: true, fixed: '', - columnWidth: 100 + columnWidth: 300 }, { userId: this.$store.state.user.name, @@ -1268,7 +1417,7 @@ serialNumber: '801002Table3PN', tableId: "801002Table3", tableName: "装箱明细", - columnProp: "partNo", + columnProp: "pn", headerAlign: "center", align: "left", columnLabel: "PN", @@ -1596,7 +1745,7 @@ serialNumber: '801002Table5PartNo', tableId: "801002Table5", tableName: "栈板装箱明细", - columnProp: "partNo", + columnProp: "pn", headerAlign: "center", align: "left", columnLabel: "物料编码", @@ -1672,6 +1821,27 @@ }) }, methods: { + openPartDialog () { + this.searchPartList(); + this.partFlag = true + }, + closePartDialog () { + this.partList = [] + this.partFlag = false + }, + searchPartList () { + this.partData.site = this.currentRow.site + this.partData.delNo = this.currentRow.delNo + getNotifyPartDetail(this.partData).then(({data}) => { + if (data && data.code === 0){ + this.partList = data.rows; + } + }) + }, + partRowDblclick (row) { + this.boxModelData.partNo = row.partNo + this.partFlag = false + }, // 获取基础数据列表S getBaseList(val, type) { this.tagNo = val @@ -1811,9 +1981,9 @@ let tempData = { username: this.$store.state.user.name, } - getAllBuList(tempData).then(({data}) => { + getBuList(tempData).then(({data}) => { if (data.code === 0) { - this.buList = data.rows + this.buList = data.row2 } }) }, @@ -1868,6 +2038,7 @@ this.palletModelFlag=true }, newPalletModel(){ + this.oneOrAll=1; if(this.currentRow.site===''||this.currentRow.site==null){ this.$alert('请先选择发货通知单！', '错误', { confirmButtonText: '确定' @@ -1890,27 +2061,45 @@ netWeight:'', palletRemark:'', } + searchEcssCoDelNotifyDetail(this.currentRow).then(({data}) => { + if (data && data.code == 0) { + this.dataList8 = data.rows + this.dataList8.forEach(o => { + if (!o.nocartons) { + o.nativeNocartons = Math.ceil(o.qty/(o.rollqty*o.boxrolls)); + o.nocartons = Math.ceil(o.qty/(o.rollqty*o.boxrolls)); + } else { + o.nativeNocartons = o.nocartons; + } + }); + this.dataList8 = this.dataList8.filter(o => parseInt(o.nocartons)>0); + } else { + this.dataList8 = []; + } + }); this.palletModelFlag=true }, + handleSelectionChange(val) { + this.multipleSelection = val; + }, savePalletHeader(){ - if(this.palletModelData.palletQty===''||this.palletModelData.palletQty==null){ - this.$alert('请输入数量！', '错误', { - confirmButtonText: '确定' - }) - return false - } - if(this.palletModelData.grossWeight===''||this.palletModelData.grossWeight==null){ - this.$alert('请输入毛重！', '错误', { + if (this.multipleSelection.length===0) { + this.$alert('请选择装箱物料！', '错误', { confirmButtonText: '确定' }) return false } - if(this.palletModelData.netWeight===''||this.palletModelData.netWeight==null){ - this.$alert('请输入净重！', '错误', { + if(this.palletModelData.palletQty===''||this.palletModelData.palletQty==null){ + this.$alert('请输入数量！', '错误', { confirmButtonText: '确定' }) return false } + this.multipleSelection.forEach(o => { + o.qty = o.nocartons*o.rollqty*o.boxrolls; + o.nocartons = o.nativeNocartons - o.nocartons; + }); + this.palletModelData.notifyDetailList = this.multipleSelection; savePalletHeader(this.palletModelData).then(({data}) => { if (data && data.code === 0) { this.refreshCurrentTabTable() @@ -2029,6 +2218,87 @@ }) }) }, + oneClickPacking(){ + this.oneOrAll = 2; + if(this.currentRow.site===''||this.currentRow.site==null){ + this.$alert('请先选择发货通知单！', '错误', { + confirmButtonText: '确定' + }) + return false + } + if(this.dataList4.length>0){ + this.$alert('已存在装箱数据，不可一键装箱！', '错误', { + confirmButtonText: '确定' + }) + return false + } + this.oneClickPackingModelData={ + addFlag:0, + site:this.currentRow.site, + buNo:this.currentRow.buNo, + delNo:this.currentRow.delNo, + seqNo:'', + palletNo:'', + palletQty:'', + length:'', + width:'', + height:'', + volume:'', + grossWeight:'', + netWeight:'', + palletRemark:'', + } + this.oneClickPackingModelFlag=true + }, + saveOneClickPacking(){ + if(this.oneClickPackingModelData.palletQty===''||this.oneClickPackingModelData.palletQty==null){ + this.$alert('请输入数量！', '错误', { + confirmButtonText: '确定' + }) + return false + } + saveOneClickPacking(this.oneClickPackingModelData).then(({data}) => { + if (data && data.code === 0) { + this.refreshCurrentTabTable() + this.oneClickPackingModelFlag=false; + this.$message({ + message: '操作成功', + type: 'success', + duration: 1500, + onClose: () => {} + }) + } else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + }, + + openPalletDialog () { + //请求 + this.searchPalletList(); + }, + closePalletDialog () { + this.palletList = [] + this.palletFlag = false + }, + searchPalletList () { + this.palletData.buNo = this.oneOrAll===2?this.oneClickPackingModelData.buNo:this.palletModelData.buNo + searchPalletList(this.palletData).then(({data}) => { + if (data && data.code === 0){ + this.palletList = data.rows; + } + }) + }, + palletRowDblclick (row) { + if (this.oneOrAll===2) { + this.oneClickPackingModelData.pallet = row.palletNo + } else { + this.palletModelData.pallet = row.palletNo + } + this.palletFlag = false + }, }, created() { this.getBu () @@ -2037,5 +2307,9 @@ diff --git a/src/views/modules/ecss/createDeclaration.vue b/src/views/modules/ecss/createDeclaration.vue index dc394f5..091ad21 100644 --- a/src/views/modules/ecss/createDeclaration.vue +++ b/src/views/modules/ecss/createDeclaration.vue @@ -28,7 +28,7 @@ placeholder="选择日期"> - + - + + + + + + + + + + + @@ -257,7 +269,7 @@ - + @@ -295,17 +307,17 @@ - + - + - + @@ -315,17 +327,17 @@ - + - + - + @@ -362,18 +374,18 @@ v-loading="dataListLoading" style="width: 100%;"> + label="品名" + min-width="120"> + label="HS Code" + min-width="80"> - @@ -129,8 +306,12 @@ searchDeclarationHeader, searchDeclarationDetail, deleteDeclaration, + downloadDeclarationElements, + getNotifyPartDetail, + getCustomerInfo }from "@/api/ecss/ecss.js" import {EventBus} from "../../../main"; + import ExportUtil from "@/utils/export"; export default { name: "declaration", components:{ @@ -138,6 +319,31 @@ }, data() { return { + customerInfoList:[], + notifyPartDetailList:[], + currentRow:{}, + exportGoodsFlag:false, + exportGoods:{ + salesMethod:'EXW', + currency: 'USD', + madeArea: 'Shanghai, China', + sendPort:'Shanghai, China', + deliveryGoodsDate:'', + voyage :'', + shippingDate:'', + 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, + exportPakingFlag:false, + exportPaking:{ + origin:"made in china", + itemNo:'' + }, + brandType:'', + exportParam: {}, pageIndex: 1, pageSize: 100, totalPage: 0, @@ -238,10 +444,10 @@ serialNumber: '801006Table2Levy', tableId: "801006Table2", tableName: "报关单子记录", - columnProp: "levy", + columnProp: "dutyStatus", headerAlign: "center", align: "left", - columnLabel: "征免", + columnLabel: "征免性质", columnHidden: false, columnImage: false, columnSortable: false, @@ -284,7 +490,7 @@ sortLv: 0, status: true, fixed: '', - columnWidth: 120 + columnWidth: 180 }, { userId: this.$store.state.user.name, @@ -446,7 +652,7 @@ sortLv: 0, status: true, fixed: '', - columnWidth: 100 + columnWidth: 180 }, { userId: this.$store.state.user.name, @@ -842,7 +1048,7 @@ sortLv: 0, status: true, fixed: '', - columnWidth: 80 + columnWidth: 90 }, ], columnList2: [ @@ -927,7 +1133,7 @@ columnProp: "netWeight", headerAlign: "center", align: "right", - columnLabel: "数量", + columnLabel: "净重", columnHidden: false, columnImage: false, columnSortable: false, @@ -1138,6 +1344,165 @@ }); }); }, + handleCurrentChange(val) { + this.currentRow = val; + }, + chooseBrandType() { + if (!this.currentRow) { + this.$message.warning('请选择报关单！') + return + } + this.brandType='境外品牌（其他）' + this.brandTypeFlag = true + }, + exportPakingList() { + if (!this.currentRow) { + this.$message.warning('请选择报关单！') + return + } + this.exportPaking = this.currentRow + if (!this.exportPaking.origin) { + this.exportPaking.origin = 'made in china' + } + if (!this.exportPaking.itemNo) { + this.exportPaking.itemNo = 'Y' + } + this.exportPakingFlag = 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 = []; + } + }); + } + }, + exportGoodsList() { + if (!this.currentRow) { + this.$message.warning('请选择报关单！') + return + } + this.exportGoods.salesMethod = 'EXW' + this.exportGoods.currency = 'USD' + this.exportGoods.madeArea = 'Shanghai, China' + this.exportGoods.sendPort = 'Shanghai, China' + this.exportGoods.deliveryGoodsDate = '' + this.exportGoods.voyage = '' + this.exportGoods.shippingDate = '' + this.exportGoodsFlag = true + }, + // 导出 + downloadDeclarationElements() { + if (!this.currentRow) { + this.$message.warning('请选择报关单！') + return + } + let exportParam={} + exportParam.declarationNo = this.currentRow.declarationNo + exportParam.site = this.currentRow.site + exportParam.delNo = this.currentRow.delNo + exportParam.brandType = this.brandType + let error; + ExportUtil.export( + "/ecss/coDel/downloadDeclarationElements", + exportParam, this.currentRow.declarationNo+"报关要素.xlsx" + ); + this.brandTypeFlag = false + }, + downloadDeclaration() { + if (!this.currentRow) { + this.$message.warning('请选择报关单！') + return + } + let exportParam={} + exportParam.declarationNo = this.currentRow.declarationNo + exportParam.site = this.currentRow.site + exportParam.delNo = this.currentRow.delNo + ExportUtil.export( + "/ecss/coDel/downloadDeclaration", + exportParam, this.currentRow.declarationNo+"报关单.xlsx" + ); + }, + downloadInvoice() { + if (!this.currentRow) { + this.$message.warning('请选择报关单！') + return + } + let exportParam={} + exportParam.declarationNo = this.currentRow.declarationNo + exportParam.site = this.currentRow.site + exportParam.delNo = this.currentRow.delNo + ExportUtil.export( + "/ecss/coDel/downloadInvoice", + exportParam, this.currentRow.declarationNo+"发票.xlsx" + ); + }, + downloadPackingList() { + if (!this.currentRow) { + this.$message.warning('请选择报关单！') + return + } + if ((this.currentRow.buNo==='01-Label' || this.currentRow.buNo==='03-RFID') + && !this.exportPaking.origin) { + this.$message.warning('请填写制造地！') + return + } + if ((this.currentRow.buNo==='01-Label' || this.currentRow.buNo==='03-RFID') + && !this.exportPaking.palletWeight) { + this.$message.warning('请填写栈板重量！') + return + } + if (this.exportPaking.material && !this.exportPaking.hsCode) { + this.$message.warning('请填写hsCode！') + return + } + if (this.exportPaking.packaging && !this.exportPaking.kgs) { + this.$message.warning('请填写plastic packaging！') + return + } + let exportParam=this.exportPaking + exportParam.declarationNo = this.currentRow.declarationNo + exportParam.site = this.currentRow.site + exportParam.delNo = this.currentRow.delNo + exportParam.notifyPartDetailList = this.notifyPartDetailList + ExportUtil.export( + "/ecss/coDel/downloadPackingList", + exportParam, this.currentRow.declarationNo+"箱单.xlsx" + ); + this.exportPakingFlag = false; + }, + downloadExportGoods() { + if (!this.currentRow) { + this.$message.warning('请选择报关单！') + return + } + let exportParam=this.exportGoods + exportParam.declarationNo = this.currentRow.declarationNo + exportParam.site = this.currentRow.site + exportParam.delNo = this.currentRow.delNo + ExportUtil.export( + "/ecss/coDel/downloadExportGoods", + exportParam, this.currentRow.declarationNo+"出口货物委托书.xlsx" + ); + this.exportGoodsFlag = false; + }, + getCustomerInfo() { + getCustomerInfo(this.currentRow).then(({data}) => { + //区分请求成功和失败的状况 + if (data && data.code == 0) { + this.customerInfoList = data.rows + } else { + this.customerInfoList = []; + } + }); + }, }, created() { @@ -1146,5 +1511,9 @@ diff --git a/src/views/modules/ecss/del_upload_excel.vue b/src/views/modules/ecss/del_upload_excel.vue index 9d72ffd..64fe1ff 100644 --- a/src/views/modules/ecss/del_upload_excel.vue +++ b/src/views/modules/ecss/del_upload_excel.vue @@ -39,7 +39,7 @@ import {queryFileId} from "@/api/qc/qc.js" import {saveEcssCoDelNotifyByExcel} from '@/api/ecss/ecss.js' import {downLoadObjectFile} from '@/api/eam/eam_object_list.js' - import {getAllBuList}from '@/api/factory/site.js' + import {getBuList}from '@/api/factory/site.js' export default { name: 'bomComponentUpload', data() { @@ -64,11 +64,11 @@ let tempData = { username: this.$store.state.user.name, } - getAllBuList(tempData).then(({data}) => { + getBuList(tempData).then(({data}) => { if (data.code === 0) { - this.buList = data.rows - if(data.rows.length>0){ - this.pageData.buNo=data.rows[0].buNo + this.buList = data.row2 + if(data.row2.length>0){ + this.pageData.buNo=data.row2[0].buNo } } }) @@ -107,6 +107,10 @@ // 保修当前的数据 saveUploadFile () { + if (null == this.pageData.buNo || this.pageData.buNo=='') { + this.$message.error("请先选择BU!") + return false + } // 判断文件是否上传 if (null == this.fileList || 0 === this.fileList.length) { this.$message.error("请先上传文件!") @@ -123,7 +127,7 @@ // 关闭窗口并刷新页面 this.closeDialog() } else { - this.$message.warning(data.msg) + this.$message.error(data.msg) } }) }, diff --git a/src/views/modules/ecss/hsCode.vue b/src/views/modules/ecss/hsCode.vue index 4e575e7..a5e8391 100644 --- a/src/views/modules/ecss/hsCode.vue +++ b/src/views/modules/ecss/hsCode.vue @@ -12,6 +12,9 @@ + + + @@ -70,7 +73,7 @@ - + @@ -89,9 +92,14 @@ + + + + + - + @@ -100,9 +108,7 @@ - - - + @@ -129,7 +135,7 @@ saveHSCodeData, deleteHsCode, }from "@/api/ecss/ecss.js" - import {getAllBuList}from '@/api/factory/site.js' + import {getBuList}from '@/api/factory/site.js' export default { name: "null", components:{ @@ -151,6 +157,7 @@ limit: 100, buNo:'', hsCode:'', + hsCodeDesc:'', codeNo:'', username:this.$store.state.user.name, }, @@ -163,6 +170,7 @@ site:'', buNo:'', hsCode:'', + hsCodeDesc:'', codeNo:'', remark:'', }, @@ -205,6 +213,24 @@ fixed: '', columnWidth: 100 }, + { + userId: this.$store.state.user.name, + functionId: 801003, + serialNumber: '801003Table1HsCode', + tableId: "801003Table1", + tableName: "HsCode基础信息", + columnProp: "hsCodeDesc", + 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: 801003, @@ -380,7 +406,7 @@ }, refreshCurrentTabTable(){ if(this.currentRow===''||this.currentRow===null){ - this.currentRow={site:'',hsCode:'',buNo:'',recordType:'',codeNo:''} + this.currentRow={site:'',hsCode:'',hsCodeDesc: '',buNo:'',recordType:'',codeNo:''} } if(this.activeName==='detail'){ // searchEcssCoDelNotifyDetail(this.currentRow).then(({data}) => { @@ -403,9 +429,9 @@ let tempData = { username: this.$store.state.user.name, } - getAllBuList(tempData).then(({data}) => { + getBuList(tempData).then(({data}) => { if (data.code === 0) { - this.buList = data.rows + this.buList = data.row2 } }) }, @@ -416,6 +442,7 @@ site:'', buNo:'', hsCode:'', + hsCodeDesc: '', codeNo:'', remark:'', } @@ -428,6 +455,7 @@ site:row.site, buNo:row.buNo, hsCode:row.hsCode, + hsCodeDesc : row.hsCodeDesc, codeNo:row.codeNo, remark:row.remark, } @@ -465,6 +493,12 @@ }) return false } + if(this.addModel.hsCodeDesc==null||this.addModel.hsCodeDesc===''){ + this.$alert('请输入品名！', '错误', { + confirmButtonText: '确定' + }) + return false + } if(this.addModel.codeNo==null||this.addModel.codeNo===''){ this.$alert('请选择属性模板！', '错误', { confirmButtonText: '确定' diff --git a/src/views/modules/ecss/package.vue b/src/views/modules/ecss/package.vue new file mode 100644 index 0000000..3c86430 --- /dev/null +++ b/src/views/modules/ecss/package.vue @@ -0,0 +1,641 @@ + + + + + diff --git a/src/views/modules/ecss/pallet.vue b/src/views/modules/ecss/pallet.vue new file mode 100644 index 0000000..4a6afbf --- /dev/null +++ b/src/views/modules/ecss/pallet.vue @@ -0,0 +1,633 @@ + + + + + diff --git a/src/views/modules/ecss/pallet_upload_excel.vue b/src/views/modules/ecss/pallet_upload_excel.vue index e779aef..4f2fd2d 100644 --- a/src/views/modules/ecss/pallet_upload_excel.vue +++ b/src/views/modules/ecss/pallet_upload_excel.vue @@ -42,7 +42,7 @@ import {queryFileId} from "@/api/qc/qc.js" import {saveCoDelPalletDataByExcel} from '@/api/ecss/ecss.js' import {downLoadObjectFile} from '@/api/eam/eam_object_list.js' - import {getAllBuList}from '@/api/factory/site.js' + import {getBuList}from '@/api/factory/site.js' export default { name: 'bomComponentUpload', data() { @@ -69,9 +69,9 @@ let tempData = { username: this.$store.state.user.name, } - getAllBuList(tempData).then(({data}) => { + getBuList(tempData).then(({data}) => { if (data.code === 0) { - this.buList = data.rows + this.buList = data.row2 } }) console.log(inData) diff --git a/src/views/modules/ecss/partHsCode.vue b/src/views/modules/ecss/partHsCode.vue index e50795a..85d859e 100644 --- a/src/views/modules/ecss/partHsCode.vue +++ b/src/views/modules/ecss/partHsCode.vue @@ -14,6 +14,9 @@ + + + @@ -29,7 +32,7 @@ - + - - + - + - + - + - + + + + + + + - + - - - + + + + + @@ -141,6 +168,141 @@ + + + + + + + 查询 + + + + + + + + + + + + 关闭 + + + + + + + + + + 查询 + + + + + + + + + + 关闭 + + + + + + + + + + 查询 + + + + + + + + + + + + + + + + + + 关闭 + + @@ -148,9 +310,10 @@