Skip to content

caosy / fun-admin

Go to a project
Commit 4d504a92 by chongli
Options

增加发票递送方式和递送费相关信息

parent 426ed8ab
Inline Side-by-side
Showing with 93 additions and 30 deletions
src/main/java/com/ctrip/fun/admin/controller/basic/InvoiceRequestController.java
......@@ -98,6 +98,9 @@ public class InvoiceRequestController {
InvoiceRequestBean bean = invoiceRequestService.get("", id);
BeanConverter.copyProperties(dto, bean);
model.put("sendWay", bean.getSendWay());
model.put("payInfo", bean.getPayInfo());
String returnPage = request.getParameter("page");
model.put("action", "/invoiceRequest/edit");
return "basic/invoiceRequest/invoiceRequestForm";
......
src/main/java/com/ctrip/fun/admin/form/basic/InvoiceRquestDto.java
package com.ctrip.fun.admin.form.basic;
import java.util.Date;
import java.util.List;
import org.springframework.format.annotation.DateTimeFormat;
import com.ctrip.fun.common.vo.basic.InvoiceOrderInfoBean;
/**
......@@ -55,6 +51,11 @@ public class InvoiceRquestDto {
//销售员备注
private String salesRemark;
//寄送方式：到付、寄送
private String sendWay;
//到付，付款信息
private String payInfo;
private List<InvoiceOrderInfoBean> invoiceOrderInfoBeans;
......@@ -181,6 +182,22 @@ public class InvoiceRquestDto {
this.salesRemark = salesRemark;
}
public String getSendWay() {
return sendWay;
}
public void setSendWay(String sendWay) {
this.sendWay = sendWay;
}
public String getPayInfo() {
return payInfo;
}
public void setPayInfo(String payInfo) {
this.payInfo = payInfo;
}
}
src/main/java/com/ctrip/fun/admin/service/basic/InvoiceRequestExcelExportService.java
......@@ -67,9 +67,9 @@ public class InvoiceRequestExcelExportService extends AbstractExcelExportService
XSSFCell cell = null;
List<String> titleList = new ArrayList<String>();
titleList.add("发票申请ID");titleList.add("快递费用归属部门");titleList.add("发票抬头");titleList.add("纳税识别号");
titleList.add("发票申请ID");titleList.add("快递费用归属部门");titleList.add("提交人");titleList.add("发票抬头");titleList.add("纳税识别号");
titleList.add("发票寄送地址");titleList.add("寄送联系人");titleList.add("联系方式");titleList.add("开票备注");
titleList.add("未开票原因");titleList.add("快递单号");titleList.add("寄出时间");
titleList.add("未开票原因");titleList.add("快递单号");titleList.add("寄出时间");titleList.add("寄送方式");titleList.add("发票寄送费凭证");
titleList.add("订单号");titleList.add("开票金额");titleList.add("球场");
for (int i = 0; i < titleList.size(); i++) {
......@@ -86,40 +86,44 @@ public class InvoiceRequestExcelExportService extends AbstractExcelExportService
XSSFCell cell_Id = row.createCell(0);
cell_Id.setCellStyle(bodyStyle);
cell_Id.setCellValue(item.getId()==null?"":item.getId()+"");
XSSFCell cell_CostOfDepart = row.createCell(1);
cell_CostOfDepart.setCellStyle(bodyStyle);
cell_CostOfDepart.setCellValue(item.getCostOfDepart()==null?"":item.getCostOfDepart());
XSSFCell cell_InvoiceTitle = row.createCell(2);
XSSFCell cell_requestPerson = row.createCell(2);
cell_requestPerson.setCellValue(item.getRequestPerson()==null?"":item.getRequestPerson());
XSSFCell cell_InvoiceTitle = row.createCell(3);
cell_InvoiceTitle.setCellValue(item.getInvoiceTitle()==null?"":item.getInvoiceTitle());
XSSFCell cell_taxIdNum = row.createCell(3);
XSSFCell cell_taxIdNum = row.createCell(4);
cell_taxIdNum.setCellValue(item.getTaxIdNum()==null?"":item.getTaxIdNum());
XSSFCell cell_ContactAddress = row.createCell(4);
XSSFCell cell_ContactAddress = row.createCell(5);
cell_ContactAddress.setCellValue(item.getContactAddress()==null?"":item.getContactAddress());
XSSFCell cell_ContactName = row.createCell(5);
XSSFCell cell_ContactName = row.createCell(6);
cell_ContactName.setCellValue(item.getContactName()==null?"":item.getContactName());
XSSFCell cell_ContactTel = row.createCell(6);
XSSFCell cell_ContactTel = row.createCell(7);
cell_ContactTel.setCellValue(item.getContactTel()==null?"":item.getContactTel());
XSSFCell cell_InvoiceRemark = row.createCell(7);
XSSFCell cell_InvoiceRemark = row.createCell(8);
cell_InvoiceRemark.setCellValue(item.getInvoiceRemark()==null?"":item.getInvoiceRemark());
XSSFCell cell_RefusedReason = row.createCell(8);
XSSFCell cell_RefusedReason = row.createCell(9);
cell_RefusedReason.setCellValue(item.getRefusedReason()==null?"":item.getRefusedReason());
XSSFCell cell_ExpressNo = row.createCell(9);
XSSFCell cell_ExpressNo = row.createCell(10);
cell_ExpressNo.setCellStyle(bodyStyle);
cell_ExpressNo.setCellValue(item.getExpressNo()==null?"":item.getExpressNo());
XSSFCell cell_SendTime = row.createCell(10);
XSSFCell cell_SendTime = row.createCell(11);
cell_SendTime.setCellStyle(bodyStyle);
cell_SendTime.setCellValue(item.getSendTime()==null?"":item.getSendTime());
XSSFCell cell_orderNo = row.createCell(11);
XSSFCell cell_SendWay = row.createCell(12);
cell_SendWay.setCellValue(item.getSendWay()==null?"":item.getSendWay());
XSSFCell cell_PayInfo = row.createCell(13);
cell_PayInfo.setCellValue(item.getPayInfo()==null?"":item.getPayInfo());
XSSFCell cell_orderNo = row.createCell(14);
cell_orderNo.setCellValue(invoiceOrderInfoBean.getOrderNo()==null?"":invoiceOrderInfoBean.getOrderNo());
XSSFCell cell_Amount = row.createCell(12);
XSSFCell cell_Amount = row.createCell(15);
cell_Amount.setCellValue(invoiceOrderInfoBean.getAmount()==null?"":invoiceOrderInfoBean.getAmount());
XSSFCell cell_CourseName = row.createCell(13);
XSSFCell cell_CourseName = row.createCell(16);
cell_CourseName.setCellValue(invoiceOrderInfoBean.getCourseName()==null?"":invoiceOrderInfoBean.getCourseName());
}
for(int i=0;i<11;i++){
for(int i=0;i<14;i++){
//如果订单数量大于1就要合并
if(infoBeans.size()>1){
sheet.addMergedRegion(new CellRangeAddress(rowbased, rowbased+infoBeans.size()-1, i, i));
......
src/main/java/com/ctrip/fun/admin/service/basic/InvoiceRequestExcelImportService.java
......@@ -43,10 +43,9 @@ public class InvoiceRequestExcelImportService {
InvoiceRequestBean bean = new InvoiceRequestBean();
bean.setId(Integer.valueOf(getCellValue(row.getCell(0))));
bean.setRefusedReason(getCellValue(row.getCell(8)));
String aa = getCellValue(row.getCell(9));
bean.setExpressNo(getCellValue(row.getCell(9)));
bean.setSendTime(getCellValue(row.getCell(10)));
bean.setRefusedReason(getCellValue(row.getCell(9)));
bean.setExpressNo(getCellValue(row.getCell(10)));
bean.setSendTime(getCellValue(row.getCell(11)));
if(isMergedRegion(sheet,i,0)){
int lastRow = getRowNum(cras,sheet.getRow(i).getCell(0),sheet);
i = lastRow;
......
src/main/webapp/WEB-INF/templates/basic/invoiceRequest/invoiceRequestForm.ftl
......@@ -14,7 +14,7 @@ $(function(){
$("#city").val(contactAddressArray[1]);
$("#county").val(contactAddressArray[2]);
$("#road").val(contactAddressArray[3]);
$("#room").val(contactAddressArray[4]);
$("#room").val(contactAddressArray[4]);
}
});
......@@ -32,8 +32,15 @@ $("#submitCheck").click(function(){
var contactName = $("#contactName").val();
var contactTel = $("#contactTel").val();
var payInfo = $("#payInfo").val();
var sendWay = $("input[name='sendWay']:checked").val();
if(costOfDepart==""){
alert("请填入快递费用归属部门");
return;
......@@ -76,6 +83,14 @@ $("#submitCheck").click(function(){
alert("请填入联系方式");
return;
}
if(sendWay==2){
if(payInfo==""){
alert("请填入快递费用付款信息");
return;
}
}
if(index==0){
alert("请填入订单信息");
return;
......@@ -89,7 +104,7 @@ $("#submitCheck").click(function(){
$("#addOrder").click(function(){
$("#rowsOfOrder").append("<tr> <td style='width:10%'><input type='checkbox'></td> <td style='width:10%'><input name='invoiceOrderInfoBeans["+index+"].orderNo'></td><td style='width:5%'><input name='invoiceOrderInfoBeans["+index+"].courseName'></td><td style='width:16%'><input name='invoiceOrderInfoBeans["+index+"].amount'></td></tr>");
$("#rowsOfOrder").append("<tr> <td style='width:10%'><input type='checkbox'></td> <td style='width:10%'><input name='invoiceOrderInfoBeans["+index+"].orderNo'></td><td style='width:5%'><input name='invoiceOrderInfoBeans["+index+"].amount'></td><td style='width:16%'><input name='invoiceOrderInfoBeans["+index+"].courseName'></td></tr>");
index++;
});
......@@ -123,7 +138,6 @@ $("#deleteOrder").click(function(){
<@com.layout title="新建发票信息" module="tools" current="invoiceInfo_create" pageJs=pageJsContent pageCss=pageCssContent>
<form id="telTaskForm" class="form-inline form-horizontal" action="${action}" method="post">
<div id="course_container">
<div class="row-fluid show-grid">
......@@ -144,11 +158,25 @@ $("#deleteOrder").click(function(){
</div>
</div>
<@form.hidden "dto.contactAddress"/>
<@form.textInput path="dto.contactName" attributes="class=\"input-medium\"" label="寄送联系人" required = true />
<@form.textInput path="dto.contactTel" attributes="class=\"input-medium\"" label="联系方式" required = true />
<@form.textInput path="dto.invoiceRemark" attributes="class=\"input-medium\"" label="发票备注" required = true />
<@form.textInput path="dto.salesRemark" attributes="class=\"input-medium\"" label="销售备注" required = true />
<div class="long_content_div control-group ">
<label class="control-label" for="contactAddress">递送方式</label>
<div class="controls">
<input id="sendWay_Id_1" name="sendWay" type="radio" value="2" checked=true />寄送
<input id="sendWay_Id_2" name="sendWay" type="radio" value="1" <#if sendWay??> <#if sendWay=="1">checked=true</#if> </#if> />到付
</div>
</div>
<div class="long_content_div control-group ">
<label class="control-label" for="payInfo">付款信息</label>
<div class="controls">
<input id="payInfo" name="payInfo" type="text" placeholder='微信:10654321111111233' value="${payInfo!}" />
</div>
</div>
......@@ -173,7 +201,7 @@ $("#deleteOrder").click(function(){
<tbody id="rowsOfOrder">
<#if dto.id ?? >
<#list dto.invoiceOrderInfoBeans as item>
<tr> <td style="width:10%"><input type='checkbox' /></td> <td style='width:10%'><input name='invoiceOrderInfoBeans[${item_index}].orderNo' value=${item.orderNo} ></td><td style='width:5%'><input name='invoiceOrderInfoBeans[${item_index}].courseName' value=${item.courseName}></td><td style='width:16%'><input name='invoiceOrderInfoBeans[${item_index}].amount' value=${item.amount}></td></tr>
<tr> <td style="width:10%"><input type='checkbox' /></td> <td style='width:10%'><input name='invoiceOrderInfoBeans[${item_index}].orderNo' value=${item.orderNo} ></td><td style='width:5%'><input name='invoiceOrderInfoBeans[${item_index}].amount' value=${item.amount}></td><td style='width:16%'><input name='invoiceOrderInfoBeans[${item_index}].courseName' value=${item.courseName}></td></tr>
</#list>
</#if>
</tbody>
......
src/main/webapp/WEB-INF/templates/basic/invoiceRequest/invoiceRequestList.ftl
......@@ -99,6 +99,8 @@ function financeUpdate(){
<th style="width: 38px;">未开票原因</th>
<th style="width: 38px;">运单号</th>
<th style="width: 38px;">寄送时间</th>
<th style="width: 38px;">寄送方式</th>
<th style="width: 38px;">寄送费凭证</th>
<th style="width: 38px;">详情查看</th>
<th style="width: 38px;">财务处理</th>
......@@ -125,6 +127,16 @@ function financeUpdate(){
<td>${item.expressNo!}</td>
<td>${item.sendTime!}</td>
<#if item.sendWay=="1">
<td>到付</td>
<#elseif item.sendWay=="2">
<td>寄送</td>
<#else>
<td>未知</td>
</#if>
<td>${item.payInfo!}</td>
<td> <a href="/invoiceRequest/edit?id=${item.id!}" >查看</a> </td>
<td> <a href='javascript:void(0);' onclick="changeMobilePhoneToEdit('${item.id!}')" >处理</a> </td>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment