fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by weiqingting
Commit 3ceefa5bba0c8dca3eeafa4a392d51484da4400c 1 parent 72a7e5f6

tijiao

Inline Side-by-side
Showing 19 changed files with 378 additions and 72 deletions
module.exports=function(app) {
/*基础商品列表*/
app.get("/supplier/baseproduct/index","goods.basegoods.Index");
app.get("/supplier/baseproduct/index","goods.basegoods.Index",function(){
this.$extend={
moduleName:"基础商品",
pageName:"商品列表"
}
});
/*列表头部各个审核状态的数量*/
app.post("/base/goods/ajax/auditCount","basegoods_getbaseProductCountByStatus");
... ... @@ -10,13 +15,23 @@ module.exports=function(app) {
app.post("/product/getBaseProductList","basegoods_getBaseProductList");
/*添加页面*/
app.get("/base/goods/add","basegoods_queryProductColors");
app.get("/base/goods/add","goods.basegoods.Edit","basegoods_queryProductColors",function(){
this.$extend={
moduleName:"基础商品",
pageName:"添加商品"
}
});
/*添加数据接口*/
app.post("/base/goods/ajax/add","basegoods_addBaseProduct");
/*修改页面*/
app.get("/base/goods/update/:productSkn/:isAuditing","basegoods_queryProductColors");
app.get("/base/goods/update/:productSkn/:isAuditing","goods.basegoods.Edit","basegoods_queryProductColors",function(){
this.$extend={
moduleName:"基础商品",
pageName:"修改商品"
}
});
/*删除*/
app.post("/base/goods/ajax/delete","basegoods_deleteBaseProduct");
... ...
module.exports=function(app) {
/*品牌货到付款限制页面路由*/
app.get("/goods/cod/brand/index","goods.cod.Index");
app.get("/goods/cod/brand/index","goods.cod.Brand",function(){
this.$extend={
moduleName:"货到付款限制",
pageName:"品牌设置"
}
});
/*分页*/
app.post("/payDelivery/queryTotalBrandPayDelivery","cod_queryTotalBrandPayDelivery");
... ... @@ -15,7 +20,12 @@ module.exports=function(app) {
app.post("/payDelivery/queryCountBrandPayDelivery","cod_queryCountBrandPayDelivery");
/*单品货到付款限制页面路由*/
app.get("/goods/cod/goods/index","goods.cod.Index2");
app.get("/goods/cod/goods/index","goods.cod.Goods",function(){
this.$extend={
moduleName:"货到付款限制",
pageName:"单品设置"
}
});
/*列表*/
app.post("/payDelivery/queryPayDeliveryList","cod_queryPayDeliveryList");
... ... @@ -42,5 +52,10 @@ module.exports=function(app) {
app.post("/payDelivery/queryPayDeliveryBrandName","cod_queryPayDeliveryBrandName");
/*批量导入*/
app.get("/goods/cod/upload","goods.cod.Upload");
app.get("/goods/cod/upload","goods.cod.Upload",function(){
this.$extend={
moduleName:"货到付款限制",
pageName:"批量导入"
}
});
}
\ No newline at end of file
... ...
... ... @@ -3,19 +3,7 @@ module.exports=function(app) {
app.get("/goods/yohoCoin/index","goods.yohoCoin.Index",function(){
this.$extend={
moduleName:"商品管理",
pageName:"YOHO币管理",
skn: true,
store: true,
brand: true,
supplier: true,
gender: true,
sortTree: true,
returnCoinTime: false,
bulkImport: true,
bulkExport: true,
gridurl: '/good/yohoCoin/queryPageList'
pageName:"YOHO币管理"
}
});
... ... @@ -33,8 +21,10 @@ module.exports=function(app) {
/*yoho币审核页面渲染*/
app.get("/goods/yohoCoin/Audit","goods.yohoCoin.Audit",function(){
this.$extend={
moduleName:"商品管理",
pageName:"YOHO币审核"
}
});
/*yoho币审核列表查询*/
... ...
module.exports={
namespace:"cods",
namespace:"cod",
apis:{
queryTotalBrandPayDelivery:{
title:'品牌货到付款限制页面列表',
... ...
<%include '../../../common/views/__ui/header'%>
<%include '../../../common/views/__partail/ListHeader'%>
<div class="contentpanel">
<div class="panel panel-default" style="margin-bottom:10px;">
<div class="panel-heading">
<a href="/base/goods/add" class="btn btn-success"><i class="fa fa-plus"></i> 添加基础商品</a>
</div>
<div class="panel-body">
<div class="row">
<div class="panel-col">
<input type="text" id="productSkn" value="" class="form-control" placeholder="SKN"
style="height: 39px;" maxlength="9" />
</div>
<div class="panel-col">
<input type="text" id="productName" class="form-control" placeholder="商品名称" style="height: 39px;"/>
</div>
<div class="panel-col">
<input type="text" id="founderName" class="form-control" placeholder="创建人" style="height: 39px;"/>
</div>
<div class="panel-col">
<select id="shopId" class="form-control">
<option value="-1">请选择店铺</option>
</select>
</div>
<div class="panel-col">
<select id="brandId" class="form-control">
<option value="-1">请选择品牌</option>
</select>
</div>
<div class="panel-col">
<select id="isOutLets" class="form-control">
<option value="-1">是否奥莱</option>
<option value="Y">是</option>
<option value="N">否</option>
</select>
</div>
<div class="panel-col">
<select id="isAdvance" class="form-control">
<option value="-1">是否预售</option>
<option value="Y">是</option>
<option value="N">否</option>
</select>
</div>
<div class="panel-col">
<select id="gender" class="form-control">
<option value="-1">请选择性别</option>
<option value="1">男</option>
<option value="2">女</option>
<option value="3">通用</option>
</select>
</div>
<div class="panel-col">
<select id="isJit" class="form-control">
<option value="-1">是否JIT商品</option>
<option value="Y">是JIT</option>
<option value="N">非JIT</option>
</select>
</div>
<div class="panel-col">
<input type="text" id="factoryCode" class="form-control" placeholder="厂家编号" style="height: 39px;"/>
</div>
<div class="panel-col2">
<div id="sort"></div>
</div>
<div class="panel-col">
<a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
<a id="all-btn" href="" class="btn btn-info">全部</a>
</div>
<div class="panel-col">
<a id="pass-btn" href="javascript:;" class="btn btn-info">通过</a>
<a id="reject-btn" href="javascript:;" class="btn btn-info">驳回</a>
</div>
<div class="panel-col">
<a id="import-btn" href="/goods/base/batch" class="btn btn-info">基础商品导入</a>
</div>
<div class="panel-col" style="display: none;" id="daochu">
<a href="javascript:;" class="btn btn-info" id="basedaochu">基础商品导出</a>
</div>
<div class="panel-col">
<a id="import-btn" href="/goods/piliang/batch" class="btn btn-info">批量功能</a>
</div>
</div>
</div>
</div>
<div class="panel panel-primary-head">
<div class="dataTab_wrapper" id="basicTab"></div>
<div class="dataTab_wrapper" id="basicTable"></div>
</div>
</div>
<script type="text/template" id="template">
<div class="rows" style="height: 100px;">
<div class="form-group">
<span class="col-sm-2 control-label">驳回原因:</span>
<div class="col-sm-8">
<textarea id="bohui" class="form-control" rows="3"></textarea>
</div>
</div>
</div>
</div>
</script>
<%include '../../../common/views/__ui/footer'%>
\ No newline at end of file
... ...
<%include '../../../common/views/__ui/header'%>
<%include '../../../common/views/__partail/ListHeader'%>
<div class="contentpanel">
<div class="panel panel-default" style="margin-bottom:10px;">
<div class="panel-body">
<div class="row">
<div class="panel-col">
<select id="brandId" class="form-control">
<option value="-1">请选择品牌</option>
</select>
</div>
<div class="panel-col">
<select id="isPayDelivery" class="form-control">
<option value="-1">状态</option>
<option value="1">开启</option>
<option value="0">关闭</option>
</select>
</div>
<div class="panel-col">
<a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
<a id="export-btn" href="" class="btn btn-info">导出</a>
</div>
</div>
</div>
</div>
<div class="panel panel-primary-head">
<div class="dataTab_wrapper" id="basicTab"></div>
<div class="dataTab_wrapper" id="basicTable" ></div>
</div>
</div>
<script type="text/template" id="template">
<div class="rows" style="height: 100px;">
<div class="form-group">
<p>您确定要驳回申请吗？</p>
<span class="col-sm-2 control-label" style="color:red;">* 驳回原因:</span>
<div class="col-sm-8">
<textarea id="reason" class="form-control" rows="3" ></textarea>
</div>
</div>
</div>
</div>
</script>
<%include '../../../common/views/__ui/footer'%>
\ No newline at end of file
... ...
<%include '../../../common/views/__ui/header'%>
<%include '../../../common/views/__partail/ListHeader'%>
<div class="contentpanel">
<div class="panel panel-default" style="margin-bottom:10px;">
<div class="panel-body">
<div class="row">
<div class="panel-col">
<select id="productSkn" class="form-control">
<option value="-1">SKN</option>
</select>
</div>
<div class="panel-col">
<select id="brandId" class="form-control">
<option value="-1">请选择品牌</option>
</select>
</div>
<div class="panel-col">
<select id="isPayDelivery" class="form-control">
<option value="-1">状态</option>
<option value="1">开启</option>
<option value="0">关闭</option>
</select>
</div>
<div class="panel-col-3">
<a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
<a id="export-btn" href="" class="btn btn-info">导出</a>
<a id="btn-input" href="/goods/cod/upload" class="btn btn-info">批量导入</a>
</div>
</div>
</div>
</div>
<div class="panel panel-primary-head">
<div class="dataTab_wrapper" id="basicTab"></div>
<div class="dataTab_wrapper" id="basicTable" ></div>
</div>
</div>
<script type="text/template" id="template">
<div class="rows" style="height: 100px;">
<div class="form-group">
<span class="col-sm-2 control-label">驳回原因:</span>
<div class="col-sm-8">
<textarea id="reason" class="form-control" rows="3" ></textarea>
</div>
</div>
</div>
</div>
</script>
<%include '../../../common/views/__ui/footer'%>
\ No newline at end of file
... ...
<%include '../../../common/views/__ui/header'%>
<%include '../../../common/views/__partail/ListHeader'%>
<div class="contentpanel">
<div class="panel panel-default" style="margin-bottom:10px;">
<div class="panel-body">
<table class="table table-bordered">
<tr>
<td rowspan="2">单品设置</td>
<td>上传EXCEL:</td>
<td style="position: relative;"><input id="sort-file" name="file" data-type="searchSort" type="file" style="cursor: pointer; height: 37px; top: 8px;">
<!--<p style="background: darkgray; text-align: center;">选择文件</p>-->
</td>
</tr>
<tr>
<td>说明：</td>
<td colspan="2">
1、上传文件必须是<span style="color:red;">.xlsx</span>文件<br>
2、Excel表头为：<span style="color: #67D267;">SKN、操作（关闭：0；开启：1）</span><br>
3、第一行为表头内容，第二行开始为正式内容<br>
4、每个文件控制在2500行以内<br>
5、<a href="/ajax/link/payDelivery">下载样例</a>
</td>
</tr>
</table>
<div class="result">
</div>
</div>
</div>
</div>
<%include '../../../common/views/__ui/footer'%>
\ No newline at end of file
... ...
<%include '../../../common/views/__ui/header'%>
<%include '../../../common/views/__partail/ListHeader'%>
<div class="contentpanel">
<div id="yohoCoinSearch" class="panel panel-default" style="margin-bottom:10px;">
<div class="panel-body">
<div class="row">
<div class="panel-col">
<input id="skn" class="form-control panel-input height40" type="text" placeholder="请输入SKN" onkeyup="this.value=this.value.replace(/\D/gi,'')">
</div>
<div class="panel-col">
<select name="shop" id="shop" tabindex="-1" title="" class="form-control">
<option value="-1">请选择店铺</option>
</select>
</div>
<div class="panel-col">
<select name="brand" id="brand" tabindex="-1" title="" class="form-control">
<option value="-1">请选择品牌</option>
</select>
</div>
<div class="panel-col">
<select name="supplier" id="supplier" tabindex="-1" title="" class="form-control">
<option value="-1">请选择供应商</option>
</select>
</div>
<div class="panel-col">
<select name="gender" id="gender" tabindex="-1" title="" class="form-control">
<option value="-1">选择性别</option>
<option value="1">男</option>
<option value="2">女</option>
<option value="3">通用</option>
</select>
</div>
<div class="panel-col">
<select name="auditor" id="auditor" tabindex="-1" title="" class="form-control">
<option value="">请选择审核人</option>
<option value="2965">Tracy</option>
<option value="10235">David Wong</option>
</select>
</div>
<div class="panel-col2">
<div id="sortTree"></div>
</div>
<div class="panel-col" style="width: auto">
<a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
<a id="all-btn" href="javascript:;" class="btn btn-info">全部</a>
</div>
<div id="checkOperation" class="panel-col" style="width: auto;">
<a id="all-checkOk" href="javascript:;" class="btn btn-success">批量通过</a>
<a id="all-checkNo" href="javascript:;" class="btn btn-danger">批量驳回</a>
</div>
</div>
</div>
</div>
<div class="panel">
<ul id="yohoCoinNav" class="nav nav-pills" style="margin-bottom: 10px">
<li data-status="1" class="active"><a href="#">待审核</a></li>
<li data-status="2"><a href="#">通过</a></li>
<li data-status="3"><a href="#">驳回</a></li>
<li data-status=""><a href="#">全部</a></li>
</ul>
<div class="dataTables_wrapper no-footer" id="yohoCoinAudit_table"></div>
</div>
</div>
<%include '../../../common/views/__ui/footer'%>
\ No newline at end of file
... ...
... ... @@ -5,37 +5,24 @@
<div id="yohoCoinSearch" class="panel panel-default" style="margin-bottom:10px;">
<div class="panel-body">
<div class="row">
<%if skn%>
<div class="panel-col">
<input id="skn" class="form-control panel-input height40" type="text" placeholder="请输入SKN" onkeyup="this.value=this.value.replace(/\D/gi,'')">
</div>
<%/if%>
<%if store%>
<div class="panel-col">
<select name="shop" id="shop" tabindex="-1" class="form-control">
<option value="-1">请选择店铺</option>
</select>
</div>
<%/if%>
<%if brand%>
<div class="panel-col">
<select name="brand" id="brand" tabindex="-1" class="form-control">
<option value="-1">请选择品牌</option>
</select>
</div>
<%/if%>
<%if supplier%>
<div class="panel-col">
<select name="supplier" id="supplier" tabindex="-1" class="form-control">
<option value="-1">请选择供应商</option>
</select>
</div>
<%/if%>
<%if gender%>
<div class="panel-col">
<select name="gender" id="gender" tabindex="-1" class="form-control">
<option value="-1">选择性别</option>
... ... @@ -44,9 +31,6 @@
<option value="3">通用</option>
</select>
</div>
<%/if%>
<%if gender%>
<div class="panel-col">
<select name="auditStatus" id="auditStatus" tabindex="-1" class="form-control">
<option value="-1">选择审核状态</option>
... ... @@ -56,30 +40,13 @@
<option value="3">驳回</option>
</select>
</div>
<%/if%>
<div class="panel-col">
<input id="returnMoney" class="form-control panel-input height40" type="text" placeholder="反币金额">
</div>
<%if sortTree%>
<div class="panel-col2">
<div id="sortTree"></div>
</div>
<%/if%>
<%if returnCoinTime%>
<div class="panel-col form-inline" style="width: auto">
<div class="form-group" style="margin-right: 0">
<label>反币时间：</label>
<input type="text" class="form-control" jsaction="date:end:endDate" id="startDate" placeholder="开始时间">
</div>
<label>~</label>
<div class="form-group">
<input type="text" class="form-control" jsaction="date:start:startDate" id="endDate" placeholder="结束时间">
</div>
</div>
<%/if%>
<div class="panel-col" style="width: auto">
<a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
... ... @@ -87,13 +54,8 @@
</div>
<div class="panel-col" style="width: auto">
<%if bulkImport%>
<a id="import-btn" href="javascript:;" class="btn btn-primary">批量导入</a>
<%/if%>
<%if bulkExport%>
<a id="export-btn" href="javascript:;" class="btn btn-primary">导出</a>
<%/if%>
</div>
</div>
</div>
... ...
... ... @@ -4,7 +4,7 @@
*/
var $ = require('jquery'),
common = require('../common/common');
common = require('../../../common/common');
/*获取基础商品数据*/
var param = location.href.slice(location.href.indexOf("info")).match(/\/\d+/g);
... ...
'use strict';
var $ = require('jquery'),
common = require('../common/common');
common = require('../../../common/common');
new common.dropDown({el:"#brandId",ajax:"brand",params:function(){
return {status:1}
... ...
'use strict';
var $ = require('jquery'),
common=require('../common/common');
common=require('../../../common/common');
/*基础商品模型(Model)*/
var RESPONSEDATA={};
... ...
'use strict';
var $ = require('jquery'),
common = require('../common/common');
common = require('../../../common/common');
var ENUM = {
... ... @@ -171,7 +171,7 @@ var t = new common.tab2({
}
}
g.init('/base/goods/ajax/index');
g.init('/product/getBaseProductList');
},
columns: [{
... ... @@ -456,7 +456,7 @@ var g = new common.grid({
},
]
});
g.init('/base/goods/ajax/index');
g.init('/product/getBaseProductList');
// 筛选
$(document).on('click', "#filter-btn", function() {
... ...
... ... @@ -4,7 +4,7 @@
*/
'use strict';
var $ = require('jquery'),
common = require('../common/common');
common = require('../../../common/common');
var ENUM = {
... ...
... ... @@ -3,7 +3,7 @@
*/
'use strict';
var $ = require('jquery'),
common = require('../common/common');
common = require('../../../common/common');
var ENUM = {
tips: {
... ...
... ... @@ -3,7 +3,7 @@
*/
'use strict';
var $ = require('jquery'),
common = require('../common/common');
common = require('../../../common/common');
$('input[type="file"]').after('<div class="file-name btn btn-default">请选择文件</div>');
... ...
... ... @@ -272,11 +272,11 @@ $(document).on('click', '#yohoCoinNav li', function() {
$(this).addClass("active").siblings().removeClass("active");
if($(this).data("status") == "1"){
$("#checkOperation").show();
g1.init($("#gridurl").val());
g1.init("/good/yohoCoin/queryPageList4Audit");
g = g1;
}else{
$("#checkOperation").hide();
g2.init($("#gridurl").val());
g2.init("/good/yohoCoin/queryPageList4Audit");
g = g2;
}
});
... ...
... ... @@ -77,7 +77,7 @@ var g = new common.grid({
}
}]
});
g.init($("#gridurl").val());
g.init("/good/yohoCoin/queryPageList");
//批量上传
ajaxUpload();
... ...