From 336cc1da02624db3d42ad09187b6b51b98ee35dc Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期二, 05 三月 2024 14:20:40 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0 --- cloud-server-management/src/main/webapp/static/modular/system/tDiscountAudit/tDiscount.js | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tDiscountAudit/tDiscount.js b/cloud-server-management/src/main/webapp/static/modular/system/tDiscountAudit/tDiscount.js index abb94e6..764ed0d 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tDiscountAudit/tDiscount.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tDiscountAudit/tDiscount.js @@ -15,6 +15,7 @@ return [ {field: 'selectItem', radio: true}, {title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'}, + {title: '课包id', field: 'courseId', visible: true, align: 'center', valign: 'middle'}, {title: '所在省', field: 'pname', visible: true, align: 'center', valign: 'middle' }, {title: '所在市', field: 'cname', visible: true, align: 'center', valign: 'middle'}, @@ -22,11 +23,7 @@ }, {title: '课包名称', field: 'name', visible: true, align: 'center', valign: 'middle' }, - {title: '折扣类型', field: 'type', visible: true, align: 'center', valign: 'middle' - ,formatter:function (data) { - return{1:"会员折扣",3:"限时折扣",4:"赠送课时"}[data] - } - }, + {title: '折扣类型', field: 'type', visible: true, align: 'center', valign: 'middle'}, {title: '状态', field: 'status', visible: true, align: 'center', valign: 'middle' ,formatter:function (data) { return{1:"待审核",3:"未通过"}[data] @@ -204,10 +201,17 @@ layer.closeAll(); }, btn2:function () { + var state = TCompetition.seItem.status; + if (state == 3){ + Feng.error("当前状态不能再次审核!") + return false; + } let audit = document.querySelector('input[name="r1"]:checked').value; let text = $("#text").val() if(audit==3){ if(text==''){ + console.log("让我看看!") + console.log(TCompetition.seItem.courseId) Feng.info("请输入拒绝理由") return false; } @@ -230,7 +234,8 @@ window.parent.layer.closeAll(); return Feng.error("操作失败!"); }); - ajax.set("id", TCompetition.seItem.id); + + ajax.set("id", TCompetition.seItem.courseId); ajax.set("audit", audit); ajax.set("text", text); ajax.start(); @@ -262,7 +267,7 @@ area: ['100%', '100%'], //宽高 fix: false, //不固定 maxmin: true, - content: Feng.ctxPath + '/tDiscount/infoOne?id=' + this.seItem.id + content: Feng.ctxPath + '/tDiscount/infoOne?id=' + this.seItem.courseId }); this.layerIndex = index; } @@ -310,7 +315,7 @@ queryData['cityCode'] = $("#cCode").val(); queryData['name'] = $("#name").val(); queryData['shopName'] = $("#shopName").val(); - queryData['type'] = $("type").val(); + queryData['type'] = $("#type").val(); TCompetition.table.refresh({query: queryData}); }; -- Gitblit v1.7.1