前端：添加延迟记录
This commit is contained in:
parent
0bc32f95ff
commit
352ca04b43
@ -1 +1 @@
|
||||
{"games":["\u98ce\u66b4\u5947\u5175","\u6b4c\u624bCOCOS","\u4e2d\u53e4\u6218\u9524","\u5996\u7075\u6218\u59ec","\u751f\u5316\u7eaa\u5143","\u90e8\u843d\u6218\u9b42","\u8bd9\u8c10\u4e09\u56fd","\u50cf\u7d20\u9879\u76ee","\u5b64\u5c9b\u5947\u5175","\u90e8\u843d\u7e41\u4f53\u7248","\u90e8\u843d\u97e9\u6587\u7248","\u90e8\u843d\u8d8a\u5357\u7248","\u90e8\u843d\u82f1\u6587\u7248","\u90e8\u843d\u6cf0\u6587\u7248","\u90e8\u843dH5\u7248","\u66d9\u5149\u4e4b\u5883","\u9b54\u6cd5\u95e8H5","\u6b63\u7248\u9b54\u6cd5\u95e8\u539f\u751f","3D\u963f\u51e1\u8fbe","\u5927\u6218\u56fd","\u5927\u4e09\u56fd","\u5927\u4e09\u56fd\u97e9\u6587","\u5766\u514b\u7a81\u88ad","\u5251\u5723\u6302\u673a","\u7cbe\u7075\u7eaa\u5143","\u9b54\u6cd5\u65e0\u654c","\u4e50\u8c37\u519b\u5e08","X\u7cbe\u7075","\u5730\u4ea7\u5927\u4ea8","\u4e50\u8c37MT","\u8d85\u7ea7\u6536\u85cf\u5bb6","\u4e71\u4e16\u957f\u6b4c","\u6b4c\u624b2019","\u6218\u56fd\u4e89\u9e23","\u6697\u9ed1\u5730\u4e0b\u57ce\u7e41\u4f53","\u5c71\u6d77\u7ecf","3D\u751f\u5316","\u5176\u4ed6"],"roles":["\u8212\u5c55"],"gxvroles":[""],"gxyyeroles":["\u9b4f\u6676","\u67f3\u94b0\u6ce2","\u6c60\u6e90","\u9093\u6770","\u674e\u4fca","\u9ec4\u6653","\u674e\u5b9c\u6cfd","\u9a6c\u5929\u5e73","\u53f6\u664f\u6587"],"gxcperoles":["\u9093\u5b9a\u946b","\u9976\u677e","\u91d1\u5143\u5143","\u7f57\u68a6\u83f2","\u9676\u4e39","\u5ed6\u5b50\u9f99"],"gxyferoles":["\u8212\u5c55","\u9093\u5b9a\u658c","\u5510\u51ef","\u55bb\u987a\u745e","\u5218\u601d\u654f"],"xfvroles":["\u8212\u5c55","\u9093\u5b9a\u658c","\u5510\u51ef","\u55bb\u987a\u745e","\u5218\u601d\u654f","\u9b4f\u6676","\u67f3\u94b0\u6ce2","\u6c60\u6e90","\u9093\u6770","\u674e\u4fca","\u9ec4\u6653","\u9093\u5b9a\u946b","\u9976\u677e","\u91d1\u5143\u5143","\u7f57\u68a6\u83f2","\u9676\u4e39","\u5ed6\u5b50\u9f99","\u6556\u957f\u521a","\u5218\u601d\u79cb","\u6885\u5bb6\u8d35","\u674e\u5b9c\u6cfd","\u9a6c\u5929\u5e73","\u53f6\u664f\u6587","\u9093\u5b9a\u5764"],"xfyyeroles":["\u67f3\u94b0\u6ce2","\u6c60\u6e90","\u9093\u6770","\u9b4f\u6676","\u674e\u4fca","\u9ec4\u6653","\u674e\u5b9c\u6cfd","\u9a6c\u5929\u5e73","\u53f6\u664f\u6587","\u8212\u5c55"],"dbvroles":[""],"dbyferoles":["\u8212\u5c55","\u9093\u5b9a\u658c","\u5510\u51ef","\u55bb\u987a\u745e","\u5218\u601d\u654f","\u6556\u957f\u521a","\u5218\u601d\u79cb","\u6885\u5bb6\u8d35"],"dbyyeroles":["\u9b4f\u6676","\u67f3\u94b0\u6ce2","\u6c60\u6e90","\u9093\u6770","\u674e\u4fca","\u9ec4\u6653","\u674e\u5b9c\u6cfd","\u9a6c\u5929\u5e73","\u53f6\u664f\u6587"],"dbcperoles":["\u9093\u5b9a\u946b","\u9976\u677e","\u5434\u9e23\u9a9e","\u91d1\u5143\u5143","\u7f57\u68a6\u83f2","\u9676\u4e39","\u5ed6\u5b50\u9f99"],"sxyyeroles":["\u67f3\u94b0\u6ce2","\u6c60\u6e90","\u9093\u6770","\u9b4f\u6676","\u674e\u4fca","\u9ec4\u6653","\u674e\u5b9c\u6cfd","\u9a6c\u5929\u5e73","\u53f6\u664f\u6587"],"sxaroles":["\u9b4f\u6676","\u67f3\u94b0\u6ce2","\u6c60\u6e90","\u9093\u6770","\u674e\u4fca","\u9ec4\u6653","\u674e\u5b9c\u6cfd","\u9a6c\u5929\u5e73","\u53f6\u664f\u6587"]}
|
||||
{"games":["\u98ce\u66b4\u5947\u5175","\u6b4c\u624bCOCOS","\u4e2d\u53e4\u6218\u9524","\u5996\u7075\u6218\u59ec","\u751f\u5316\u7eaa\u5143","\u90e8\u843d\u6218\u9b42","\u8bd9\u8c10\u4e09\u56fd","\u50cf\u7d20\u9879\u76ee","\u5b64\u5c9b\u5947\u5175","\u90e8\u843d\u7e41\u4f53\u7248","\u90e8\u843d\u97e9\u6587\u7248","\u90e8\u843d\u8d8a\u5357\u7248","\u90e8\u843d\u82f1\u6587\u7248","\u90e8\u843d\u6cf0\u6587\u7248","\u90e8\u843dH5\u7248","\u66d9\u5149\u4e4b\u5883","\u9b54\u6cd5\u95e8H5","\u6b63\u7248\u9b54\u6cd5\u95e8\u539f\u751f","3D\u963f\u51e1\u8fbe","\u5927\u6218\u56fd","\u5927\u4e09\u56fd","\u5927\u4e09\u56fd\u97e9\u6587","\u5766\u514b\u7a81\u88ad","\u5251\u5723\u6302\u673a","\u7cbe\u7075\u7eaa\u5143","\u9b54\u6cd5\u65e0\u654c","\u4e50\u8c37\u519b\u5e08","X\u7cbe\u7075","\u5730\u4ea7\u5927\u4ea8","\u4e50\u8c37MT","\u8d85\u7ea7\u6536\u85cf\u5bb6","\u4e71\u4e16\u957f\u6b4c","\u6b4c\u624b2019","\u6218\u56fd\u4e89\u9e23","\u6697\u9ed1\u5730\u4e0b\u57ce\u7e41\u4f53","\u5c71\u6d77\u7ecf","3D\u751f\u5316","\u5176\u4ed6"],"roles":["\u8212\u5c55","\u7f57\u677e\u67cf"],"gxvroles":[""],"gxyyeroles":["\u9b4f\u6676","\u67f3\u94b0\u6ce2","\u6c60\u6e90","\u9093\u6770","\u674e\u4fca","\u9ec4\u6653","\u674e\u5b9c\u6cfd","\u9a6c\u5929\u5e73","\u53f6\u664f\u6587"],"gxcperoles":["\u9093\u5b9a\u946b","\u9976\u677e","\u91d1\u5143\u5143","\u7f57\u68a6\u83f2","\u9676\u4e39","\u5ed6\u5b50\u9f99"],"gxyferoles":["\u8212\u5c55","\u9093\u5b9a\u658c","\u5510\u51ef","\u55bb\u987a\u745e","\u5218\u601d\u654f"],"xfvroles":["\u8212\u5c55","\u9093\u5b9a\u658c","\u5510\u51ef","\u55bb\u987a\u745e","\u5218\u601d\u654f","\u9b4f\u6676","\u67f3\u94b0\u6ce2","\u6c60\u6e90","\u9093\u6770","\u674e\u4fca","\u9ec4\u6653","\u9093\u5b9a\u946b","\u9976\u677e","\u91d1\u5143\u5143","\u7f57\u68a6\u83f2","\u9676\u4e39","\u5ed6\u5b50\u9f99","\u6556\u957f\u521a","\u5218\u601d\u79cb","\u6885\u5bb6\u8d35","\u674e\u5b9c\u6cfd","\u9a6c\u5929\u5e73","\u53f6\u664f\u6587","\u9093\u5b9a\u5764"],"xfyyeroles":["\u67f3\u94b0\u6ce2","\u6c60\u6e90","\u9093\u6770","\u9b4f\u6676","\u674e\u4fca","\u9ec4\u6653","\u674e\u5b9c\u6cfd","\u9a6c\u5929\u5e73","\u53f6\u664f\u6587","\u8212\u5c55"],"dbvroles":[""],"dbyferoles":["\u8212\u5c55","\u9093\u5b9a\u658c","\u5510\u51ef","\u55bb\u987a\u745e","\u5218\u601d\u654f","\u6556\u957f\u521a","\u5218\u601d\u79cb","\u6885\u5bb6\u8d35"],"dbyyeroles":["\u9b4f\u6676","\u67f3\u94b0\u6ce2","\u6c60\u6e90","\u9093\u6770","\u674e\u4fca","\u9ec4\u6653","\u674e\u5b9c\u6cfd","\u9a6c\u5929\u5e73","\u53f6\u664f\u6587"],"dbcperoles":["\u9093\u5b9a\u946b","\u9976\u677e","\u5434\u9e23\u9a9e","\u91d1\u5143\u5143","\u7f57\u68a6\u83f2","\u9676\u4e39","\u5ed6\u5b50\u9f99"],"sxyyeroles":["\u67f3\u94b0\u6ce2","\u6c60\u6e90","\u9093\u6770","\u9b4f\u6676","\u674e\u4fca","\u9ec4\u6653","\u674e\u5b9c\u6cfd","\u9a6c\u5929\u5e73","\u53f6\u664f\u6587"],"sxaroles":["\u9b4f\u6676","\u67f3\u94b0\u6ce2","\u6c60\u6e90","\u9093\u6770","\u674e\u4fca","\u9ec4\u6653","\u674e\u5b9c\u6cfd","\u9a6c\u5929\u5e73","\u53f6\u664f\u6587"]}
|
||||
@ -110,7 +110,7 @@ $issxarole = in_array($user['name'], $SXAROLES); //可以添加上线卡片
|
||||
$isyqeroles = in_array($user['name'], $YQEROLES);
|
||||
|
||||
//调试
|
||||
//$user['name'] = "吴昊";
|
||||
// $user['name'] = "罗松柏";
|
||||
// $canEdit = 1;
|
||||
//$isgxyyerole=1;
|
||||
//$isgxcperole=1;
|
||||
@ -1025,6 +1025,9 @@ if ($act == 'newevent') {
|
||||
-webkit-opacity: 1;
|
||||
color: #626262;
|
||||
}
|
||||
.recording-box { margin: 10px 20px 0 20px; color:#626262; font-size: 12px; }
|
||||
.recording—title { font-size: 16px; color:#686868; }
|
||||
.recording—name { float: right; }
|
||||
</style>
|
||||
<div class='popup-bg' id='popup-bg'>
|
||||
<div class="yiny" id='yiny' onclick="guanbi()"></div>
|
||||
@ -1138,6 +1141,15 @@ if ($act == 'newevent') {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 延期原因 -->
|
||||
<div class='recording-box'>
|
||||
<div class='recording—title'>延迟记录</div>
|
||||
<div class="recording—con-box" id="recording-content">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -1206,6 +1218,17 @@ if ($act == 'newevent') {
|
||||
{{~}}
|
||||
</script>
|
||||
|
||||
<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.reason}}</p>
|
||||
<P class='recording—name'>调整人：xxx</p>
|
||||
</div>
|
||||
{{~}}
|
||||
</script>
|
||||
|
||||
|
||||
<script>
|
||||
var showGame = "";
|
||||
var starttime, endtime;
|
||||
@ -1809,6 +1832,7 @@ if ($act == 'newevent') {
|
||||
starttime = start;
|
||||
endtime = end;
|
||||
|
||||
console.log("11111")
|
||||
|
||||
$.ajax({
|
||||
url: './?app=pmcalendar&act=getEvents',
|
||||
@ -1849,7 +1873,7 @@ if ($act == 'newevent') {
|
||||
|
||||
editable: <?=$canEdit ? "true" : "false"?>,
|
||||
eventDrop: function (event, dayDelta, minuteDelta, allDay, revertFunc) {
|
||||
|
||||
console.log("3333")
|
||||
dict = {id: event.id};
|
||||
dict.start = $.fullCalendar.formatDate(event.start, 'yyyy-MM-dd');
|
||||
dict.end = $.fullCalendar.formatDate(event.end, 'yyyy-MM-dd');
|
||||
@ -1868,6 +1892,7 @@ if ($act == 'newevent') {
|
||||
selectable: true,
|
||||
selectHelper: true,
|
||||
select: function (start, end, allDay) {
|
||||
console.log("22222")
|
||||
console.log(start)
|
||||
console.log(end)
|
||||
console.log(allDay)
|
||||
@ -2308,7 +2333,19 @@ if ($act == 'newevent') {
|
||||
$("#fujianname").empty();
|
||||
$("#yyfujian").empty();
|
||||
$("#yffujian").empty();
|
||||
console.log(res.chanpin_remark)
|
||||
// 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;
|
||||
}
|
||||
console.log(recording)
|
||||
tmpltxt = doT.template(document.getElementById("recording-dot").innerHTML);//生成模板方法
|
||||
document.getElementById("recording-content").innerHTML = tmpltxt(recording);//数据渲染
|
||||
}
|
||||
|
||||
if (res.chanpin_remark != "" && res.chanpin_remark != null) {
|
||||
var chanpin_remark = JSON.parse(res.chanpin_remark)
|
||||
var cptime = chanpin_remark.user + " " + chanpin_remark.date;
|
||||
@ -2323,7 +2360,7 @@ if ($act == 'newevent') {
|
||||
document.getElementById("cptext").value = '';
|
||||
document.getElementById("cptime").innerHTML = '';
|
||||
}
|
||||
console.log(res.yunying_remark)
|
||||
// console.log(res.yunying_remark)
|
||||
if (res.yunying_remark != "" && res.yunying_remark != null) {
|
||||
var yunying_remark = JSON.parse(res.yunying_remark);
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user