From 447fae817ccd66c877de0f1c0090c3852141fe5c Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Thu, 31 Oct 2024 16:25:32 +0800
Subject: [PATCH] 20241030

---
 .../quote/detail/primary/quoteDetailCost.vue  | 10 ++++----
 src/views/modules/quote/quoteDetailReport.vue | 25 ++++++++++++++++---
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/quote/detail/primary/quoteDetailCost.vue b/src/views/modules/quote/detail/primary/quoteDetailCost.vue
index 3525dae..f33d6f4 100644
--- a/src/views/modules/quote/detail/primary/quoteDetailCost.vue
+++ b/src/views/modules/quote/detail/primary/quoteDetailCost.vue
@@ -182,7 +182,7 @@ export default {
     <!--系统自动计算结果-->
     <el-form :model="quoteDetail" ref="costForm" :rules="rules" label-position="top" label-width="120px">
       <fieldset
-        style="height:80px;margin-top: 2px;">
+        style="height:80px;margin-top: 2px;border: 1px solid #777;">
         <legend>系统自动计算结果(料工费/工具)</legend>
         <el-row :gutter="10" >
           <el-col :span="4">
@@ -224,7 +224,7 @@ export default {
         </el-row>
       </fieldset>
       <fieldset
-        style="height:80px;margin-top: 5px;">
+        style="height:80px;margin-top: 5px;border: 1px solid #777;">
         <legend>调整后成本(料工费/工具)</legend>
         <el-row :gutter="10" >
           <el-col :span="4">
@@ -266,7 +266,7 @@ export default {
         </el-row>
       </fieldset>
       <fieldset
-        style="height:80px;margin-top: 5px;">
+        style="height:80px;margin-top: 5px;border: 1px solid #777;">
         <legend>其他成本</legend>
         <el-row :gutter="10" >
           <el-col :span="4">
@@ -301,7 +301,7 @@ export default {
           </el-col>
         </el-row>
       </fieldset>
-      <fieldset style="height:80px;margin-top: 5px;">
+      <fieldset style="height:80px;margin-top: 5px;border: 1px solid #777;">
         <legend>利润</legend>
         <el-row :gutter="10" >
           <el-col :span="4">
@@ -318,7 +318,7 @@ export default {
           </el-col>
         </el-row>
       </fieldset>
-      <fieldset style="height:80px;margin-top: 5px;">
+      <fieldset style="height:80px;margin-top: 5px;border: 1px solid #777;">
         <legend>最终价格</legend>
         <el-row :gutter="10" >
           <el-col :span="4">
diff --git a/src/views/modules/quote/quoteDetailReport.vue b/src/views/modules/quote/quoteDetailReport.vue
index 0985689..9014f50 100644
--- a/src/views/modules/quote/quoteDetailReport.vue
+++ b/src/views/modules/quote/quoteDetailReport.vue
@@ -7,6 +7,7 @@ import BreakdownCost from "./detail/breakdownCost.vue";
 import BuSelect from "../../../components/selector/select/BuSelect.vue";
 import {queryPropertyTemplate} from "../../../api/property/template";
 import {queryPropertyTemplateDetailAvailableList} from "../../../api/property/templateDetail";
+import {againQuote} from "../../../api/quote/quote";
 
 export default {
   name: "quoteDetailReport",
@@ -393,6 +394,24 @@ export default {
         this.$message.error(error)
       })
     },
+    handleAgainQuote(row){
+      this.$confirm('确定重新报价该报价单吗？').then(()=>{
+        let params = {
+          id:row.quoteId,
+          createBy: this.$store.state.user.name,
+        }
+        againQuote(params).then(({data})=>{
+          if (data && data.code === 0){
+            this.$message.success(data.msg)
+            this.handleQuery();
+          }else {
+            this.$message.warning(data.msg)
+          }
+        }).catch((error)=>{
+          this.$message.error(error)
+        })
+      })
+    }
   },
   created() {
     this.getSiteAndBuByUserName();
@@ -492,7 +511,7 @@ export default {
                        width="100"
                        label="操作">
         <template slot-scope="{row,$index}">
-          <a>重新报价</a>
+          <a @click="handleAgainQuote(row)">重新报价</a>
         </template>
       </el-table-column>
     </el-table>
@@ -668,12 +687,12 @@ export default {
         <el-table-column label="属性值" header-align="center" min-width="140" prop="value">
           <template slot-scope="scope">
             <template v-if="scope.row.valueTypeDb==='T' && scope.row.valueChooseFlag==='Y'">
-              <el-select v-model="scope.row['textValue']" placeholder="请选择" style="width: 100%">
+              <el-select v-model="scope.row['textValue']" placeholder="请选择" style="width: 100%" clearable>
                 <el-option :label="available.availableValue" :value="available.availableValue" :key="available.id" v-for="(available) in scope.row.availableList"></el-option>
               </el-select>
             </template>
             <template v-else-if="scope.row.valueTypeDb==='N' && scope.row.valueChooseFlag==='Y'">
-              <el-select v-model="scope.row['numValue']" placeholder="请选择" style="width: 100%">
+              <el-select v-model="scope.row['numValue']" placeholder="请选择" style="width: 100%" clearable>
                 <el-option :label="available.availableValue" :value="available.availableValue" :key="available.id" v-for="(available) in scope.row.availableList"></el-option>
               </el-select>
             </template>