wuhao/leguevent
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

前端

Browse Source
This commit is contained in:
罗松柏 2021-03-02 15:57:31 +08:00
parent d9a683c3cb
commit cf0b0e5e6d
1 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
pmcalendar.php
View File

@ -110,8 +110,8 @@ $issxarole = in_array($user['name'], $SXAROLES); //可以添加上线卡片
$isyqeroles = in_array($user['name'], $YQEROLES);
//调试
//$user['name'] = "罗松柏";
//$canEdit = 1;
$user['name'] = "罗松柏";
$canEdit = 1;
//$isgxyyerole=1;
//$isgxcperole=1;
//$isgxyferole=1;
@ -1028,6 +1028,7 @@ if ($act == 'newevent') {
.recording-box { margin: 10px 20px 0 20px; color:#626262; font-size: 12px; }
.recording—title { font-size: 16px; color:#686868; }
.recording—name { float: right; }
.recording—con-box { margin-top: -16px; padding-bottom: 50px; }
</style>
<div class='popup-bg' id='popup-bg'>
<div class="yiny" id='yiny' onclick="guanbi()"></div>
@ -1142,7 +1143,7 @@ if ($act == 'newevent') {
</div>
<!-- 延期原因 -->
<div class='recording-box'>
<div class='recording-box' id="recording-box">
<div class='recording—title'>延迟记录</div>
<div class="recording—con-box" id="recording-content">
@ -1221,9 +1222,9 @@ if ($act == 'newevent') {
<script type="text/x-dot-template" id="recording-dot">
{{~it:item:index}}
<div style="margin-top: 28px;">
<p>《{{= item.project}}》{{=item.type}}从{{=item.date1}}日调整到{{=item.date2}}日</p>
<p>《{{= item.project}}》项目{{=item.type}}从{{=item.date1}}日{{=item.timetype}}到{{=item.date2}}日</p>
<p>调整理由为：{{=item.reason}}</p>
<P class='recording—name'>调整人：xxx</p>
<P class='recording—name'>调整人：{{=item.user}}</p>
</div>
{{~}}
</script>
@ -2334,17 +2335,31 @@ if ($act == 'newevent') {
$("#yyfujian").empty();
$("#yffujian").empty();
// console.log(res.chanpin_remark)
if(res.yanqi_history != null){
var recording = JSON.parse(res.yanqi_history);
for(let i in recording){
recording[i]['project'] = res.game;
recording[i]['type'] = res.event;
if(res.event == '打包' || res.event=="更新"){//延期记录只有打包和更新才有
console.log(8888)
if(res.yanqi_history != null){
var recording = JSON.parse(res.yanqi_history);
for(let i in recording){
recording[i]['project'] = res.game;
recording[i]['type'] = res.event;
var date1 = new Date(recording[i].date1);
var timec1 = Date.parse(date1)/1000;
var date2 = new Date(recording[i].date2);
var timec2 = Date.parse(date2)/1000;
if(timec1 > timec2){
recording[i]['timetype'] = "提前";
}else {
recording[i]['timetype'] = "延期";
}
}
// console.log(recording)
tmpltxt = doT.template(document.getElementById("recording-dot").innerHTML);//生成模板方法
document.getElementById("recording-content").innerHTML = tmpltxt(recording);//数据渲染
}
console.log(recording)
tmpltxt = doT.template(document.getElementById("recording-dot").innerHTML);//生成模板方法
document.getElementById("recording-content").innerHTML = tmpltxt(recording);//数据渲染
}else {
$("#recording-box").css('display','none');
}
if (res.chanpin_remark != "" && res.chanpin_remark != null) {
var chanpin_remark = JSON.parse(res.chanpin_remark)