From ff4c1197cdd680c23ba61a2123d1f524a204fed4 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Tue, 18 Mar 2025 13:54:07 +0800
Subject: [PATCH] 20240318

---
 src/views/modules/quote/detail/quoteDetail.vue    |  4 ++--
 .../modules/quote/detail/quoteGroupDetail.vue     |  2 +-
 src/views/modules/quote/index.vue                 |  2 +-
 src/views/modules/quote/primary/quoteSearch.vue   |  1 +
 src/views/modules/quote/primary/quoteTable.vue    | 15 ++++++++++-----
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/quote/detail/quoteDetail.vue b/src/views/modules/quote/detail/quoteDetail.vue
index b43fc17..9d9dd37 100644
--- a/src/views/modules/quote/detail/quoteDetail.vue
+++ b/src/views/modules/quote/detail/quoteDetail.vue
@@ -660,7 +660,7 @@ export default {
 <template>
 <div class="rq">
   <template v-if="saveAuth">
-    <el-button type="primary" v-if="!authFlag" :disabled="quote.status === '下达' || !quote.status" @click="handleSaveQuoteDetail(null)">新增</el-button>
+    <el-button type="primary" v-if="!authFlag" :disabled="quote.status !== '草稿' || !quote.status" @click="handleSaveQuoteDetail(null)">新增</el-button>
   </template>
   <el-table  v-loading="queryLoading" border :data="dataList" style="width: 100%;margin-top: 5px" :height="height" @header-dragend="handleColumnResize">
     <el-table-column width="80" align="center" label="默认报价行" v-if="quoteGroupDetail && quoteGroupDetail.status === '草稿'">
@@ -702,7 +702,7 @@ export default {
         <a type="text" v-if="row.status === '草稿'" @click="handleSaveQuoteDetail(row)">编辑</a>
         <a type="text" v-if="row.status === '草稿'" @click="handleDeleteQuoteDetail(row)">删除</a>
 <!--        <a type="text" v-if="row.status !== '下达'" @click="againQuoteDetail(row)">重新报价</a>-->
-        <a type="text" v-if="row.status === '下达'" @click="handleDetail(row)">详情</a>
+        <a type="text" v-if="row.status !== '草稿'" @click="handleDetail(row)">详情</a>
       </template>
     </el-table-column>
   </el-table>
diff --git a/src/views/modules/quote/detail/quoteGroupDetail.vue b/src/views/modules/quote/detail/quoteGroupDetail.vue
index e2b4a63..c358c15 100644
--- a/src/views/modules/quote/detail/quoteGroupDetail.vue
+++ b/src/views/modules/quote/detail/quoteGroupDetail.vue
@@ -619,7 +619,7 @@ export default {
 
 <template>
 <div class="rq">
-  <el-button type="primary" v-if="!authFlag" :disabled="quote.status === '下达' || !quote.status" @click="handleSaveQuoteDetail(null)">新增</el-button>
+  <el-button type="primary" v-if="!authFlag" :disabled="quote.status !== '草稿' || !quote.status" @click="handleSaveQuoteDetail(null)">新增</el-button>
 
   <el-table  v-loading="queryLoading" border :data="dataList" style="width: 100%;margin-top: 5px" :height="height">
     <el-table-column type="index" width="55" align="center" label="序号"></el-table-column>
diff --git a/src/views/modules/quote/index.vue b/src/views/modules/quote/index.vue
index e640176..83f8ac7 100644
--- a/src/views/modules/quote/index.vue
+++ b/src/views/modules/quote/index.vue
@@ -600,7 +600,7 @@ export default {
             this.handleSearch();
             this.currentQuote = {
               ...row,
-              status: '下达',
+              status:row.enStatus
             }
           }else {
             this.$message.warning(data.msg)
diff --git a/src/views/modules/quote/primary/quoteSearch.vue b/src/views/modules/quote/primary/quoteSearch.vue
index 383cb5e..6f7b57f 100644
--- a/src/views/modules/quote/primary/quoteSearch.vue
+++ b/src/views/modules/quote/primary/quoteSearch.vue
@@ -74,6 +74,7 @@ export default {
             <el-select v-model="quote.status" style="width: 100%">
               <el-option label="全部" value=""></el-option>
               <el-option label="草稿" value="草稿"></el-option>
+              <el-option label="驳回" value="驳回"></el-option>
               <el-option label="下达" value="下达"></el-option>
             </el-select>
           </el-form-item>
diff --git a/src/views/modules/quote/primary/quoteTable.vue b/src/views/modules/quote/primary/quoteTable.vue
index 7b130e7..d6c11d4 100644
--- a/src/views/modules/quote/primary/quoteTable.vue
+++ b/src/views/modules/quote/primary/quoteTable.vue
@@ -43,8 +43,12 @@ export default {
     handleRemoveClick(row,$index){
       this.$emit('remove',row)
     },
-    handleUpdateStatus(row){
-      this.$emit('updateStatus',row)
+    handleUpdateStatus(row,status){
+      let params = {
+        ...row,
+        enStatus:status,
+      }
+      this.$emit('updateStatus',params)
     },
     handleQueryById(row){
       this.$emit('queryById',row)
@@ -127,9 +131,10 @@ export default {
       <template slot-scope="{row,$index}">
         <a type="text" v-if="row.status === '草稿'" @click="handleSaveClick(row)">编辑</a>
         <a type="text" v-if="row.status === '草稿'" @click="handleRemoveClick(row,$index)">删除</a>
-        <a type="text" v-if="row.status === '草稿'" @click="handleUpdateStatus(row)">下达</a>
-        <a type="text" v-if="row.status === '下达'" @click="handleQueryById(row)">详情</a>
-        <a type="text" @click="againQuote(row)">重新报价</a>
+        <a type="text" v-if="row.status === '草稿'" @click="handleUpdateStatus(row,'下达')">下达</a>
+        <a type="text" v-if="row.status === '草稿'" @click="handleUpdateStatus(row,'驳回')">驳回</a>
+        <a type="text" v-if="row.status !== '草稿'" @click="handleQueryById(row)">详情</a>
+<!--        <a type="text" @click="againQuote(row)">重新报价</a>-->
       </template>
     </el-table-column>
   </el-table>