diff --git a/vue/src/components/ImportExcel-base/index.vue b/vue/src/components/ImportExcel-base/index.vue index fac4ea54..68487ce1 100644 --- a/vue/src/components/ImportExcel-base/index.vue +++ b/vue/src/components/ImportExcel-base/index.vue @@ -309,8 +309,8 @@ export default { hqFPlatform: "红旗F平台", //红旗F平台导入 hqYPlatform: "一汽轿车", //一汽轿车平台导入 vwoutorder: "准时化出库单", - sparepartoutorder: "大众备件出库单", - sparepartoutorder90: "大众备件调整出库单", + sparepartoutorder: "大众备件无单号出库单", + sparepartoutorder90: "大众备件有单号出库单", kanbanoutorder: "大众看板出库单", HQ_H_OUTORDER: "红旗批量出库单", HQ_M_OUTORDER: "红旗M平台出库单", diff --git a/vue/src/router/modules/vw_menu.js b/vue/src/router/modules/vw_menu.js index 75de3c26..bf038578 100644 --- a/vue/src/router/modules/vw_menu.js +++ b/vue/src/router/modules/vw_menu.js @@ -202,7 +202,7 @@ const vwMenudataRouter = { component: () => import('@/views/ux/billManage/sparePart'), name: 'SparePartReport',//命名路由 meta: { - title: '大众备件手工汇总', + title: '大众备件数据输出', roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） icon: '供货' } @@ -212,7 +212,7 @@ const vwMenudataRouter = { component: () => import('@/views/ux/billManage/sparePart90'), name: 'SparePart90Report',//命名路由 meta: { - title: '大众备件明细输出', + title: '大众备件调整输出', roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） icon: '工厂' } diff --git a/vue/src/router/modules/wms_out_order.js b/vue/src/router/modules/wms_out_order.js index 7f5f544a..67b7ac33 100644 --- a/vue/src/router/modules/wms_out_order.js +++ b/vue/src/router/modules/wms_out_order.js @@ -69,6 +69,16 @@ const vwsOutOrderDataRouter = { icon: '零件' } }, + { + path: '/wms-unSettledSum', + component: () => import('@/views/ux/billManage/UnSettledSum'), + name: 'UnSettledSum',//命名路由 + meta: { + title: '结算未结寄售核对表', + roles: ['SettleAccount.WMSJIT'],//控制页面角色（可以设置多个角色） + icon: '零件' + } + }, diff --git a/vue/src/views/ux/billManage/UnSettledSum/index.vue b/vue/src/views/ux/billManage/UnSettledSum/index.vue new file mode 100644 index 00000000..ea75f24a --- /dev/null +++ b/vue/src/views/ux/billManage/UnSettledSum/index.vue @@ -0,0 +1,839 @@ + + + + + + + diff --git a/vue/src/views/ux/billManage/WMSOutputDetailDiffReport/index.vue b/vue/src/views/ux/billManage/WMSOutputDetailDiffReport/index.vue index 1fb94883..2acb0eb5 100644 --- a/vue/src/views/ux/billManage/WMSOutputDetailDiffReport/index.vue +++ b/vue/src/views/ux/billManage/WMSOutputDetailDiffReport/index.vue @@ -83,14 +83,15 @@ @click="handleFilter" >搜索 - + v-loading="formLoading1" + @click="handleContinueIssue()" + >继续出库 + -
{ + let id = element.id; + params.push(id); + }); + alert = "选中项"; - handleImportSap() { - // this.$nextTick(() => { - // this.$refs["formCount"].resetFields(); - // }); - this.dataValue = ""; - this.formTitle = "同步"; - this.isEdit = false; - this.form = {}; - this.dialogAccounDateVisible = true; + this.$confirm("是否确认继续出库" + alert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts( + "/api/settleaccount/WMSOutputDetailDiffReport/ModifyTaskState", + params + ) + .then((res) => { + if (res == true) { + this.$notify({ + title: "成功", + message: "出库成功", + type: "success", + duration: 2000, + }); + } else { + this.$message({ + type: "warning", + message: "执行失败！", + }); + } + this.formLoading1 = false; + this.getList(); + }); + }) + .catch(() => { + this.formLoading1 = false; + this.$message({ + type: "info", + message: "已取消操作", + }); + }); }, //生成出库单数据 save() { diff --git a/vue/src/views/ux/billManage/kanbanOutOrder/detail_old.vue b/vue/src/views/ux/billManage/kanbanOutOrder/detail_old.vue new file mode 100644 index 00000000..3a9954a1 --- /dev/null +++ b/vue/src/views/ux/billManage/kanbanOutOrder/detail_old.vue @@ -0,0 +1,686 @@ + + + + + + + + diff --git a/vue/src/views/ux/billManage/kanbanWithOutOrder/detail_old.vue b/vue/src/views/ux/billManage/kanbanWithOutOrder/detail_old.vue new file mode 100644 index 00000000..51736b7b --- /dev/null +++ b/vue/src/views/ux/billManage/kanbanWithOutOrder/detail_old.vue @@ -0,0 +1,847 @@ + + + + + + + + + diff --git a/vue/src/views/ux/billManage/sparePart/index.vue b/vue/src/views/ux/billManage/sparePart/index.vue index 585a1fb3..3b1c7912 100644 --- a/vue/src/views/ux/billManage/sparePart/index.vue +++ b/vue/src/views/ux/billManage/sparePart/index.vue @@ -1202,54 +1202,54 @@ export default { }); }, //备件 - saveNoBill() { - this.$refs.formNoBill.validate((valid) => { - if (valid) { - this.formNoBillLoading = true; - this.listNoBillExportQuery.version = this.formNoBill.versionValue; //版本 - // if (this.formCount.materialCode != "") { - // this.listExportQuery.materialCode = this.formCount.materialCode; //物料号 - // } - if (this.formNoBill.sapCode != "") { - this.listNoBillExportQuery.sapCode = this.formNoBill.sapCode; //厂内物料号 - } - this.listNoBillExportQuery.begin = this.startTimeNoBill - ? this.startTimeNoBill - : undefined; - this.listNoBillExportQuery.end = this.endTimeNoBill - ? this.endTimeNoBill - : undefined; + // saveNoBill() { + // this.$refs.formNoBill.validate((valid) => { + // if (valid) { + // this.formNoBillLoading = true; + // this.listNoBillExportQuery.version = this.formNoBill.versionValue; //版本 + // // if (this.formCount.materialCode != "") { + // // this.listExportQuery.materialCode = this.formCount.materialCode; //物料号 + // // } + // if (this.formNoBill.sapCode != "") { + // this.listNoBillExportQuery.sapCode = this.formNoBill.sapCode; //厂内物料号 + // } + // this.listNoBillExportQuery.begin = this.startTimeNoBill + // ? this.startTimeNoBill + // : undefined; + // this.listNoBillExportQuery.end = this.endTimeNoBill + // ? this.endTimeNoBill + // : undefined; - console.log( - "大众备件未结明细-导出条件：" + - JSON.stringify(this.listNoBillExportQuery) - ); - this.$axios - .gets( - "/api/settleaccount/ReportMakeService/SharePartUnSettledExport", - this.listExportQuery - ) - .then((res) => { - let taskid = res; - if (Number.isInteger(taskid)) { - this.$notify({ - title: "成功", - message: "任务生成成功！任务号:" + taskid, - type: "success", - duration: 2000, - }); - } - this.getList(); - this.formNoBillLoading = false; - this.dialogFormNoBillVisible = false; - }) - .catch(() => { - this.formNoBillLoading = false; - this.dialogFormNoBillVisible = false; - }); - } - }); - }, + // console.log( + // "大众备件未结明细-导出条件：" + + // JSON.stringify(this.listNoBillExportQuery) + // ); + // this.$axios + // .gets( + // "/api/settleaccount/ReportMakeService/SharePartUnSettledExport", + // this.listExportQuery + // ) + // .then((res) => { + // let taskid = res; + // if (Number.isInteger(taskid)) { + // this.$notify({ + // title: "成功", + // message: "任务生成成功！任务号:" + taskid, + // type: "success", + // duration: 2000, + // }); + // } + // this.getList(); + // this.formNoBillLoading = false; + // this.dialogFormNoBillVisible = false; + // }) + // .catch(() => { + // this.formNoBillLoading = false; + // this.dialogFormNoBillVisible = false; + // }); + // } + // }); + // }, handleCreate() { // this.$nextTick(() => { // this.$refs["formCount"].resetFields(); @@ -1268,17 +1268,17 @@ export default { this.dialogFormVisible = true; }, //无条码备件明细统计 - handleCreateNoBill() { - if (this.$refs["formNoBill"] !== undefined) { - this.$refs["formNoBill"].resetFields(); - } - this.formTitle = "备件明细报表统计"; - this.isEdit = false; - this.formNoBill = {}; - this.startTimeNoBill = ""; - this.endTimeNoBill = ""; - this.dialogFormNoBillVisible = true; - }, + // handleCreateNoBill() { + // if (this.$refs["formNoBill"] !== undefined) { + // this.$refs["formNoBill"].resetFields(); + // } + // this.formTitle = "备件明细报表统计"; + // this.isEdit = false; + // this.formNoBill = {}; + // this.startTimeNoBill = ""; + // this.endTimeNoBill = ""; + // this.dialogFormNoBillVisible = true; + // }, filterHandler(value, row, column) { const property = column["property"]; return row[property] === value; diff --git a/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue b/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue index 1ed000ae..8975f9cf 100644 --- a/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue +++ b/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue @@ -30,7 +30,7 @@ size="mini" type="warning" icon="el-icon-download" - @click="print()" + @click="HandleOutPutCancel()" >取消出库(支持批量) 确认
@@ -259,7 +259,7 @@ export default { SkipCount: 0, MaxResultCount: 15, billNum: "", - version: "", + version: "", }, listOutPutQuery: { version: "", @@ -358,14 +358,9 @@ export default { this.listQuery.version = this.customerInfo.version; this.listQuery.billNum = this.customerInfo.parentId; - console.log( - "大众备件出库单导出：" + JSON.stringify(this.listQuery) - ); + console.log("大众备件出库单导出：" + JSON.stringify(this.listQuery)); this.$axios - .posts( - "/api/settleaccount/wmsSharePartoutput/Export", - this.listQuery - ) + .posts("/api/settleaccount/wmsSharePartoutput/Export", this.listQuery) .then((res) => { let fileNameOfProject = res; this.$axios @@ -465,73 +460,25 @@ export default { }); } }, - //取消出库单 - handleCancelBills(row) { - if (this.multipleSelection.length == 0) { - this.$message({ - message: "至少选择一行！", - type: "warning", - }); - return; - } - var params = []; - let myalert = ""; //声明变量，其变量必须在此声明后使用 - if (row) { - //单行 - params.push(row.id); - myalert = row.name; - } else { - //多选 - this.multipleSelection.forEach((element) => { - let id = element.id; - params.push(id); - }); - myalert = "选中项"; + save(row) { + if (this.formTitle == "撤销出库") { + this.CancelBills(row); + } else if (this.formTitle == "创建出库单") { + this.saveBills(row); } - this.listOutPutQuery.version = this.customerInfo.version; - this.listOutPutQuery.guids = params; - this.listOutPutQuery.billNum = this.customerInfo.parentId; - console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery)); - - this.$confirm("是否确认取消出库" + myalert + "?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }) - .then(() => { - this.$axios - .posts( - "/api/settleaccount/wmsSharePartoutput/WmsSharePartOutPut-Cancel", - this.listOutPutQuery - ) - .then((response) => { - const index = this.list.indexOf(row); - this.$notify({ - title: "成功", - message: "操作成功", - type: "success", - duration: 2000, - }); - this.getList(); - }); - }) - .catch(() => { - this.$message({ - type: "info", - message: "已取消操作", - }); - }); }, - print() { + + //确认出库单 + handleCreateBills() { this.dialogFormVisible = true; if (this.$refs["accountDatelist"] !== undefined) { this.$refs["accountDatelist"].resetFields(); } + this.formTitle = "创建出库单"; }, + //出库单 - handleCreateBills(row) { - this.dialogFormVisible = true; - //this.formLoading = true; + saveBills(row) { this.listOutPutQuery.guids = []; this.listOutPutQuery.version = this.customerInfo.version; this.listOutPutQuery.billNum = this.customerInfo.parentId; @@ -540,7 +487,6 @@ export default { message: "请选择日期！", type: "warning", }); - this.getList(); return; //this.getList(); } else { @@ -549,7 +495,7 @@ export default { } //this.listOutPutQuery.accountDate = this.accountDatelist; console.log( - "未选择时全部确认出库条件：" + JSON.stringify(this.listOutPutQuery) + "全部确认出库条件：" + JSON.stringify(this.listOutPutQuery) ); this.$axios @@ -575,6 +521,88 @@ export default { }); } }, + //撤销出库 + HandleOutPutCancel() { + if (this.multipleSelection.length == 0) { + this.$message({ + message: "至少选择一行！", + type: "warning", + }); + return; + } + let myalert = "选中项"; //声明变量，其变量必须在此声明后使用 + this.$confirm("是否确认取消出库" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.dialogFormVisible = true; + if (this.$refs["accountDatelist"] !== undefined) { + this.$refs["accountDatelist"].resetFields(); + } + this.formTitle = "撤销出库"; + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", + }); + }); + }, + //取消出库单 + CancelBills(row) { + if (this.accountDatelist.accountDate == "") { + this.$message({ + message: "请选择日期！", + type: "warning", + }); + return; + } + var params = []; + if (row) { + //单行 + params.push(row.id); + } else { + //多选 + this.multipleSelection.forEach((element) => { + let id = element.id; + params.push(id); + }); + } + this.listOutPutQuery.version = this.customerInfo.version; + this.listOutPutQuery.guids = params; + this.listOutPutQuery.billNum = this.customerInfo.parentId; + this.listOutPutQuery.accountDate = this.accountDatelist.accountDate; + console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery)); + + this.$axios + .posts( + "/api/settleaccount/wmsSharePartoutput/WmsSharePartOutPut-Cancel", + this.listOutPutQuery + ) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "操作成功", + type: "success", + duration: 2000, + }); + this.accountDatelist.accountDate = ""; + this.dialogFormVisible = false; + this.getList(); + this.formLoading = false; + }) + .catch(() => { + this.formLoading = false; + this.$message({ + type: "info", + message: "调用服务出错！", + }); + }); + }, + //删除出库单 handleDelete(row) { var params = []; diff --git a/vue/src/views/ux/billManage/sparepartOutOrder/index.vue b/vue/src/views/ux/billManage/sparepartOutOrder/index.vue index e3c787f5..3aae6098 100644 --- a/vue/src/views/ux/billManage/sparepartOutOrder/index.vue +++ b/vue/src/views/ux/billManage/sparepartOutOrder/index.vue @@ -1,4 +1,4 @@ - +