发表管理流程修改和页面修改

src/main/java/com/jeeplus/modules/workinvoice/service/WorkInvoiceService.java

@@ -222,7 +222,9 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 			List<User> users = new ArrayList<>();
 			List<User> bmzrs = UserUtils.getByRoleActivityEnname("bmzr",2,office.getId(),"5",workInvoice.getCreateBy());
 			List<User> scbzrs = UserUtils.getByRoleActivityEnname("scfgld",1,office.getId(),"5",workInvoice.getCreateBy());
-			List<User> fpglys = UserUtils.getByRoleActivityEnname("fpgly",1,office.getId(),"5",workInvoice.getCreateBy());
+			//List<User> fpglys = UserUtils.getByRoleActivityEnname("fpgly",1,office.getId(),"5",workInvoice.getCreateBy());
+		//财务主任
+		List<User> fpglys = UserUtils.getByRoleActivityEnname("cwzg",1,office.getId(),"5",workInvoice.getCreateBy());
 		long s7=System.currentTimeMillis();
 			if (StringUtils.isNotBlank(workActivityMenu.getId())) {
 				workProjectNotify.setNotifyRole("");
@@ -385,7 +387,9 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 		long s6=System.currentTimeMillis();
 			List<User> users = new ArrayList<>();
 			List<User> bmzrs = UserUtils.getByRoleActivityEnname("bmzr",2,office.getId(),"5",workInvoice.getCreateBy());
-			List<User> fpglys = UserUtils.getByRoleActivityEnname("fpgly",3,office.getId(),"5",workInvoice.getCreateBy());
+			//List<User> fpglys = UserUtils.getByRoleActivityEnname("fpgly",3,office.getId(),"5",workInvoice.getCreateBy());
+		//财务主任
+		List<User> fpglys = UserUtils.getByRoleActivityEnname("cwzg",3,office.getId(),"5",workInvoice.getCreateBy());
 		long s7=System.currentTimeMillis();
 			if (StringUtils.isNotBlank(workActivityMenu.getId())) {
 				workProjectNotify.setNotifyRole("");
@@ -633,7 +637,7 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 					exp = "pass";
 					if ("yes".equals(workInvoice.getAct().getFlag())) {
 						workActivityProcessService.insertAuditsByType(auditUsers,workInvoice.getProcessInstanceId(),3,1);
-						notifyRole = "发票管理员";
+						notifyRole = "财务主任审批";
 						workActivityProcess.setIsApproval("1");
 						enname ="fpgly";
 					} else {
@@ -960,7 +964,7 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 						if ("yes".equals(workInvoice.getAct().getFlag()) &&("0").equals(workInvoice.getExt())) {
 							workActivityProcessService.insertAuditsByType(auditUsers,workInvoice.getProcessInstanceId(),2,1);
 							//分公司流程
-							notifyRole = "发票管理员审批";
+							notifyRole = "财务主任审批";
 							workActivityProcess.setIsApproval("1");
 							enname = "fpgly";
 							vars.put("fpglyList", auditUsers);

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

@@ -158,12 +158,12 @@ public class WorkInvoiceController extends BaseController {
 				}else{
 					users = UserUtils.getByProssType(workInvoice.getProcessInstanceId(),3);
 					if (users==null )
-						users = UserUtils.getByRoleActivityEnname("fpgly",3,office.getId(),"5",workInvoice.getCreateBy());
+						users = UserUtils.getByRoleActivityEnname("cwzg",3,office.getId(),"5",workInvoice.getCreateBy());
 				}
 			}else  if ("scbzr".equals(taskDefKey)){
 				users = UserUtils.getByProssType(workInvoice.getProcessInstanceId(),3);
 				if (users==null )
-					users = UserUtils.getByRoleActivityEnname("fpgly",1,office.getId(),"5",workInvoice.getCreateBy());
+					users = UserUtils.getByRoleActivityEnname("cwzg",1,office.getId(),"5",workInvoice.getCreateBy());
 			}else  if ("fpgly".equals(taskDefKey)){
 				if(("1").equals(workInvoice.getExt())) {
 					users = UserUtils.getByProssType(workInvoice.getProcessInstanceId(), 3);

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

@@ -153,7 +153,7 @@
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
-				<label class="layui-form-label"><span class="require-item">*</span>开票内容要求：</label>
+				<label class="layui-form-label">开票内容要求：</label>
 				<div class="layui-input-block">
 					<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.content}"/>
 				</div>

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

@@ -499,7 +499,7 @@
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
-				<label class="layui-form-label"><span class="require-item">*</span>开票内容要求：</label>
+				<label class="layui-form-label">开票内容要求：</label>
 				<div class="layui-input-block">
 					<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.content}"/>
 				</div>

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

@@ -471,9 +471,9 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 with-textarea">
-					<label class="layui-form-label"><span class="require-item">*</span>开票内容要求：</label>
+					<label class="layui-form-label">开票内容要求：</label>
 					<div class="layui-input-block">
-						<form:textarea path="content" id="contractTypeDoc" htmlEscape="false" rows="4"    class="form-control required"/>
+						<form:textarea path="content" id="contractTypeDoc" htmlEscape="false" rows="4"    class="form-control"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">

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

@@ -470,9 +470,9 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 with-textarea">
-					<label class="layui-form-label"><span class="require-item">*</span>开票内容要求：</label>
+					<label class="layui-form-label">开票内容要求：</label>
 					<div class="layui-input-block">
-						<form:textarea path="content" id="contractTypeDoc" htmlEscape="false" rows="4"    class="form-control required"/>
+						<form:textarea path="content" id="contractTypeDoc" htmlEscape="false" rows="4"    class="form-control"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">

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

@@ -147,7 +147,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>开票内容要求：</label>
+					<label class="layui-form-label">开票内容要求：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.content}"/>
 					</div>

src/main/webapp/webpage/modules/workinvoicealter/workInvoiceAudita.jsp

@@ -159,7 +159,7 @@
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
-				<label class="layui-form-label"><span class="require-item">*</span>开票内容要求：</label>
+				<label class="layui-form-label">开票内容要求：</label>
 				<div class="layui-input-block">
 					<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoiceAlter.content}"/>
 				</div>

src/main/webapp/webpage/modules/workinvoicealter/workInvoiceForma.jsp

@@ -422,9 +422,9 @@
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm12 with-textarea">
-				<label class="layui-form-label"><span class="require-item">*</span>开票内容要求：</label>
+				<label class="layui-form-label">开票内容要求：</label>
 				<div class="layui-input-block">
-					<form:textarea path="content" id="contractTypeDoc" readonly="true" htmlEscape="false" rows="4"    class="form-control required"/>
+					<form:textarea path="content" id="contractTypeDoc" readonly="true" htmlEscape="false" rows="4"    class="form-control"/>
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/workinvoicealter/workInvoiceFormas.jsp

@@ -421,9 +421,9 @@
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm12 with-textarea">
-				<label class="layui-form-label"><span class="require-item">*</span>开票内容要求：</label>
+				<label class="layui-form-label">开票内容要求：</label>
 				<div class="layui-input-block">
-					<form:textarea path="content" id="contractTypeDoc" readonly="true" htmlEscape="false" rows="4"    class="form-control required"/>
+					<form:textarea path="content" id="contractTypeDoc" readonly="true" htmlEscape="false" rows="4"    class="form-control"/>
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/workinvoicealter/workInvoiceModifya.jsp

@@ -424,9 +424,9 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 with-textarea">
-					<label class="layui-form-label"><span class="require-item">*</span>开票内容要求：</label>
+					<label class="layui-form-label">开票内容要求：</label>
 					<div class="layui-input-block">
-						<form:textarea path="content" readonly="true" id="contractTypeDoc" htmlEscape="false" rows="4"    class="form-control required"/>
+						<form:textarea path="content" readonly="true" id="contractTypeDoc" htmlEscape="false" rows="4"    class="form-control"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/workinvoicealter/workInvoiceViewa.jsp

@@ -147,7 +147,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>开票内容要求：</label>
+					<label class="layui-form-label">开票内容要求：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoiceAlter.content}"/>
 					</div>