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

'123'

This commit is contained in:
xd 2024-08-15 14:31:38 +08:00
parent d1c005a06b
commit f800f8c750
7 changed files with 25 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ruoyi-admin/src/main/java/com/ruoyi/web/controller/redBook/RedBookController.java
View File

@ -221,14 +221,15 @@ public class RedBookController extends BaseController
public List<Product> handleSearchData(Product product)
{
List<Product> list = new ArrayList<>();
String name_0 = product.getName_0();//型号
String model = product.getModel();//规格
if(!StringUtils.isBlank(name_0) || !StringUtils.isBlank(model) ){
if(!StringUtils.isBlank(name_0)){
name_0 = name_0.replace(" ","");
name_0 = name_0.toUpperCase();
String model = product.getModel();//规格规格
List<String> sqlParam = new ArrayList<String>();
if(!StringUtils.isBlank(model)){
String[] split = model.split("\\s");
for(String each : split){
sqlParam.add(each.toUpperCase());
}
list = redBookService.handleSearchData(name_0,model);
list = redBookService.handleSearchData(sqlParam);
}
return list;
}

5
ruoyi-system/src/main/java/com/ruoyi/redBook/mapper/OARedBookMapper.java
View File

@ -71,11 +71,10 @@ public interface OARedBookMapper
/**
* 点击查询按钮查询数据
* @param name_0
* @param model
* @param sqlParam
* @return
*/
List<Product> handleSearchData(@Param("name_0")String name_0,@Param("model")String model);
List<Product> handleSearchData(List<String> sqlParam);
/**
* 保存报价单

5
ruoyi-system/src/main/java/com/ruoyi/redBook/service/IRedBookService.java
View File

@ -67,11 +67,10 @@ public interface IRedBookService
/**
* 点击查询按钮查询数据
* @param name_0
* @param model
* @param sqlParam
* @return
*/
List<Product> handleSearchData(String name_0,String model);
List<Product> handleSearchData(List<String> sqlParam);
/**
* 保存报价单

7
ruoyi-system/src/main/java/com/ruoyi/redBook/service/impl/RedBookServiceImpl.java
View File

@ -103,13 +103,12 @@ public class RedBookServiceImpl implements IRedBookService
/**
* 点击查询按钮查询数据
* @param name_0
* @param model
* @param sqlParam
* @return
*/
@Override
public List<Product> handleSearchData(String name_0,String model) {
return oaRedBookMapper.handleSearchData(name_0,model);
public List<Product> handleSearchData(List<String> sqlParam) {
return oaRedBookMapper.handleSearchData(sqlParam);
}
/**

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

@ -73,13 +73,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
convert(decimal,convert(float,A.红本价格)) price,convert(varchar(10),B.date_0,23) pricedate
from [rb_product_price] A
left join rb_productVersion B on A.version_uid_0=B.uid_0
where B.sta_0=1
<if test="name_0 != null and name_0 != ''">
and A.型号 like '%${name_0}%'
</if>
<if test="model != null and model != ''">
and A.规格 = #{model}
</if>
where B.sta_0=1 and
<foreach item="item" collection="list" open="(" separator=" and " close=")">
A.namevoltage like '%${item}%'
</foreach>
order by len(A.namevoltage)
</select>

6
ruoyi-ui/src/views/components/Tools/ChangeRecord/index.vue
View File

@ -1,7 +1,7 @@
<template>
<el-table height="500" v-loading="loading" :data="records" :span-method="objectSpanMethod">
<el-table-column label="变更日期" align="center" prop="changeTime"/>
<el-table height="100%" v-loading="loading" :data="records" :span-method="objectSpanMethod">
<el-table-column label="变更事件" align="center" prop="title"/>
<el-table-column label="变更日期" align="center" prop="changeTime"/>
<el-table-column label="变更字段" align="center" prop="changeField"/>
<el-table-column label="变更前" align="center" prop="beforeChange"/>
<el-table-column label="变更后" align="center" prop="afterChange"/>
@ -23,7 +23,7 @@
//变更记录数据
records: [],
mergeObj: {}, // 用来记录需要合并行的下标
mergeArr: ['changeTime','title', 'createName'] // 表格中的列名
mergeArr: ['title','changeTime','createName'] // 表格中的列名
}
},
watch: {

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

@ -3,9 +3,8 @@
<el-form label-width="80px" :model="form">
<el-row :gutter="5">
<el-col :span="10">
<el-input style="width:30%" size="mini" v-model="queryParams.name_0" placeholder="型号 模糊查询"></el-input>
<el-input style="width:30%;margin-left: 5px;" size="mini" v-model="queryParams.model" placeholder="规格 模糊查询"></el-input>
<el-button style="float: right;" size="mini" type="primary" icon="el-icon-search" @click="handleSearchClick">搜索</el-button>
<el-input style="width:30%;" size="mini" v-model="queryParams.model" placeholder="型号规格 模糊查询"></el-input>
<el-button style="margin-left: 5px;" size="mini" type="primary" icon="el-icon-search" @click="handleSearchClick">搜索</el-button>
</el-col>
<el-col :span="14">
<el-button style="float: right;margin-left: 5px;" size="mini" type="success" icon="el-icon-document" @click="handleMadeQuotClick" :disabled="selectedResultData.length==0 || madeQuotDis">生成报价单</el-button>
@ -71,7 +70,7 @@
<el-table width="100%" style="min-width:800px" v-loading="searchResultLoading" ref="searchResultTable" :data="searchResultPagedData" @row-dblclick="handleRowDblclick">
<el-table-column label="版本uid" align="center" prop="uid_0" v-if="false"/>
<el-table-column label="产品型号" align="center" prop="name_0"/>
<el-table-column label="产品型号" align="center" prop="name_0" />
<el-table-column label="型号" align="center" prop="model" v-if="false"/>
<el-table-column label="规格" align="center" prop="spec" v-if="false"/>
<el-table-column label="电压" align="center" prop="voltage"/>
@ -385,7 +384,6 @@
this.tableHeight = (window.innerHeight - 340) + 'px';
},
methods: {
/** 查看报价单转报价操作 */
handleQuotInfo(row) {
const quotId = row.quotId;