Merge remote-tracking branch 'origin/master'

src/main/webapp/yw/bpm/instance/infoFlow_v_2_1.jsp

@@ -280,8 +280,8 @@ span[id$="_filespan"] ul{
 					<c:forEach items="${requestScope.processList }" var="tache">
 						<div class="wf_shadow1">
 							<c:if test="${tache.taskCount != 0 || tache.assistCount != 0}">
-								<div style="position: absolute; margin-left: 750px; cursor: pointer; color: blue;" id="showTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">查看抄送信息</div>
-								<div style="position: absolute; margin-left: 750px; cursor: pointer; color: blue; display: none;" id="hideTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">隐藏抄送信息</div>
+								<div style="position: absolute; margin-left: 800px; cursor: pointer; color: blue;" id="showTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">查看抄送信息</div>
+								<div style="position: absolute; margin-left: 800px; cursor: pointer; color: blue; display: none;" id="hideTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">隐藏抄送信息</div>
 							</c:if>
 							<c:if test="${tache.userHeaderImg.headerfileid!=null && tache.userHeaderImg.headerfileid!='' }">
 								<div style="position: absolute; margin-left: 5px; width: 90px;">

src/main/webapp/yw/bpm/instance/processFlow_v_2_1.jsp

@@ -477,8 +477,8 @@ span[id$="_filespan"] ul{
 					<c:forEach items="${requestScope.processList }" var="tache">
 						<div class="wf_shadow1">
 							<c:if test="${tache.taskCount != 0 || tache.assistCount != 0}">
-								<div style="position: absolute; margin-left: 750px; cursor: pointer; color: blue;" id="showTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">查看抄送信息</div>
-								<div style="position: absolute; margin-left: 750px; cursor: pointer; color: blue; display: none;" id="hideTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">隐藏抄送信息</div>
+								<div style="position: absolute; margin-left: 800px; cursor: pointer; color: blue;" id="showTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">查看抄送信息</div>
+								<div style="position: absolute; margin-left: 800px; cursor: pointer; color: blue; display: none;" id="hideTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">隐藏抄送信息</div>
 							</c:if>
 							<c:if test="${tache.userHeaderImg.headerfileid!=null && tache.userHeaderImg.headerfileid!='' }">
 								<div style="position: absolute; margin-left: 5px; width: 90px;">

src/main/webapp/yw/master1_bpm/instance/infoFlowForAll_v_2_1.jsp

@@ -258,8 +258,8 @@ span[id$="_filespan"] ul{
 					<c:forEach items="${requestScope.processList }" var="tache">
 						<div class="wf_shadow1">
 							<c:if test="${tache.taskCount != 0 || tache.assistCount != 0}">
-								<div style="position: absolute; margin-left: 750px; cursor: pointer; color: blue;" id="showTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">查看抄送信息</div>
-								<div style="position: absolute; margin-left: 750px; cursor: pointer; color: blue; display: none;" id="hideTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">隐藏抄送信息</div>
+								<div style="position: absolute; margin-left: 800px; cursor: pointer; color: blue;" id="showTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">查看抄送信息</div>
+								<div style="position: absolute; margin-left: 800px; cursor: pointer; color: blue; display: none;" id="hideTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">隐藏抄送信息</div>
 							</c:if>
 							<c:if test="${tache.userHeaderImg.headerfileid!=null && tache.userHeaderImg.headerfileid!='' }">
 								<div style="position: absolute; margin-left: 5px; width: 90px;">

src/main/webapp/yw/master1_bpm/instance/infoFlowForDealed_v_2_1.jsp

@@ -258,8 +258,8 @@ span[id$="_filespan"] ul{
 					<c:forEach items="${requestScope.processList }" var="tache">
 						<div class="wf_shadow1">
 							<c:if test="${tache.taskCount != 0 || tache.assistCount != 0}">
-								<div style="position: absolute; margin-left: 750px; cursor: pointer; color: blue;" id="showTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">查看抄送信息</div>
-								<div style="position: absolute; margin-left: 750px; cursor: pointer; color: blue; display: none;" id="hideTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">隐藏抄送信息</div>
+								<div style="position: absolute; margin-left: 800px; cursor: pointer; color: blue;" id="showTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">查看抄送信息</div>
+								<div style="position: absolute; margin-left: 800px; cursor: pointer; color: blue; display: none;" id="hideTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">隐藏抄送信息</div>
 							</c:if>
 							<c:if test="${tache.userHeaderImg.headerfileid!=null && tache.userHeaderImg.headerfileid!='' }">
 								<div style="position: absolute; margin-left: 5px; width: 90px;">

src/main/webapp/yw/master1_bpm/instance/infoFlowForDealing_v_2_1.jsp

@@ -258,8 +258,8 @@ span[id$="_filespan"] ul{
 					<c:forEach items="${requestScope.processList }" var="tache">
 						<div class="wf_shadow1">
 							<c:if test="${tache.taskCount != 0 || tache.assistCount != 0}">
-								<div style="position: absolute; margin-left: 750px; cursor: pointer; color: blue;" id="showTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">查看抄送信息</div>
-								<div style="position: absolute; margin-left: 750px; cursor: pointer; color: blue; display: none;" id="hideTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">隐藏抄送信息</div>
+								<div style="position: absolute; margin-left: 800px; cursor: pointer; color: blue;" id="showTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">查看抄送信息</div>
+								<div style="position: absolute; margin-left: 800px; cursor: pointer; color: blue; display: none;" id="hideTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">隐藏抄送信息</div>
 							</c:if>
 							<c:if test="${tache.userHeaderImg.headerfileid!=null && tache.userHeaderImg.headerfileid!='' }">
 								<div style="position: absolute; margin-left: 5px; width: 90px;">

src/main/webapp/yw/master1_bpm/instance/infoFlowForGroup_v_2_1.jsp

@@ -258,8 +258,8 @@ span[id$="_filespan"] ul{
 					<c:forEach items="${requestScope.processList }" var="tache">
 						<div class="wf_shadow1">
 							<c:if test="${tache.taskCount != 0 || tache.assistCount != 0}">
-								<div style="position: absolute; margin-left: 750px; cursor: pointer; color: blue;" id="showTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">查看抄送信息</div>
-								<div style="position: absolute; margin-left: 750px; cursor: pointer; color: blue; display: none;" id="hideTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">隐藏抄送信息</div>
+								<div style="position: absolute; margin-left: 800px; cursor: pointer; color: blue;" id="showTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">查看抄送信息</div>
+								<div style="position: absolute; margin-left: 800px; cursor: pointer; color: blue; display: none;" id="hideTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">隐藏抄送信息</div>
 							</c:if>
 							<c:if test="${tache.userHeaderImg.headerfileid!=null && tache.userHeaderImg.headerfileid!='' }">
 								<div style="position: absolute; margin-left: 5px; width: 90px;">

src/main/webapp/yw/master1_bpm/instance/infoFlowForMineTask.jsp

@@ -258,8 +258,8 @@ span[id$="_filespan"] ul{
 					<c:forEach items="${requestScope.processList }" var="tache">
 						<div class="wf_shadow1">
 							<c:if test="${tache.taskCount != 0 || tache.assistCount != 0}">
-								<div style="position: absolute; margin-left: 750px; cursor: pointer; color: blue;" id="showTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">查看抄送信息</div>
-								<div style="position: absolute; margin-left: 750px; cursor: pointer; color: blue; display: none;" id="hideTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">隐藏抄送信息</div>
+								<div style="position: absolute; margin-left: 800px; cursor: pointer; color: blue;" id="showTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">查看抄送信息</div>
+								<div style="position: absolute; margin-left: 800px; cursor: pointer; color: blue; display: none;" id="hideTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">隐藏抄送信息</div>
 							</c:if>
 							<c:if test="${tache.userHeaderImg.headerfileid!=null && tache.userHeaderImg.headerfileid!='' }">
 								<div style="position: absolute; margin-left: 5px; width: 90px;">

src/main/webapp/yw/master1_bpm/instance/infoFlowForMine_v_2_1.jsp

@@ -258,8 +258,8 @@ span[id$="_filespan"] ul{
 					<c:forEach items="${requestScope.processList }" var="tache">
 						<div class="wf_shadow1">
 							<c:if test="${tache.taskCount != 0 || tache.assistCount != 0}">
-								<div style="position: absolute; margin-left: 750px; cursor: pointer; color: blue;" id="showTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">查看抄送信息</div>
-								<div style="position: absolute; margin-left: 750px; cursor: pointer; color: blue; display: none;" id="hideTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">隐藏抄送信息</div>
+								<div style="position: absolute; margin-left: 800px; cursor: pointer; color: blue;" id="showTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">查看抄送信息</div>
+								<div style="position: absolute; margin-left: 800px; cursor: pointer; color: blue; display: none;" id="hideTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">隐藏抄送信息</div>
 							</c:if>
 							<c:if test="${tache.userHeaderImg.headerfileid!=null && tache.userHeaderImg.headerfileid!='' }">
 								<div style="position: absolute; margin-left: 5px; width: 90px;">

src/main/webapp/yw/master1_bpm/instance/infoFlow_v_2_1.jsp

@@ -251,8 +251,8 @@ span[id$="_filespan"] ul{
 					<c:forEach items="${requestScope.processList }" var="tache">
 						<div class="wf_shadow1">
 							<c:if test="${tache.taskCount != 0 || tache.assistCount != 0}">
-								<div style="position: absolute; margin-left: 750px; cursor: pointer; color: blue;" id="showTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">查看抄送信息</div>
-								<div style="position: absolute; margin-left: 750px; cursor: pointer; color: blue; display: none;" id="hideTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">隐藏抄送信息</div>
+								<div style="position: absolute; margin-left: 800px; cursor: pointer; color: blue;" id="showTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">查看抄送信息</div>
+								<div style="position: absolute; margin-left: 800px; cursor: pointer; color: blue; display: none;" id="hideTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">隐藏抄送信息</div>
 							</c:if>
 							<c:if test="${tache.userHeaderImg.headerfileid!=null && tache.userHeaderImg.headerfileid!='' }">
 								<div style="position: absolute; margin-left: 5px; width: 90px;">

src/main/webapp/yw/master1_bpm/instance/processFlow_v_2_1.jsp

@@ -603,8 +603,8 @@ span[id$="_filespan"] ul{
 					<c:forEach items="${requestScope.processList }" var="tache">
 						<div class="wf_shadow1">
 							<c:if test="${tache.taskCount != 0 || tache.assistCount != 0}">
-								<div style="position: absolute; margin-left: 750px; cursor: pointer; color: blue;" id="showTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">查看抄送信息</div>
-								<div style="position: absolute; margin-left: 750px; cursor: pointer; color: blue; display: none;" id="hideTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">隐藏抄送信息</div>
+								<div style="position: absolute; margin-left: 800px; cursor: pointer; color: blue;" id="showTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">查看抄送信息</div>
+								<div style="position: absolute; margin-left: 800px; cursor: pointer; color: blue; display: none;" id="hideTaskDetail_${tache.tache.tinsId}" onclick="showTaskDetail('${tache.tache.tinsId}');">隐藏抄送信息</div>
 							</c:if>
 							<c:if test="${tache.userHeaderImg.headerfileid!=null && tache.userHeaderImg.headerfileid!='' }">
 								<div style="position: absolute; margin-left: 5px; width: 90px;">