From 22222ab409c008a7d63ad28f14060dfa8b2aa091 Mon Sep 17 00:00:00 2001
From: jiayang yue <jiayang.yue@xujiesoft.com>
Date: Tue, 18 Mar 2025 23:47:18 +0800
Subject: [PATCH] =?UTF-8?q?2025.03.18=20=E8=AF=A2=E4=BB=B7=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/inquiry/inquiryApplication.vue    |  2 ++
 src/views/modules/inquiry/inquiryDetail.vue         |  2 ++
 .../inquiry/inquiryTechnicalMaterialsNoBuilt.vue    |  1 +
 src/views/modules/quote/quotes.vue                  | 13 ++++++++++---
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/inquiry/inquiryApplication.vue b/src/views/modules/inquiry/inquiryApplication.vue
index cb308aa..41502f7 100644
--- a/src/views/modules/inquiry/inquiryApplication.vue
+++ b/src/views/modules/inquiry/inquiryApplication.vue
@@ -55,6 +55,7 @@
           <el-option label="草稿" value="C"></el-option>
           <el-option label="下达" value="B"></el-option>
           <el-option label="已转报价" value="A"></el-option>
+          <el-option label="已驳回" value="D"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item :label="'PjM'">
@@ -139,6 +140,7 @@
               <span v-if="scope.row.status === 'C'">草稿</span>
               <span v-if="scope.row.status === 'B'">下达</span>
               <span v-if="scope.row.status === 'A'">已转报价</span>
+              <span v-if="scope.row.status === 'D'">已驳回</span>
             </span>
             <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
                                                style="width: 100px; height: 80px"/></span>
diff --git a/src/views/modules/inquiry/inquiryDetail.vue b/src/views/modules/inquiry/inquiryDetail.vue
index 4b08cc1..0dd7a78 100644
--- a/src/views/modules/inquiry/inquiryDetail.vue
+++ b/src/views/modules/inquiry/inquiryDetail.vue
@@ -91,6 +91,7 @@
           <el-option label="草稿" value="C"></el-option>
           <el-option label="已下达" value="B"></el-option>
           <el-option label="已转报价" value="A"></el-option>
+          <el-option label="已驳回" value="D"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item :label="' '">
@@ -144,6 +145,7 @@
               <span v-if="scope.row.status === 'C'">草稿</span>
               <span v-if="scope.row.status === 'B'">已下达</span>
               <span v-if="scope.row.status === 'A'">已转报价</span>
+              <span v-if="scope.row.status === 'D'">已驳回</span>
             </span>
             <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
                                                style="width: 100px; height: 80px"/></span>
diff --git a/src/views/modules/inquiry/inquiryTechnicalMaterialsNoBuilt.vue b/src/views/modules/inquiry/inquiryTechnicalMaterialsNoBuilt.vue
index 176d3ff..f09c6a4 100644
--- a/src/views/modules/inquiry/inquiryTechnicalMaterialsNoBuilt.vue
+++ b/src/views/modules/inquiry/inquiryTechnicalMaterialsNoBuilt.vue
@@ -138,6 +138,7 @@
               <span v-if="scope.row.status === 'C'">草稿</span>
               <span v-if="scope.row.status === 'B'">下达</span>
               <span v-if="scope.row.status === 'A'">已转报价</span>
+              <span v-if="scope.row.status === 'D'">已驳回</span>
             </span>
             <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
                                                style="width: 100px; height: 80px"/></span>
diff --git a/src/views/modules/quote/quotes.vue b/src/views/modules/quote/quotes.vue
index c5458da..d1b7fb1 100644
--- a/src/views/modules/quote/quotes.vue
+++ b/src/views/modules/quote/quotes.vue
@@ -40,7 +40,7 @@ export default {
         requestEndDate: '',
         requiredCompletionStartDate: '',
         requiredCompletionEndDate: '',
-        status: '',
+        status: 'EE',
         quoterName: '',
         requesterName: '',
         priorityLevel: '',
@@ -630,7 +630,6 @@ export default {
     handleQuery(){
       this.queryForm.limit = this.pageSize
       this.queryForm.page = this.pageIndex
-      this.queryForm.status = 'B'
       this.queryLoading = true
       searchInquiryApplicationInfo(this.queryForm).then(({data})=>{
         if (data && data.code === 0){
@@ -930,6 +929,13 @@ export default {
           placeholder="选择日期">
         </el-date-picker>
       </el-form-item>
+        <el-form-item :label="'状态'">
+          <el-select v-model="queryForm.status" style="width: 120px">
+            <el-option label="全部" value="EE"></el-option>
+            <el-option label="下达" value="B"></el-option>
+            <el-option label="已驳回" value="D"></el-option>
+          </el-select>
+        </el-form-item>
       <el-form-item :label="' '">
         <el-button @click="handleQuery()">查询</el-button>
         <!--        <el-button type="primary" icon="el-icon-upload" @click="handleImportQuotation()">导入</el-button>-->
@@ -974,7 +980,8 @@ export default {
             <span v-if="!item.columnHidden">
               <span v-if="scope.row.status === 'C'">草稿</span>
               <span v-if="scope.row.status === 'B'">下达</span>
-              <span v-if="scope.row.status === 'A'">已报价</span>
+              <span v-if="scope.row.status === 'A'">已转报价</span>
+              <span v-if="scope.row.status === 'D'">已驳回</span>
             </span>
             <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
                                                style="width: 100px; height: 80px"/></span>