Merge remote-tracking branch 'origin/master'

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

@@ -23,11 +23,13 @@ import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.projectrecord.enums.ProjectStatusEnum;
 import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
+import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.Role;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.service.AreaService;
 import com.jeeplus.modules.sys.service.OfficeService;
+import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.sysuseroffice.service.UserofficeService;
 import com.jeeplus.modules.workactivity.entity.Activity;
@@ -245,6 +247,20 @@ public class WorkInvoiceController extends BaseController {
 		String view = "workInvoiceForm";
 		String tabId = request.getParameter("tabId");
 		if("1".equals(tabId)){
+			List<MainDictDetail> billingContentList = DictUtils.getMainDictList("billing_content");
+			for (MainDictDetail dictDetail: billingContentList) {
+				if(workInvoice.getBillingContent().equals(dictDetail.getValue())){
+					workInvoice.setBillingContent(dictDetail.getLabel());
+					break;
+				}
+			}
+			List<MainDictDetail> receiptTypeList = DictUtils.getMainDictList("receipt_type");
+			for (MainDictDetail dictDetail: receiptTypeList) {
+				if(workInvoice.getChargeType().equals(dictDetail.getValue())){
+					workInvoice.setChargeType(dictDetail.getLabel());
+					break;
+				}
+			}
 			view = "workInvoiceView";
 		}else if("3".equals(tabId)){
 			ProcessInstance processInstance = actTaskService.getProcIns(workInvoice.getProcessInstanceId());

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

@@ -1128,8 +1128,38 @@ public class WorkProjectNotifyController extends BaseController {
 					String taskDefKey = workInvoice.getAct().getTaskDefKey();
 					model.addAttribute("workInvoice", workInvoice);
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+
+						List<MainDictDetail> billingContentList = DictUtils.getMainDictList("billing_content");
+						for (MainDictDetail dictDetail: billingContentList) {
+							if(workInvoice.getBillingContent().equals(dictDetail.getValue())){
+								workInvoice.setBillingContent(dictDetail.getLabel());
+								break;
+							}
+						}
+						List<MainDictDetail> receiptTypeList = DictUtils.getMainDictList("receipt_type");
+						for (MainDictDetail dictDetail: receiptTypeList) {
+							if(workInvoice.getChargeType().equals(dictDetail.getValue())){
+								workInvoice.setChargeType(dictDetail.getLabel());
+								break;
+							}
+						}
 						return "modules/workinvoice/workInvoiceView";
 					} else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+
+						List<MainDictDetail> billingContentList = DictUtils.getMainDictList("billing_content");
+						for (MainDictDetail dictDetail: billingContentList) {
+							if(workInvoice.getBillingContent().equals(dictDetail.getValue())){
+								workInvoice.setBillingContent(dictDetail.getLabel());
+								break;
+							}
+						}
+						List<MainDictDetail> receiptTypeList = DictUtils.getMainDictList("receipt_type");
+						for (MainDictDetail dictDetail: receiptTypeList) {
+							if(workInvoice.getChargeType().equals(dictDetail.getValue())){
+								workInvoice.setChargeType(dictDetail.getLabel());
+								break;
+							}
+						}
 						if (StringUtils.isNotBlank(taskDefKey) && ("bmzr".equals(taskDefKey) ||
 								"scbzr".equals(taskDefKey))) {
 							return "modules/workinvoice/workInvoiceAudit";

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

@@ -554,6 +554,18 @@
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
+				<label class="layui-form-label">收款类型：</label>
+				<div class="layui-input-block">
+					<input id="chargeType" htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.chargeType}" />
+				</div>
+			</div>
+			<div class="layui-item layui-col-sm6">
+				<label class="layui-form-label">开票内容：</label>
+				<div class="layui-input-block">
+					<input id="billingContent" htmlEscape="false" readonly="true"   class="form-control layui-input" value="${workInvoice.billingContent}" />
+				</div>
+			</div>
+			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label"><span class="require-item">*</span>开票金额(元)：</label>
 				<div class="layui-input-block">
 					<input id="kaipiao" htmlEscape="false" readonly="true"   class="form-control layui-input" value="<fmt:formatNumber value="${workInvoice.money}" pattern="##00.00"/>"/>

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

@@ -582,6 +582,22 @@
 						<form:input id="bankNumber" path="bankNumber" htmlEscape="false" placeholder="请输入银行账号"  class="form-control number layui-input"/>
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label"><span class="require-item">*</span>收款类型：</label>
+					<div class="layui-input-block">
+						<form:select  path="chargeType" class="form-control simple-select judgment">
+							<form:options items="${fns:getMainDictList('receipt_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+						</form:select>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label"><span class="require-item">*</span>开票内容：</label>
+					<div class="layui-input-block">
+						<form:select path="billingContent" class="form-control simple-select judgment">
+							<form:options items="${fns:getMainDictList('billing_content')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+						</form:select>
+					</div>
+				</div>
 				<div class="layui-item layui-col-sm12">
 					<label class="layui-form-label"><span class="require-item">*</span>开票金额(元)：</label>
 					<div class="layui-input-block">

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

@@ -144,6 +144,18 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">收款类型：</label>
+					<div class="layui-input-block">
+						<input id="chargeType" htmlEscape="false" readonly="true" style="background-color: #f1f1f1"  class="form-control layui-input" value="${workInvoice.chargeType}" />
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">开票内容：</label>
+					<div class="layui-input-block">
+						<input id="billingContent" htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${workInvoice.billingContent}" />
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>开票金额(元)：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false" readonly="true" style="background-color: #f1f1f1"  class="form-control layui-input" value="<fmt:formatNumber value="${workInvoice.money}" pattern="##00.00"/>"/>