督办人员增加已撤回

tip-front/src/main/webapp/tc_suite/taskmt/doTaskIndex.jsp

@@ -147,10 +147,10 @@
 		.people_answer li{float: left;width: 100%;border-bottom: 1px solid #ccc;margin-top: 20px;}
 		.ranswer_answer textarea{width: 100%;height: 60px;text-indent: 5px;}
 		.approval{width: 100%;padding: 0 10px}
-		.approval ul li{width: 33.333333333%;float: left; cursor:pointer;text-align: center;}
+		.approval ul li{width: 25%;float: left; cursor:pointer;text-align: center;}
 		.approval ul li label{float: left;margin: 0px;text-align: center;width: 100%;cursor: pointer;margin-bottom: 5px;}
 		.approval ul li p{margin: 0;font-size: 14px;color: #000000;}
-		.approval ul li span{font-size: 14px;cursor: pointer;}
+		.approval ul li span{font-size: 12px;cursor: pointer;}
 		.approval ul .show span{color: #0c94ff;}
 		/* 取消在线状态显示 */
 		.state_off{background-position: -239px -330px;background: none;padding-left:0;}
@@ -1408,12 +1408,12 @@
 									<div class="mt-tab">
 										<c:choose>
 											<c:when test="${reportType}">
-																				<c:if test="${isShowApprovalOpinion}">
-																					<li class="mt-tabLi" target="opinion">
-																						<span>审批意见</span>
-																						<span class="mt-tab-line"></span>
-																					</li>
-																				</c:if>
+												<c:if test="${isShowApprovalOpinion}">
+													<li class="mt-tabLi" target="opinion">
+														<span>审批意见</span>
+														<span class="mt-tab-line"></span>
+													</li>
+												</c:if>
 												<li class="ps_class mt-tab-chosen mt-tabLi" id="ps" target="ps">
 													<span>${tc:i18n("task.comment.message")}</span>
 													<span class="mt-tab-line"></span>
@@ -1462,6 +1462,14 @@
 													<span>批示留言<span id="instructionsCount">${instructionsCount}</span>条</span>
 													<div style="clear: both"></div>
 												</li>
+												<c:if test="${isSupervisePerson}">
+													<li id="withdrawn">
+														<label><img src="${path}/tc_suite/taskmt/img/withdrawn.png" alt=""></label>
+														<p></p>
+														<span>已撤回</span>
+														<div style="clear: both"></div>
+													</li>
+												</c:if>
 												<li id="viewTask">
 													<label><img src="${path}/tc_suite/taskmt/img/ck.png" alt=""></label>
 													<p></p>
@@ -3121,6 +3129,12 @@
 
 			});
 
+			// 撤回列表
+			$("#withdrawn").click(function(){
+				var url = "${path}/taskByType/${id}/bbs/LevMsgTaskWithDraw/?hiddenPs=1";
+				$("#processFrame").attr("src",url);
+			});
+
 			//查看次数
 			$("#viewTask").click(function(){
 				var url = "${path}/taskByType/${id}/bbs/CommonOpinion/?hiddenPs=1";

tip-front/src/main/webapp/tc_suite/taskmt/taskMessageList.jsp

@@ -898,8 +898,9 @@
                                             </table>
                                         </form>
                                     </span>
+
                                     <%-- 一级留言[回复]文字按钮 --%>
-                                    <c:if test="${process.itemType == 10002004 || process.itemType == 10002002 }"><!--|| (process.itemType == 10002001 && isManager )-->
+                                    <c:if test="${(process.itemType == 10002004 || process.itemType == 10002002) && pType != 'LevMsgTaskWithDraw'}"><!--|| (process.itemType == 10002001 && isManager )-->
                                         <c:if test="${process.itemId != -1}">
                                             <a style="float: right;margin: 0;" href="javascript:;" class="mt-btn-font" name="replys" ct="add${status.index }">[${tc:i18n("task.reply")}]</a><!--回复-->
                                             <%-- <c:if test="${processCount > 0 }">
@@ -908,12 +909,12 @@
                                         </c:if>
                                     </c:if>
                                     <%-- 一级留言[撤回]文字按钮 --%>
-                                    <c:if test="${process.itemType == 10002004 && process.itemId != -1 && process.pid == pid && process.lessThanHalfAnHour}">
+                                    <c:if test="${process.itemType == 10002004 && process.itemId != -1 && process.pid == pid && process.lessThanHalfAnHour && pType != 'LevMsgTaskWithDraw'}">
                                         <a href="javascript:;" name="withdraw" class="mt-btn-font" itemId="${process.itemId}"
                                            style="float: right;margin: 0;">[${tc:i18n("task.porcess.withdraw")}]</a>
                                     </c:if>
                                     <%-- 领导批示[公布范围]文字按钮 --%>
-                                    <c:if test="${process.itemType == 10002004 && process.isKaizhouLingDao && isSupervise}">
+                                    <c:if test="${process.itemType == 10002004 && process.isKaizhouLingDao && isSupervise && pType != 'LevMsgTaskWithDraw'}">
                                         <div class="mt-btn mt-btn-blue" style="float: right;margin-right:10px">
                                             <span name="visibilityScope" itemId="${process.itemId}">${process.visibilityScopeStr}</span>
                                         </div>
@@ -1002,6 +1003,7 @@
 <script type="application/javascript">
     var tempOpinion = '${tempOpinion}';
     var tempAttachment = '${tempAttachment}';
+
     $("#gdDiv").mCustomScrollbar({
         autoHideScrollbar:true,
         axis:"y"