部门筛选调整

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceTwoController.java

@@ -576,6 +576,11 @@ public class WorkInvoiceTwoController extends BaseController {
 	public String cancellationForm(WorkInvoice workInvoice, Model model) {
 		String view = "conditionWorkInvoiceTwoForm";
 		String tabId = request.getParameter("tabId");
+		//对于老项目正在作废中的发票处理
+		if (StringUtils.isBlank(workInvoice.getCancellationState()) && (workInvoice.getInvoiceState().equals("6") || workInvoice.getInvoiceState().equals("9") || workInvoice.getInvoiceState().equals("11"))){
+			//将发票状态改为已完成
+			workInvoice.setInvoiceState("5");
+		}
 		if("1".equals(tabId)){
 			view = "workInvoiceView";
 		}else if("3".equals(tabId)){
@@ -639,6 +644,11 @@ public class WorkInvoiceTwoController extends BaseController {
 		User loginUser = UserUtils.getUser();
 		String invoiceState = workInvoice.getCancellationState();
 		if(null != loginUser && (loginUser.getOffice().getName().equals("财务部") || loginUser.getId().equals(workInvoice.getCreateBy().getId()))){
+			//对于老项目正在作废中的发票处理
+			if (StringUtils.isBlank(workInvoice.getCancellationState()) && (workInvoice.getInvoiceState().equals("6") || workInvoice.getInvoiceState().equals("9") || workInvoice.getInvoiceState().equals("11"))){
+				//将发票状态改为已完成
+				workInvoice.setInvoiceState("5");
+			}
 			//启动流程
 			workInvoice.setCancellationState("6");
 			String cancellationProcessInstanceId ="";

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -2243,7 +2243,11 @@ public class WorkProjectNotifyController extends BaseController {
 						workInvoice.setBank(bankName);
 					}
 					workInvoice.setHome("home");
-					workInvoice.setAct(getByAct(workInvoice.getCancellationProcessInstanceId()));
+					if (StringUtils.isNotBlank(workInvoice.getCancellationProcessInstanceId())){
+						workInvoice.setAct(getByAct(workInvoice.getCancellationProcessInstanceId()));
+					}else {
+						workInvoice.setAct(getByAct(workInvoice.getProcessInstanceId()));
+					}
 					String taskDefKey = workInvoice.getAct().getTaskDefKey();
 					model.addAttribute("workInvoice", workInvoice);
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
@@ -2256,7 +2260,7 @@ public class WorkProjectNotifyController extends BaseController {
 							return "modules/workinvoice/conditionWorkInvoiceAudit";
 						} else if (StringUtils.isNotBlank(taskDefKey) && "fpgly".equals(taskDefKey)) {
 							workInvoice.setDrawerName(UserUtils.getUser().getName());
-							workInvoice.setInvoiceDate(new Date());
+//							workInvoice.setInvoiceDate(new Date());
 							model.addAttribute("workInvoice", workInvoice);
 							return "modules/workinvoice/conditionWorkInvoiceAudit";
 						}
@@ -7978,7 +7982,12 @@ public class WorkProjectNotifyController extends BaseController {
 					return "modules/workinvoice/workInvoiceView";
 				} else if (workProjectNotify.getType().equals("211")) {    //开票管理
 					WorkInvoice workInvoice = workInvoiceService.get(workProjectNotify.getNotifyId());
-					workInvoice.setAct(getByAct(workInvoice.getProcessInstanceId()));
+//					workInvoice.setAct(getByAct(workInvoice.getProcessInstanceId()));
+					if (StringUtils.isNotBlank(workInvoice.getCancellationProcessInstanceId())){
+						workInvoice.setAct(getByAct(workInvoice.getCancellationProcessInstanceId()));
+					}else {
+						workInvoice.setAct(getByAct(workInvoice.getProcessInstanceId()));
+					}
 					if (workInvoice.getAct() != null) {
 						String taskDefKey = workInvoice.getAct().getTaskDefKey();
 					}

src/main/resources/mappings/modules/bzshbExamin/StandardOpinionDao.xml

@@ -7,6 +7,7 @@
 		from project_report_data a
 		left join work_project_user wpu on wpu.project_id = a.project_id
 		left join sys_user su on su.id = wpu.user_id
+		left join sys_office o on o.id = a.office_id
 		left join rural_project_records rpr on rpr.id = a.project_id
 		<where>
 			and a.del_flag = 0
@@ -31,6 +32,9 @@
 					#{officeId}
 				</foreach>
 			</if>
+			<if test="officeId == '' and officeName!=null and officeName!=''">
+				AND o.name like concat('%',#{officeName},'%')
+			</if>
 		</where>
 		group by wpu.user_id
 		order by a.audit_pass_date desc
@@ -82,6 +86,7 @@
 		from project_report_data a
 		left join work_project_user wpu on wpu.project_id = a.project_id
 		left join sys_user su on su.id = wpu.user_id
+		left join sys_office o on o.id = a.office_id
 		left join rural_project_records rpr on rpr.id = a.project_id
 		<where>
 			and rpr.project_id is not null
@@ -106,6 +111,9 @@
 					#{officeId}
 				</foreach>
 			</if>
+			<if test="officeId == '' and officeName!=null and officeName!=''">
+				AND o.name like concat('%',#{officeName},'%')
+			</if>
 		</where>
 		group by wpu.user_id) z
     </select>

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageAllConfigDao.xml

@@ -96,6 +96,9 @@
 					#{officeId}
 				</foreach>
 			</if>
+			<if test="officeId == '' and officeName!=null and officeName!=''">
+				AND so.name like concat('%',#{officeName},'%')
+			</if>
 		</where>
 		group by a.user_id
 		ORDER BY a.update_date DESC
@@ -106,6 +109,7 @@
 		count(1) from (select a.id
 		FROM rural_project_message_all_config a
 		LEFT JOIN sys_user sua ON sua.id = a.user_id
+		left join sys_office so on so.id = a.office_id
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			<if test="(userId != null and userId != '') or (userName != null and userName != '')">
@@ -117,6 +121,9 @@
 					#{officeId}
 				</foreach>
 			</if>
+			<if test="officeId == '' and officeName!=null and officeName!=''">
+				AND so.name like concat('%',#{officeName},'%')
+			</if>
 		</where>
 		group by a.user_id) z
 	</select>

src/main/resources/mappings/modules/workinvoice/WorkInvoiceDao.xml

@@ -576,6 +576,9 @@
 					#{officeId}
 				</foreach>
 			</if>
+			<if test="officeId == '' and officeName!=null and officeName!=''">
+				AND o.name like concat('%',#{officeName},'%')
+			</if>
 			<if test="invoiceNumber != null and invoiceNumber != ''">
 				AND a.invoice_number LIKE
 					<if test="dbName == 'oracle'">'%'||#{invoiceNumber}||'%'</if>
@@ -1335,6 +1338,9 @@
 					#{officeId}
 				</foreach>
 			</if>
+			<if test="officeId == '' and officeName!=null and officeName!=''">
+				AND o.name like concat('%',#{officeName},'%')
+			</if>
 			<!--<if test="submitterId != null and submitterId != ''">
 				AND a.create_by = #{submitterId}
 			</if>-->

src/main/webapp/webpage/modules/bzshStandardOpinion/StandardOpinionAllList.jsp

@@ -229,7 +229,7 @@
 							<label class="layui-form-label">部门：</label>
 							<div class="layui-input-block with-icon">
 								<sys:treeselect id="officeId" name="officeId" value="${standardOpinion.officeId}" labelName="officeName" labelValue="${standardOpinion.officeName}" cssStyle="background-color: #fff"
-												title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+												title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowInput="true" allowClear="true" notAllowSelectParent="true"/>
 							</div>
 						</div>
 						<div style="clear:both;"></div>

src/main/webapp/webpage/modules/bzshStandardOpinion/StandardOpinionList.jsp

@@ -348,7 +348,7 @@
 							<label class="layui-form-label">部门：</label>
 							<div class="layui-input-block with-icon">
 								<sys:treeselect id="officeId" name="officeId" value="${standardOpinion.officeId}" labelName="officeName" labelValue="${standardOpinion.officeName}" cssStyle="background-color: #fff"
-												title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+												title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowInput="true" allowClear="true" notAllowSelectParent="true"/>
 							</div>
 						</div>
 						<div style="clear:both;"></div>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageList.jsp

@@ -1140,7 +1140,7 @@
 							<label class="layui-form-label">部门：</label>
 							<div class="layui-input-block with-icon">
 								<sys:treeselect id="office" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
-												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowInput="true" allowClear="true" notAllowSelectParent="false"/>
 							</div>
 						</div>
 						<div class="layui-item query athird">

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsList.jsp

@@ -484,7 +484,7 @@
 							<label class="layui-form-label">部门：</label>
 							<div class="layui-input-block with-icon">
 								<sys:treeselectMoHu id="officeId" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
-												title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+												title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
 							</div>
 						</div>
 						<div class="layui-item query athird">

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralProjectRecordsCaseBaseList.jsp

@@ -933,7 +933,7 @@
 							<label class="layui-form-label">部门：</label>
 							<div class="layui-input-block with-icon">
 								<sys:treeselect id="office" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
-												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=6" allowInput="true" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
 							</div>
 						</div>
 						<div class="layui-item query athird ">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsList.jsp

@@ -356,7 +356,7 @@
 							<label class="layui-form-label">部门:</label>
 							<div class="layui-input-block with-icon">
 								<sys:treeselectMoHu id="officeId" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
-												title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+												title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
 							</div>
 						</div>
 

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllConfigList.jsp

@@ -182,7 +182,7 @@
 						<label class="layui-form-label">权限部门：</label>
 						<div class="layui-input-block with-icon">
 							<sys:treeselect id="officeId" name="officeId" value="${ruralProjectMessageAllConfig.officeId}" labelName="officeName" labelValue="${ruralProjectMessageAllConfig.officeName}" cssStyle="background-color: #fff"
-											title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+											title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowInput="true" allowClear="true" notAllowSelectParent="true"/>
 						</div>
 					</div>
 					<%--<div class="layui-item query athird">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllList.jsp

@@ -834,7 +834,7 @@
 							<label class="layui-form-label">部门：</label>
 							<div class="layui-input-block with-icon">
 								<sys:treeselect id="office" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
-												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false" />
+												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowInput="true" allowClear="true" notAllowSelectParent="false" />
 							</div>
 						</div>
 

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/electronicSeal/ruralProjectMessageElectronicSealList.jsp

@@ -407,7 +407,7 @@
 							<label class="layui-form-label">部门：</label>
 							<div class="layui-input-block with-icon">
 								<sys:treeselect id="office" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
-												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false" />
+												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=6" allowInput="true" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false" />
 							</div>
 						</div>
 

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/electronicSealCZ/ruralProjectMessageElectronicSealCZList.jsp

@@ -359,7 +359,7 @@
 							<label class="layui-form-label">部门：</label>
 							<div class="layui-input-block with-icon">
 								<sys:treeselect id="office" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
-												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false" />
+												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=6" allowInput="true" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false" />
 							</div>
 						</div>
 						<div class="layui-item query athird ">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/electronicSealYC/ruralProjectMessageElectronicSealYCList.jsp

@@ -359,7 +359,7 @@
 							<label class="layui-form-label">部门：</label>
 							<div class="layui-input-block with-icon">
 								<sys:treeselect id="office" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
-												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false" />
+												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowInput="true" allowClear="true" notAllowSelectParent="false" />
 							</div>
 						</div>
 						<div class="layui-item query athird ">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp

@@ -751,7 +751,7 @@
 							<label class="layui-form-label">部门:</label>
 							<div class="layui-input-block with-icon">
 								<sys:treeselect id="office" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
-												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowInput="true" allowClear="true" notAllowSelectParent="false"/>
 							</div>
 						</div>
 						<div class="layui-item query athird">

src/main/webapp/webpage/modules/signature/dailyOfficeWorkSignature/DailyOfficeWorkSignatureList.jsp

@@ -295,7 +295,7 @@
                             <label class="layui-form-label">部门：</label>
                             <div class="layui-input-block with-icon">
                                 <sys:treeselectMoHu id="officeId" name="office.id" value="${dailyOfficeWork.office.id}" labelName="office.name" labelValue="${dailyOfficeWork.office.name}"
-                                                    title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+                                                    title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
                             </div>
                         </div>
                         <div class="layui-item query athird ">

src/main/webapp/webpage/modules/signatureManagement/businessSignature/BusinessSignatureList.jsp

@@ -295,7 +295,7 @@
                             <label class="layui-form-label">申请部门：</label>
                             <div class="layui-input-block with-icon">
                                 <sys:treeselectMoHu id="officeId" name="office.id" value="${electronicSignatureInfo.office.id}" labelName="office.name" labelValue="${electronicSignatureInfo.office.name}"
-                                                    title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+                                                    title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input"  allowClear="true" notAllowSelectParent="false"/>
                             </div>
                         </div>
                         <div class="layui-item query athird ">

src/main/webapp/webpage/modules/signatureManagement/electronicSignature/ElectronicSignatureList.jsp

@@ -351,7 +351,7 @@
                             <label class="layui-form-label">申请部门：</label>
                             <div class="layui-input-block with-icon">
                                 <sys:treeselectMoHu id="officeId" name="office.id" value="${electronicSignatureInfo.office.id}" labelName="office.name" labelValue="${electronicSignatureInfo.office.name}"
-                                                    title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+                                                    title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
                             </div>
                         </div>
                         <div class="layui-item query athird ">
@@ -396,8 +396,6 @@
                         <c:if test="${isArea == '1'}">
                             <button class="layui-btn layui-btn-sm layui-bg-blue" title="地区负责人申请详情" onclick="openDialogForm('地区负责人申请详情','${ctx}/districtDirectorApplication/districtDirectorApplication/ListByCreate','95%','95%','','关闭')">&nbsp;地区负责人申请详情</button>
                         </c:if>
-
-
                     </div>
                     <div style="clear: both;"></div>
                 </div>

src/main/webapp/webpage/modules/signatureManagement/electronicSignature/districtDirectorApplicationList.jsp

@@ -339,7 +339,7 @@
                             <label class="layui-form-label">申请部门：</label>
                             <div class="layui-input-block with-icon">
                                 <sys:treeselectMoHu id="officeId" name="office.id" value="${districtDirectorApplication.office.id}" labelName="office.name" labelValue="${districtDirectorApplication.office.name}"
-                                                    title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+                                                    title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
                             </div>
                         </div>
                         <div class="layui-item query athird">
@@ -381,10 +381,14 @@
             <div class="layui-form contentDetails contentShadow shadowLBR">
                 <div class="nav-btns">
                     <div class="layui-btn-group">
-                        <button class="layui-btn layui-btn-sm layui-bg-blue" title="地区负责人申请" onclick="openDialogDis('地区负责人申请','${ctx}/districtDirectorApplication/districtDirectorApplication/form','95%','95%')">&nbsp;地区负责人申请</button>
+                        <h2><button class="layui-btn layui-btn-sm layui-bg-blue" title="地区负责人申请" onclick="openDialogDis('地区负责人申请','${ctx}/districtDirectorApplication/districtDirectorApplication/form','95%','95%')">&nbsp;地区负责人申请</button>
 
                         <button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+                            <span style="color: red;font-size: 14px">(签章责任人一般为地区负责人)</span>
+
+                        </h2>
                     </div>
+
                     <div style="clear: both;"></div>
                 </div>
                 <table class="oa-table layui-table" id="contentTable1"></table>

src/main/webapp/webpage/modules/sys/sysHome.jsp

@@ -1156,15 +1156,8 @@
                     </c:if>
                 </c:when>
                 <c:otherwise>
-                    <c:if test="${fn:contains(workProjectNotify.title, '驳回')}">
-                        "<span class=\"bord-record\" title=\"${workProjectNotify.title}\">【驳回】${workProjectNotify.title}</span>" +
-                    </c:if>
-                    <c:if test="${fn:contains(workProjectNotify.title, '完成') || fn:contains(workProjectNotify.title, '通过') || fn:contains(workProjectNotify.title, '成功')}">
-                        "<span class=\"bord-record\" title=\"${workProjectNotify.title}\">【通过】${workProjectNotify.title}</span>" +
-                    </c:if>
-
-
-            </c:otherwise>
+                    "<span class=\"bord-record\" title=\"${workProjectNotify.title}\">${workProjectNotify.title}</span>" +
+                </c:otherwise>
             </c:choose>
             '<span class="bord-record-time">' + '<fmt:formatDate value="${workProjectNotify.updateDate}" pattern="yyyy-MM-dd"/>' + '</span></ a></li>');
         </c:if>

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllList.jsp

@@ -503,7 +503,7 @@
 							<label class="layui-form-label">经办人部门：</label>
 							<div class="layui-input-block with-icon">
 								<sys:treeselect id="officeId" name="officeId" value="${workInvoice.officeId}" labelName="officeName" labelValue="${workInvoice.officeName}" cssStyle="background-color: #fff"
-												title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+												title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowInput="true" allowClear="true" notAllowSelectParent="true"/>
 							</div>
 						</div>
 						<div class="layui-item query athird">
@@ -703,6 +703,18 @@
                             var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
                     }}
+				,{align:'center', title: '作废状态', fixed: 'right', width:70,templet:function(d){
+						<%--var st = getAuditState(d.status);--%>
+
+						<%--var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/workinvoice/workInvoice/getProcessOne?id=" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
+						<%--return xml;--%>
+						var st = getCancellationAuditState(d.cancellationStatus);
+						if(st.action)
+							var xml = "<span onclick=\"openDialogListView('发票作废流程追踪', '${ctx}/workinvoiceTwo/workinvoiceTwo/getCancellationProcess?id=" + d.id + "','"+ d.id +"','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+						else
+							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >"+ st.status + "</span>";
+						return xml;
+					}}
                 ,{field:'op',align:'center',title:"操作",fixed: 'right',width:220,templet:function(d){
                         ////对操作进行初始化
                         var xml="<div class=\"layui-btn-group\">";
@@ -730,7 +742,7 @@
                         {
                             xml += "<a href=\"javascript:void(0)\" onclick=\"contractOpenDialogre('变更发票管理', '${ctx}/workinvoiceAll/workInvoiceAll/alterForm?id="+ d.id +"','95%','95%')\" class=\"op-btn op-btn-revert\" ><i class=\"fa fa-edit\"></i> 变更</a>";
                         }*/
-						if(d.modifyDetails != undefined && d.modifyDetails =="1" && d.financeFlag =="1")
+						if(d.modifyDetails != undefined && d.modifyDetails =="1" && d.financeFlag =="1" && (d.cancellationStatus == undefined || d.cancellationStatus == null || d.cancellationStatus == '' || d.cancellationStatus == 0))
 						{
 							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreModify('修改发票明细', '${ctx}/workinvoiceAllTwo/workinvoiceAllTwo/modifyDetails?id=" + d.id + " &home=oldInfo ','"+ d.id+"','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" >修改明细</a>";
 						}
@@ -738,7 +750,7 @@
 						{
 							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreModify('管理员修改发票', '${ctx}/workinvoiceAll/workInvoiceAll/form?id=" + d.id + "&tabId=3','"+ d.id+"','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" >管理员修改</a>";
 						}
-						if(d.financeFlag != undefined && d.financeFlag =="1")
+						if(d.financeFlag != undefined && d.financeFlag =="1" && (d.cancellationStatus == undefined || d.cancellationStatus == null || d.cancellationStatus == '' || d.cancellationStatus == 0) )
 						{
 							xml +="<a href=\"javascript:void(0)\" onclick=\"receiptInvoice('发票收款', '${ctx}/workinvoiceAll/workInvoiceAll/receiptForm?id=" + d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-orange\" > 收款</a>";
 							xml+="<a href=\"${ctx}/workinvoiceAll/workInvoiceAll/saveAffirmReceipt?id=" + d.id + "\" onclick=\"return confirmx('是否确认收款？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-orange\"> 确认收款</a>";
@@ -798,6 +810,7 @@
                     ,"responsibleName":"${workInvoice.createBy.name}"
                     ,"receiptMoney":"${workInvoice.receiptMoney}"
                     ,"status":"${workInvoice.invoiceState}"
+					,"cancellationStatus":"${workInvoice.cancellationState}"
 					,"widNumber":"${workInvoice.widNumber}"
 					,"widTotalMoney":"${workInvoice.widTotalMoney}"
 					,"accountCheckingArea":"${workInvoice.accountCheckingArea}"

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllTwoList.jsp

@@ -588,7 +588,7 @@
 									<label class="layui-form-label">经办人部门：</label>
 									<div class="layui-input-block with-icon">
 										<sys:treeselect id="officeId" name="officeId" value="${workInvoice.officeId}" labelName="officeName" labelValue="${workInvoice.officeName}" cssStyle="background-color: #fff"
-														title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+														title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowInput="true" allowClear="true" notAllowSelectParent="true"/>
 									</div>
 								</div>
 								<div class="layui-item query athird">

src/main/webapp/webpage/modules/workinvoice/workInvoiceTwoList.jsp

@@ -630,7 +630,7 @@
 							<label class="layui-form-label">经办人部门：</label>
 							<div class="layui-input-block with-icon">
 								<sys:treeselect id="officeId" name="officeId" value="${workInvoice.officeId}" labelName="officeName" labelValue="${workInvoice.officeName}" cssStyle="background-color: #fff"
-												title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+												title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowInput="true" allowClear="true" notAllowSelectParent="true"/>
 							</div>
 						</div>
 						<div class="layui-item query athird">
@@ -833,7 +833,7 @@
 							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						return xml;
 					}}
-				/*,{align:'center', title: '作废状态', fixed: 'right', width:70,templet:function(d){
+				,{align:'center', title: '作废状态', fixed: 'right', width:70,templet:function(d){
 						<%--var st = getAuditState(d.status);--%>
 
 						<%--var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/workinvoice/workInvoice/getProcessOne?id=" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
@@ -844,7 +844,7 @@
 						else
 							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >"+ st.status + "</span>";
 						return xml;
-					}}*/
+					}}
 				,{field:'op',align:'center',title:"操作",fixed: 'right',width:140,templet:function(d){
 						////对操作进行初始化
 						var xml="<div class=\"layui-btn-group\">";
@@ -885,7 +885,7 @@
 						if(d.cancellationFlag != undefined && d.cancellationFlag =="1")
 						{
 							xml +="<a href=\"javascript:void(0)\" onclick=\"openElectronicInvoiceDialogreplay('上传电子发票', '${ctx}/workinvoiceTwo/workinvoiceTwo/electronicInvoiceForm?id=" + d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 上传电子发票</a>";
-							/*xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('作废发票', '${ctx}/workinvoiceTwo/workinvoiceTwo/cancellationForm?id=" + d.id + "&tabId=3','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 作废</a>";*/
+							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('作废发票', '${ctx}/workinvoiceTwo/workinvoiceTwo/cancellationForm?id=" + d.id + "&tabId=3','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 作废</a>";
 						}
 						if(d.conditionCanedit != undefined && d.conditionCanedit =="1")
 						{

src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyReadShowList.jsp

@@ -392,7 +392,7 @@
                     ,"type":"${workProjectNotify.type}"
                     ,"type1":"${fns:getDictLabel(workProjectNotify.type, 'project_notify_type', '')}"
                     ,"step":"${workProjectNotify.notifyRole}"
-					<c:if test="${fn:contains(workProjectNotify.title, '完成') || fn:contains(workProjectNotify.title, '通过') || fn:contains(workProjectNotify.title, '成功')}">
+					<c:if test="${fn:contains(workProjectNotify.notifyRole, '完成') || fn:contains(workProjectNotify.notifyRole, '通过') || fn:contains(workProjectNotify.notifyRole, '成功')}">
 					,"isreply":"2"
 					</c:if>
 					<c:if test="${fn:contains(workProjectNotify.title, '驳回')}">

src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyShowList.jsp

@@ -410,7 +410,7 @@
                     ,"type":"${workProjectNotify.type}"
                     ,"type1":"${fns:getDictLabel(workProjectNotify.type, 'project_notify_type', '')}"
                     ,"step":"${workProjectNotify.notifyRole}"
-					<c:if test="${fn:contains(workProjectNotify.title, '完成') || fn:contains(workProjectNotify.title, '通过') || fn:contains(workProjectNotify.title, '成功')}">
+					<c:if test="${fn:contains(workProjectNotify.notifyRole, '完成') || fn:contains(workProjectNotify.notifyRole, '通过') || fn:contains(workProjectNotify.notifyRole, '成功')}">
 					,"isreply":"2"
 					</c:if>
 					<c:if test="${fn:contains(workProjectNotify.title, '驳回')}">

src/main/webapp/webpage/modules/workreimbursement/workReimbursementAllList.jsp

@@ -127,7 +127,7 @@
                             <label class="layui-form-label">报销部门：</label>
                             <div class="layui-input-block with-icon">
                                 <sys:treeselect id="officeId" name="officeId" value="${workReimbursement.officeId}" labelName="officeName" labelValue="${workReimbursement.officeName}"
-                                                title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"  allowInput="true"/>
+                                                title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"  allowInput="true"/>
                             </div>
                         </div>
                         <div class="layui-item query athird">

src/main/webapp/webpage/modules/workreimbursement/workReimbursementList.jsp

@@ -180,7 +180,7 @@
                             <label class="layui-form-label">报销部门：</label>
                             <div class="layui-input-block with-icon">
                                 <sys:treeselect id="officeId" name="officeId" value="${workReimbursement.officeId}" labelName="officeName" labelValue="${workReimbursement.officeName}"
-                                                title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"  allowInput="true" cssStyle="background-color:#fff"/>
+                                                title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"  allowInput="true" cssStyle="background-color:#fff"/>
                             </div>
                         </div>
                         <div class="layui-item query athird">

src/main/webapp/webpage/modules/workstaff/qualificationList.jsp

@@ -143,7 +143,7 @@
                         <label class="layui-form-label">部门：</label>
                         <div class="layui-input-block with-icon">
                             <sys:treeselect id="office" name="office.id" value="${workStaffBasicInfo.office.id}" labelName="office.name" labelValue="${workStaffBasicInfo.office.name}"
-                                            title="部门" url="/sys/office/treeData?type=2" cssClass="form-control layui-input required" notAllowSelectParent="false"/>
+                                            title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input required" notAllowSelectParent="false" allowInput="true"/>
                         </div>
                     </div>
                     <%--<div class="layui-item query athird">

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoList.jsp

@@ -194,7 +194,7 @@
                         <label class="layui-form-label">部门：</label>
                         <div class="layui-input-block with-icon">
                             <sys:treeselect id="office" name="office.id" value="${workStaffBasicInfo.office.id}" labelName="office.name" labelValue="${workStaffBasicInfo.office.name}"
-                                            title="部门" url="/sys/office/treeData?type=2" cssClass="form-control layui-input required" notAllowSelectParent="false" allowInput="true"/>
+                                            title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input required" notAllowSelectParent="false" allowInput="true"/>
                         </div>
                     </div>
                     <%--<div class="layui-item query athird">