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

View File

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

View File

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

View File

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

View File

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

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

View File

@ -1,7 +1,7 @@
<template> <template>
<el-table height="500" v-loading="loading" :data="records" :span-method="objectSpanMethod"> <el-table height="100%" v-loading="loading" :data="records" :span-method="objectSpanMethod">
<el-table-column label="变更日期" align="center" prop="changeTime"/>
<el-table-column label="变更事件" align="center" prop="title"/> <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="changeField"/>
<el-table-column label="变更前" align="center" prop="beforeChange"/> <el-table-column label="变更前" align="center" prop="beforeChange"/>
<el-table-column label="变更后" align="center" prop="afterChange"/> <el-table-column label="变更后" align="center" prop="afterChange"/>
@ -23,7 +23,7 @@
// //
records: [], records: [],
mergeObj: {}, // mergeObj: {}, //
mergeArr: ['changeTime','title', 'createName'] // mergeArr: ['title','changeTime','createName'] //
} }
}, },
watch: { watch: {

View File

@ -3,9 +3,8 @@
<el-form label-width="80px" :model="form"> <el-form label-width="80px" :model="form">
<el-row :gutter="5"> <el-row :gutter="5">
<el-col :span="10"> <el-col :span="10">
<el-input style="width:30%" size="mini" v-model="queryParams.name_0" placeholder="型号 模糊查询"></el-input> <el-input style="width:30%;" size="mini" v-model="queryParams.model" placeholder="型号规格 模糊查询"></el-input>
<el-input style="width:30%;margin-left: 5px;" 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-button style="float: right;" size="mini" type="primary" icon="el-icon-search" @click="handleSearchClick">搜索</el-button>
</el-col> </el-col>
<el-col :span="14"> <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> <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 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="版本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="model" v-if="false"/>
<el-table-column label="规格" align="center" prop="spec" v-if="false"/> <el-table-column label="规格" align="center" prop="spec" v-if="false"/>
<el-table-column label="电压" align="center" prop="voltage"/> <el-table-column label="电压" align="center" prop="voltage"/>
@ -385,7 +384,6 @@
this.tableHeight = (window.innerHeight - 340) + 'px'; this.tableHeight = (window.innerHeight - 340) + 'px';
}, },
methods: { methods: {
/** 查看报价单转报价操作 */ /** 查看报价单转报价操作 */
handleQuotInfo(row) { handleQuotInfo(row) {
const quotId = row.quotId; const quotId = row.quotId;