xd
/
JNBusiness
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'123'

This commit is contained in:
xd 2024-05-22 13:12:43 +08:00
parent a30ccb9d58
commit ae05a9b055
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ABAP_AS_WITH_POOL.jcoDestination
View File

@ -1,5 +1,5 @@
#for tests only ! #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.destination.pool_capacity=10
jco.client.lang=ZH jco.client.lang=ZH
jco.client.ashost=172.19.0.120 jco.client.ashost=172.19.0.120
@ -7,5 +7,5 @@ jco.client.saprouter=
jco.client.user=RFC jco.client.user=RFC
jco.client.sysnr=00 jco.client.sysnr=00
jco.destination.peak_limit=10 jco.destination.peak_limit=10
jco.client.passwd=654321 jco.client.passwd=gQwxMDXz:z%]%(D`z%xN*]YwLtg])onxv2:/*QW3OBRYL2x0
jco.client.client=300 jco.client.client=300

2
ruoyi-system/src/main/resources/mapper/quot/QuotFileMapper.xml
View File

@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectQuotFileList" parameterType="QuotFile" resultMap="QuotFileResult"> <select id="selectQuotFileList" parameterType="QuotFile" resultMap="QuotFileResult">
<include refid="selectQuotFileVo"/> <include refid="selectQuotFileVo"/>
<where> <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 != null and fileType != ''">
<if test="fileType == 'quotJsgfFile'"> <if test="fileType == 'quotJsgfFile'">
and file_type in ('quotJsgfFile','quotXjFile') and file_type in ('quotJsgfFile','quotXjFile')

10
ruoyi-ui/src/views/redBook/quots.vue
View File

@ -50,6 +50,11 @@
<el-link :underline="false" type="primary" @click="handleDetail(scope.row)">{{scope.row.quotCode}}</el-link> <el-link :underline="false" type="primary" @click="handleDetail(scope.row)">{{scope.row.quotCode}}</el-link>
</template> </template>
</el-table-column> </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="quotCustomer" />
<el-table-column label="报价项目" width="250" align="center" prop="quotProject" /> <el-table-column label="报价项目" width="250" align="center" prop="quotProject" />
<el-table-column label="总价" width="100" align="center" prop="totalPrice" /> <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="createName" />
<el-table-column label="创建日期" width="180" align="center" prop="createTime" /> <el-table-column label="创建日期" width="180" align="center" prop="createTime" />
<el-table-column label="更新日期" width="180" align="center" prop="updateTime" /> <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> </el-table>
<!-- 报价详情对话框 --> <!-- 报价详情对话框 -->