diff --git a/vue/src/components/ImportExcel-base/index.vue b/vue/src/components/ImportExcel-base/index.vue index 6d0b07af..b1243eb4 100644 --- a/vue/src/components/ImportExcel-base/index.vue +++ b/vue/src/components/ImportExcel-base/index.vue @@ -310,6 +310,7 @@ export default { hqYPlatform: "一汽轿车", //一汽轿车平台导入 vwoutorder: "准时化出库单", sparepartoutorder: "大众备件出库单", + sparepartoutorder90: "大众备件调整出库单", kanbanoutorder: "大众看板出库单", HQ_H_OUTORDER: "红旗H平台出库单", HQ_M_OUTORDER: "红旗M平台出库单", @@ -319,7 +320,7 @@ export default { bomdatabase: "产品结构BOM", HQ_H_CHECKOUT: "红旗H平台备件出库单", HQ_M_CHECKOUT: "红旗M平台备件出库单", - HQ_Y_CHECKOUT: "一汽轿车平台备件出库单", + //HQ_Y_CHECKOUT: "一汽轿车平台备件出库单", prebatch: "预批量", secondaryPriceRatio: "二配结算价格比例", factory: "工厂设置", @@ -334,6 +335,7 @@ export default { customerStorageLocation: "客户存储地点", secondaryAdjustment: "二配数量调整输入", secondaryDiscount: "二配折扣调整输入", + Wms_HqKB_Output: "红旗数据调整", }[this.crmType] || "" ); }, @@ -365,6 +367,8 @@ export default { sparepartoutorder: "/api/settleaccount/wmsSharePartoutput/ExcelImport", //大众备件出库单导入 + sparepartoutorder90: + "/api/settleaccount/wmsSharePart90output/ExcelImport", //大众备件数据调整出库单导入 bomdatabase: "/api/settleaccount/bom/ExcelImport", prebatch: "/api/settleaccount/Prebatch/ExcelImport", secondaryPriceRatio: @@ -389,7 +393,9 @@ export default { HQ_H_CHECKOUT: "/api/settleaccount/WmsHQHSharePartoutput/ExcelImport", //H平台备件出库单导入 HQ_M_CHECKOUT: "/api/settleaccount/WmsHQMSharePartoutput/ExcelImport", //M平台备件出库单导入 - HQ_Y_CHECKOUT: "/api/settleaccount//ExcelImport", //一汽轿车平台备件出库单导入 + Wms_HqKB_Output: + "/api/settleaccount/WmsHQMSharePartoutput/ExcelImport", //红旗数据调整导入 + //HQ_Y_CHECKOUT: "/api/settleaccount//ExcelImport", //一汽轿车平台备件出库单导入 }[this.crmType] || "" ); }, @@ -527,7 +533,7 @@ export default { }, //执行按钮 sureClick() { - if(this.versionValue==''){ + if (this.versionValue == "") { this.$message.error("必须选择版本！"); return false; } diff --git a/vue/src/router/modules/hq_out_order.js b/vue/src/router/modules/hq_out_order.js index afc22315..c2c92124 100644 --- a/vue/src/router/modules/hq_out_order.js +++ b/vue/src/router/modules/hq_out_order.js @@ -87,6 +87,16 @@ const hqOutOrderDataRouter = { icon: '售后' } }, + { + path: 'hq-kb-outorder', + component: () => import('@/views/ux/vw/dataInput/hq_kb_output'), + name: 'WmsHQKBOutput',//命名路由 + meta: { + title: '红旗数据调整出库单', + roles: ['SettleAccount.WMSHQ'],//控制页面角色（可以设置多个角色） + icon: '红旗' + } + }, // { // path: 'hq-y-checkout', // component: () => import('@/views/ux/vw/dataInput/hq_y_checkout'), diff --git a/vue/src/views/login/index.vue b/vue/src/views/login/index.vue index 8f3f4f2d..e104f9e9 100644 --- a/vue/src/views/login/index.vue +++ b/vue/src/views/login/index.vue @@ -12,7 +12,7 @@ 长春市闻荫科技 ©2021 闻荫科技-长春派格结算管理系统 + href="http://www.ccwin-in.com">©2022 闻荫科技-长春派格结算管理系统 diff --git a/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue b/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue index 673c91f2..5c5dcbfa 100644 --- a/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue +++ b/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue @@ -69,6 +69,22 @@ @filter="handleFilters" > +
+ + +

+ {{ this.resultData.successMessage }} + 下载错误数据 +

+ +
+
+

+ {{ this.resultData.successMessage }} +

+
取消 - 确认 @@ -243,6 +256,13 @@ export default { return {}; }, }, + resultData: { + totalSize: 0, + errSize: 0, + errTemplate: "", + errMessage: "", + successMessage: "", + }, listQuery: { Filters: [ { @@ -338,6 +358,42 @@ export default { }, }, methods: { + /** + * 下载错误模板 + */ + downloadErrData() { + let fileNameOfProject = this.resultData.errTemplate; + this.$axios + .BolbGets( + "/api/settleaccount/getblobfile/download/" + fileNameOfProject + ) + .then((response) => { + if (fileNameOfProject.indexOf("_") != -1) { + let downName = + fileNameOfProject.slice(0, fileNameOfProject.lastIndexOf("_")) + + fileNameOfProject.slice(fileNameOfProject.lastIndexOf(".")); + downloadFile(response, downName); + this.$notify({ + title: "成功", + message: "错误数据-导出成功！", + type: "success", + duration: 2000, + }); + } else { + downloadFile(response, fileNameOfProject); + this.$notify({ + title: "成功", + message: "错误数据-导出成功！", + type: "success", + duration: 2000, + }); + } + this.listLoading = false; + }) + .catch((error) => { + this.listLoading = false; + }); + }, //可获取到编辑的数据 handleEdit(index, row) { console.log(index, row); @@ -462,7 +518,13 @@ export default { //出库单 handleCreateBills(row) { this.dialogFormVisible = true; - this.formLoading = true; + this.resultData = {}; + }, + //出库单 + save(row) { + this.dialogFormVisible = true; + this.resultData.errSize == 0; //重新弹窗 + //this.formLoading = true; this.listOutPutQuery.guids = []; this.listOutPutQuery.version = this.customerInfo.version; this.listOutPutQuery.billNum = this.customerInfo.parentId; @@ -480,25 +542,34 @@ export default { } //this.listOutPutQuery.accountDate = this.accountDatelist; console.log( - "未选择时全部确认出库条件：" + JSON.stringify(this.listOutPutQuery) + "无条码看板-全部确认出库条件：" + JSON.stringify(this.listOutPutQuery) ); - this.$axios .posts( "/api/settleaccount/wmskanbanoutputextend/WmsKanbanOutPut-Pass", this.listOutPutQuery ) - .then((response) => { + .then((res) => { const index = this.list.indexOf(row); - this.$notify({ - title: "成功", - message: "生成成功", - type: "success", - duration: 2000, - }); - this.accountDatelist.accountDate = ""; - this.dialogFormVisible = false; - this.getList(); + if (res === "Success") { + this.$notify({ + title: "成功", + message: "确认成功!", + type: "success", + duration: 2000, + }); + this.accountDatelist.accountDate = ""; + this.resultData.errSize = 0; + this.dialogFormVisible = false; + this.resultData.successMessage = "出库成功！"; + this.getList(); + } else { + this.dialogFormVisible = false; + this.resultData.errTemplate = res; //指定错误模板名称，作为参数，用于错误模板下载 + this.resultData.errSize = 1; //保持大于0，用于控制错误数据下载按钮的可不可见 + this.resultData.successMessage = "有错误检验信息！"; + alert(JSON.stringify(this.resultData)); + } this.formLoading = false; }) .catch(() => { diff --git a/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue b/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue index 2add744c..fd21a3f8 100644 --- a/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue +++ b/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue @@ -383,24 +383,24 @@ export default { "大众备件调整结算数量按钮：" + JSON.stringify(this.listOutPutQuery) ); //"taskId": "3fa85f64-5717-4562-b3fc-2c963f66afa6","outPutQty": 0 - // this.$axios - // .posts( - // "/api/settleaccount/wmsSharePartoutput/WmsSharePartOutPutModify", - // this.listOutPutQuery - // ) - // .then((response) => { - // const index = this.list.indexOf(row); - // this.$notify({ - // title: "成功", - // message: "操作成功", - // type: "success", - // duration: 2000, - // }); - // this.getList(); - // }) - // .catch(() => { - // this.listLoading = false; - // }); + this.$axios + .posts( + "/api/settleaccount/wmsSharePartoutput/WmsSharePartOutPutModify", + this.listOutPutQuery + ) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "操作成功", + type: "success", + duration: 2000, + }); + this.getList(); + }) + .catch(() => { + this.listLoading = false; + }); } }, //取消出库单 @@ -469,7 +469,7 @@ export default { //出库单 handleCreateBills(row) { this.dialogFormVisible = true; - this.formLoading = true; + //this.formLoading = true; this.listOutPutQuery.guids = []; this.listOutPutQuery.version = this.customerInfo.version; this.listOutPutQuery.billNum = this.customerInfo.parentId; diff --git a/vue/src/views/ux/vw/dataInput/hq_kb_output/detail.vue b/vue/src/views/ux/vw/dataInput/hq_kb_output/detail.vue new file mode 100644 index 00000000..0074429b --- /dev/null +++ b/vue/src/views/ux/vw/dataInput/hq_kb_output/detail.vue @@ -0,0 +1,761 @@ + + + + + + + + diff --git a/vue/src/views/ux/vw/dataInput/hq_kb_output/index.vue b/vue/src/views/ux/vw/dataInput/hq_kb_output/index.vue new file mode 100644 index 00000000..31235291 --- /dev/null +++ b/vue/src/views/ux/vw/dataInput/hq_kb_output/index.vue @@ -0,0 +1,340 @@ + + + + + + + + diff --git a/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue b/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue index 0379a3b8..2b4deafb 100644 --- a/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue +++ b/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue @@ -1,4 +1,4 @@ - +