diff --git a/vue/src/axios/index.js b/vue/src/axios/index.js index f020c7f7..34ee4e47 100644 --- a/vue/src/axios/index.js +++ b/vue/src/axios/index.js @@ -2,6 +2,7 @@ import router from '../router' import axios from 'axios' import qs from 'qs' import config from '../../static/config' +//import config from '../../public/config' import { Message, Loading diff --git a/vue/src/views/ux/billManage/WMSOutputSumReport/index.vue b/vue/src/views/ux/billManage/WMSOutputSumReport/index.vue index 24686ff2..a8f9f283 100644 --- a/vue/src/views/ux/billManage/WMSOutputSumReport/index.vue +++ b/vue/src/views/ux/billManage/WMSOutputSumReport/index.vue @@ -875,9 +875,7 @@ export default { /** 格式化字段 */ fieldFormatter(row, column) { if (column.property === "state") { - return { 0: "新建", 2: "成功", 1: "失败" }[ - row[column.property] - ]; + return { 0: "新建", 2: "成功", 1: "失败" }[row[column.property]]; } if ( column.property == "settleInputDate" || @@ -898,9 +896,13 @@ export default { this.showExcelImport = false; }, - getList() { + getList(data) { this.listLoading = true; - this.listQuery.SkipCount = (this.page - 1) * 10; + if (data != undefined) { + this.listQuery.SkipCount = (this.page - 1) * data.limit; + } else { + this.listQuery.SkipCount = (this.page - 1) * 15; + } if (this.JobversionValue != "") { this.listQuery.version = this.JobversionValue; } @@ -921,6 +923,9 @@ export default { .catch(() => { this.listLoading = false; }); + //清空 同步WMS至SAP信息 + this.resultData.errSize = 0; + this.resultData.successMessage = ""; }, /** 筛选操作 */ handleFilter() { diff --git a/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue b/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue index edc7a7de..d515117c 100644 --- a/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue +++ b/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue @@ -345,6 +345,11 @@ export default { tempsTabs.push({ label: "零件描述", prop: "materialDesc", width: 250 }); tempsTabs.push({ label: "寄售库存", prop: "stockQty", width: 100 }); tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 }); + tempsTabs.push({ + label: "实际出库数量", + prop: "realityNumber", + width: 160, + }); tempsTabs.push({ label: "状态", prop: "state", width: 100 }); return tempsTabs; }, @@ -406,7 +411,7 @@ export default { logic: 0, column: column, action: 0, - value: params.value, + value: params.value,realityNumber }; this.selectJobVersionValue = params.value; this.listQuery.Filters.push(filter); diff --git a/vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue b/vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue index a799a888..b656f58c 100644 --- a/vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue @@ -1,4 +1,4 @@ - + - +