diff --git a/vue/src/components/ImportExcel-base/index.vue b/vue/src/components/ImportExcel-base/index.vue index 735d4a6b..53c2b244 100644 --- a/vue/src/components/ImportExcel-base/index.vue +++ b/vue/src/components/ImportExcel-base/index.vue @@ -303,6 +303,7 @@ export default { vWKanBan: "大众看板结算明细", scrapClaims: "CP7报废和索赔", sparePart: "大众备件结算明细", + sparePart90: "大众备件结算明细调整数据", hqHPlatform: "红旗H平台", hqMPlatform: "红旗M平台", hqFPlatform: "红旗F平台", //红旗F平台导入 @@ -345,6 +346,7 @@ export default { vWKanBan: "/api/settleaccount/VWKanBan/ExcelImport", //大众看板结算明细导入 scrapClaims: "/api/settleaccount/ScrapClaims/ExcelImport", //CP7报废和索赔导入 sparePart: "/api/settleaccount/SparePart/ExcelImport", //大众备件结算明细导入 + sparePart90: "/api/settleaccount/SparePart/ExcelImport90", //大众备件结算数据调整导入 hqHPlatform: "/api/settleaccount/HQHPlatform/ExcelImport", //红旗H平台导入 hqMPlatform: "/api/settleaccount/HQMPlatform/ExcelImport", //红旗M平台导入 hqFPlatform: "/api/settleaccount/HQFPlatform/ExcelImport", //红旗F平台导入 diff --git a/vue/src/router/modules/vw_menu.js b/vue/src/router/modules/vw_menu.js index 666a6709..89e4db69 100644 --- a/vue/src/router/modules/vw_menu.js +++ b/vue/src/router/modules/vw_menu.js @@ -74,6 +74,16 @@ const vwMenudataRouter = { icon: '工厂' } }, + { + path: 'spare-part-90', + component: () => import('@/views/ux/vw/dataInput/SparePart90'), + name: 'SparePart90',//命名路由 + meta: { + title: '大众备件结算调整', + roles: ['SettleAccount.SparePart'],//控制页面角色(可以设置多个角色) + icon: '工厂' + } + }, { path: 'scrap-claims', component: () => import('@/views/ux/vw/dataInput/ScrapClaims'), @@ -186,6 +196,16 @@ const vwMenudataRouter = { roles: ['SettleAccount.Reports'],//控制页面角色(可以设置多个角色) icon: '供货' } + }, + { + path: '/vwsparepart90', + component: () => import('@/views/ux/billManage/sparePart90'), + name: 'SparePart90Report',//命名路由 + meta: { + title: '备件数据调整输出', + 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 d5a1b27f..7925ae0c 100644 --- a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue +++ b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue @@ -782,19 +782,32 @@ export default { customerInfos: "", searchContent: "", // 输入内容 form: {}, + // formCount: { + // startTime: "", + // endTime: "", + // cp5startTime: "", + // cp5endTime: "", + // // name: "未结算对比", + // // settledate: "", + // // materialCode: "", + // // sapMaterialCode: "", + // // chassisNumber: "", + // // kennCode: "", + // // version: "", + // }, + formCount: { + versionValue: undefined, startTime: "", endTime: "", cp5startTime: "", cp5endTime: "", - // name: "未结算对比", - // settledate: "", - // materialCode: "", - // sapMaterialCode: "", - // chassisNumber: "", - // kennCode: "", - // version: "", + materialCode: undefined, + sapCode: undefined, + kennCode: undefined, + chassisNumber: undefined, }, + cp5startTime: "", cp5endTime: "", dataKenCode: "", @@ -967,23 +980,22 @@ export default { }); return; } else { - var getbillNum = ""; - var getTaskState=""; + var getbillNum = ""; + var getTaskState = ""; //判断已经生成出库单的不能再生成出库操作 this.multipleSelection.forEach((element) => { let state = element.fileName; if (state != "" && state != "已确认") { this.isEdit = true; getbillNum += state + ","; - } - else if(element.stateName != "Succeeded"){ - this.isTaskSuccess=true; - getTaskState+=element.taskId; + } else if (element.stateName != "Succeeded") { + this.isTaskSuccess = true; + getTaskState += element.taskId; } }); } //任务不成功的不能单击确认 - if(this.isTaskSuccess == true){ + if (this.isTaskSuccess == true) { this.$message({ message: "有未成功的任务,不能单击确认!:" + @@ -1056,22 +1068,21 @@ export default { return; } else { var getbillNum = ""; - var getTaskState=""; + var getTaskState = ""; //判断已经生成出库单的不能再生成出库操作 this.multipleSelection.forEach((element) => { let state = element.fileName; if (state != "" && state != "已确认") { this.isEdit = true; getbillNum += state + ","; - } - else if(element.stateName != "Succeeded"){ - this.isTaskSuccess=true; - getTaskState+=element.taskId; + } else if (element.stateName != "Succeeded") { + this.isTaskSuccess = true; + getTaskState += element.taskId; } }); } //任务不成功的不能单击确认 - if(this.isTaskSuccess == true){ + if (this.isTaskSuccess == true) { this.$message({ message: "有未成功的任务,不能单击确认!:" + diff --git a/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue index 4444b4a4..3d000416 100644 --- a/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue +++ b/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue @@ -530,13 +530,13 @@ export default { name: "未结算对比", // datetime5: [], // datetime7: [], - settledate: "", - materialCode: "", - sapMaterialCode: "", - sapCode: "", - chassisNumber: "", - kennCode: "", - version: "", + settledate: undefined, + materialCode: undefined, + sapMaterialCode: undefined, + sapCode: undefined, + chassisNumber: undefined, + kennCode: undefined, + version: undefined, }, list: null, totalCount: 0, diff --git a/vue/src/views/ux/billManage/SettleDoorPanel/index.vue b/vue/src/views/ux/billManage/SettleDoorPanel/index.vue index c810301d..00000723 100644 --- a/vue/src/views/ux/billManage/SettleDoorPanel/index.vue +++ b/vue/src/views/ux/billManage/SettleDoorPanel/index.vue @@ -687,10 +687,10 @@ export default { endTime: "", cp5startTime: "", cp5endTime: "", - materialCode: "", - sapMaterialCode: "", - chassisNumber: "", - kennCode: "", + materialCode: undefined, + sapMaterialCode: undefined, + chassisNumber: undefined, + kennCode: undefined, }, list: null, totalCount: 0, diff --git a/vue/src/views/ux/billManage/kanBanWithCode/index.vue b/vue/src/views/ux/billManage/kanBanWithCode/index.vue index d2ac6c6d..96e50bf0 100644 --- a/vue/src/views/ux/billManage/kanBanWithCode/index.vue +++ b/vue/src/views/ux/billManage/kanBanWithCode/index.vue @@ -649,13 +649,13 @@ export default { name: "未结算对比", // datetime5: [], // datetime7: [], - kanBan: "", //看板 - settledate: "", - materialCode: "", //客户物料号 - sapMaterialCode: "", //厂内物料号 - chassisNumber: "", - kennCode: "", - version: "", + kanBan: undefined, //看板 + settledate: undefined, + materialCode: undefined, //客户物料号 + sapMaterialCode:undefined, //厂内物料号 + chassisNumber: undefined, + kennCode: undefined, + version: undefined, }, list: null, totalCount: 0, diff --git a/vue/src/views/ux/billManage/kanBanWithOutCode/index.vue b/vue/src/views/ux/billManage/kanBanWithOutCode/index.vue index cbbad397..f53e6021 100644 --- a/vue/src/views/ux/billManage/kanBanWithOutCode/index.vue +++ b/vue/src/views/ux/billManage/kanBanWithOutCode/index.vue @@ -649,13 +649,13 @@ export default { name: "未结算对比", // datetime5: [], // datetime7: [], - kanBan: "", //看板 - settledate: "", - materialCode: "", //客户物料号 - sapMaterialCode: "", //厂内物料号 - chassisNumber: "", - kennCode: "", - version: "", + kanBan: undefined, //看板 + settledate: undefined, + materialCode: undefined, //客户物料号 + sapMaterialCode: undefined, //厂内物料号 + chassisNumber: undefined, + kennCode: undefined, + version: undefined, }, list: null, totalCount: 0, diff --git a/vue/src/views/ux/billManage/sparePart/index.vue b/vue/src/views/ux/billManage/sparePart/index.vue index 2c9705c7..143ea982 100644 --- a/vue/src/views/ux/billManage/sparePart/index.vue +++ b/vue/src/views/ux/billManage/sparePart/index.vue @@ -741,7 +741,7 @@ export default { // sapMaterialCode: "", // chassisNumber: "", // kennCode: "", - // version: "", + version: undefined, }, cp5startTime: "", cp5endTime: "", diff --git a/vue/src/views/ux/billManage/sparePart90/index.vue b/vue/src/views/ux/billManage/sparePart90/index.vue new file mode 100644 index 00000000..f69cdb0a --- /dev/null +++ b/vue/src/views/ux/billManage/sparePart90/index.vue @@ -0,0 +1,1362 @@ + + + + + + + + + 统计 + + 删除(支持批量) + 已确认(支持批量) + 生成出库单(支持批量) + + + + + + + + + + 说明:每间隔3分钟进行自动刷新! + + + + + + + + + {{ scope.column.label }} + + + + + + + + + + {{ item.label }} + + + + + + + + + 下载 + 检验失败,下载 + + + + + + + + + + + + + + + + + + + + + + + {{ item.title }} + + + + + + + + + + + + + + 当前状态:等待执行 + + + 当前状态:执行中... + + + + + 执行结果:执行成功 + + + 执行结果:执行失败 + + + + + + {{ + form.name + }} + {{ + form.actionName + }} + + + {{ + form.creator + }} + + + + + + + 下载错误数据 + + + 下载生成数据 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vue/src/views/ux/billManage/sparepartOutOrder90/detail.vue b/vue/src/views/ux/billManage/sparepartOutOrder90/detail.vue new file mode 100644 index 00000000..3133b696 --- /dev/null +++ b/vue/src/views/ux/billManage/sparepartOutOrder90/detail.vue @@ -0,0 +1,676 @@ + + + + + + + 确认出库单 + 取消出库(支持批量) + + 删除出库单(支持批量) + + + 搜索 + + + + + + + + + + + {{ scope.column.label }} + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vue/src/views/ux/billManage/sparepartOutOrder90/index.vue b/vue/src/views/ux/billManage/sparepartOutOrder90/index.vue new file mode 100644 index 00000000..904d5dec --- /dev/null +++ b/vue/src/views/ux/billManage/sparepartOutOrder90/index.vue @@ -0,0 +1,340 @@ + + + + + + 搜索 + + 导入文件(Excel) + + + + + + + + {{ + scope.row.billNum + }} + + + + + + + {{ scope.column.label }} + + + + + + + + + + + + diff --git a/vue/src/views/ux/vw/dataInput/SparePart90/index.vue b/vue/src/views/ux/vw/dataInput/SparePart90/index.vue new file mode 100644 index 00000000..1d24ce4e --- /dev/null +++ b/vue/src/views/ux/vw/dataInput/SparePart90/index.vue @@ -0,0 +1,594 @@ + + + + + + 导入文件(Excel) + + + + + 导出数据 + + + 导出Excel + 导出Csv + + + + 搜索 + + + + + + + + + + + + {{ scope.row.version }} + + + + + + {{ scope.column.label }} + + + + + + + + + + + + + + diff --git a/vue/static/tableFieldForSearch.json b/vue/static/tableFieldForSearch.json index f201fd3c..c719e6ff 100644 --- a/vue/static/tableFieldForSearch.json +++ b/vue/static/tableFieldForSearch.json @@ -2733,6 +2733,81 @@ } ] }, + "sparePart90": { + "id": "36", + "data": [ + { + "fieldId": 3, + "formType": "text", + "name": "采购类型", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "purchaseType", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "采购订单号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "purchaseOrderNo", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "物料代码", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "materialCode", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "交货单号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "deliveryOrderNo", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "批次号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "batchNo", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "工厂", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "factory", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "工厂名称", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "factoryName", + "setting": [] + } + ] + }, "wmsSparePart": { "id": "36", "data": [
+ +