20240910

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,

src/views/modules/quote/detail/primary/quoteDetailCost.vue

@@ -162,7 +162,13 @@ export default {
         <legend>系统自动计算结果(料工费/工具)</legend>
         <el-row :gutter=" 10">
           <el-col :span="4">
-            <el-form-item label="材料成本:" prop="partCost" :show-message="false">
+            <el-form-item label="材料标准成本:" prop="partCost" :show-message="false">
+              <el-input-number style="width: 100%; " :controls="false"
+                               v-model="quoteDetail.partCost" :precision="4" disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="材料实际成本:" prop="partCost" :show-message="false">
               <el-input-number style="width: 100%; " :controls="false"
                                v-model="quoteDetail.partCost" :precision="4" disabled/>
             </el-form-item>
@@ -198,7 +204,13 @@ export default {
         <legend>调整后成本(料工费/工具)</legend>
         <el-row :gutter=" 10">
           <el-col :span="4">
-            <el-form-item label="材料成本:" prop="adjustPartCost" :show-message="false">
+            <el-form-item label="材料标准成本:" prop="adjustPartCost" :show-message="false">
+              <el-input-number style="width: 100%;" :controls="false"
+                               v-model="quoteDetail.adjustPartCost" :step="0" :precision="4" :min="0"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="材料实际成本:" prop="adjustPartCost" :show-message="false">
               <el-input-number style="width: 100%;" :controls="false"
                                v-model="quoteDetail.adjustPartCost" :step="0" :precision="4" :min="0"/>
             </el-form-item>

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',