20241009

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

@@ -224,6 +224,24 @@ export default {
           columnProp: 'quotePrice',
           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: '5011Table4QuoteUnitPrice',
+          tableId: "5011Table4",
+          tableName: "报价材料信息",
+          columnProp: 'quoteUnitPrice',
+          headerAlign: "center",
+          align: "right",
           columnLabel: '材料标准总成本',
           columnHidden: false,
           columnImage: false,
@@ -251,6 +269,24 @@ export default {
           fixed: 'right',
           columnWidth: 100,
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5011,
+          serialNumber: '5011Table4AllQuotePrice',
+          tableId: "5011Table4",
+          tableName: "报价材料信息",
+          columnProp: 'allQuotePrice',
+          headerAlign: "center",
+          align: "right",
+          columnLabel: '报价成本总成本',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: 'right',
+          columnWidth: 100,
+        },
       ],
       props: {
         children: 'list',

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

@@ -55,6 +55,7 @@ export default {
       this.quoteDetail.totalCost =
         this.quoteDetail.adjustPartCost +
         this.quoteDetail.adjustBomUnYield +
+        this.quoteDetail.adjustQuoteCost +
         this.quoteDetail.adjustMachineCost +
         this.quoteDetail.adjustFabricateCost +
         this.quoteDetail.adjustLabourCost +
@@ -89,6 +90,8 @@ export default {
           this.quoteDetail.adjustPartCost = data.row.unitQuotePrice;
           this.quoteDetail.bomUnYield = data.row.actualQuotePrice;
           this.quoteDetail.adjustBomUnYield = data.row.actualQuotePrice;
+          this.quoteDetail.quoteCost = data.row.quoteCost;
+          this.quoteDetail.adjustQuoteCost = data.row.quoteCost;
           this.quoteDetail.labourCost = data.row.labourCost;
           this.quoteDetail.adjustLabourCost = data.row.labourCost;
           this.quoteDetail.machineCost = data.row.machineCost;
@@ -123,6 +126,12 @@ export default {
       }
       this.computeTotalCost();
     },
+    'quoteDetail.adjustQuoteCost'(newValue, oldValue){
+      if (newValue === undefined || newValue === null){
+        this.quoteDetail.adjustQuoteCost = 0;
+      }
+      this.computeTotalCost();
+    },
     'quoteDetail.adjustMachineCost'(newValue, oldValue){
       if (newValue === undefined || newValue === null){
         this.quoteDetail.adjustMachineCost = 0;
@@ -184,7 +193,7 @@ export default {
       <fieldset
         style="height:80px;margin-top: 2px;border-color: rgb(255,255,255);">
         <legend>系统自动计算结果(料工费/工具)</legend>
-        <el-row :gutter=" 10">
+        <el-row :gutter="10" type="flex">
           <el-col :span="4">
             <el-form-item label="材料标准成本:" prop="partCost" :show-message="false">
               <el-input-number style="width: 100%; " :controls="false"
@@ -197,6 +206,12 @@ export default {
                                v-model="quoteDetail.bomUnYield" :precision="4" disabled/>
             </el-form-item>
           </el-col>
+          <el-col :span="4">
+            <el-form-item label="材料报价成本:" prop="bomUnYield" :show-message="false">
+              <el-input-number style="width: 100%;" :controls="false"
+                               v-model="quoteDetail.quoteCost" :precision="4" disabled/>
+            </el-form-item>
+          </el-col>
           <el-col :span="4">
             <el-form-item label="机器成本:" prop="machineCost" :show-message="false">
               <el-input-number style="width: 100%; " :controls="false"
@@ -226,7 +241,7 @@ export default {
       <fieldset
         style="height:80px;margin-top: 5px;border-color: rgb(255,255,255);">
         <legend>调整后成本(料工费/工具)</legend>
-        <el-row :gutter=" 10">
+        <el-row :gutter="10" type="flex">
           <el-col :span="4">
             <el-form-item label="材料标准成本:" prop="adjustPartCost" :show-message="false">
               <el-input-number style="width: 100%;" :controls="false"
@@ -239,6 +254,12 @@ export default {
                                v-model="quoteDetail.adjustBomUnYield" :disabled="quoteDetail.status === '下达'" :step="0" :precision="4" :min="0"/>
             </el-form-item>
           </el-col>
+          <el-col :span="4">
+            <el-form-item label="材料报价成本:" prop="adjustBomUnYield" :show-message="false">
+              <el-input-number style="width: 100%;" :controls="false"
+                               v-model="quoteDetail.adjustQuoteCost" :disabled="quoteDetail.status === '下达'" :step="0" :precision="4" :min="0"/>
+            </el-form-item>
+          </el-col>
           <el-col :span="4">
             <el-form-item label="机器成本:" prop="adjustMachineCost" :show-message="false">
               <el-input-number style="width: 100%;" :controls="false"
@@ -268,7 +289,7 @@ export default {
       <fieldset
         style="height:80px;margin-top: 5px;border-color: rgb(255,255,255)">
         <legend>其他成本</legend>
-        <el-row :gutter=" 10">
+        <el-row :gutter="10" type="flex">
           <el-col :span="4">
             <el-form-item label="管理成本:" prop="manageCost" :show-message="false">
               <el-input-number style="width: 100%;" :controls="false"
@@ -299,11 +320,15 @@ export default {
                                v-model="quoteDetail.totalCost" :step="0" :precision="4" :min="0" disabled/>
             </el-form-item>
           </el-col>
+          <el-col :span="4">
+          </el-col>
+          <el-col :span="4">
+          </el-col>
         </el-row>
       </fieldset>
       <fieldset style="height:80px;margin-top: 5px;border-color: rgb(255,255,255);">
         <legend>利润</legend>
-        <el-row :gutter=" 10">
+        <el-row :gutter="10" type="flex">
           <el-col :span="4">
             <el-form-item label="利润率%:" prop="profitRate" :show-message="false">
               <el-input-number style="width: 100%;" :controls="false"
@@ -316,11 +341,21 @@ export default {
                                v-model="quoteDetail.profitAmount" :step="0" :precision="4" :min="0" disabled/>
             </el-form-item>
           </el-col>
+          <el-col :span="4">
+          </el-col>
+          <el-col :span="4">
+          </el-col>
+          <el-col :span="4">
+          </el-col>
+          <el-col :span="4">
+          </el-col>
+          <el-col :span="4">
+          </el-col>
         </el-row>
       </fieldset>
       <fieldset style="height:80px;margin-top: 5px;border-color: rgb(255,255,255);">
         <legend>最终价格</legend>
-        <el-row :gutter=" 10">
+        <el-row :gutter="10" type="flex">
           <el-col :span="4">
             <el-form-item label="未税总额:" prop="totalPrice" :show-message="false">
               <el-input-number style="width: 100%;" :controls="false"
@@ -351,6 +386,10 @@ export default {
                                v-model="quoteDetail.taxUnitPrice" :step="0" :precision="6" :min="0" disabled/>
             </el-form-item>
           </el-col>
+          <el-col :span="4">
+          </el-col>
+          <el-col :span="4">
+          </el-col>
         </el-row>
       </fieldset>
     </el-form>

src/views/modules/quote/quoteDetailReport.vue

@@ -0,0 +1,15 @@
+<script>
+export default {
+  name: "quoteDetailReport"
+}
+</script>
+
+<template>
+  <div>
+    <h1>Quote Detail Report</h1>
+  </div>
+</template>
+
+<style scoped>
+
+</style>