diff --git a/src/views/modules/quote/detail/primary/quoteDetailBom.vue b/src/views/modules/quote/detail/primary/quoteDetailBom.vue
index 20dd9c2..162a095 100644
--- a/src/views/modules/quote/detail/primary/quoteDetailBom.vue
+++ b/src/views/modules/quote/detail/primary/quoteDetailBom.vue
@@ -173,7 +173,8 @@ export default {
status: true,
fixed: '',
columnWidth: 90,
- },{
+ },
+ {
userId: this.$store.state.user.name,
functionId: 5011,
serialNumber: '5011Table4UnitPrice',
@@ -182,7 +183,7 @@ export default {
columnProp: 'unitPrice',
headerAlign: "center",
align: "right",
- columnLabel: '单位成本',
+ columnLabel: '单位标准成本',
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -190,7 +191,44 @@ export default {
status: true,
fixed: '',
columnWidth: 90,
- },{
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 5011,
+ serialNumber: '5011Table4UnitPrice',
+ tableId: "5011Table4",
+ tableName: "报价材料信息",
+ columnProp: 'unitPrice',
+ 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,
+ serialNumber: '5011Table4QuotePrice',
+ tableId: "5011Table4",
+ tableName: "报价材料信息",
+ columnProp: 'quotePrice',
+ headerAlign: "center",
+ align: "right",
+ columnLabel: '材料总成本',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: 'right',
+ columnWidth: 90,
+ },
+ {
userId: this.$store.state.user.name,
functionId: 5011,
serialNumber: '5011Table4QuotePrice',
@@ -199,7 +237,7 @@ export default {
columnProp: 'quotePrice',
headerAlign: "center",
align: "right",
- columnLabel: '单位报价成本',
+ columnLabel: '材料实际总成本',
columnHidden: false,
columnImage: false,
columnSortable: false,
diff --git a/src/views/modules/quote/detail/primary/quoteDetailCost.vue b/src/views/modules/quote/detail/primary/quoteDetailCost.vue
index 3b1e7cc..928b45c 100644
--- a/src/views/modules/quote/detail/primary/quoteDetailCost.vue
+++ b/src/views/modules/quote/detail/primary/quoteDetailCost.vue
@@ -162,7 +162,13 @@ export default {
-
+
+
+
+
+
+
@@ -198,7 +204,13 @@ export default {
-
+
+
+
+
+
+
diff --git a/src/views/modules/quote/detail/primary/quoteDetailRouting.vue b/src/views/modules/quote/detail/primary/quoteDetailRouting.vue
index 6f05d70..a5eb2ca 100644
--- a/src/views/modules/quote/detail/primary/quoteDetailRouting.vue
+++ b/src/views/modules/quote/detail/primary/quoteDetailRouting.vue
@@ -229,7 +229,43 @@ export default {
status: true,
fixed: '',
columnWidth: 100,
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 5011,
+ serialNumber: '5011Table5LaborRunFactor',
+ tableId: "5011Table5",
+ tableName: "报价工艺信息",
+ columnProp: 'laborRunFactor',
+ headerAlign: "center",
+ align: "right",
+ columnLabel: '人工单位产出',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 120,
},{
+ userId: this.$store.state.user.name,
+ functionId: 5011,
+ serialNumber: '5011Table5LaborSetupTime',
+ tableId: "5011Table5",
+ tableName: "报价工艺信息",
+ columnProp: 'laborSetupTime',
+ headerAlign: "center",
+ align: "right",
+ columnLabel: '人工调机时间',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 100,
+ },
+ {
userId: this.$store.state.user.name,
functionId: 5011,
serialNumber: '5011Table5RunTimeDesc',
@@ -246,33 +282,35 @@ export default {
status: true,
fixed: '',
columnWidth: 100,
- },{
+ },
+ {
userId: this.$store.state.user.name,
functionId: 5011,
- serialNumber: '5011Table5LaborRunFactor',
+ serialNumber: '5011Table5MachCycleTime',
tableId: "5011Table5",
tableName: "报价工艺信息",
- columnProp: 'laborRunFactor',
+ columnProp: 'machCycleTime',
headerAlign: "center",
align: "right",
- columnLabel: '人工单位产出',
+ columnLabel: '机器处理时间',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 120,
- },{
+ columnWidth: 100,
+ },
+ {
userId: this.$store.state.user.name,
functionId: 5011,
- serialNumber: '5011Table5LaborSetupTime',
+ serialNumber: '5011Table5LaborCycleTime',
tableId: "5011Table5",
tableName: "报价工艺信息",
- columnProp: 'laborSetupTime',
+ columnProp: 'laborCycleTime',
headerAlign: "center",
align: "right",
- columnLabel: '人工调机时间',
+ columnLabel: '人工处理时间',
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -280,7 +318,8 @@ export default {
status: true,
fixed: '',
columnWidth: 100,
- },{
+ },
+ {
userId: this.$store.state.user.name,
functionId: 5011,
serialNumber: '5011Table5CrewSize',