From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/webapp/static/modular/system/tDiscountAudit/tDiscount.js | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 73845ff..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'},
@@ -200,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;
}
@@ -226,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();
@@ -258,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;
}
@@ -306,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