fe / yohobuy-portal-fe · Commits

Go to a project

Authored by weiqingting
Commit f062c6251eae4e6115f9a3a5413c01c7ba437c16 1 parent 1be1b33c

三期bug修改

Inline Side-by-side
Showing 8 changed files with 189 additions and 65 deletions
... ... @@ -3,7 +3,8 @@ var $ = require('jquery'),
common=require('../common/common');
var RESPONSEDATA={};
var param = location.href.match(/(add|update)\/(\d+)/);
var param = location.href.match(/(add|update|update2)\/(\d+)/);
if(param){
common.util.__ajax({
url:'/base/goods/getData',
... ... @@ -14,11 +15,16 @@ if(param){
console.log(RESPONSEDATA);
},true);
}
/*审核*/
if($("#isShenHe").val()){
RESPONSEDATA.shenghe=true;
}
RESPONSEDATA.ENUMYEAR=(function(){
var _y=[];
for(var i=2005;i<(new Date).getFullYear()+10;i++){
_y.push({YEAR:i});
}
return _y;
})()
console.log(RESPONSEDATA);
/*审核*/
$("#basicInfo").html(common.util.__template2($("#template2").html(),RESPONSEDATA));
... ... @@ -47,9 +53,17 @@ var ENUM={
*isSuppled 能否补货，'N','Y'
*barCode 条形码
*/
goodsSizeList:{"sizeId":"","salePrice":"","barCode":"","isSuppled":""}
goodsSizeList:{"sizeId":"","salePrice":"","barCode":"","isSuppled":"N"}
}
var Bll={
validateSort:function(){
var select=tabTree.getAddress();
if(select[2]&&select[2].id){
return select[2].id;
}
return false;
}
}
/*下拉选择*/
new common.dropDown({el:"#brandId",ajax:"queryBrand"});
... ... @@ -95,14 +109,16 @@ var g=new common.grid({
}
],
complete:function(){
new common.dropDown({
el: ".btn-sort-chima",
ajax: "sortsize",
params: {
"sortId" : tabTree.selected[0]?tabTree.selected[0].id:""
}
});
var sort=Bll.validateSort();
if(sort){
new common.dropDown({
el: ".btn-sort-chima",
ajax: "sortsize",
params: {
"sortId" : sort
}
});
}
g.__e.init();
}
});
... ... @@ -122,7 +138,10 @@ g.__e.on("callback", function(obj) {
$(document).on("click",".sortadd",function(){
var text=$(this).text();
if(!Bll.validateSort()){
common.util.__tip("请选择完整的分类目录");
return;
}
if(g.__e.validate()){
g.__rows.push({
"factoryCode": "",
... ... @@ -135,6 +154,9 @@ $(document).on("click",".sortadd",function(){
// g.__e.init();
}
});
$(document).on("change","#brandId",function(){
// $("#productName").val($(this).text().replace(/\/));
});
$(document).on("click",".sortdelete",function(){
var index=$(this).data("index");
[].splice.call(g.__rows,index,1);
... ... @@ -169,7 +191,6 @@ $(document).on("change",".btn-sort-xiaoshou",function(){
var _eq=$(this).data("eq");
var item=g.__rows[_index].goodsSizeList[_eq];
item.salePrice=$(this).val();
});
$(document).on("change",".btn-sort-tiaoma",function(){
var _index=$(this).data("index");
... ... @@ -189,22 +210,58 @@ $(document).on("change",".w-goods-text",function(){
console.log(item);
});
$(document).on("change",":checkbox[name=ageLevel]",function(){
var value=$(this).val();
if($(this).is(":checked")){
if(value==1){
$(":checkbox[name=ageLevel]").eq(1).prop("checked",false);
$(":checkbox[name=ageLevel]").eq(2).prop("checked",false);
}else{
$(":checkbox[name=ageLevel]").eq(0).prop("checked",false);
}
}
var arr=[];
$(":checked[name=ageLevel]").each(function(){
arr.push($(this).val())
});
$("#ageLevel").val(arr.join('|'));
});
var e=new common.edit("#basicInfo");
e.on("validate",function(){
return g.__e.validate();
});
e.init();
e.on("validate",function(){
if(Bll.validateSort()){
return true;
}
return "请选择完整的分类目录";
});
e.on("validate",function(){
if(g.__rows.length==0){
return "请添加销售属性";
}
});
e.on("validate",function(){
if((+$("#salesPriceStr").val())>(+$("#retailPriceStr").val())){
return "销售价应该限定小于等于吊牌价";
}
})
$(document).on("click","#btnReview",function(){
e.submit($("#basicForm").attr("action"),function(option){
var select=tabTree.getAddress();
option.data.productSkn=param?param[2]:"";
option.data.maxSortId=tabTree.selected[0]?tabTree.selected[0].id:"";
option.data.middleSortId=tabTree.selected[1]?tabTree.selected[1].id:"";
option.data.smallSortId=tabTree.selected[2]?tabTree.selected[2].id:"";
option.data.maxSortId=select[0]?select[0].id:"";
option.data.middleSortId=select[1]?select[1].id:"";
option.data.smallSortId=select[2]?select[2].id:"";
option.data.shopId=$("#shopId").val();
option.data.brandId=$("#brandId").val();
option.data.supplierId=$("#supplierId").val();
option.data.isAuditing=RESPONSEDATA.isAuditing?RESPONSEDATA.isAuditing:"";
//expectShelfTime
// option.data=new Date(expectShelfTime).getTime();
... ...
... ... @@ -2,6 +2,7 @@
var $ = require('jquery'),
common=require('../common/common');
var ENUM={
status:{toAuditNum:'待审核',failAuditNum:'驳回',passAuditNum:'通过',all:'全部'},//全部
tips:{"toAuditNum":0,"failAuditNum":0,"passAuditNum":0,"all":""}
... ... @@ -12,8 +13,7 @@ var AuditEnum = {
status:{
toAuditNum:100,
passAuditNum:200,
failAuditNum:300,
failAuditNum:300
}
}
... ... @@ -213,22 +213,18 @@ var g = new common.grid({
{display:"创建时间",render: function (item) {
var t = new Date(item.createTime * 1000);
var formatted = t.format("yyyy-mm-dd hh:MM:ss");
var formatted = t.format("yyyy-MM-dd hh:mm:ss");
return "<p>"+formatted+"</p>";
}},
{display:"创建人",name:"createUser"},
{display:"操作",render:function(item){
var html=[];
html.push('<a data-index="'+ item.__index+ '" class="btn btn-info btn-xs delete-class-btn" href="JavaScript:void(0)">删除</a>');
if(item.isAuditing==200){
//审核
html.push('<a data-index="'+ item.__index+ '" class="btn btn-info btn-xs edit-class-btn" href="/base/goods/update2/'+item.productSkn+'">修改</a>');
}else{
html.push('<a data-index="'+ item.__index+ '" class="btn btn-info btn-xs edit-class-btn" href="/base/goods/update/'+item.productSkn+'">修改</a>');
}
html.push('<a data-index="'+ item.__index+ '" class="btn btn-info btn-xs edit-class-btn" href="/base/goods/update/'+item.productSkn+'">修改</a>');
if (item.isAuditing!=200) { // 200 审核通过
if (item.isAuditing!=200&&item.isAuditing!=300) { // 200 审核通过
html.push('<a data-index="'+ item.__index+ '" href="JavaScript:;" class="btn btn-info btn-xs edit-class-btn apply-success">通过</a>');
}
if (item.isAuditing!=300) { // 200 审核通过
... ... @@ -410,4 +406,15 @@ Date.prototype.format = function(format) {
}
/*删除*/
$(document).on("click",".delete-class-btn",function(){
var item=g.rows[$(this).data("index")];
console.log(item);
common.util.__ajax({
url:'/base/goods/ajax/delete',
data:{
productSkn:item.productSkn,
isAuditing:item.isAuditing
}
});
})
\ No newline at end of file
... ...
... ... @@ -261,6 +261,15 @@ edit.prototype = {
err.push("<p>" + name + "不可为空</p>");
});
}
if ((id || name) && $(this).attr("match")&&$.trim($(this).val())) {
new Validator.init($(this)[0], {
rules: {
match: $(this).attr("match")
}
}).validate(function(obj) {
err.push("<p>" + name + "请输入正确的格式</p>");
});
}
// if ($(this).attr("maxlength")) {
// rule.push("max:" + $(this).attr("maxlength"));
... ...
... ... @@ -98,13 +98,14 @@ tabTree.prototype= {
p.stepMet(g.selected, g.active_count)
}
g.changeVolume();
g.setHeadVal();
// g.setHeadVal();
return event.stopPropagation()
});
$(document).click(function() {
if (g.dom["citybox"].css("display") == "block") {
g.reset()
}
console.log(g.selected);
})
},
changeVolume: function() {
... ...
... ... @@ -28,7 +28,7 @@ var regExps = {
email: /^([\w-]+(?:\.[\w-]+)*)@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,6}(?:\.[a-z]{2})?)$/i,
url: /^((https?):\/\/(\w+:{0,1}\w*@)?(\S+)|)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/,
numbers: /^\d+(\.\d{1,2})?$/,
digits: /[0-9]*$/,
digits: /^[0-9]*$/,
letters: /[a-z][A-Z]*$/
};
var Validate = function(element, options) {
... ...
... ... @@ -131,17 +131,14 @@ exports.res = [
action:"/base/goods/ajax/update"
}
},
{//审核修改页面
route:'/base/goods/update2/:productSkn',
method:'GET',
view:'pages/basegoods/edit',
url:'/productColor/queryProductColors',
src:'/basegoods/edit',
data:{
pageTitle:"审核基础商品",
isShenHe:"true",
action:""
}
{//删除
route:'/base/goods/ajax/delete',
method:'POST',
url:'/product/deleteBaseProduct',
params:[
{name:'productSkn',type:'Number'},
{name:'isAuditing',type:'String'}
]
},
{//修改接口
route:'/base/goods/ajax/update',
... ... @@ -176,9 +173,62 @@ exports.res = [
{name:'maxSortId',type:'Number'},
{name:'middleSortId',type:'Number'},
{name:'smallSortId',type:'Number'}
{name:'smallSortId',type:'Number'},
{name:'seasons',type:'String'},
{name:'isOutLets',type:'String'},
{name:'outletsSetting',type:'String'},
{name:'isAdvance',type:'String'},
{name:'isVip',type:'String'},
{name:'vipSetting',type:'String'},
{name:'stock',type:'Number'},
{name:'isAuditing',type:'Number'}
]
},
// {
// route:'/base/goods/ajax/update2',
// method:'POST',
// url:'/product/batchAuditRejectBaseProduct',
// params:[
// {name:'productSkn',type:'Number'},
// {name:'ageLevel',type:'String'},
// {name: 'attribute',type: 'Number'},
// {name:'factoryCode',type:'String'},
// {name:'gender',type:'String'},
// {name:'goodsSeason',type:'Number'},
// {name:'goodsYears',type:'Number'},
// {name:'grade',type:'Number'},
// {name:'isLimitbuy',type:'String'},
// {name:'isLimited',type:'String'},
// {name:'isPromotionalGifts',type:'String'},
// {name:'productName',type:'String'},
// {name:'productTag',type:'Number'},
// {name:'retailPriceStr',type:'String'},
// {name:'salesPriceStr',type:'String'},
// {name:'expectShelfTimeStr',type:'String'},
// {name:'expectArrivalTimeStr',type:'String'},
// {name: 'baseGoodInfoStr',type: 'String'},
// {name:'shopId',type:'Number'},
// {name:'brandId',type:'Number'},
// {name:'supplierId',type:'Number'},
// {name:'maxSortId',type:'Number'},
// {name:'middleSortId',type:'Number'},
// {name:'smallSortId',type:'Number'},
// {name:'seasons',type:'String'},
// {name:'isOutLets',type:'String'},
// {name:'outletsSetting',type:'String'},
// {name:'isAdvance',type:'String'},
// {name:'isVip',type:'String'},
// {name:'vipSetting',type:'String'},
// {name:'stock',type:'Number'}
// ]
// },
{//基础商品详情空页面
route:'/base/goods/info/:productSkn',
method:'GET',
... ...
//exports.domain = require('../config/common.js').domain;
exports.domain = 'http://172.16.6.227:8083/yohobuy-platform-web'; //马力
exports.domain = require('../config/common.js').domain;
// exports.domain = 'http://172.16.6.227:8083/yohobuy-platform-web'; //马力
//exports.domain = 'http://172.16.6.236:8080/platform'; //钱军
//exports.domain = 'http://172.16.6.162:8088/platform'; //李建
... ...
... ... @@ -147,10 +147,10 @@
<div class="form-group">
<label class="col-sm-2 control-label">货品年<span class="red">*</span></label>
<div class="col-sm-1">
<select id="goodsYears" class="form-control" required>
<option value="2014">2014</option>
<option value="2015">2015</option>
<option value="2016">2016</option>
<select id="goodsYears" class="form-control" value="[[goodsYears||'2016']]" required>
[[each ENUMYEAR as item index]]
<option value="[[item.YEAR]]">[[item.YEAR]]</option>
[[/each]]
</select>
</div>
<label class="col-sm-1 control-label">货品季<span class="red">*</span></label>
... ... @@ -203,7 +203,7 @@
</div>
</div>
<div class="form-group">
[[if shenghe]]
[[if isAuditing==200]]
<label class="col-sm-2 control-label">适销季<span class="red">*</span></label>
<div class="col-sm-2">
<label class="radio-inline">
... ... @@ -225,7 +225,7 @@
<label class="radio-inline">
<input type="radio" name="grade" value="0">否</label>
</div>
<input type="hidden" id="grade" value="[[grade]]" for="radio" required/>
<input type="hidden" id="grade" value="[[grade||'0']]" for="radio" required/>
</div>
<div class="form-group">
... ... @@ -235,7 +235,7 @@
<input type="radio" name="isPromotionalGifts" value="Y">是</label>
<label class="radio-inline">
<input type="radio" name="isPromotionalGifts" value="N">否</label>
<input id="isPromotionalGifts" type="hidden" value="[[isPromotionalGifts]]" for="radio" />
<input id="isPromotionalGifts" type="hidden" value="[[isPromotionalGifts||'N']]" for="radio" />
</div>
<label class="col-sm-1 control-label">限量款</label>
<div class="col-sm-2">
... ... @@ -244,7 +244,7 @@
<label class="radio-inline">
<input type="radio" name="isLimited" value="N">否</label>
</div>
<input id="isLimited" type="hidden" value="[[isLimited]]" for="radio" />
<input id="isLimited" type="hidden" value="[[isLimited||'N']]" for="radio" />
</div>
<div class="form-group">
... ... @@ -254,9 +254,9 @@
<input type="radio" name="isLimitbuy" value="Y">是</label>
<label class="radio-inline">
<input type="radio" name="isLimitbuy" value="N">否</label>
<input type="hidden" id="isLimitbuy" value="[[isLimitbuy]]" for="radio" />
<input type="hidden" id="isLimitbuy" value="[[isLimitbuy||'N']]" for="radio" />
</div>
[[if shenghe]]
[[if isAuditing==200]]
<label class="col-sm-2 control-label">是否预购</label>
<div class="col-sm-2">
<label class="radio-inline">
... ... @@ -267,24 +267,24 @@
</div>
[[/if]]
</div>
[[if shenghe]]
[[if isAuditing==200]]
<div class="form-group">
<label class="col-sm-2 control-label">是否奥莱</label>
<div class="col-sm-2">
<label class="radio-inline">
<input type="radio" name="outletsSetting " value="B">品牌设置</label>
<input type="radio" name="outletsSetting" value="B">品牌设置</label>
<label class="radio-inline">
<input type="radio" name="outletsSetting " value="Y">是</label>
<input type="radio" name="outletsSetting" value="Y">是</label>
<label class="radio-inline">
<input type="radio" name="outletsSetting " value="N">否</label>
<input type="hidden" id="outletsSetting " value="[[outletsSetting ]]" for="radio" />
<input type="radio" name="outletsSetting" value="N">否</label>
<input type="hidden" id="outletsSetting" value="[[outletsSetting]]" for="radio" />
</div>
</div>
[[/if]]
[[if shenghe]]
[[if isAuditing==200]]
<div class="form-group">
<label class="col-sm-2 control-label">是否VIP</label>
<div class="col-sm-2">
... ... @@ -306,11 +306,11 @@
<div class="form-group">
<label class="col-sm-2 control-label">吊牌价<span class="red">*</span></label>
<div class="col-sm-2">
<input type="number" id="retailPriceStr" class="form-control" required value="[[retailPriceStr]]" />
<input type="number" id="retailPriceStr" class="form-control" required value="[[retailPriceStr]]" match="digits" placeholder="吊牌价" />
</div>
<label class="col-sm-1 control-label">销售价<span class="red">*</span></label>
<div class="col-sm-2">
<input type="number" id="salesPriceStr" class="form-control" required value="[[salesPriceStr]]" />
<input type="number" id="salesPriceStr" class="form-control" required value="[[salesPriceStr]]" match="numbers" placeholder="销售价" />
</div>
</div>
... ...