From 6a06a50adcfef7e98f18c4c9f8a36aef103fe9f2 Mon Sep 17 00:00:00 2001 From: 44673626 <44673626@qq.com> Date: Wed, 29 Dec 2021 17:14:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E7=89=A9=E6=96=99=E7=BB=84?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=8C=E5=85=88=E5=89=8D=E4=BA=A4=E7=BB=99?= =?UTF-8?q?=E5=AE=9E=E4=B9=A0=E7=94=9F=E5=81=9A=E7=9A=84=E6=9C=89=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E8=87=AA=E5=B7=B1=E5=8F=88=E6=94=B9=E4=B8=80?= =?UTF-8?q?=E9=81=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/src/router/modules/vw_menu.js | 36 ++-- .../ux/billManage/FisUnSettledDiff/index.vue | 2 +- .../InvoiceSettledDetailDiff/index.vue | 110 ++++++++-- .../billManage/InvoiceSettledDiff/index.vue | 2 +- .../ux/billManage/IssuedUnsettled/index.vue | 2 +- .../ux/billManage/SettleDoorPanel/index.vue | 2 +- .../UnInvoiceSettledDetailDiff/index.vue | 14 +- .../billManage/UnSettleDiffExport/index.vue | 14 +- .../ux/billManage/UnSettledDiff/index.vue | 2 +- .../ux/billManage/kanBanWithCode/index.vue | 33 ++- .../views/ux/billManage/sparePart/index.vue | 188 ++++++++++------ .../views/ux/billManage/vwOutOrder/detail.vue | 200 ++++++++++++------ .../views/ux/billManage/vwOutOrder/index.vue | 5 +- vue/static/tableFieldForSearch.json | 18 ++ 14 files changed, 441 insertions(+), 187 deletions(-) diff --git a/vue/src/router/modules/vw_menu.js b/vue/src/router/modules/vw_menu.js index 2ec6da00..5d8e00ed 100644 --- a/vue/src/router/modules/vw_menu.js +++ b/vue/src/router/modules/vw_menu.js @@ -41,7 +41,7 @@ const vwMenudataRouter = { meta: { title: 'FIS结算明细', roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色） - icon: '结算' + icon: '库存' } }, { @@ -59,9 +59,9 @@ const vwMenudataRouter = { component: () => import('@/views/ux/vw/dataInput/vwKanBan/index'), name: 'VWKanBan',//命名路由 meta: { - title: '大众看板结算明细', + title: '大众看板结算导入', roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色） - icon: '发运' + icon: '看板' } }, { @@ -69,9 +69,9 @@ const vwMenudataRouter = { component: () => import('@/views/ux/vw/dataInput/SparePart'), name: 'SparePart',//命名路由 meta: { - title: '大众备件结算明细导入', + title: '大众备件结算导入', roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色） - icon: '结算' + icon: '工厂' } }, { @@ -104,7 +104,7 @@ const vwMenudataRouter = { meta: { title: '发票与结算核对汇总', roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） - icon: '结算对比' + icon: '结算' } }, { @@ -122,7 +122,7 @@ const vwMenudataRouter = { component: () => import('@/views/ux/billManage/UnInvoiceSettledDetailDiff'), name: 'UnInvoiceSettledDetailDiff',//命名路由 meta: { - title: '准时化量差输出', + title: '准时化量差价差输出', roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） icon: '售后' } @@ -132,19 +132,29 @@ const vwMenudataRouter = { component: () => import('@/views/ux/billManage/UnSettleDiffExport'), name: 'UnSettleDiffExport',//命名路由 meta: { - title: '准时化未结差异比对输出', + title: '准时化未结核对', roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） - icon: '售后' + icon: '器具' } }, + { + path: '/unsettled-detail',//大众准时化未结明细表（包含漏结，漏结要有标识） + component: () => import('@/views/ux/billManage/IssuedUnsettled/index'), + name: 'UnsettledDetail',//命名路由 + meta: { + title: '准时化未结明细', + roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） + icon: '报表' + } + }, { path: '/kbwithcode', component: () => import('@/views/ux/billManage/kanBanWithCode'), name: 'KanBanWithCode',//命名路由 meta: { - title: '看板结算数量差异输出', + title: '看板结算输出', //roles: ['SettleAccount.EstimatedStockDiffReports'],//控制页面角色（可以设置多个角色） - icon: '对比' + icon: '看板' } }, @@ -153,9 +163,9 @@ const vwMenudataRouter = { component: () => import('@/views/ux/billManage/sparePart'), name: 'SparePartReport',//命名路由 meta: { - title: '备件结算数量差异输出', + title: '备件结算输出', //roles: ['abpvnext_master.ProjectPeople'],//控制页面角色（可以设置多个角色） - icon: '二配' + icon: '供货' } } ] diff --git a/vue/src/views/ux/billManage/FisUnSettledDiff/index.vue b/vue/src/views/ux/billManage/FisUnSettledDiff/index.vue index cb67d913..d37088e2 100644 --- a/vue/src/views/ux/billManage/FisUnSettledDiff/index.vue +++ b/vue/src/views/ux/billManage/FisUnSettledDiff/index.vue @@ -512,7 +512,7 @@ export default { tempsTabs.push({ label: "单据流水号", prop: "taskId", - width: 80, + width: 130, }); tempsTabs.push({ label: "当前版本", diff --git a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue index c40a4b55..0541e6fd 100644 --- a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue +++ b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue @@ -63,7 +63,7 @@ 说明：每间隔15秒进行自动刷新！说明：每间隔30秒进行自动刷新！ @@ -83,6 +83,7 @@ border highlight-current-row style="width: 100%" + @sort-change="sortChange" @row-click="handleRowClick" @selection-change="handleSelectionChange" @filter-change="filterChange" @@ -402,11 +403,34 @@ + + {{ item.label }} + {{ + item.value + }} + + + @@ -534,28 +558,25 @@ - + - - - - + - + - - - + { clearInterval(timer); @@ -897,7 +916,7 @@ export default { width: 220, }); tempsTabs.push({ - label: "状态", + label: "审批状态", prop: "fileName", width: 150, }); @@ -905,6 +924,33 @@ export default { }, }, methods: { + sortChange(data) { + const { prop, order } = data; + if (!prop || !order) { + this.handleFilter(); + return; + } + this.listQuery.Sorting = prop + " " + order; + console.log(this.listQuery.Sorting); + this.handleFilter(); + }, + /** 筛选操作 */ + handleFilter() { + this.page = 1; + this.getList(); + this.listQuery.Filters = []; + if (this.searchContent != "") { + var column = "taskId"; + let filter = { + logic: 0, + column: column, + action: 0, + value: this.searchContent, + }; + this.listQuery.Filters.push(filter); + } + this.getList(); + }, handleSelectionChange(val) { this.multipleSelection = val; }, @@ -988,14 +1034,15 @@ export default { type: "warning", }) .then(() => { - alert(this.JobversionValue); this.$axios .posts( "/api/settleaccount/wmsjitoutput/WmsJitOutPut", this.listBillQuery ) .then((response) => { - console.log("检查柱护板-hostCheckQuery"+JSON.stringify(response)); + console.log( + "检查柱护板-hostCheckQuery" + JSON.stringify(response) + ); const index = this.list.indexOf(row); this.$notify({ title: "成功", @@ -1003,12 +1050,11 @@ export default { type: "success", duration: 2000, }); - + this.getList(); }); }) .catch(() => { - this.$message({ type: "info", message: "已取消操作", @@ -1206,12 +1252,34 @@ export default { }); }, //获取物料组车型 + // getMaterialGroup() { + // this.$axios + // .posts("/api/settleaccount/CodeSetting/list", { + // project: "物料组", + // maxResultCount: 1000, + // skipCount: 0, + // }) + // .then((response) => { + // this.materialGroupList = []; + // response.items.forEach((element) => { + // let options = {}; + // options.value = element.description; + // options.label = element.value; + // this.materialGroupList.push(options); + // }); + // }) + // .catch(() => { + // this.listLoading = false; + // }); + // }, + //获取物料组车型 getMaterialGroup() { this.$axios .posts("/api/settleaccount/CodeSetting/list", { project: "物料组", maxResultCount: 1000, skipCount: 0, + sorting:"value ascending" }) .then((response) => { this.materialGroupList = []; diff --git a/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue index 0d9c579d..53b6a364 100644 --- a/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue +++ b/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue @@ -626,7 +626,7 @@ export default { tempsTabs.push({ label: "单据流水号", prop: "taskId", - width: 85, + width: 130, }); tempsTabs.push({ label: "模块名称", diff --git a/vue/src/views/ux/billManage/IssuedUnsettled/index.vue b/vue/src/views/ux/billManage/IssuedUnsettled/index.vue index fe737698..6e6ac6a8 100644 --- a/vue/src/views/ux/billManage/IssuedUnsettled/index.vue +++ b/vue/src/views/ux/billManage/IssuedUnsettled/index.vue @@ -730,7 +730,7 @@ export default { tempsTabs.push({ label: "单据流水号", prop: "taskId", - width: 85, + width: 130, }); tempsTabs.push({ label: "模块名称", diff --git a/vue/src/views/ux/billManage/SettleDoorPanel/index.vue b/vue/src/views/ux/billManage/SettleDoorPanel/index.vue index 2aa3f604..c810301d 100644 --- a/vue/src/views/ux/billManage/SettleDoorPanel/index.vue +++ b/vue/src/views/ux/billManage/SettleDoorPanel/index.vue @@ -772,7 +772,7 @@ export default { tempsTabs.push({ label: "单据流水号", prop: "taskId", - width: 85, + width: 130, }); tempsTabs.push({ label: "模块名称", diff --git a/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue b/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue index cd71ff50..068ea053 100644 --- a/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue +++ b/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue @@ -385,18 +385,21 @@ - {{ item.label }} {{ @@ -774,7 +777,7 @@ export default { tempsTabs.push({ label: "单据流水号", prop: "taskId", - width: 85, + width: 130, }); tempsTabs.push({ label: "模块名称", @@ -954,6 +957,7 @@ export default { project: "物料组", maxResultCount: 1000, skipCount: 0, + sorting: "value ascending", }) .then((response) => { this.materialGroupList = []; diff --git a/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue b/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue index dcc93423..bfd56ab4 100644 --- a/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue +++ b/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue @@ -386,18 +386,21 @@ - {{ item.label }} {{ @@ -731,7 +734,7 @@ export default { tempsTabs.push({ label: "单据流水号", prop: "taskId", - width: 85, + width: 130, }); tempsTabs.push({ label: "模块名称", @@ -906,6 +909,7 @@ export default { project: "物料组", maxResultCount: 1000, skipCount: 0, + sorting: "value ascending", }) .then((response) => { this.materialGroupList = []; diff --git a/vue/src/views/ux/billManage/UnSettledDiff/index.vue b/vue/src/views/ux/billManage/UnSettledDiff/index.vue index fc2a3da1..c3602e58 100644 --- a/vue/src/views/ux/billManage/UnSettledDiff/index.vue +++ b/vue/src/views/ux/billManage/UnSettledDiff/index.vue @@ -728,7 +728,7 @@ export default { tempsTabs.push({ label: "单据流水号", prop: "taskId", - width: 85, + width: 130, }); tempsTabs.push({ label: "模块名称", diff --git a/vue/src/views/ux/billManage/kanBanWithCode/index.vue b/vue/src/views/ux/billManage/kanBanWithCode/index.vue index f7a365ec..8c051717 100644 --- a/vue/src/views/ux/billManage/kanBanWithCode/index.vue +++ b/vue/src/views/ux/billManage/kanBanWithCode/index.vue @@ -35,7 +35,7 @@ @click="handleCreateBills()" >生成出库单(支持批量) - - {{ item.label }} {{ @@ -464,25 +467,23 @@ - - - + @@ -754,18 +755,13 @@ export default { prop: "createdAt", width: 150, }); - tempsTabs.push({ + tempsTabs.push({ label: "说明", prop: "remark", width: 220, }); - // tempsTabs.push({ - // label: "操作名称", - // prop: "actionName", - // width: 120, - // }); tempsTabs.push({ - label: "状态", + label: "审批状态", prop: "fileName", width: 150, }); @@ -825,7 +821,7 @@ export default { }); }); }, - handleConfirm(row){ + handleConfirm(row) { if (this.multipleSelection.length == 0) { this.$message({ message: "至少选择一行！", @@ -1014,6 +1010,7 @@ export default { project: "物料组", maxResultCount: 1000, skipCount: 0, + sorting: "value ascending", }) .then((response) => { this.materialGroupList = []; diff --git a/vue/src/views/ux/billManage/sparePart/index.vue b/vue/src/views/ux/billManage/sparePart/index.vue index 5149bd7e..567066e5 100644 --- a/vue/src/views/ux/billManage/sparePart/index.vue +++ b/vue/src/views/ux/billManage/sparePart/index.vue @@ -35,7 +35,7 @@ @click="handleCreateBills()" >生成出库单(支持批量) - - {{ item.label }} {{ @@ -428,17 +431,30 @@ - + + + + + + + @@ -483,37 +499,60 @@ - - + + - - + + - - - + + - +
@@ -577,6 +616,25 @@ export default { return time.getTime() <= new Date(this.startTime).getTime(); }, }, + pickerOptions1: { + disabledDate: (time) => { + //return time.getTime() <= new Date(this.startTime).getTime() || time.getTime() > Date.now(); + return time.getTime() <= new Date(this.startTime).getTime(); + }, + }, + + pickerOptions2: { + disabledDate: (time) => { + //if (this.endTime != "") { + return time.getTime() > new Date(this.cp5endTime).getTime(); + //} + }, + }, + pickerOptions3: { + disabledDate: (time) => { + return time.getTime() <= new Date(this.cp5startTime).getTime(); + }, + }, startTime: "", endTime: "", pickerOptionsCp7: { @@ -601,6 +659,7 @@ export default { radio: "0", //结算状态：0未结 1部分结算 versionList: [], materialGroupList: [], + getmaterialGroupValue: "", // 是否显示详细弹出层 openView: false, versionValue: "", @@ -630,16 +689,20 @@ export default { searchContent: "", // 输入内容 form: {}, formCount: { - name: "未结算对比", - // datetime5: [], - // datetime7: [], - settledate: "", - materialCode: "", - sapMaterialCode: "", - chassisNumber: "", - kennCode: "", - version: "", + startTime: "", + endTime: "", + cp5startTime: "", + cp5endTime: "", + // name: "未结算对比", + // settledate: "", + // materialCode: "", + // sapMaterialCode: "", + // chassisNumber: "", + // kennCode: "", + // version: "", }, + cp5startTime: "", + cp5endTime: "", list: null, totalCount: 0, listLoading: true, @@ -724,7 +787,7 @@ export default { tempsTabs.push({ label: "单据流水号", prop: "taskId", - width: 85, + width: 130, }); tempsTabs.push({ label: "模块名称", @@ -746,13 +809,8 @@ export default { prop: "remark", width: 220, }); - // tempsTabs.push({ - // label: "操作名称", - // prop: "actionName", - // width: 120, - // }); tempsTabs.push({ - label: "状态", + label: "审批状态", prop: "fileName", width: 150, }); @@ -760,6 +818,15 @@ export default { }, }, methods: { + //cp5 + getdateValueCp5(val) { + this.cp5startTime = val; + this.getbalanceIndexData(); + }, + getdateValCp5(val) { + this.cp5endTime = val; + this.getbalanceIndexData(); + }, handleSelectionChange(val) { this.multipleSelection = val; }, @@ -812,7 +879,7 @@ export default { }); }); }, - handleConfirm(row){ + handleConfirm(row) { if (this.multipleSelection.length == 0) { this.$message({ message: "至少选择一行！", @@ -994,20 +1061,20 @@ export default { this.listLoading = false; }); }, - //获取物料组车型 getMaterialGroup() { this.$axios .posts("/api/settleaccount/CodeSetting/list", { project: "物料组", maxResultCount: 1000, skipCount: 0, + sorting: "value ascending", }) .then((response) => { this.materialGroupList = []; response.items.forEach((element) => { let options = {}; options.value = element.description; - options.label = element.description; + options.label = element.value; this.materialGroupList.push(options); }); }) @@ -1021,7 +1088,8 @@ export default { this.datetime5 = []; this.startTime = ""; this.endTime = ""; - // this.datetime7 = []; + this.cp5startTime = ""; + this.cp5endTime = ""; }, save() { this.$refs.formCount.validate((valid) => { @@ -1031,22 +1099,18 @@ export default { if (this.formCount.materialCode != "") { this.listExportQuery.materialCode = this.formCount.materialCode; //物料号 } - // if (this.formCount.sapMaterialCode != "") { - // this.listExportQuery.sapMaterialCode = this.formCount.sapMaterialCode; //厂内物料号 - // } + if (this.formCount.sapCode != "") { + this.listExportQuery.sapCode = this.formCount.sapCode; //厂内物料号 + } if (this.formCount.kennCode != "") { this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号 } - var getdate5 = JSON.stringify(this.datetime5); - if (getdate5 != "[]") { - alert(this.datetime5[0]); - this.listExportQuery.begin = this.datetime5 - ? this.datetime5[0] || undefined - : undefined; - this.listExportQuery.end = this.datetime5 - ? this.datetime5[1] || undefined - : undefined; - } + this.listExportQuery.begin = this.cp5startTime + ? this.cp5startTime + : undefined; + this.listExportQuery.end = this.cp5endTime + ? this.cp5endTime + : undefined; if (this.startTime != "") { this.listExportQuery.cp7begin = this.startTime; //CP7开始时间 } @@ -1057,8 +1121,7 @@ export default { this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号 } if (this.formCount.materialGroupValue != "") { - this.listExportQuery.materialGroup = - this.formCount.materialGroupValue; //物料组车型 + this.listExportQuery.materialGroup = this.getmaterialGroupValue; //物料组车型 } console.log( "大众备件结算核对-导出条件：" + JSON.stringify(this.listExportQuery) @@ -1096,6 +1159,11 @@ export default { this.formTitle = "报表统计"; this.isEdit = false; this.form = {}; + this.datetime5 = []; + this.startTime = ""; + this.endTime = ""; + this.cp5startTime = ""; + this.cp5endTime = ""; this.dialogFormVisible = true; }, filterHandler(value, row, column) { diff --git a/vue/src/views/ux/billManage/vwOutOrder/detail.vue b/vue/src/views/ux/billManage/vwOutOrder/detail.vue index f64c24b9..b3bea7bf 100644 --- a/vue/src/views/ux/billManage/vwOutOrder/detail.vue +++ b/vue/src/views/ux/billManage/vwOutOrder/detail.vue @@ -10,6 +10,12 @@ @click="handleDownload()" >导出全部 --> + { this.customerInfo.parentId = element.ParentId; + this.customerInfo.version = element.Version; }); if (this.customerInfo.parentId != "") { this.getList(); @@ -209,21 +228,38 @@ export default { tempsTabs.push({ label: "版本", prop: "version", - width: 150, + width: 110, }); tempsTabs.push({ label: "零件号", prop: "materialCode", width: 150, }); + tempsTabs.push({ label: "KEEN号", prop: "kennCode", width: 170 }); + tempsTabs.push({ label: "底盘号", prop: "chassisNumber", width: 190 }); tempsTabs.push({ label: "零件描述", prop: "materialDesc", width: 250 }); tempsTabs.push({ label: "物料组", prop: "materialGroup", width: 220 }); - tempsTabs.push({ label: "数量", prop: "wmsBillNum", width: 100 }); + tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 100 }); + tempsTabs.push({ label: "数量", prop: "qty", width: 100 }); tempsTabs.push({ label: "状态", prop: "state", width: 100 }); return tempsTabs; }, }, methods: { + //版本下拉列表选择项 + JobVersionValue(params) { + //版本下拉选择 + this.listQuery.Filters = []; + var column = "state"; + let filter = { + logic: 0, + column: column, + action: 0, + value: params.value, + }; + this.listQuery.Filters.push(filter); + this.getList(); + }, //取消出库单 handleCancelBills(row) { if (this.multipleSelection.length == 0) { @@ -233,8 +269,7 @@ export default { }); return; } - //var params = []; - var params = ""; + var params = []; let myalert = ""; //声明变量，其变量必须在此声明后使用 if (row) { //单行 @@ -244,13 +279,14 @@ export default { //多选 this.multipleSelection.forEach((element) => { let id = element.id; - //params.push(id); - params += id + ","; + params.push(id); }); myalert = "选中项"; } - this.listOutPutQuery.version = row.version; - this.listOutPutQuery.ids = params.substr(0, params.length - 1); + 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: "确定", @@ -284,59 +320,96 @@ export default { //出库单 handleCreateBills(row) { if (this.multipleSelection.length == 0) { - this.$message({ - message: "至少选择一行！", + this.listLoading = true; + this.listOutPutQuery.guids = []; + this.listOutPutQuery.version = this.customerInfo.version; + this.listOutPutQuery.billNum = this.customerInfo.parentId; + console.log( + "未选择时全部确认出库条件：" + JSON.stringify(this.listOutPutQuery) + ); + this.$confirm("是否全部确认出库?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", type: "warning", - }); - return; - } - //var params = []; - 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); - params += id + ","; - }); - myalert = "选中项"; - } - this.listOutPutQuery.version = row.version; - this.listOutPutQuery.ids = params.substr(0, params.length - 1); - - this.$confirm("是否确认出库" + myalert + "?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }) - .then(() => { - this.$axios - .posts( - "/api/settleaccount/wmsjitoutput/WmsJitOutPut-Pass", - this.listOutPutQuery - ) - .then((response) => { - const index = this.list.indexOf(row); - this.$notify({ - title: "成功", - message: "生成成功", - type: "success", - duration: 2000, + }) + .then(() => { + this.$axios + .posts( + "/api/settleaccount/wmsjitoutput/WmsJitOutPut-Pass", + this.listOutPutQuery + ) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "生成成功", + type: "success", + duration: 2000, + }); + this.getList(); + this.listLoading = false; }); - this.getList(); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", }); + this.listLoading = false; + }); + } else { + this.listLoading = true; + 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 = "选中项"; + } + 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", }) - .catch(() => { - this.$message({ - type: "info", - message: "已取消操作", + .then(() => { + this.$axios + .posts( + "/api/settleaccount/wmsjitoutput/WmsJitOutPut-Pass", + this.listOutPutQuery + ) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "生成成功", + type: "success", + duration: 2000, + }); + this.getList(); + this.listLoading = false; + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", + }); + this.listLoading = false; }); - }); + } }, /** 刷新列表 */ handleHandle(data) { @@ -346,6 +419,15 @@ export default { }, /** 格式化字段 */ fieldFormatter(row, column) { + if (column.property == "state") { + return { + 0: "未处理", + 1: "申请出库", + 2: "确认出库", + 3: "不能出库", + 4: "取消出库", + }[row[column.property]]; + } return row[column.property] || "--"; }, importExcelData() { diff --git a/vue/src/views/ux/billManage/vwOutOrder/index.vue b/vue/src/views/ux/billManage/vwOutOrder/index.vue index ab32ba22..90727815 100644 --- a/vue/src/views/ux/billManage/vwOutOrder/index.vue +++ b/vue/src/views/ux/billManage/vwOutOrder/index.vue @@ -105,9 +105,10 @@ import Detail from "./detail"; import moment from "moment"; import { formatTimeToTimestamp } from "@/utils/index"; + export default { name: "sendUnsettledDiffReport", - components: { Pagination, Detail }, + components: { Pagination, Detail}, directives: { permission }, data() { return { @@ -216,9 +217,11 @@ export default { handleDrawerOpen(param) { this.drawer = true; var parentId = param.billNum; //单据号 + var version = param.version; //版本 this.customerInfos = [ { ParentId: parentId, + Version: version, }, ]; }, diff --git a/vue/static/tableFieldForSearch.json b/vue/static/tableFieldForSearch.json index 31f598ab..956275ca 100644 --- a/vue/static/tableFieldForSearch.json +++ b/vue/static/tableFieldForSearch.json @@ -2926,6 +2926,24 @@ "fieldType": 1, "fieldName": "materialGroup", "setting": [] + }, + { + "fieldId": 2, + "formType": "select", + "isNull": 0, + "name": "状态", + "options": "", + "type": 3, + "value": "", + "fieldType": 0, + "fieldName": "state", + "setting": [ + "未处理,0", + "申请出库,1", + "确认出库,2", + "不能出库,3", + "取消出库,4" + ] } ] }