From 6c26a1d556fd63a464274b535d079e4df32ebc3e Mon Sep 17 00:00:00 2001
From: zelian_wu <zelian.wu@xujiesoft.com>
Date: Tue, 26 Mar 2024 17:26:54 +0800
Subject: [PATCH] =?UTF-8?q?2024-03-26=20=E6=8A=A5=E4=BB=B7BOM=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quotationDetail/quoteRouting.vue          |   3 +
 .../test/testSoRouting/testRoutingTable.vue   | 154 +++++++++---------
 2 files changed, 80 insertions(+), 77 deletions(-)

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 {
               <el-input disabled v-model="testSoRouting.workCenterType"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="8" v-if="false">
             <el-form-item label="准备时间" prop="machSetupTime">
               <el-input-number @input="computeRequiredTime" style="width: 100%;margin-top: -5px;" :min="0" v-model="testSoRouting.machSetupTime" :controls="false"></el-input-number>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="8" v-if="false">
             <el-form-item label="单位产出量" prop="machRunFactor">
               <el-input-number @input="computeRequiredTime" style="width: 100%;margin-top: -5px;" :min="0" v-model="testSoRouting.machRunFactor" :controls="false"></el-input-number>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="8" v-if="false">
             <el-form-item label="效率%" prop="efficiency">
               <el-input-number @input="computeRequiredTime" style="width: 100%;margin-top: -5px;" :min="0" v-model="testSoRouting.efficiency" :controls="false"></el-input-number>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="8" v-if="false">
             <el-form-item label="产出单位" prop="factorUnit">
               <el-select v-model="testSoRouting.factorUnit" @change="computeRequiredTime"
                          style="width: 100%" placeholder="请选择" default-first-option>
@@ -695,7 +695,7 @@ export default {
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item label="需求时间" prop="requiredTime">
-              <el-input-number disabled style="width: 100%;margin-top: -5px;" :min="0" v-model="testSoRouting.requiredTime" :controls="false"></el-input-number>
+              <el-input-number style="width: 100%;margin-top: -5px;" :min="0" v-model="testSoRouting.requiredTime" :controls="false"></el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="8" v-if="false">