diff --git a/src/views/modules/quote/detail/quoteDetail.vue b/src/views/modules/quote/detail/quoteDetail.vue index 1b58152..e08ff45 100644 --- a/src/views/modules/quote/detail/quoteDetail.vue +++ b/src/views/modules/quote/detail/quoteDetail.vue @@ -191,6 +191,24 @@ export default { fixed: '', columnWidth: 240 }, + { + userId: this.$store.state.user.name, + functionId: 5011, + serialNumber: '5011Table2QuoteTaxRate', + tableId: '5011Table2', + tableName: '报价详情信息表', + columnProp: 'customerPartNo', + headerAlign: 'center', + align: 'right', + columnLabel: '客户物料编码', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 90 + }, { userId: this.$store.state.user.name, functionId: 5011, @@ -212,85 +230,85 @@ export default { { userId: this.$store.state.user.name, functionId: 5011, - serialNumber: '5011Table2AdjustPartCost', + serialNumber: '5011Table2QuoteProfitRate', tableId: '5011Table2', tableName: '报价详情信息表', - columnProp: 'adjustPartCost', + columnProp: 'quoteProfitRate', headerAlign: 'center', align: 'right', - columnLabel: '材料成本', + columnLabel: 'VA%', columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 130 + columnWidth: 60 }, { userId: this.$store.state.user.name, functionId: 5011, - serialNumber: '5011Table2AdjustLabourCost', + serialNumber: '5011Table2QuoteTaxRate', tableId: '5011Table2', tableName: '报价详情信息表', - columnProp: 'adjustLabourCost', + columnProp: 'quoteTaxRate', headerAlign: 'center', align: 'right', - columnLabel: '人工成本', + columnLabel: 'Margin%', columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 120 + columnWidth: 60 }, { userId: this.$store.state.user.name, functionId: 5011, - serialNumber: '5011Table2AdjustMachineCost', + serialNumber: '5011Table2QuoteProfitAmount', tableId: '5011Table2', tableName: '报价详情信息表', - columnProp: 'adjustMachineCost', + columnProp: 'quoteProfitAmount', headerAlign: 'center', align: 'right', - columnLabel: '机器成本', + columnLabel: 'Contribution%', columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 120 + columnWidth: 100 }, { userId: this.$store.state.user.name, functionId: 5011, - serialNumber: '5011Table2AdjustToolCost', + serialNumber: '5011Table2AdjustPartCost', tableId: '5011Table2', tableName: '报价详情信息表', - columnProp: 'adjustToolCost', + columnProp: 'adjustPartCost', headerAlign: 'center', align: 'right', - columnLabel: '工具成本', + columnLabel: '材料成本', columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 120 + columnWidth: 130 }, { userId: this.$store.state.user.name, functionId: 5011, - serialNumber: '5011Table2AdjustTestCost', + serialNumber: '5011Table2AdjustLabourCost', tableId: '5011Table2', tableName: '报价详情信息表', - columnProp: 'adjustTestCost', + columnProp: 'adjustLabourCost', headerAlign: 'center', align: 'right', - columnLabel: '测试成本', + columnLabel: '人工成本', columnHidden: false, columnImage: false, columnSortable: false, @@ -302,13 +320,13 @@ export default { { userId: this.$store.state.user.name, functionId: 5011, - serialNumber: '5011Table2PackCost', + serialNumber: '5011Table2AdjustMachineCost', tableId: '5011Table2', tableName: '报价详情信息表', - columnProp: 'packCost', + columnProp: 'adjustMachineCost', headerAlign: 'center', align: 'right', - columnLabel: '包装成本', + columnLabel: '机器成本', columnHidden: false, columnImage: false, columnSortable: false, @@ -320,13 +338,13 @@ export default { { userId: this.$store.state.user.name, functionId: 5011, - serialNumber: '5011Table2ShippingCost', + serialNumber: '5011Table2AdjustToolCost', tableId: '5011Table2', tableName: '报价详情信息表', - columnProp: 'shippingCost', + columnProp: 'adjustToolCost', headerAlign: 'center', align: 'right', - columnLabel: '运输成本', + columnLabel: '工具成本', columnHidden: false, columnImage: false, columnSortable: false, @@ -338,13 +356,13 @@ export default { { userId: this.$store.state.user.name, functionId: 5011, - serialNumber: '5011Table2AdjustElseCost', + serialNumber: '5011Table2AdjustTestCost', tableId: '5011Table2', tableName: '报价详情信息表', - columnProp: 'adjustElseCost', + columnProp: 'adjustTestCost', headerAlign: 'center', align: 'right', - columnLabel: '其他成本', + columnLabel: '测试成本', columnHidden: false, columnImage: false, columnSortable: false, @@ -356,85 +374,85 @@ export default { { userId: this.$store.state.user.name, functionId: 5011, - serialNumber: '5011Table2TotalCost', + serialNumber: '5011Table2PackCost', tableId: '5011Table2', tableName: '报价详情信息表', - columnProp: 'totalCost', + columnProp: 'packCost', headerAlign: 'center', align: 'right', - columnLabel: '总成本', + columnLabel: '包装成本', columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 80 + columnWidth: 120 }, { userId: this.$store.state.user.name, functionId: 5011, - serialNumber: '5011Table2FinalTransactionPrice', + serialNumber: '5011Table2ShippingCost', tableId: '5011Table2', tableName: '报价详情信息表', - columnProp: 'finalTransactionPrice', + columnProp: 'shippingCost', headerAlign: 'center', align: 'right', - columnLabel: '最终交易价', + columnLabel: '运输成本', columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 80 + columnWidth: 120 }, { userId: this.$store.state.user.name, functionId: 5011, - serialNumber: '5011Table2QuoteProfitRate', + serialNumber: '5011Table2AdjustElseCost', tableId: '5011Table2', tableName: '报价详情信息表', - columnProp: 'quoteProfitRate', + columnProp: 'adjustElseCost', headerAlign: 'center', align: 'right', - columnLabel: 'VA%', + columnLabel: '其他成本', columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 80 + columnWidth: 120 }, { userId: this.$store.state.user.name, functionId: 5011, - serialNumber: '5011Table2QuoteProfitAmount', + serialNumber: '5011Table2TotalCost', tableId: '5011Table2', tableName: '报价详情信息表', - columnProp: 'quoteProfitAmount', + columnProp: 'totalCost', headerAlign: 'center', align: 'right', - columnLabel: 'Contribution%', + columnLabel: '总成本', columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 100 + columnWidth: 80 }, { userId: this.$store.state.user.name, functionId: 5011, - serialNumber: '5011Table2QuoteTaxRate', + serialNumber: '5011Table2FinalTransactionPrice', tableId: '5011Table2', tableName: '报价详情信息表', - columnProp: 'quoteTaxRate', + columnProp: 'finalTransactionPrice', headerAlign: 'center', align: 'right', - columnLabel: 'Margin%', + columnLabel: '最终交易价', columnHidden: false, columnImage: false, columnSortable: false, diff --git a/src/views/modules/quote/index.vue b/src/views/modules/quote/index.vue index 80bccf3..4356bd3 100644 --- a/src/views/modules/quote/index.vue +++ b/src/views/modules/quote/index.vue @@ -128,56 +128,38 @@ export default { { userId: this.$store.state.user.name, functionId: 5011, - serialNumber: '5011Table1PlmPartNo', - tableId: '5011Table1', - tableName: '报价信息表', - columnProp: 'plmPartNo', - headerAlign: 'center', - align: 'left', - columnLabel: 'PLM物料编码', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - }, - { - userId: this.$store.state.user.name, - functionId: 5011, - serialNumber: '5011Table1IfsPartNo', + serialNumber: '5011Table1QuoteVersionNo', tableId: '5011Table1', tableName: '报价信息表', - columnProp: 'ifsPartNo', + columnProp: 'buDesc', headerAlign: 'center', - align: 'left', - columnLabel: 'IFS物料编码', + align: 'center', + columnLabel: 'BU', columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 120 + columnWidth: 80 }, { userId: this.$store.state.user.name, functionId: 5011, - serialNumber: '5011Table1PartDesc', + serialNumber: '5011Table1QuoteVersionNo', tableId: '5011Table1', tableName: '报价信息表', - columnProp: 'partDesc', + columnProp: 'inquiryCreateBy', headerAlign: 'center', - align: 'left', - columnLabel: '物料名称', + align: 'center', + columnLabel: '销售', columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 200 + columnWidth: 80 }, { userId: this.$store.state.user.name, @@ -395,6 +377,60 @@ export default { fixed: '', columnWidth: 120 }, + { + userId: this.$store.state.user.name, + functionId: 5011, + serialNumber: '5011Table1PlmPartNo', + tableId: '5011Table1', + tableName: '报价信息表', + columnProp: 'plmPartNo', + headerAlign: 'center', + align: 'left', + columnLabel: 'PLM物料编码', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120 + }, + { + userId: this.$store.state.user.name, + functionId: 5011, + serialNumber: '5011Table1IfsPartNo', + tableId: '5011Table1', + tableName: '报价信息表', + columnProp: 'ifsPartNo', + headerAlign: 'center', + align: 'left', + columnLabel: 'IFS物料编码', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120 + }, + { + userId: this.$store.state.user.name, + functionId: 5011, + serialNumber: '5011Table1PartDesc', + tableId: '5011Table1', + tableName: '报价信息表', + columnProp: 'partDesc', + headerAlign: 'center', + align: 'left', + columnLabel: '物料名称', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 200 + }, { userId: this.$store.state.user.name, functionId: 5011,