提交 219ced92 authored 作者: zgy's avatar zgy

完成海报管理

上级 a0cc9b73
...@@ -41,12 +41,12 @@ public class TbCfPostersServiceImpl implements TbCfPostersService { ...@@ -41,12 +41,12 @@ public class TbCfPostersServiceImpl implements TbCfPostersService {
public int save(TbCfPostersEntity tbCfPosters) { public int save(TbCfPostersEntity tbCfPosters) {
tbCfPosters.setId(IdUtil.createIdbyUUID()); tbCfPosters.setId(IdUtil.createIdbyUUID());
tbCfPosters.setCreateTime(new Date()); tbCfPosters.setCreateTime(new Date());
tbCfPosters.setUpdateTime(new Date());
return tbCfPostersDao.save(tbCfPosters); return tbCfPostersDao.save(tbCfPosters);
} }
@Override @Override
public int update(TbCfPostersEntity tbCfPosters) { public int update(TbCfPostersEntity tbCfPosters) {
tbCfPosters.setCreateTime(new Date());
tbCfPosters.setUpdateTime(new Date()); tbCfPosters.setUpdateTime(new Date());
return tbCfPostersDao.update(tbCfPosters); return tbCfPostersDao.update(tbCfPosters);
} }
......
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
left JOIN tb_cf_express_template e ON i.item_descrition_id = e.template_id left JOIN tb_cf_express_template e ON i.item_descrition_id = e.template_id
WHERE 1=1 and i.enable_flag!=0 WHERE 1=1 and i.enable_flag!=0
<if test="name != null and name.trim() != ''"> <if test="name != null and name.trim() != ''">
AND item_name LIKE concat('%',#{name},'%') AND item_name LIKE concat('%',#{name},'%') or item_id LIKE concat('%',#{name},'%')
</if> </if>
<if test="code != null and code.trim() != ''"> <if test="code != null and code.trim() != ''">
AND item_code=#{code} AND item_code=#{code}
...@@ -138,7 +138,12 @@ ...@@ -138,7 +138,12 @@
<if test="itemCategory != null and itemCategory.trim() != ''"> <if test="itemCategory != null and itemCategory.trim() != ''">
AND item_category=#{itemCategory} AND item_category=#{itemCategory}
</if> </if>
<if test="typeTwo != null and typeTwo.trim() != ''">
AND item_categorytwo=#{typeTwo}
</if>
<if test="typeThree != null and typeThree.trim() != ''">
AND item_descrition_id=#{typeThree}
</if>
<choose> <choose>
<when test="sidx != null and sidx.trim() != ''"> <when test="sidx != null and sidx.trim() != ''">
order by ${sidx} ${order} order by ${sidx} ${order}
...@@ -150,7 +155,6 @@ ...@@ -150,7 +155,6 @@
<if test="offset != null and limit != null"> <if test="offset != null and limit != null">
limit #{offset}, #{limit} limit #{offset}, #{limit}
</if> </if>
</select> </select>
<select id="queryItemInfoById" resultType="com.platform.entity.ItemDescSkus"> <select id="queryItemInfoById" resultType="com.platform.entity.ItemDescSkus">
......
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
margin:0 auto; margin:0 auto;
} }
.category-container{ .category-container{
width:800px;
min-height:600px; min-height:600px;
padding-bottom: 80px;
} }
.edit-container{ .edit-container{
position: relative; position: relative;
...@@ -29,10 +29,14 @@ ...@@ -29,10 +29,14 @@
bottom:0; bottom:0;
right:0; right:0;
} }
.productList{
padding-bottom: 10px;
}
.productList,.search{ .productList,.search{
display: flex; display: flex;
justify-content: space-between; justify-content: start;
}.productList-style-start{ }
.productList-style-start{
display: flex; display: flex;
justify-content: start; justify-content: start;
} }
...@@ -54,6 +58,14 @@ ...@@ -54,6 +58,14 @@
.vradio-wrapper>i{ .vradio-wrapper>i{
vertical-align:top; vertical-align:top;
} }
#searchjqGrid{
width:100%;
margin-top:10px;
}
#showItems{
margin-top:20px;
}
</style> </style>
</head> </head>
<body> <body>
...@@ -133,36 +145,31 @@ ...@@ -133,36 +145,31 @@
<!-- </div>--> <!-- </div>-->
<!-- 商品列表页 --> <!-- 商品列表页 -->
<div v-else-if='typeActive==1' > <div v-else-if='typeActive==1' >
<div class="productList"> <div class="productList-style-start">
<div> <div>
<span>一级分类</span> <span>一级分类</span>
<i-Select v-model="categoryListsActive1" style="width:100px" @on-change="changeSubCateType"> <i-Select v-model.sync="categoryListsActive1" style="width:100px" @on-change="changeSubCateType">
<i-Option v-for="item in CategoryLists1" :value="item.value" :key="item.value">{{ item.label }}</i-Option> <i-Option v-for="item in CategoryLists1" :value="item.value" :key="item.value">{{ item.label }}</i-Option>
</i-Select> </i-Select>
</div> </div>
<div> <div>
<span style="margin-left:20px;" >二级分类</span> <span style="margin-left:20px;" >二级分类</span>
<i-Select v-model="categoryListsActive2" @on-change="queryMiniCatagory(2)" style="width:100px"> <i-Select v-model.sync="categoryListsActive2" @on-change="queryMiniCatagory(2)" style="width:100px">
<i-Option v-for="item in CategoryLists2" :value="item.value" :key="item.value">{{ item.label }}</i-Option> <i-Option v-for="item in CategoryLists2" :value="item.value" :key="item.value">{{ item.label }}</i-Option>
</i-Select> </i-Select>
</div> </div>
<div> <div>
<span style="margin-left:20px;">三级分类</span> <span style="margin-left:20px;">三级分类</span>
<i-Select v-model="categoryListsActive3" style="width:100px"> <i-Select v-model.sync="categoryListsActive3" style="width:100px">
<i-Option v-for="item in CategoryLists3" :value="item.value" :key="item.value">{{ item.label }}</i-Option> <i-Option v-for="item in CategoryLists3" :value="item.value" :key="item.value">{{ item.label }}</i-Option>
</i-Select> </i-Select>
</div> </div>
<div>
<span style="margin-left:20px;">独立分类</span>
<i-Select v-model="categoryListsActive" style="width:100px">
<i-Option v-for="item in categoryLists" :value="item.value" :key="item.value">{{ item.label }}</i-Option>
</i-Select>
</div>
</div> </div>
<i-Button type="warning" style="float: right;margin-top:30px;width:100px;" @click='resetSelectedCategory'>重置</i-Button> <i-Button type="warning" style="float: right;margin-top:30px;width:100px;" @click='resetSelectedCategory'>重置</i-Button>
</div> </div>
<!-- 商品 --> <!-- 商品 -->
<div v-else> <div v-else-if="typeActive==2">
<div class="productList-style-start"> <div class="productList-style-start">
<div> <div>
<span>一级分类</span> <span>一级分类</span>
...@@ -177,27 +184,37 @@ ...@@ -177,27 +184,37 @@
</i-Select> </i-Select>
</div> </div>
<div> <div>
<span style="margin-left:20px;">三级分类</span> <span style="margin-left:20px;" >三级分类</span>
<i-Select v-model="commoditycategoryListsActive3" style="width:100px"> <i-Select v-model="commoditycategoryListsActive3" style="width:100px">
<i-Option v-for="item in commodityCategoryLists3" :value="item.value" :key="item.value">{{ item.label }}</i-Option> <i-Option v-for="item in commodityCategoryLists3" :value="item.value" :key="item.value">{{ item.label }}</i-Option>
</i-Select> </i-Select>
</div> </div>
</div> </div>
<div class="search" style="margin-top:20px;"> <div class="search" style="margin-top:20px;">
<div> <div>
<i-Input v-model="search" placeholder="请输入搜索内容" style="width:500px;" /> <i-Input v-model="search"
placeholder="请输入搜索内容(可选)"
style="width:500px;" />
</div> </div>
<i-Button type="primary" style="width:100px;" @click='handleSearch()'>搜索</i-Button> <i-Button
type="primary"
style="width:100px;"
@click='handleSearch()'
>搜索</i-Button>
<i-Button style="width:100px;" @click="resetSelectedCategory('commodity')">重置</i-Button> <i-Button style="width:100px;" @click="resetSelectedCategory('commodity')">重置</i-Button>
</div> </div>
<section id="showItems"> <section id="showItems">
表格内容。。。 <table id="searchjqGrid"></table>
</section> </section>
</div> </div>
<!-- <div class="btn-container">--> <div v-else-if="typeActive==3">
<!-- <i-Button type="primary" @click='submit()'>确定</i-Button>--> <div>
<!-- <i-Button >取消</i-Button>--> <span style="margin-left:20px;">商品标签</span>
<!-- </div>--> <i-Select v-model="tagListsActive" style="width:100px">
<i-Option v-for="item in tagLists" :value="item.value" :key="item.value">{{ item.label }}</i-Option>
</i-Select>
</div>
</div>
</section> </section>
</Card> </Card>
</div> </div>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论