diff --git a/src/views/modules/quotation/sellForQuotation/quotationDetail/quoteRouting.vue b/src/views/modules/quotation/sellForQuotation/quotationDetail/quoteRouting.vue index 13b47b4..f997940 100644 --- a/src/views/modules/quotation/sellForQuotation/quotationDetail/quoteRouting.vue +++ b/src/views/modules/quotation/sellForQuotation/quotationDetail/quoteRouting.vue @@ -9,6 +9,7 @@ import { searchQuoteBomList, searchQuoteBOMVersion } from "../../../../../api/quotation/quoteOfBom"; +import {Decimal} from "decimal.js"; export default { name: "quoteRouting", @@ -498,6 +499,8 @@ export default { this.setRunTimeDesc(i); let detail = this.routingDetailList[i]; // detail.machineCost 机器成本 + // detail.laborCosts 人工成本 + detail.laborCosts = new Decimal(detail.laborClassCost) } }, setRunTimeDesc(i){ diff --git a/src/views/modules/test/testSoRouting/testRoutingTable.vue b/src/views/modules/test/testSoRouting/testRoutingTable.vue index 33a0584..c958d52 100644 --- a/src/views/modules/test/testSoRouting/testRoutingTable.vue +++ b/src/views/modules/test/testSoRouting/testRoutingTable.vue @@ -188,78 +188,78 @@ export default { fixed: '', columnWidth: 100 }, - { - userId: this.$store.state.user.name, - functionId: 102001, - serialNumber: '102001Table3MachSetupTime', - tableId: '102001Table3', - tableName: '测试工艺路线', - columnProp: 'machSetupTime', - headerAlign: 'center', - align: 'center', - columnLabel: '准备时间', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 100 - }, - { - userId: this.$store.state.user.name, - functionId: 102001, - serialNumber: '102001Table3MachRunFactor', - tableId: '102001Table3', - tableName: '测试工艺路线', - columnProp: 'machRunFactor', - headerAlign: 'center', - align: 'center', - columnLabel: '单位产出量', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 100 - }, - { - userId: this.$store.state.user.name, - functionId: 102001, - serialNumber: '102001Table3Efficiency', - tableId: '102001Table3', - tableName: '测试工艺路线', - columnProp: 'efficiency', - headerAlign: 'center', - align: 'center', - columnLabel: '效率%', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 100 - }, - { - userId: this.$store.state.user.name, - functionId: 102001, - serialNumber: '102001Table3FactorUnit', - tableId: '102001Table3', - tableName: '测试工艺路线', - columnProp: 'factorUnit', - headerAlign: 'center', - align: 'center', - columnLabel: '产出单位', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 100 - }, + // { + // userId: this.$store.state.user.name, + // functionId: 102001, + // serialNumber: '102001Table3MachSetupTime', + // tableId: '102001Table3', + // tableName: '测试工艺路线', + // columnProp: 'machSetupTime', + // headerAlign: 'center', + // align: 'center', + // columnLabel: '准备时间', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // columnWidth: 100 + // }, + // { + // userId: this.$store.state.user.name, + // functionId: 102001, + // serialNumber: '102001Table3MachRunFactor', + // tableId: '102001Table3', + // tableName: '测试工艺路线', + // columnProp: 'machRunFactor', + // headerAlign: 'center', + // align: 'center', + // columnLabel: '单位产出量', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // columnWidth: 100 + // }, + // { + // userId: this.$store.state.user.name, + // functionId: 102001, + // serialNumber: '102001Table3Efficiency', + // tableId: '102001Table3', + // tableName: '测试工艺路线', + // columnProp: 'efficiency', + // headerAlign: 'center', + // align: 'center', + // columnLabel: '效率%', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // columnWidth: 100 + // }, + // { + // userId: this.$store.state.user.name, + // functionId: 102001, + // serialNumber: '102001Table3FactorUnit', + // tableId: '102001Table3', + // tableName: '测试工艺路线', + // columnProp: 'factorUnit', + // headerAlign: 'center', + // align: 'center', + // columnLabel: '产出单位', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // columnWidth: 100 + // }, { userId: this.$store.state.user.name, functionId: 102001, @@ -666,22 +666,22 @@ export default { - + - + - + - + @@ -695,7 +695,7 @@ export default { - +