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

'123'

This commit is contained in:
xd 2024-05-14 15:57:19 +08:00
parent 0f52340a3d
commit f2aee0c152
5 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/redBook/excelUtil.java
View File

@ -82,7 +82,6 @@ public class excelUtil {
wsheet.setRowView(i,380);
String[] bjs = {"询价单位："+quot.getQuotCustomer(),"业务联系人："+quot.getQuotLxr(),"项目名称："+quot.getQuotProject(),"联 系 电 话："+quot.getQuotLxrdh(),"询价日期：","编 制：","报价日期：","审 核："};
int k=0;
String labelValue = "";
while(k<bjs.length){
wsheet.mergeCells(0,i,3,i);
label = new Label(0, i, bjs[k],wff_merge);

7
ruoyi-system/src/main/resources/mapper/redBook/OARedBookMapper.xml
View File

@ -163,7 +163,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN sys_dept d on u.dept_id = d.dept_id
</sql>
<select id="listQuots" parameterType="OAQuot" resultType="OAQuot">
select a.quot_id,a.quotCode,a.quotCustomer,a.quotProject,a.quotLxr,a.quotLxrdh,a.totalPrice,a.create_by,a.create_time createTime
select a.quot_id,a.quotCode,a.quotCustomer,a.quotProject,a.quotLxr,a.quotLxrdh,a.totalPrice,
a.create_by,a.create_time createTime,
a.update_by,a.update_time updateTime
from OAQuot a
<include refid="quotsJoins"/>
<where>
@ -173,6 +175,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
and datediff(d, a.create_time, #{params.endTime}) <![CDATA[>=]]> 0
</if>
<if test="quotCustomer != null and quotCustomer != ''"><!-- 客户检索 -->
and a.quotCustomer like '%${quotCustomer}%'
</if>
<!-- 数据范围过滤 -->
${params.dataScope}
</where>

3
ruoyi-ui/src/store/modules/settings.js
View File

@ -8,7 +8,8 @@ const state = {
theme: storageSetting.theme || '#409EFF',
sideTheme: storageSetting.sideTheme || sideTheme,
showSettings: showSettings,
topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav,
//topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav,
topNav: storageSetting.topNav === undefined ? topNav : true,
tagsView: storageSetting.tagsView === undefined ? tagsView : storageSetting.tagsView,
fixedHeader: storageSetting.fixedHeader === undefined ? fixedHeader : storageSetting.fixedHeader,
sidebarLogo: storageSetting.sidebarLogo === undefined ? sidebarLogo : storageSetting.sidebarLogo,

2
ruoyi-ui/src/views/redBook/productSelect.vue
View File

@ -478,7 +478,7 @@
this.searchData(this.selectedYsxhUid, item.section)
},
//查询数据
//查询结果数据
searchData(sid, section) {
this.params = {uid_0: sid, section: section, name_0: this.selectedYsxhTag}
searchData(this.params).then(response => {

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

@ -13,6 +13,13 @@
:default-time="['00:00:00', '23:59:59']"
></el-date-picker>
</el-form-item>
<el-form-item label="客户名称" prop="quotCustomer">
<el-input
v-model="queryParams.quotCustomer"
placeholder="请输入客户名称"
clearable
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -38,6 +45,7 @@
<el-table-column label="联系人" width="100" align="center" prop="quotLxr" />
<el-table-column label="联系人电话" width="150" align="center" prop="quotLxrdh" />
<el-table-column label="创建日期" width="180" align="center" prop="createTime" />
<el-table-column label="更新日期" width="180" align="center" prop="updateTime" />
</el-table>
<!-- 报价详情对话框 -->