From 76bba01451fda151677311e0e9317b03dd2cf423 Mon Sep 17 00:00:00 2001 From: qiezi <15576055375@163.com> Date: Tue, 29 Apr 2025 10:55:44 +0800 Subject: [PATCH] 20250429 --- .../board/VulcanizationDispatchOrder.vue | 45 ++-- src/views/modules/board/partInventory.vue | 229 +++++------------- .../modules/production/generateReport.vue | 4 +- .../modules/production/liuhuaProductView.vue | 3 +- 4 files changed, 78 insertions(+), 203 deletions(-) diff --git a/src/views/modules/board/VulcanizationDispatchOrder.vue b/src/views/modules/board/VulcanizationDispatchOrder.vue index 9fc06de..9b59e96 100644 --- a/src/views/modules/board/VulcanizationDispatchOrder.vue +++ b/src/views/modules/board/VulcanizationDispatchOrder.vue @@ -12,33 +12,16 @@ export default { firstReportDate2Flag:'Y', }, columnList: [ - { - tableId: "vulcanizationTable", - tableName: this.$route.meta.title, - columnProp: "site", - columnLabel: "工厂编码", - columnHidden: false, - columnImage: false, - columnSortable: false, - columnWidth: 70, - format: null, - functionId: this.$route.meta.menuId, - sortLv: 0, - status: true, - fixed: '', - serialNumber: null, - columnType: null, - align: 'left' - }, + {tableId: "vulcanizationTable", tableName: this.$route.meta.title, columnProp: "site", columnLabel: "工厂", columnHidden: false, columnImage: false, columnSortable: false, columnWidth: 40, format: null, functionId: this.$route.meta.menuId, sortLv: 0, status: true, fixed: '', serialNumber: null, columnType: null, align: 'left'}, { tableId: "vulcanizationTable", tableName: this.$route.meta.title, columnProp: "seqNo", - columnLabel: "派工单号", + columnLabel: "派工单", columnHidden: false, columnImage: false, columnSortable: false, - columnWidth: 70, + columnWidth: 60, format: null, functionId: this.$route.meta.menuId, sortLv: 0, @@ -73,7 +56,7 @@ export default { columnHidden: false, columnImage: false, columnSortable: false, - columnWidth: 120, + columnWidth: 60, format: null, functionId: this.$route.meta.menuId, sortLv: 0, @@ -109,7 +92,7 @@ export default { columnHidden: false, columnImage: false, columnSortable: false, - columnWidth: 70, + columnWidth: 60, format: null, functionId: this.$route.meta.menuId, sortLv: 0, @@ -127,7 +110,7 @@ export default { columnHidden: false, columnImage: false, columnSortable: false, - columnWidth: 70, + columnWidth: 60, format: null, functionId: this.$route.meta.menuId, sortLv: 0, @@ -145,7 +128,7 @@ export default { columnHidden: false, columnImage: false, columnSortable: false, - columnWidth: 70, + columnWidth: 60, format: null, functionId: this.$route.meta.menuId, sortLv: 0, @@ -163,7 +146,7 @@ export default { columnHidden: false, columnImage: false, columnSortable: false, - columnWidth: 130, + columnWidth: 120, format: null, functionId: this.$route.meta.menuId, sortLv: 0, @@ -181,7 +164,7 @@ export default { columnHidden: false, columnImage: false, columnSortable: false, - columnWidth: 130, + columnWidth: 75, format: null, functionId: this.$route.meta.menuId, sortLv: 0, @@ -194,12 +177,12 @@ export default { { tableId: "vulcanizationTable", tableName: this.$route.meta.title, - columnProp: "ScheduledDate", + columnProp: "scheduledDate", columnLabel: "派工日期", columnHidden: false, columnImage: false, columnSortable: false, - columnWidth: 130, + columnWidth: 120, format: null, functionId: this.$route.meta.menuId, sortLv: 0, @@ -212,12 +195,12 @@ export default { { tableId: "vulcanizationTable", tableName: this.$route.meta.title, - columnProp: "lastReportTimeDepartment", + columnProp: "latestReportDepartment", columnLabel: "最后报工工序", columnHidden: false, columnImage: false, columnSortable: false, - columnWidth: 130, + columnWidth: 90, format: null, functionId: this.$route.meta.menuId, sortLv: 0, @@ -235,7 +218,7 @@ export default { columnHidden: false, columnImage: false, columnSortable: false, - columnWidth: 130, + columnWidth: 90, format: null, functionId: this.$route.meta.menuId, sortLv: 0, diff --git a/src/views/modules/board/partInventory.vue b/src/views/modules/board/partInventory.vue index 93cc54b..ae6a908 100644 --- a/src/views/modules/board/partInventory.vue +++ b/src/views/modules/board/partInventory.vue @@ -11,7 +11,7 @@ export default { partDescription:'', spec:'', partType:'', - summaryType:3, + summaryType:1, warehouseId:'', locationId:'', batchNo:'', @@ -187,79 +187,7 @@ export default { columnProp: "firstInDate", headerAlign: "center", align: "center", - columnLabel: "入库日期", - columnHidden: false, - columnImage: false, - columnSortable: true, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 100 - }, - { - userId: this.$store.state.user.name, - functionId: 153, - serialNumber: '153Table1', - tableId: "153Table1", - tableName: "物料库存信息表", - columnProp: "freezeFlag", - headerAlign: "center", - align: "left", - columnLabel: "冻结", - columnHidden: false, - columnImage: false, - columnSortable: true, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 60 - }, - { - userId: this.$store.state.user.name, - functionId: 153, - serialNumber: '153Table1', - tableId: "153Table1", - tableName: "物料库存信息表", - columnProp: "partType", - headerAlign: "center", - align: "left", - columnLabel: "物料类别", - columnHidden: false, - columnImage: false, - columnSortable: true, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 80 - }, - { - userId: this.$store.state.user.name, - functionId: 153, - serialNumber: '153Table1', - tableId: "153Table1", - tableName: "物料库存信息表", - columnProp: "familyId", - headerAlign: "center", - align: "left", - columnLabel: "物料分类", - columnHidden: false, - columnImage: false, - columnSortable: true, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 80 - }, - { - userId: this.$store.state.user.name, - functionId: 153, - serialNumber: '153Table1', - tableId: "153Table1", - tableName: "物料库存信息表", - columnProp: "familyName", - headerAlign: "center", - align: "left", - columnLabel: "物料分类名称", + columnLabel: "首次入库日期", columnHidden: false, columnImage: false, columnSortable: true, @@ -322,42 +250,6 @@ export default { fixed: '', columnWidth: 100 }, - { - userId: this.$store.state.user.name, - functionId: 153, - serialNumber: '153Table1', - tableId: "153Table1", - tableName: "物料库存信息表", - columnProp: "partnerId", - headerAlign: "center", - align: "left", - columnLabel: "单位编码", - columnHidden: false, - columnImage: false, - columnSortable: true, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 60 - }, - { - userId: this.$store.state.user.name, - functionId: 153, - serialNumber: '153Table1', - tableId: "153Table1", - tableName: "物料库存信息表", - columnProp: "partnerType", - headerAlign: "center", - align: "left", - columnLabel: "单位类型", - columnHidden: false, - columnImage: false, - columnSortable: true, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 80 - }, { userId: this.$store.state.user.name, functionId: 153, @@ -412,24 +304,6 @@ export default { fixed: '', columnWidth: 100 }, - { - userId: this.$store.state.user.name, - functionId: 153, - serialNumber: '153Table1', - tableId: "153Table1", - tableName: "物料库存信息表", - columnProp: "demandPartnerId", - headerAlign: "center", - align: "left", - columnLabel: "产品库存所属客户编码", - columnHidden: false, - columnImage: false, - columnSortable: true, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 140 - }, { userId: this.$store.state.user.name, functionId: 153, @@ -500,6 +374,16 @@ export default { currentChangeHandle(val){ this.queryParams.no = val; this.handleQueryPartInventory(); + }, + getFullNum(num) { + if (isNaN(num)) { + return num; + } + let str = '' + num; + if (!/e/i.test(str)) { + return num; + } + return num.toFixed(18).replace(/\.?0+$/, ""); } }, created() { @@ -533,42 +417,42 @@ export default {