diff --git a/vue/src/router/modules/wms_out_order.js b/vue/src/router/modules/wms_out_order.js index 271dde15..766cdb21 100644 --- a/vue/src/router/modules/wms_out_order.js +++ b/vue/src/router/modules/wms_out_order.js @@ -37,16 +37,16 @@ const vwsOutOrderDataRouter = { icon: '零件' } }, - // { - // path: '/nonDeliveryList', - // component: () => import('@/views/ux/billManage/NonDeliveryList'), - // name: 'NonDeliveryList',//命名路由 - // meta: { - // title: 'WMS未出库清单', - // roles: ['SettleAccount.Reports'],//控制页面角色(可以设置多个角色) - // icon: '零件' - // } - // }, + { + path: '/wmsOutputSumReport', + component: () => import('@/views/ux/billManage/WMSOutputSumReport'), + name: 'WMSOutputSumReport',//命名路由 + meta: { + title: '结算出库SAP接口', + roles: ['SettleAccount.Reports'],//控制页面角色(可以设置多个角色) + icon: '零件' + } + }, diff --git a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue index 217464cf..a5e75de2 100644 --- a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue +++ b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue @@ -1148,8 +1148,9 @@ export default { this.$axios .posts("/api/settleaccount/Job/versionlist", this.listQuery) .then((response) => { + let res = response.reverse(); //降序排列 this.JobVersionList = []; - response.forEach((element) => { + res.forEach((element, index) => { let options = {}; options.value = element; options.label = element; diff --git a/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue index 3f1dae5b..44502294 100644 --- a/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue +++ b/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue @@ -641,8 +641,9 @@ export default { this.$axios .posts("/api/settleaccount/Job/versionlist", this.listQuery) .then((response) => { + let res = response.reverse(); //降序排列 this.JobVersionList = []; - response.forEach((element) => { + res.forEach((element, index) => { let options = {}; options.value = element; options.label = element; diff --git a/vue/src/views/ux/billManage/KanbanUnSettled/index.vue b/vue/src/views/ux/billManage/KanbanUnSettled/index.vue index 47bf12d7..5a4aa18e 100644 --- a/vue/src/views/ux/billManage/KanbanUnSettled/index.vue +++ b/vue/src/views/ux/billManage/KanbanUnSettled/index.vue @@ -773,8 +773,9 @@ export default { this.$axios .posts("/api/settleaccount/Job/versionlist", this.listQuery) .then((response) => { + let res = response.reverse(); //降序排列 this.JobVersionList = []; - response.forEach((element) => { + res.forEach((element, index) => { let options = {}; options.value = element; options.label = element; @@ -1043,6 +1044,7 @@ export default { this.listLoading = true; //导入界面中超链接过来的参数 this.listQuery.name = "看板未结明细"; + this.listQuery.type = this.JobversionValue; this.$axios .posts("/api/settleaccount/Job/list", this.listQuery) .then((response) => { diff --git a/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue b/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue index 3d017b24..72bcdafa 100644 --- a/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue +++ b/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue @@ -781,8 +781,9 @@ export default { this.$axios .posts("/api/settleaccount/Job/versionlist", this.listQuery) .then((response) => { + let res = response.reverse(); //降序排列 this.JobVersionList = []; - response.forEach((element) => { + res.forEach((element, index) => { let options = {}; options.value = element; options.label = element; diff --git a/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue b/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue index 0cfacdae..1670bfdd 100644 --- a/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue +++ b/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue @@ -747,8 +747,9 @@ export default { this.$axios .posts("/api/settleaccount/Job/versionlist", this.listQuery) .then((response) => { + let res = response.reverse(); //降序排列 this.JobVersionList = []; - response.forEach((element) => { + res.forEach((element, index) => { let options = {}; options.value = element; options.label = element; diff --git a/vue/src/views/ux/billManage/WMSOutputSumReport/index.vue b/vue/src/views/ux/billManage/WMSOutputSumReport/index.vue new file mode 100644 index 00000000..4be2e7a8 --- /dev/null +++ b/vue/src/views/ux/billManage/WMSOutputSumReport/index.vue @@ -0,0 +1,717 @@ + + + + + + + + + + diff --git a/vue/src/views/ux/billManage/kanBanWithCode/index.vue b/vue/src/views/ux/billManage/kanBanWithCode/index.vue index d9848d84..d16a3be2 100644 --- a/vue/src/views/ux/billManage/kanBanWithCode/index.vue +++ b/vue/src/views/ux/billManage/kanBanWithCode/index.vue @@ -1106,8 +1106,9 @@ export default { this.$axios .posts("/api/settleaccount/Job/versionlist", this.listQuery) .then((response) => { + let res = response.reverse(); //降序排列 this.JobVersionList = []; - response.forEach((element) => { + res.forEach((element, index) => { let options = {}; options.value = element; options.label = element; diff --git a/vue/src/views/ux/billManage/sparePart/index.vue b/vue/src/views/ux/billManage/sparePart/index.vue index 051c14bb..585a1fb3 100644 --- a/vue/src/views/ux/billManage/sparePart/index.vue +++ b/vue/src/views/ux/billManage/sparePart/index.vue @@ -1057,8 +1057,9 @@ export default { this.$axios .posts("/api/settleaccount/Job/versionlist", this.listQuery) .then((response) => { + let res = response.reverse(); //降序排列 this.JobVersionList = []; - response.forEach((element) => { + res.forEach((element, index) => { let options = {}; options.value = element; options.label = element; diff --git a/vue/src/views/ux/billManage/sparePart90/index.vue b/vue/src/views/ux/billManage/sparePart90/index.vue index 0fd211a1..01851965 100644 --- a/vue/src/views/ux/billManage/sparePart90/index.vue +++ b/vue/src/views/ux/billManage/sparePart90/index.vue @@ -934,8 +934,9 @@ export default { this.$axios .posts("/api/settleaccount/Job/versionlist", this.listQuery) .then((response) => { + let res = response.reverse(); //降序排列 this.JobVersionList = []; - response.forEach((element) => { + res.forEach((element, index) => { let options = {}; options.value = element; options.label = element; 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 66b87e93..c6a5f7a1 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 @@ -1038,8 +1038,9 @@ export default { this.$axios .posts("/api/settleaccount/Job/versionlist", this.listQuery) .then((response) => { + let res = response.reverse(); //降序排列 this.JobVersionList = []; - response.forEach((element) => { + res.forEach((element, index) => { let options = {}; options.value = element; options.label = element; diff --git a/vue/src/views/ux/vw/dataInput/hq_y_report/index.vue b/vue/src/views/ux/vw/dataInput/hq_y_report/index.vue index fd3713c5..646d156f 100644 --- a/vue/src/views/ux/vw/dataInput/hq_y_report/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_y_report/index.vue @@ -255,7 +255,6 @@ - @@ -289,7 +288,6 @@ - - @@ -962,8 +959,9 @@ export default { this.$axios .posts("/api/settleaccount/Job/versionlist", this.listQuery) .then((response) => { + let res = response.reverse(); //降序排列 this.JobVersionList = []; - response.forEach((element) => { + res.forEach((element, index) => { let options = {}; options.value = element; options.label = element; diff --git a/vue/src/views/ux/vw/dataInput/r3-open/index.vue b/vue/src/views/ux/vw/dataInput/r3-open/index.vue index 8df4ed6d..3fa74589 100644 --- a/vue/src/views/ux/vw/dataInput/r3-open/index.vue +++ b/vue/src/views/ux/vw/dataInput/r3-open/index.vue @@ -355,6 +355,11 @@ export default { //this.listLoading = false; }); }, + + + + + handleImportExcel() { //导入 this.showExcelImport = true; diff --git a/vue/static/tableFieldForSearch.json b/vue/static/tableFieldForSearch.json index e9f1e4f9..1f3cd826 100644 --- a/vue/static/tableFieldForSearch.json +++ b/vue/static/tableFieldForSearch.json @@ -2971,6 +2971,51 @@ } ] }, + "wmsOutputSumReport": { + "id": "36", + "data": [ + { + "fieldId": 3, + "formType": "text", + "name": "客户", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "client", + "setting": [] + }, + { + "fieldId": 3, + "formType": "text", + "name": "出库类型", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "type", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "物料组(车型)", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "materialGroup", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "状态", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "state", + "setting": [] + } + ] + }, "hqMPlatform": { "id": "36", "data": [