|
@@ -221,68 +221,68 @@
|
|
|
<input style="height: 25px;width:170px;" id="endDate" value="${endDate}" class="Wdate" onclick="WdatePicker({dateFmt:'yyyy-MM-dd'})">
|
|
|
</td>
|
|
|
</tr>
|
|
|
- <tr class="selectTr">
|
|
|
- <td style="width:80px;text-align:right;"><span class="tdSpan">${tc:i18n("task.cycle")}:</span></td>
|
|
|
- <td style="padding-top:5px;text-align:left;" >
|
|
|
- <select id="reportFrequency" name="reportFrequency" style="width:100px;border:1px solid #ccc;height:27px;display: none;" disabled>
|
|
|
- <option value="3" >自定义</option>
|
|
|
- <option value="2" >月</option>
|
|
|
- <option value="1" >季</option>
|
|
|
- <option value="4" >年</option>
|
|
|
- </select>
|
|
|
- <span id="userDefine" style="margin:-2px 0 0 0px;vertical-align:middle;">
|
|
|
- <%--<button type="button" class='btn btn-default ' id="addFrequency" onclick="com.minto.taskPhase.addUserFrequency()">增加阶段</button>--%>
|
|
|
- <div class="btn-group">
|
|
|
- <button type="button" class="btn btn-default" style="margin-right: 0;" id="addFrequency" onclick="com.minto.taskPhase.createDefaultFrequency('','0')">${tc:i18n("task.increase.phase")}</button>
|
|
|
- <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
|
|
|
- <span class="caret"></span>
|
|
|
- <span class="sr-only">Toggle Dropdown</span>
|
|
|
- </button>
|
|
|
- <ul class="dropdown-menu">
|
|
|
- <li><a href="javascript:;" onclick="com.minto.taskPhase.changePhaseByType('2',false);">${tc:i18n("task.by.month")}</a></li>
|
|
|
- <li><a href="javascript:;" onclick="com.minto.taskPhase.changePhaseByType('1',false);">${tc:i18n("task.quarterly")}</a></li>
|
|
|
- <li><a href="javascript:;" onclick="com.minto.taskPhase.changePhaseByType('4',false);">${tc:i18n("task.by.year")}</a></li>
|
|
|
- </ul>
|
|
|
- </div>
|
|
|
- </span>
|
|
|
- </td>
|
|
|
- </tr>
|
|
|
- <tr id="frequencyDetail" style="display: none;">
|
|
|
- <td colspan="2" style="padding:10px;">
|
|
|
- <table id = "frequencies" class="data-table" style="width:100%;overflow:auto;">
|
|
|
- <thead>
|
|
|
- <tr>
|
|
|
- <td>${tc:i18n("task.phase")}</td>
|
|
|
- <td>${tc:i18n("task.phase.requirements")}</td>
|
|
|
- <td>${tc:i18n("task.starting.time")}</td>
|
|
|
- <td>${tc:i18n("task.phase.deadline")}</td>
|
|
|
- <td>${tc:i18n("task.reporting.time")}</td>
|
|
|
- <%--<td>提醒提前时间</td>--%>
|
|
|
- <td>${tc:i18n("common.table.operating.label")}</td>
|
|
|
- </tr>
|
|
|
- </thead>
|
|
|
- <tbody>
|
|
|
- <c:forEach items="${phases}" var="ph">
|
|
|
- <tr phase-id="${ph.id}">
|
|
|
- <td style="width:150px;"><input class="mt-input" style="width:100%;" value="${ph.label}" disabled></td>
|
|
|
- <td><input style="width: 100%;" value="${ph.phaseDetail}" disabled></td>
|
|
|
- <td class="hide">
|
|
|
- <input class="manager mt-input" readonly style="width: 95%;" onclick="com.minto.taskPhase.choosePhaseManager(this)">
|
|
|
- <input type="hidden" name="manager"/>
|
|
|
- </td>
|
|
|
- <td style="width:110px;"><input style="width:190px;" value="${ph.startDate}" class="Wdate mt-input" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" disabled></td>
|
|
|
- <td style="width:110px;"><input style="width:190px;" value="${ph.endDate}" class="Wdate mt-input" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" disabled><input type="hidden" value="${ph.startDate}"></td>
|
|
|
- <td style="width:110px;text-align: center;">
|
|
|
- <span disabled class="mt-btn-font font_del" onclick="com.minto.taskPhase.toReportConfig(this)">[${tc:i18n("common.button.set.label")}]<input type="hidden" value=""></span>
|
|
|
- </td>
|
|
|
- <%--<td style="width:100px;"><input style="width:56px;" value="${ph.remindForward}" disabled>小时</td>--%>
|
|
|
- <td style="width:100px;text-align: center;"><span disabled class="mt-btn-font font_del">[${tc:i18n("common.button.delete.label")}]</span></td>
|
|
|
- </tr>
|
|
|
- </c:forEach>
|
|
|
- </tbody>
|
|
|
- </table>
|
|
|
- </td>
|
|
|
- </tr>
|
|
|
+<%-- <tr class="selectTr">--%>
|
|
|
+<%-- <td style="width:80px;text-align:right;"><span class="tdSpan">${tc:i18n("task.cycle")}:</span></td>--%>
|
|
|
+<%-- <td style="padding-top:5px;text-align:left;" >--%>
|
|
|
+<%-- <select id="reportFrequency" name="reportFrequency" style="width:100px;border:1px solid #ccc;height:27px;display: none;" disabled>--%>
|
|
|
+<%-- <option value="3" >自定义</option>--%>
|
|
|
+<%-- <option value="2" >月</option>--%>
|
|
|
+<%-- <option value="1" >季</option>--%>
|
|
|
+<%-- <option value="4" >年</option>--%>
|
|
|
+<%-- </select>--%>
|
|
|
+<%-- <span id="userDefine" style="margin:-2px 0 0 0px;vertical-align:middle;">--%>
|
|
|
+<%-- <%–<button type="button" class='btn btn-default ' id="addFrequency" onclick="com.minto.taskPhase.addUserFrequency()">增加阶段</button>–%>--%>
|
|
|
+<%-- <div class="btn-group">--%>
|
|
|
+<%-- <button type="button" class="btn btn-default" style="margin-right: 0;" id="addFrequency" onclick="com.minto.taskPhase.createDefaultFrequency('','0')">${tc:i18n("task.increase.phase")}</button>--%>
|
|
|
+<%-- <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">--%>
|
|
|
+<%-- <span class="caret"></span>--%>
|
|
|
+<%-- <span class="sr-only">Toggle Dropdown</span>--%>
|
|
|
+<%-- </button>--%>
|
|
|
+<%-- <ul class="dropdown-menu">--%>
|
|
|
+<%-- <li><a href="javascript:;" onclick="com.minto.taskPhase.changePhaseByType('2',false);">${tc:i18n("task.by.month")}</a></li>--%>
|
|
|
+<%-- <li><a href="javascript:;" onclick="com.minto.taskPhase.changePhaseByType('1',false);">${tc:i18n("task.quarterly")}</a></li>--%>
|
|
|
+<%-- <li><a href="javascript:;" onclick="com.minto.taskPhase.changePhaseByType('4',false);">${tc:i18n("task.by.year")}</a></li>--%>
|
|
|
+<%-- </ul>--%>
|
|
|
+<%-- </div>--%>
|
|
|
+<%-- </span>--%>
|
|
|
+<%-- </td>--%>
|
|
|
+<%-- </tr>--%>
|
|
|
+<%-- <tr id="frequencyDetail" style="display: none;">--%>
|
|
|
+<%-- <td colspan="2" style="padding:10px;">--%>
|
|
|
+<%-- <table id = "frequencies" class="data-table" style="width:100%;overflow:auto;">--%>
|
|
|
+<%-- <thead>--%>
|
|
|
+<%-- <tr>--%>
|
|
|
+<%-- <td>${tc:i18n("task.phase")}</td>--%>
|
|
|
+<%-- <td>${tc:i18n("task.phase.requirements")}</td>--%>
|
|
|
+<%-- <td>${tc:i18n("task.starting.time")}</td>--%>
|
|
|
+<%-- <td>${tc:i18n("task.phase.deadline")}</td>--%>
|
|
|
+<%-- <td>${tc:i18n("task.reporting.time")}</td>--%>
|
|
|
+<%-- <%–<td>提醒提前时间</td>–%>--%>
|
|
|
+<%-- <td>${tc:i18n("common.table.operating.label")}</td>--%>
|
|
|
+<%-- </tr>--%>
|
|
|
+<%-- </thead>--%>
|
|
|
+<%-- <tbody>--%>
|
|
|
+<%-- <c:forEach items="${phases}" var="ph">--%>
|
|
|
+<%-- <tr phase-id="${ph.id}">--%>
|
|
|
+<%-- <td style="width:150px;"><input class="mt-input" style="width:100%;" value="${ph.label}" disabled></td>--%>
|
|
|
+<%-- <td><input style="width: 100%;" value="${ph.phaseDetail}" disabled></td>--%>
|
|
|
+<%-- <td class="hide">--%>
|
|
|
+<%-- <input class="manager mt-input" readonly style="width: 95%;" onclick="com.minto.taskPhase.choosePhaseManager(this)">--%>
|
|
|
+<%-- <input type="hidden" name="manager"/>--%>
|
|
|
+<%-- </td>--%>
|
|
|
+<%-- <td style="width:110px;"><input style="width:190px;" value="${ph.startDate}" class="Wdate mt-input" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" disabled></td>--%>
|
|
|
+<%-- <td style="width:110px;"><input style="width:190px;" value="${ph.endDate}" class="Wdate mt-input" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" disabled><input type="hidden" value="${ph.startDate}"></td>--%>
|
|
|
+<%-- <td style="width:110px;text-align: center;">--%>
|
|
|
+<%-- <span disabled class="mt-btn-font font_del" onclick="com.minto.taskPhase.toReportConfig(this)">[${tc:i18n("common.button.set.label")}]<input type="hidden" value=""></span>--%>
|
|
|
+<%-- </td>--%>
|
|
|
+<%-- <%–<td style="width:100px;"><input style="width:56px;" value="${ph.remindForward}" disabled>小时</td>–%>--%>
|
|
|
+<%-- <td style="width:100px;text-align: center;"><span disabled class="mt-btn-font font_del">[${tc:i18n("common.button.delete.label")}]</span></td>--%>
|
|
|
+<%-- </tr>--%>
|
|
|
+<%-- </c:forEach>--%>
|
|
|
+<%-- </tbody>--%>
|
|
|
+<%-- </table>--%>
|
|
|
+<%-- </td>--%>
|
|
|
+<%-- </tr>--%>
|
|
|
</tbody>
|
|
|
</table>
|
|
|
</div>
|
|
@@ -318,13 +318,13 @@
|
|
|
$(document).ready(function(){
|
|
|
//初始化值
|
|
|
if (!!"${reportConfig.reportFrequency}") {
|
|
|
- $("#reportFrequency").val("${reportConfig.reportFrequency}");
|
|
|
+ // $("#reportFrequency").val("${reportConfig.reportFrequency}");
|
|
|
com.minto.taskPhase.showDetailTrByType("${reportConfig.reportFrequency}");
|
|
|
}
|
|
|
//阶段表格操作事件
|
|
|
- $("#frequencies").on("click",".del-f",function(){
|
|
|
- $(this).parent().parent().remove();
|
|
|
- });
|
|
|
+ // $("#frequencies").on("click",".del-f",function(){
|
|
|
+ // $(this).parent().parent().remove();
|
|
|
+ // });
|
|
|
|
|
|
// Iframe重设高度影响其他页面
|
|
|
// setTimeout(function () {
|
|
@@ -422,9 +422,6 @@
|
|
|
}
|
|
|
|
|
|
function save(callback) {
|
|
|
- if(!checkTr()){
|
|
|
- return;
|
|
|
- }
|
|
|
var progressBar = $.startProc("正在保存,请稍后...");
|
|
|
// 调用后台保存
|
|
|
var param = {};
|