记得上下班打卡 | git大法好,push需谨慎

Commit 922db2e0 authored by 胡佳晨's avatar 胡佳晨

admin 详情

parent eac77ea3
...@@ -67,6 +67,12 @@ ...@@ -67,6 +67,12 @@
<div class="panel-body" th:width="max" style="margin-top: 10px"> <div class="panel-body" th:width="max" style="margin-top: 10px">
<form class="form-horizontal m" id="form-performances-edit" <form class="form-horizontal m" id="form-performances-edit"
th:object="${kylinPerformanceMisVo}"> th:object="${kylinPerformanceMisVo}">
<div>
<h4>场地核进度:</h4>
<span th:if="*{fieldAuditStatus==0}" >通过</span>
<span th:if="*{fieldAuditStatus==1}" style="color: red">待审核</span>
<span th:if="*{fieldAuditStatus==2}" style="color: red">拒绝</span>
</div>
<div> <div>
<h4>演出封面:</h4> <h4>演出封面:</h4>
<img class="img-details" name="img" th:src="*{imgPoster}" <img class="img-details" name="img" th:src="*{imgPoster}"
......
...@@ -96,8 +96,8 @@ ...@@ -96,8 +96,8 @@
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
// sortName: "sort", // sortName: "sort",
modalName: "演出", modalName: "演出",
orderSc:"desc", orderSc: "desc",
orderItem:"created_at", orderItem: "created_at",
columns: [{ columns: [{
checkbox: true checkbox: true
}, },
...@@ -147,9 +147,9 @@ ...@@ -147,9 +147,9 @@
align: 'center', align: 'center',
formatter: function (value, row, index) { formatter: function (value, row, index) {
var actions = []; var actions = [];
if (row.auditStatus == 0) { if (row.auditStatus == 0 && row.fieldAuditStatus == 0) {
actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>管理</a> '); actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>管理</a> ');
}else{ } else {
actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>查看</a> '); actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>查看</a> ');
} }
if (row.syncDamai == 1) { if (row.syncDamai == 1) {
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
}); });
function f(id) { function f(id) {
$.post(prefix + "/sync/damai",{performancesId:id},function (res) { $.post(prefix + "/sync/damai", {performancesId: id}, function (res) {
alert(res.msg) alert(res.msg)
}); });
} }
......
...@@ -14,6 +14,7 @@ public class PerformanceAdminListDao { ...@@ -14,6 +14,7 @@ public class PerformanceAdminListDao {
private String timeEnd; private String timeEnd;
private String sponsor; private String sponsor;
private Integer status; private Integer status;
private Integer fieldAuditStatus;
private String statusName; private String statusName;
private String auditTime; private String auditTime;
private String timeSell; private String timeSell;
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
<result column="reject_txt" property="rejectTxt"/> <result column="reject_txt" property="rejectTxt"/>
<result column="sort" property="sort"/> <result column="sort" property="sort"/>
<result column="audit_time" property="auditTime"/> <result column="audit_time" property="auditTime"/>
<result column="field_audit_status" property="fieldAuditStatus"/>
<result column="sponsor" property="sponsor"/> <result column="sponsor" property="sponsor"/>
<result column="sync_damai" property="syncDamai"/> <result column="sync_damai" property="syncDamai"/>
<result column="created_at" property="createdAt"/> <result column="created_at" property="createdAt"/>
...@@ -249,6 +250,7 @@ ...@@ -249,6 +250,7 @@
) AS 'surplus_general' , ) AS 'surplus_general' ,
ps.`status` , ps.`status` ,
ps.audit_status , ps.audit_status ,
ps.field_audit_status,
p.reject_txt , p.reject_txt ,
p.created_at p.created_at
FROM FROM
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment