From ae05a9b055bc7a60bf47825d142c3f3b60685a49 Mon Sep 17 00:00:00 2001
From: xd <844539747@qq.com>
Date: Wed, 22 May 2024 13:12:43 +0800
Subject: [PATCH] '123'

---
 ABAP_AS_WITH_POOL.jcoDestination                       |  4 ++--
 .../src/main/resources/mapper/quot/QuotFileMapper.xml  |  2 +-
 ruoyi-ui/src/views/redBook/quots.vue                   | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ABAP_AS_WITH_POOL.jcoDestination b/ABAP_AS_WITH_POOL.jcoDestination
index 72d1398..e577736 100644
--- a/ABAP_AS_WITH_POOL.jcoDestination
+++ b/ABAP_AS_WITH_POOL.jcoDestination
@@ -1,5 +1,5 @@
 #for tests only !
-#Wed May 22 08:23:51 CST 2024
+#Wed May 22 11:19:09 CST 2024
 jco.destination.pool_capacity=10
 jco.client.lang=ZH
 jco.client.ashost=172.19.0.120
@@ -7,5 +7,5 @@ jco.client.saprouter=
 jco.client.user=RFC
 jco.client.sysnr=00
 jco.destination.peak_limit=10
-jco.client.passwd=654321
+jco.client.passwd=gQwxMDXz:z%]%(D`z%xN*]YwLtg])onxv2:/*QW3OBRYL2x0
 jco.client.client=300
diff --git a/ruoyi-system/src/main/resources/mapper/quot/QuotFileMapper.xml b/ruoyi-system/src/main/resources/mapper/quot/QuotFileMapper.xml
index 6f816bc..94b5075 100644
--- a/ruoyi-system/src/main/resources/mapper/quot/QuotFileMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/quot/QuotFileMapper.xml
@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectQuotFileList" parameterType="QuotFile" resultMap="QuotFileResult">
         <include refid="selectQuotFileVo"/>
         <where>
-            <if test="relationId != null  and relationId != ''"> and relation_id = #{relationId}</if>
+            and relation_id = #{relationId}
             <if test="fileType != null  and fileType != ''">
                 <if test="fileType == 'quotJsgfFile'">
                     and file_type in ('quotJsgfFile','quotXjFile')
diff --git a/ruoyi-ui/src/views/redBook/quots.vue b/ruoyi-ui/src/views/redBook/quots.vue
index b953c59..6cf4df6 100644
--- a/ruoyi-ui/src/views/redBook/quots.vue
+++ b/ruoyi-ui/src/views/redBook/quots.vue
@@ -50,6 +50,11 @@
           <el-link :underline="false" type="primary" @click="handleDetail(scope.row)">{{scope.row.quotCode}}</el-link>
         </template>
       </el-table-column>
+      <el-table-column fixed="left" label="提交状态" align="center" prop="quotApprovalStatus" width="150px">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.rb_quot_approval_status" :value="scope.row.quotApprovalStatus"/>
+        </template>
+      </el-table-column>
       <el-table-column label="报价客户" width="250" align="center" prop="quotCustomer" />
       <el-table-column label="报价项目" width="250" align="center" prop="quotProject" />
       <el-table-column label="总价" width="100" align="center" prop="totalPrice" />
@@ -58,11 +63,6 @@
       <el-table-column label="创建人" width="180" align="center" prop="createName" />
       <el-table-column label="创建日期" width="180" align="center" prop="createTime" />
       <el-table-column label="更新日期" width="180" align="center" prop="updateTime" />
-      <el-table-column label="提交状态" align="center" prop="quotApprovalStatus" width="150px">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.rb_quot_approval_status" :value="scope.row.quotApprovalStatus"/>
-        </template>
-      </el-table-column>
     </el-table>
 
     <!-- 报价详情对话框 -->