From 6f4e1d01bf7e55ba5d41ec2d3562f87670b7d3b3 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Tue, 17 Dec 2024 17:59:48 +0800
Subject: [PATCH] 2024-12-17

---
 .../project/projectPart/projectPartQuote.vue  | 37 +++++++++++++++++++
 .../quotation/inquiry/inquiryQuoteDetail.vue  | 36 ++++++++++++++++++
 .../detail/primary/quoteDetailRouting.vue     | 19 ++++------
 .../modules/quote/detail/quoteDetail.vue      | 36 ++++++++++++++++++
 4 files changed, 116 insertions(+), 12 deletions(-)

diff --git a/src/views/modules/project/projectPart/projectPartQuote.vue b/src/views/modules/project/projectPart/projectPartQuote.vue
index b7ecfac..310fef6 100644
--- a/src/views/modules/project/projectPart/projectPartQuote.vue
+++ b/src/views/modules/project/projectPart/projectPartQuote.vue
@@ -180,6 +180,43 @@ export default {
           fixed: '',
           columnWidth: 120
         },
+
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101002002,
+          serialNumber: '101002002Table2AdjustTestCost',
+          tableId: '101002002Table2',
+          tableName: '报价详情信息表',
+          columnProp: 'adjustTestCost',
+          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: 101002002,
+          serialNumber: '101002002Table2AdjustElseCost',
+          tableId: '101002002Table2',
+          tableName: '报价详情信息表',
+          columnProp: 'adjustElseCost',
+          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: 101002002,
diff --git a/src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue b/src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue
index cf12d31..2c2b453 100644
--- a/src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue
+++ b/src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue
@@ -180,6 +180,42 @@ export default {
           fixed: '',
           columnWidth: 120
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 102001,
+          serialNumber: '102001Table2AdjustTestCost',
+          tableId: '102001Table2',
+          tableName: '报价详情信息表',
+          columnProp: 'adjustTestCost',
+          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: 102001,
+          serialNumber: '102001Table2AdjustElseCost',
+          tableId: '102001Table2',
+          tableName: '报价详情信息表',
+          columnProp: 'adjustElseCost',
+          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: 102001,
diff --git a/src/views/modules/quote/detail/primary/quoteDetailRouting.vue b/src/views/modules/quote/detail/primary/quoteDetailRouting.vue
index 6605d00..56c715c 100644
--- a/src/views/modules/quote/detail/primary/quoteDetailRouting.vue
+++ b/src/views/modules/quote/detail/primary/quoteDetailRouting.vue
@@ -800,42 +800,37 @@ export default {
     <el-dialog title="工序金额信息" top="23vh" v-drag :visible.sync="quoteDetailRoutingVisible" width="500px" append-to-body :close-on-click-modal="false">
       <el-form label-position="top" ref="quoteDetailRoutingForm" :model="quoteDetailRouting" :rules="rules" label-width="100px">
         <el-row :gutter="10">
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="物料编码">
               <el-input v-model="quoteDetailRouting.partNo" disabled></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="16">
             <el-form-item label="物料描述">
               <el-input v-model="quoteDetailRouting.partDesc" disabled></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="8">
             <el-form-item label="工序编码">
               <el-input v-model="quoteDetailRouting.operationNo" disabled></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="16">
             <el-form-item label="工序名称">
               <el-input v-model="quoteDetailRouting.operationName" disabled></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label=" "></el-form-item>
-          </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="单位机器成本" prop="workCenterCost" :show-message="false">
               <el-input-number :min="0" :controls="false" :step="0" v-model="quoteDetailRouting.workCenterCost"></el-input-number>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="10">
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="单位人工成本-调机" prop="setupLaborClassCost" :show-message="false">
               <el-input-number :min="0" :controls="false" :step="0" v-model="quoteDetailRouting.setupLaborClassCost"></el-input-number>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="单位人工成本-生产" prop="laborClassCost" :show-message="false">
               <el-input-number :min="0" :controls="false" :step="0" v-model="quoteDetailRouting.laborClassCost"></el-input-number>
             </el-form-item>
diff --git a/src/views/modules/quote/detail/quoteDetail.vue b/src/views/modules/quote/detail/quoteDetail.vue
index da28adc..1551de2 100644
--- a/src/views/modules/quote/detail/quoteDetail.vue
+++ b/src/views/modules/quote/detail/quoteDetail.vue
@@ -238,6 +238,42 @@ export default {
           fixed: '',
           columnWidth: 120
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5011,
+          serialNumber: '5011Table2AdjustTestCost',
+          tableId: '5011Table2',
+          tableName: '报价详情信息表',
+          columnProp: 'adjustTestCost',
+          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: '5011Table2AdjustElseCost',
+          tableId: '5011Table2',
+          tableName: '报价详情信息表',
+          columnProp: 'adjustElseCost',
+          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,