Authored by liuyue

confict

... ... @@ -13,20 +13,24 @@ var common={
edit:edit,
util:{
__ajax:function(options,callback){
$.ajax({
type: 'POST',
url: options.url,
dataType: 'json',
data:options.data||{},
success: function(res) {
res=res.data;
if (res.code === 200) {
common.util.__tip(res.message,"success",callback);
} else {
common.util.__tip(res.message,"danger",callback);
if(typeof options.data=="string"){
common.util.__tip(options.data,"danger");
}else{
$.ajax({
type: 'POST',
url: options.url,
dataType: 'json',
data:options.data||{},
success: function(res) {
res=res.data;
if (res.code === "200") {
common.util.__tip(res.message,"success",callback.bind(this,res));
} else {
common.util.__tip(res.message,"danger");
}
}
}
});
});
}
},
__tip:function(message,callback){
//danger
... ...
... ... @@ -12,6 +12,7 @@ var urlObj={
'querySupplier': '/product/query/supplier',
'queryShop': '/product/query/shop',
'maxSort': '/product/query/maxSort'
'shopsRest':'/ShopsRest/getShopsByName'
};
var dropDown=function(option){
... ...
... ... @@ -102,6 +102,7 @@ grid.prototype={
g.__pagination(json);
return;
} else {
g.clear();
g.ajax(_p);
}
},
... ...
... ... @@ -3,59 +3,28 @@
*/
'use strict';
var $ = require('jquery'),
Handlebars = require('yoho.handlebars'),
grid=require('../common/grid'),
dropDown = require('../common/dropDown');
common=require('../common/common');
require('yoho.bootstrap')
var ENUM={
status:{0:'待审核',1:'审核通过',2:'驳回',3:'过期',4:'作废'}//全部
}
exports.init = function() {
//下拉框
new dropDown({el: '#filter-dep'});
new common.dropDown({el: '#filter-dep'});
/**
* 状态数据转换为中文显示
* @param: $element(转换的节点), status(转换的状态字符串)
*/
function statusConvert(status) {
var status = parseInt(status);
switch (status) {
case 0:
return '待审核';
break;
case 1:
return '审核通过';
break;
case 2:
return '驳回';
break;
case 3:
return '过期';
break;
case 4:
return '作废';
break;
default:
return '全部';
break;
}
}
var btnAuthority = JSON.parse($("#btnAuthority").val());
var g = new grid({
var g = new common.grid({
el: '#basicTable',
tabUrl: $('#tabUrl').val(),
tabConvert: statusConvert,
size: 10,
// tabUrl: $('#tabUrl').val(),
// tabConvert: statusConvert,
// size: 10,
parms:function(){
return {
batchNo: $.trim($('#filter-id').val()) ||"",
name: $.trim($('#filter-name').val()) ||"",
reqDepartment:$.trim($('#filter-dep').val()) ||""
batchNo: common.util.__input("filter-id"),
name: common.util.__input("filter-name"),
reqDepartment:common.util.__input("filter-dep")
};
},
columns:[
... ... @@ -68,164 +37,139 @@ exports.init = function() {
{display: '使用期限', name: "limit", render: function(item) {
return '<p class="audit-time">' + item.limitDateFrom + '</p><p>' + item.limitDateTo + '</p>'
}},
{display: '限购码说明', hidden:btnAuthority.couponDes, name: "describe"},
{display: '优惠码说明', hidden:btnAuthority.limitDes, name: "describe"},
{display: '优惠码说明',name: "describe"},
{display: '申请记录', name: "staff"},
{display: '状态', name: "status", render: function(item) {
var html = statusConvert(item.status);
var html = ENUM.status[item.status]||'全部';
if (item.reason) {
html += '<p style="color:red;">(' + item.reason + ')</p>';
}
return html;
}},
{display:"操作",name:"operate",render:function(items){
{display:"操作",name:"operate",render:function(item){
var HtmArr=[];
if(btnAuthority.look){
HtmArr.push('<a href="/coupon/info/'+ items.id+'" class="btn btn-info btn-xs">查看详情</a>');
}
if(items.status == 0){
HtmArr.push('<a class="btn btn-primary btn-xs apply-success" data-id="'+ items.id+'" href="javascript:;">通过</a>');
HtmArr.push('<a class="btn btn-warning btn-xs apply-back" data-id="'+ items.id+'" href="javascript:;">驳回</a>');
HtmArr.push('<a class="btn btn-danger btn-xs apply-cancel" data-id="'+ items.id+'" href="javascript:;">作废</a>');
HtmArr.push('<a href="/coupon/info/'+ item.id+'" class="btn btn-info btn-xs">查看详情</a>');
if(item.status == 0){
HtmArr.push('<a class="btn btn-primary btn-xs apply-success" data-index="'+ item.__index+'" href="javascript:;">通过</a>');
HtmArr.push('<a class="btn btn-warning btn-xs apply-back" data-index="'+ item.__index+'" href="javascript:;">驳回</a>');
HtmArr.push('<a class="btn btn-danger btn-xs apply-cancel" data-index="'+ item.__index+'" href="javascript:;">作废</a>');
}
if(items.status == 1){
HtmArr.push('<a class="btn btn-danger btn-xs apply-cancel" data-id="'+ items.id+'" href="javascript:;">作废</a>');
if(item.status == 1){
HtmArr.push('<a class="btn btn-danger btn-xs apply-cancel" data-index="'+ item.__index+'" href="javascript:;">作废</a>');
}
if(items.status == 2){
HtmArr.push('<a class="btn btn-info btn-xs apply-modify" data-id="'+ items.id+'" href="/coupon/update/'+ items.id+'">修改</a>');
if(item.status == 2){
HtmArr.push('<a class="btn btn-info btn-xs apply-modify" href="/coupon/update/'+ item.id+'">修改</a>');
}
return HtmArr.join('');
}}
]
})
g.init($("#gridurl").val());
$("#filter-btn").click(function(){
g.reload();
});
var Bll={
toast:function(content,fn){
common.dialog.confirm("温馨提示",content,function(){
common.util.__ajax({
url:'/coupon/auditPromotion',
data:fn()
},function(){
g.reload();
});
});
},
definetoast:function(content,fn,fn1){
common.dialog({
title:"温馨提示",
content:content,
button:[
{value:"取消"},
{value:"确定" ,callback: function(){
common.util.__ajax({
url:'/coupon/auditPromotion',
data:fn()
},function(){
g.reload();
});
}},
{value:"发放列表" ,callback: function(){
common.dialog({
title:"发放列表",
content:'<div id="faGrid"></div>'
});
new common.grid({
el:"#faGrid",
parms:fn1(),
columns:[
{display:"批次号", name:"batchNo", render: function(item) {
return '<a href="/coupon/info/' + item.id + '">' + item.batchNo + '</a>';
}},
{display:"基本信息",name:"name", render: function(item) {
return '<p>名称:' + item.name + '</p><p>次数' + item.limitTimes + '</p><p>部门:' + item.reqDepartment + '</p>';
}},
{display: '使用期限', name: "limit", render: function(item) {
return '<p class="audit-time">' + item.limitDateFrom + '</p><p>' + item.limitDateTo + '</p>'
}},
{display: '优惠码说明',name: "describe"},
{display: '申请记录', name: "staff"}
]
}).init('/coupon/sendPromotion');
}}
]
});
}
}
//作废事件
$('#basicTable').on('click', '.apply-cancel', function() {
var that = this,
applyId = $(this).data('id');
$('#cancel-modal').modal();
$('#cancel-modal').on('click', '.btn-primary', function() {
var reason = $('#cancel-reason').val();
var item=g.rows[$(this).data("index")];
var data=function(){
var reason = $('#reason').val();
if (reason === '' || $.trim(reason) === '') {
alert('请填写作废原因');
return;
return "请填写作废原因";
}
$.ajax({
type: 'post',
dataType: 'json',
url: '{{auditUrl}}',
data: {
id: applyId,
status: 4,
reason: reason
},
success: function(data) {
$('#cancel-modal').modal('hide');
g.reload();
}
})
});
});
//通过事件
$('#basicTable').on('click', '.apply-success', function() {
var that = this,
$listBtn,
applyId = $(this).data('id'),
applyState = $(this).data('state');
$('#success-modal').modal();
$('#success-modal').on('click', '.btn-primary', function() {
$.ajax({
type: 'post',
dataType: 'json',
url: '{{auditUrl}}',
data: {
id: applyId,
status: 1 //审核通过
},
success: function(data) {
$('#success-modal').modal('hide');
g.reload();
}
})
});
$listBtn = $('#success-modal').find('.btn-info');
//发放列表点击事件
$listBtn.off('click.sendPromotion').on('click.sendPromotion', function() {
var auditTime = $(that).parents('td').siblings().find('.audit-time').text();
$.ajax({
type: 'post',
dataType: 'json',
url: '{{sendUrl}}',
data: {
auditTime: auditTime
},
success: function(res) {
var data = res.data.data.list;
if (data.length === 0) {
alert('暂无时间交叉的优惠码');
} else {
$('#send-modal').modal({
width: 1000
});
var tpl = Handlebars.compile($('#send-tpl').html());
$('#send-modal tbody').html(tpl({
data: data
}));
}
}
})
});
return {
id:item.id,
status:4,
operations:reason
};
}
Bll.toast(common.util.__template($("#template").html(),{name:"您确定要作废此优惠码吗?"}),data);
});
//驳回事件
$('#basicTable').on('click', '.apply-back', function() {
var that = this,
applyId = $(this).data('id');
$('#back-modal').modal();
$('#back-modal').on('click', '.btn-primary', function() {
var reason = $('#back-reason').val();
var item=g.rows[$(this).data("index")];
var data=function(){
var reason = $('#reason').val();
if (reason === '' || $.trim(reason) === '') {
alert('请填写驳回原因');
return;
return "请填写驳回原因";
}
$.ajax({
type: 'post',
dataType: 'json',
url: '{{auditUrl}}',
data: {
id: applyId,
status: 2,
reason: reason
},
success: function(data) {
$('#back-modal').modal('hide');
g.reload();
}
})
})
return {
id:item.id,
status:2,
operations:reason
};
}
Bll.toast(common.util.__template($("#template").html(),{name:"您确定要驳回该申请吗?"}),data);
});
//通过事件
$('#basicTable').on('click', '.apply-success', function() {
var item=g.rows[$(this).data("index")];
var data=function(){
return {
id:item.id,
status:1,
operations:reason
};
}
Bll.definetoast("您确定要通过该申请吗?",data,function(){
return {auditTime:item.limitDateFrom};
});
});
}
... ...
... ... @@ -56,7 +56,7 @@ exports.init = function() {
g.reload();
});
var tool={
var Bll={
toast:function(content,fn){
common.dialog.confirm("温馨提示",content,function(){
common.util.__ajax({
... ... @@ -78,30 +78,38 @@ exports.init = function() {
reason:"预算不够"
};
}
tool.toast("确定要通过该申请吗?",data);
Bll.toast("确定要通过该申请吗?",data);
});
//驳回
$('#basicTable').on('click', '.apply-back', function() {
var item=g.rows[$(this).data("index")];
var data=function(){
var reason = $('#reason').val();
if (reason === '' || $.trim(reason) === '') {
return "请填写驳回原因";
}
return {
id:item.id,
status:2,
reason:$("#reason").val()
reason:reason
};
};
tool.toast(common.util.__template($("#template").html(),{title:"你确定要驳回该申请吗?"}),data);
Bll.toast(common.util.__template($("#template").html(),{title:"你确定要驳回该申请吗?"}),data);
});
//作废
$('#basicTable').on('click', '.apply-cancel', function() {
var item=g.rows[$(this).data("index")];
var reason = $('#reason').val();
if (reason === '' || $.trim(reason) === '') {
return "请填写作废原因";
}
var data=function(){
return {
id:item.id,
status: 3,
reason:$("#reason").val()
reason:reason
};
}
tool.toast(common.util.__template($("#template").html(),{title:"你确定要作废此限购码吗?"}),data);
Bll.toast(common.util.__template($("#template").html(),{title:"你确定要作废此限购码吗?"}),data);
});
}
\ No newline at end of file
... ...
... ... @@ -3,96 +3,64 @@
*/
'use strict';
var $ = require('jquery'),
Handlebars = require('yoho.handlebars');
common = require('../common/common');
var dropDown=require('../common/dropDown');
require('../util/jquery.gritter');
var grid=require('../common/grid');
exports.init = function () {
exports.init=function(){
function __ajax(options,callback){
$.ajax({
type: 'POST',
url: options.url,
dataType: 'json',
data:options.data||{},
success: function(res) {
res=res.data;
$("#input").val("");
$("#modal-id").modal('hide'); //影藏弹框
if (res.code === 200) {
$.gritter.add({
title: options.msg||"提交成功",
class_name: 'growl-success',
sticky: false,
time: '1000',
after_open: function() {
callback&&callback();
}
});
} else {
$.gritter.add({
title: '提交失败',
class_name: 'growl-danger',
sticky: false,
time: '1000'
});
}
var g = new common.grid({
el: '#size-property',
columns: [
{display: "编号", name: "id"},
{display: "属性名", name: "attributeName"},
{
display: "操作", name: "", render: function (item) {
return '<a class="btn btn-info add2" data-index="' + item.__index + '">编辑</a>';
}
}
});
}
var g=new grid({
el:'#size-property',
// 传递给后台的参数
parms:function(){
//var supplierid=!!~$.trim($('#supplier-name').val())?$('#supplier-name').val():"0",
// brandId = !!~$.trim($('#brand-name').val())?$('#brand-name').val():"0";
return {
};
},
columns:[
{display:"编号",name:"id"},
{display:"属性名",name:"attributeName"},
//{display:"包含品牌",name:"",render:function(item){
// var str='';
// $.each(item.shopRelationList,function (index,a) {
// str+='<p>'+a.brandName+'</p>';
// })
// return str;
//}},
{display:"操作",name:"", render:function(item){
return '<a class="btn btn-info add2" id="'+item.id+'" data-toggle="modal" href="#modal-id">编辑</a>'
}}
]
});
console.log($('#url').val());
g.init($('#url').val());
$('#size-property').on('click', '.add2', function () {
var item = g.rows[$(this).data("index")];
common.dialog.confirm("修改尺码属性",
common.util.__template($("#template").html(), {id: item.id, input: item.attributeName})
, function () {
common.util.__ajax({
url: '/erpproduct/sizeattribute/propertyModify',
data: {
id: item.id,
attributeName: $("#input").val()
}
}, function () {
g.reload();
});
});
});
// 添加&编辑 尺码属性
$('#size-property').on('click','.add2',function(){
$('#add').on('click', function () {
common.dialog.confirm("添加尺码属性",
common.util.__template($("#template").html(), {id: "", input: ""})
, function () {
common.util.__ajax({
url: '/erpproduct/sizeattribute/propertyAdd',
data: {
attributeName: $("#input").val()
}
}, function () {
g.reload();
});
});
});
}
var id = $(this).attr('id');
var options = {};
if()
//__ajax({
// url: "/erpproduct/sizeattribute/propertyAdd",
// data:{
// attributeName: $('#input').val()
// }
//},function(){
// g.reload();
//});
});
}
... ...
// 尺码管理
var $ = require('jquery');
var edit = require('../common/edit');
var dropDown = require('../common/dropDown');
var dropDown = require('../common/dropDown');
var Handlebars = require('yoho.handlebars')
common = require('../common/common');
exports.init = function() {
$('.getsize').on('click', function() {
$.ajax({
url: '/erpproduct/size/getSize',
type: 'POST',
dataType: "json",
data: {
id: $(this).data('id')
},
success: function(data) {
console.log(data.data.data);
var siezNameBox = [];
siezNameBox.push('<input type="hidden" id="id" value="'+data.data.data.id+'" />');
siezNameBox.push('<input class="form-control"id="siezName" type="text" value="'+data.data.data.sizeName+'" />');
$('#siezNameBox').html(siezNameBox);
var g = new common.grid({
el: '#size-list',
columns: [
{display: "编号", name: "id"},
{display: "尺码名", name: "sizeName"},
{
display: "操作", name: "", render: function (item) {
return '<a class="btn btn-info add2" data-index="' + item.__index + '">编辑</a>';
}
})
});
$('#addSize').on('click',function(){
$('#siezNameBox').html('<input id="siezName" class="form-control" type="text" value="" />');
$('#modal-id').modal('show');
})
$('.add').on('click', function() {
var id= $('#id').val();
var siezName= $('#siezName').val();
console.log(siezName);
if(!id){
__ajax({
url:'/erpproduct/size/addSize',
data:{
sizeName: siezName
}
})
}else{
__ajax({
url:'/erpproduct/size/updateSize',
data:{
id:id,
sizeName: siezName
}
})
}
})
function __ajax(options,callback){
$.ajax({
type: 'POST',
url: options.url,
dataType: 'json',
data:options.data||{},
success: function(res) {
res=res.data;
if (res.code === 200) {
$.gritter.add({
title: options.msg||"提交成功",
class_name: 'growl-success',
sticky: false,
time: '1000',
after_open: function() {
callback&&callback();
}
});
setInterval(function(){
history.go(0);
},1000)
} else {
$.gritter.add({
title: '提交失败',
class_name: 'growl-danger',
sticky: false,
time: '1000'
});
setInterval(function(){
history.go(0);
},1000)
}
}
]
});
}
function getArr(curPage, pageCount) {
var arr = [];
//改变标签数,最好是奇数.......
var paginitionLength = 5;
var middle = Math.ceil(paginitionLength / 2);
g.init($('#url').val());
$('#size-list').on('click', '.add2', function () {
if (curPage - 1 >= pageCount) {
console.log('err data');
return false;
}
var item = g.rows[$(this).data("index")];
for (var i = 0; i < pageCount && i < paginitionLength; i++) {
arr[i] = i + 1;
}
console.log(item);
// 修改尺码
common.dialog.confirm("修改尺码属性",
common.util.__template($("#template").html(), {id: item.id, input: item.sizeName})
, function () {
common.util.__ajax({
url: '/erpproduct/size/updateSize',
data: function () {
if (curPage <= middle) {
return arr;
}
if (curPage > middle && curPage < pageCount + 1 - middle) {
for (var p = 0; p < arr.length; p++) {
arr[p] = curPage - (paginitionLength - middle - p);
}
if($("#input").val()==""){
return "尺码名不能为空";
}
} else {
for (var k = 0; k < arr.length; k++) {
arr[k] = pageCount - paginitionLength + k + 1;
}
}
return {
id: item.id,
sizeName: $("#input").val()
}
}
}, function () {
g.reload();
});
});
});
return arr;
}
Handlebars.registerHelper("page", function(value) {
var html = [];
var all = getArr(this.number,this.totalPages);
html.push('<li><a href="/erpproduct/size/index/1" aria-label="Previous">&laquo;</a></li>')
$.each(all, function(index) {
html.push('<li><a href="/erpproduct/size/index/' + all[index] + '" aria-label="Previous">' + all[index] + '</a></li>');
})
html.push('<li><a href="/erpproduct/size/index/'+this.totalPages+'" aria-label="Previous">&raquo;</a></li>')
return html.join('');
// 添加尺码
$('#add').on('click', function () {
common.dialog.confirm("添加尺码属性",
common.util.__template($("#template").html(), {id: "", input: ""})
, function () {
common.util.__ajax({
url: '/erpproduct/size/addSize',
data: {
sizeName: $("#input").val()
}
}, function () {
g.reload();
});
});
});
var pagecm = Handlebars.compile($("#pagenation-template").html().replace(/\\/g, ''));
$('#pagewrapper').html(pagecm({
totalPages: $('#totalPages').text(),
number:$('#number').text()
}));
};
\ No newline at end of file
... ...
... ... @@ -7,8 +7,7 @@ var grid=require('../common/grid');
require('../util/jquery.gritter');
exports.init=function(){
new dropDown({el:"#store-name",ajax:"brand"});
new dropDown({el:"#identity-type"});
new dropDown({el:"#store-name",ajax:"shopsRest"});
function __ajax(options,callback){
$.ajax({
... ... @@ -57,6 +56,7 @@ exports.init=function(){
identity: $('#identity-type option:selected').val()
},
success: function(data) {
$('#manager-name').html('');
$.each(data.data.data,function(index){
console.log(data.data.data[index].truename);
$('#manager-name').append("<option value='"+data.data.data[index].pid+"'>"+data.data.data[index].truename+"</option>");
... ...
... ... @@ -91,7 +91,7 @@ exports.init = function() {
function(option) {
option.success = function(res) {
if (res.data.code == "200") {
location.href="/supplier/store/index";
history.go(-1);
} else {
e.$tip("提交失败");
}
... ... @@ -110,7 +110,7 @@ exports.init = function() {
function(option) {
option.success = function(res) {
if (res.data.code == "200") {
location.href="/supplier/store/index";
history.go(-1);
} else {
e.$tip("提交失败");
}
... ... @@ -132,11 +132,13 @@ exports.init = function() {
homepage.each(function(index) {
hplist.push(homepage[index].value);
});
console.log('hplist:'+hplist);
var homeurl = $("input[name='homeurl']");
var homeurlist = [];
homeurl.each(function(index) {
homeurlist.push(homepage[index].value);
homeurlist.push(homeurl[index].value);
});
console.log('homeurlist:'+homeurlist);
var homeaddress = $("input[name='homeaddresslist']");
var homeaddresslist = [];
homeaddress.each(function(index) {
... ... @@ -150,7 +152,6 @@ exports.init = function() {
shopRelation.push('"agreementEndTime":'+$('#updateBrand tbody tr').eq(index).find('td').eq(1).find('.agreementendtime').val()+',');
shopRelation.push('"brandId":'+$('#updateBrand tbody tr').eq(index).find('td').eq(1).find('.brandid').val()+',');
shopRelation.push('"supplierId":'+$('#updateBrand tbody tr').eq(index).find('td').eq(1).find('.supplierid').val());
console.log(index,updateBrand.length-1);
if(index==updateBrand.length-1){
shopRelation.push('}')
}else{
... ... @@ -158,10 +159,9 @@ exports.init = function() {
}
});
shopRelation.push(']')
console.log(shopRelation.join(''));
submit(function(data) {
data.websiteUrl = hplist.toString();
data.otherUrl = homeurlist.toString();
data.otherUrl= hplist.toString();
data.websiteUrl = homeurlist.toString();
data.shopAddress = homeaddresslist.toString();
data.onCheck = onCheck;
data.shopsId = shopsId;
... ... @@ -174,30 +174,30 @@ exports.init = function() {
var homepage = $('#otherUrl').val().split(',');
$.each(homepage,
function() {
$('#homepage').append('<input value="' + this + '" type="text" name="homepage" class="form-control" style="margin-buttom:15px;">')
$('#homepage').append('<input value="' + this + '" type="text" name="homepage" class="form-control" style="margin-bottom:15px;">')
})
}else{
$('#homepage').append('<input type="text" name="homepage" class="form-control" style="margin-buttom:15px;">')
$('#homepage').append('<input type="text" value="'+$('#otherUrl').val()+'" name="homepage" class="form-control" style="margin-bottom:15px;">')
}
if ($('#websiteUrl').val().split(',').length > 1) {
var websiteUrl = $('#websiteUrl').val().split(',');
$.each(websiteUrl,
function() {
$('#homeurl').append('<input value="' + this + '" type="text" name="homeurl" class="form-control" style="margin-buttom:15px;">')
$('#homeurl').append('<input value="' + this + '" type="text" name="homeurl" class="form-control" style="margin-bottom:15px;">')
})
}else{
$('#homeurl').append('<input type="text" name="homeurl" class="form-control" style="margin-buttom:15px;">')
$('#homeurl').append('<input type="text" value="'+$('#websiteUrl').val()+'" name="homeurl" class="form-control" style="margin-bottom:15px;">')
}
if ($('#shopAddress').val().split(',').length > 1) {
var shopAddress = $('#shopAddress').val().split(',');
$.each(shopAddress,
function() {
$('#homeaddress').append('<input value="' + this + '" type="text" name="homeaddresslist" class="form-control" style="margin-buttom:15px;">')
$('#homeaddress').append('<input value="' + this + '" type="text" name="homeaddresslist" class="form-control" style="margin-bottom:15px;">')
})
}else{
$('#homeaddress').append('<input type="text" name="homeaddresslist" class="form-control" style="margin-buttom:15px;">')
$('#homeaddress').append('<input type="text" value="'+$('#shopAddress').val()+'" name="homeaddresslist" class="form-control" style="margin-bottom:15px;">')
}
});
$('#brand-name').on('change',function() {
... ...
... ... @@ -12,11 +12,10 @@ exports.res = [
data: {
pageTitle: '优惠码列表',
createUrl: '/coupon/add',
bottons:'{"look":true, "couponDes": true}',
gridurl:'/getPromotion',
tabUrl: '/getCodeCount',
sendUrl: '/sendPromotion',
auditUrl: '/auditPromotion'
gridurl:'/coupon/getPromotion',
// tabUrl: '/getCodeCount',
// sendUrl: '/sendPromotion',
// auditUrl: '/auditPromotion'
}
},
... ... @@ -31,7 +30,7 @@ exports.res = [
}]
},
{
route: '/getPromotion',
route: '/coupon/getPromotion',
method: 'POST',
url: '/promotioncode/getPromotionCodeList',
isJsonRaw: true,
... ... @@ -39,10 +38,10 @@ exports.res = [
name: 'status',
type: 'Number'
}, {
name: 'curPage',
name: 'page',
type: 'Number'
}, {
name: 'pageSize',
name: 'size',
type: 'Number'
}, {
name: 'batchNo',
... ... @@ -55,7 +54,7 @@ exports.res = [
type: 'String'
}]
},{
route: '/auditPromotion',
route: '/coupon/auditPromotion',
method: 'POST',
url: '/promotioncode/auditPromotionCode',
isJsonRaw: true,
... ... @@ -70,7 +69,7 @@ exports.res = [
type: 'String'
}]
}, {
route: '/sendPromotion',
route: '/coupon/sendPromotion',
method: 'POST',
url: '/promotioncode/getPromotionCodeSendList',
isJsonRaw: true,
... ... @@ -81,33 +80,7 @@ exports.res = [
}
]
},
{
route: '/auditPromotion',
method: 'POST',
url: '/promotioncode/auditPromotionCode',
isJsonRaw: true,
params: [{
name: 'id',
type: 'Number'
}, {
name: 'status',
type: 'Number'
}, {
name: 'reason',
type: 'String'
}]
}, {
route: '/sendPromotion',
method: 'POST',
url: '/promotioncode/getPromotionCodeSendList',
isJsonRaw: true,
params: [
{
name: 'auditTime',
type: 'String'
}
]
}, {
{
route: '/getCodeCount',
method: 'POST',
url: '/promotioncode/getPromotionCodeCountByStatus',
... ...
... ... @@ -6,18 +6,17 @@ exports.res = [{
route: '/erpproduct/size/index',
method: 'GET',
view: 'pages/product/siezChart',
url:'/product/querySizeList',
//url:'/product/querySizeList',
isJsonRaw:true,
params: [
{name: 'page', type: 'Number',def:1},
{name: 'size', type: 'Number',def:10}
],
//params: [
// {name: 'page', type: 'Number',def:1},
// {name: 'size', type: 'Number',def:10}
//],
src: '/product/sizeChart'
},{
// 产品管理【尺寸】页面分页渲染
route: '/erpproduct/size/index/:page',
method: 'GET',
view: 'pages/product/siezChart',
route: '/erpproduct/sizeattribute/sizeList',
method: 'POST',
url:'/product/querySizeList',
isJsonRaw:true,
params: [
... ... @@ -44,7 +43,7 @@ exports.res = [{
{name: 'sizeName', type: 'String'}
]
},{
// 新增尺码
// 修改尺码
route: '/erpproduct/size/updateSize',
method: 'POST',
url:"/product/updateSize",
... ...
/**
* Created by wangqianjun on 16/2/3.
*/
exports.domain = require('../config/common.js').domain;
exports.domain = require('../config/common.js').domain;
//路由配置
exports.res = [
{
... ...
... ... @@ -248,4 +248,15 @@ exports.res = [{
params:[
{name:"brandId",type:"Number"}
]
}]
\ No newline at end of file
},{
// 店铺列表
route: '/ShopsRest/getShopsByName',
method: 'POST',
url:"/ShopsRest/selectCheckPassShopsByName",
isJsonRaw:true,
params:[
{name:"shopName",type:"String"}
]
}]
\ No newline at end of file
... ...
... ... @@ -6,19 +6,20 @@ exports.uploadFile=function(req,res){
// TODO 代理上传
// 方法1
// if(req.is("multipart/form-data")){
// req.body.file=fs.createReadStream(req.files[req.body.filename].path);
// request.post({url:domain+'/fileupload/upload',formData:req.body},function optionalCallback(err, httpResponse, body){
// res.json(JSON.parse(body));
// });
// }else{
// res.json({code:"500",message:"请求类型错误"});
// }
res.json({
"code":200,
"data" : "https://ss1.baidu.com/6ONXsjip0QIZ8tyhnq/it/u=1444256491,538988776&fm=80",
"message":"success"
if(req.is("multipart/form-data")){
req.body.file=fs.createReadStream(req.files[req.body.filename].path);
request.post({url:domain+'/fileupload/upload',formData:req.body},function optionalCallback(err, httpResponse, body){
res.json(JSON.parse(body));
});
}else{
res.json({code:"500",message:"请求类型错误"});
}
// res.json({
// "code":200,
// "data" : "https://ss1.baidu.com/6ONXsjip0QIZ8tyhnq/it/u=1444256491,538988776&fm=80",
// "message":"success"
// });
//方法2
// req.pipe(request.post(domain+'/fileupload/upload'))
// .on('error', onerror)
... ...
... ... @@ -67,112 +67,9 @@
<input type="hidden" id="gridurl" value="{{gridurl}}">
<input type="hidden" id="tabUrl" value="{{tabUrl}}">
<div class="modal fade" id="cancel-modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">温馨提示</h4>
</div>
<div class="modal-body">
<p>您确定要作废此优惠码吗?</p>
<label class="col-sm-3 control-label">*请填写原因</label>
<input id="cancel-reason" type="text" class="form-control" name="agreement-code" style="width:280px;">
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
<button type="button" class="btn btn-primary">确定</button>
</div>
</div>
</div>
</div>
<div class="modal fade" id="back-modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">温馨提示</h4>
</div>
<div class="modal-body">
<p>您确定要驳回该申请吗?</p>
<label class="col-sm-3 control-label">*请填写原因</label>
<input id="back-reason" type="text" class="form-control" name="agreement-code" style="width:280px;">
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
<button type="button" class="btn btn-primary">确定</button>
</div>
</div>
</div>
</div>
<div class="modal fade" id="success-modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">温馨提示</h4>
</div>
<div class="modal-body">
您确定要通过该申请吗?
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
<button type="button" class="btn btn-primary">确定</button>
<button type="button" class="btn btn-info">发放列表</button>
</div>
</div>
</div>
</div>
<div class="modal fade" id="send-modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">发放列表</h4>
</div>
<div class="modal-body">
<div class="send-list">
<table style="width:100%;" class="coupon-send-table am-table am-table-bordered am-table-radius">
<thead>
<tr class="am-primary">
<th>批次号</th>
<th>基本信息</th>
<th>使用期限</th>
<th>优惠码说明</th>
<th>申请人</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
<script id="send-tpl" type="x-tmpl-handlebars">
\{{# data}}
<tr>
<td class="id" style="width: 20%;"><a href="/coupon/info/\{{id}}">\{{batchNo}}</a></td>
<td class="info" style="width: 30%;">
<p>名称:\{{name}}</p>
<p>次数:\{{limitTimes}}</p>
<p>部门:\{{reqDepartment}}</p>
</td>
<td class="time" style="width: 20%;">
<p>\{{limitDateFrom}}</p>
<p>\{{limitDateTo}}</p>
</td>
<td class="describe" style="width: 22%;">
<p>\{{describe}}</p>
</td>
<td class="staff" style="width: 8%;">\{{staff}}</td>
</tr>
\{{/ data}}
<script type="text/template" id="template">
<p>{name}</p>
<label class="col-sm-3 control-label">*请填写原因</label>
<input id="reason" type="text" class="form-control" name="agreement-code" style="width:280px;">
</script>
... ...
... ... @@ -18,59 +18,27 @@
</div>
</div>
</div>
<div class="contentpanel">
<div class="panel panel-default" style="margin-bottom:10px;">
<div class="panel-body">
<div class="row">
<a class="btn btn-info" data-toggle="modal" id="addSize">添加尺码</a>
<a class="btn btn-info" id="add">添加尺码</a>
</div>
</div>
<table class="table table-striped table-bordered responsive dataTable no-footer">
<thead>
<tr>
<th>编号</th>
<th>尺码名</th>
<th>操作</th>
</tr>
</thead>
<tbody>
{{#data.list}}
<tr>
<td>{{id}}</td>
<td>{{sizeName}}</td>
<td><a class="btn btn-info getsize" data-id="{{id}}" data-toggle="modal" href='#modal-id'>操作</a></td>
</tr>
{{/data.list}}
</tbody>
</table>
</div>
<input type="hidden" id="url" value="/erpproduct/sizeattribute/sizeList"/>
<div id="size-list">
{{#data}}
<div style="display: none;" id="totalPages">{{totalPage}}</div>
<div style="display: none;" id="number">{{page}}</div>
<nav ><ul class="pagination" id="pagewrapper"></ul></nav>
{{/data}}
</div>
<div class="modal fade" id="modal-id">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title">添加尺码</h4>
</div>
<div class="modal-body">
<div class="form-group">
<label for="input" class="col-sm-2 control-label">尺码名:</label>
<div class="col-sm-10" id="siezNameBox"></div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary add">保存</button>
</div>
</div>
</div>
</div>
<script id="pagenation-template" type="text/x-handlebars-template">
\{\{#page\}\}
\{\{/page\}\}
</script>
\ No newline at end of file
<script type="text/template" id="template">
<div class="form-group">
<label for="input" class="col-sm-2 control-label">尺码名:</label>
<div class="col-sm-10">
<input type="hidden" name="" value="{id}" id="id" class="form-control" value="" required="required" pattern="" title="">
<input type="text" name="" value="{input}" id="input" class="form-control" value="" required="required" pattern="" title="">
</div>
</div>
</script>
\ No newline at end of file
... ...
... ... @@ -23,7 +23,7 @@
<div class="panel panel-default" style="margin-bottom:10px;">
<div class="panel-body">
<div class="row">
<a class="btn btn-info" data-toggle="modal" href='#modal-id'>添加尺码属性</a>
<a class="btn btn-info" id="add">添加尺码属性</a>
</div>
</div>
<input type="hidden" id="url" value="/erpproduct/sizeattribute/propertyList"/>
... ... @@ -33,25 +33,15 @@
</div>
</div>
<div class="modal fade" id="modal-id">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title">添加尺码属性</h4>
</div>
<div class="modal-body">
<div class="form-group">
<label for="input" class="col-sm-2 control-label">尺码名:</label>
<div class="col-sm-10">
<input type="text" name="" id="input" class="form-control" value="" required="required" pattern="" title="">
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary add">保存</button>
</div>
<script type="text/template" id="template">
<div class="form-group">
<label for="input" class="col-sm-2 control-label">尺码属性名:</label>
<div class="col-sm-10">
<input type="hidden" name="" value="{id}" id="id" class="form-control" value="" required="required" pattern="" title="">
<input type="text" name="" value="{input}" id="input" class="form-control" value="" required="required" pattern="" title="">
</div>
</div>
</div>
</script>
... ...
... ... @@ -33,13 +33,16 @@
</div>
<div class="panel-body">
<div class="row">
<span class="col-sm-1 control-label">店铺列表 *</span>
<select name="supplier-name" id="store-name" style="width: 280px;" tabindex="-1" title="" class="select2-offscreen brandBtn-group brandBtn-group-lg">
<option value="-1">店铺列表</option>
</select>
<div style="margin-top: 20px;">
<span class="col-sm-1 control-label">管理员筛选 *</span>
<select name="store-type" id="identity-type" style="width: 280px;" tabindex="-1" title="" class="select2-offscreen brandBtn-group brandBtn-group-lg"><option value="-1" selected="selected">请选择身份</option>
<div class="container-fluid">
<span class="col-sm-1 control-label">店铺列表</span>
<select name="supplier-name" id="store-name" style="width: 280px;" tabindex="-1" title="" class="select2-offscreen brandBtn-group brandBtn-group-lg">
<option value="-1">店铺列表</option>
</select>
</div>
<div class="contentpanel" style="margin-top: 20px;">
<span class="col-sm-1 control-label">管理员筛选</span>
<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">
<select name="store-type" id="identity-type" style="width: 280px;" tabindex="-1" title="" class="form-control"><option value="-1" selected="selected">请选择身份</option>
<option value="1" data-valid="">品牌公司</option>
<option value="2" data-valid="">品牌经销商</option>
<option value="3" data-valid="">品牌代运营商</option>
... ... @@ -48,9 +51,12 @@
<option value="6" data-valid="">有货商品运营</option>
<option value="7" data-valid="">有货平台运营</option>
</select>
<select name="time-sort" id="manager-name" tabindex="-1" title="" class="select2-offscreen brandBtn-group">
<option value="-1">选择管理员</option>
</select>
</div>
<div class="col-sm-2">
<select name="time-sort" id="manager-name" tabindex="-1" title="" class="form-control">
<option value="-1">选择管理员</option>
</select>
</div>
</div>
... ...