Commit 1c955ffc authored by 徐州's avatar 徐州

新增缴费页面部分逻辑,财务用章及生成凭证

parent 349c2e1c
......@@ -10,6 +10,53 @@
createSimpleWindow("win_paymentItemHis","补充相关编号","${ctx}/jsp/paymentItemHis/paymentItemHisInitEdit.action?flag=mod&paymentItemHis.id="+row_Id+"&dt="+dt.getTime(),700,250);
}
function scpz(row_Id){
$.ajax({
url : "${ctx}/jsp/paymentVoucher/checkPoject1.action",
type: 'post',
dataType: 'json',
data:{
id : row_Id
},
async : false,
success: function(data){
if(data.result){
$.messager.confirm("提示", "确认要生成凭证吗?", function(result) {
var dt=new Date();
});
}else{
$.messager.alert('错误',data.message);
}
}
});
}
function cwyz(row_Id){
$.ajax({
url : "${ctx}/jsp/paymentVoucher/checkPoject1.action",
type: 'post',
dataType: 'json',
data:{
id : row_Id
},
async : false,
success: function(data){
if(data.result){
$.messager.confirm("提示", "确认要财务用章?", function(result) {
var dt=new Date();
});
}else{
$.messager.alert('错误',data.message);
}
}
});
}
function viewdd(row_Id){
// alert(row_Id);
var dt=new Date();
......@@ -19,6 +66,7 @@
// createSimpleWindow("win_xmxxb","查看项目信息","${ctx}/jsp/szys/szysViewjb.action?xmxxb.id="+row_Id+"&dt="+dt.getTime(),700,500);
createSimpleWindow("win_paymentItemHis","材料补充",urldz+"&dt="+dt.getTime(),850,350);
}
function view(row_Id){
var row = $('#pagination').datagrid('getSelected');
if(row){
......@@ -115,7 +163,7 @@
"paymentItemHis.zsdw": $("#zsdw").val(),
"paymentItemHis.zslxdbh": $("#jfpzbh").val(),
"paymentItemHis.ECN": $("#dzjgh").val(),
"paymentItemHis.isPrintJfpz":$("#isPrintJfpz").val()
"paymentItemHis.isCreateJfpz":$("#isCreateJfpz").val()
};
$('#pagination').datagrid('options').queryParams = queryParams;
$('#pagination').datagrid('clearSelections');
......@@ -131,19 +179,23 @@
"paymentItemHis.dwmc": $("#dwmc").val(),
"paymentItemHis.xmmc": $("#xmmc").val(),
"paymentItemHis.zsdw": $("#zsdw").val(),
"paymentItemHis.isPrintJfpz":$("#isPrintJfpz").val()
"paymentItemHis.isCreateJfpz":$("#isCreateJfpz").val()
},
singleSelect: true,
columns:[[
{field:'op',title:'操作',width:250,formatter:function(value,rec){
if($("#isPrintJfpz").val() =='0')
if($("#isCreateJfpz").val() =='0')
{
return "<a class='btn_01_mini' onclick=printZslxd('"+rec.id+"','"+rec.zslxdbh+"','"+rec.mjyj+"') >打印<b></b></a>&nbsp;<a class='btn_01_mini' onclick=edit('"+rec.id+"')>补充相关编号<b></b></a>";
return "<a class='btn_01_mini' onclick=scpz('"+rec.id+"') >生成凭证<b></b></a>";
}
else
{
return "<a class='btn_01_mini' onclick=printZslxd('"+rec.id+"','"+rec.zslxdbh+"','"+rec.mjyj+"') >打印<b></b></a>&nbsp;<a class='btn_01_mini' onclick=edit('"+rec.id+"')>补充相关编号<b></b></a>&nbsp;<a class='btn_01_mini' onclick=viewdd('"+rec.xmxxb.xxylb+"')>附件补充<b></b></a>";
if($("#isCwyz").val() =='0') {//财务未用章
return "<a class='btn_01_mini' onclick=printZslxd('"+rec.id+"','"+rec.zslxdbh+"','"+rec.mjyj+"') >预览凭证<b></b></a>&nbsp;<a class='btn_01_mini' onclick=cwyz('"+rec.id+"')>财务用章<b></b></a>&nbsp;<a class='btn_01_mini' onclick=viewdd('"+rec.xmxxb.xxylb+"')>附件补充<b></b></a>";
} else {
return "<a class='btn_01_mini' onclick=printZslxd('"+rec.id+"','"+rec.zslxdbh+"','"+rec.mjyj+"') >预览凭证<b></b></a>&nbsp;<a class='btn_01_mini' onclick=viewdd('"+rec.xmxxb.xxylb+"')>附件补充<b></b></a>";
}
}
......@@ -189,11 +241,11 @@
<tr>
<th width="15%">受理编号</th>
<td width="35%"><input id="slbh" type="text"></td>
<th width="15%">打印状态</th>
<th width="15%">缴费凭证状态</th>
<td width="35%">
<select id ="isPrintJfpz">
<option value="0">打印</option>
<option value="1">打印</option>
<select id ="isCreateJfpz">
<option value="0">生成</option>
<option value="1">生成</option>
</select>
</td>
</tr>
......
......@@ -63,6 +63,9 @@
<isNotEmpty property="yzsFlag">
<![CDATA[and t.yzsFlag = :yzsFlag]]>
</isNotEmpty>
<isNotEmpty property="isCreateJfpz">
<![CDATA[and t.isCreateJfpz = :isCreateJfpz]]>
</isNotEmpty>
order by t.createTime desc
</select>
......@@ -118,5 +121,10 @@
group by to_char(t.createtime,'yyyy-MM'),t.zsdw) b
</select>
<!-- 获取凭证编号:规则:ZSLXDBH 最大值,ZSLXDBH必须是数字,忽略不是数字的数据-->
<select id="getPzbh">
select TO_NUMBER(ZSLXDBH) from PAYMENT_ITEM_HIS where rownum = 1 and ZSLXDBH is not null and trim(TRANSLATE(ZSLXDBH,'0123456789',' ')) is null order by TO_NUMBER(ZSLXDBH) desc
</select>
</sqlMap>
......@@ -57,6 +57,13 @@
<action name="submitAudit" class="com.jshx.paymentItemHis.web.PaymentItemHisAction" method="submitAudit">
</action>
<!-- 财务用章 -->
<action name="cwyz" class="com.jshx.paymentItemHis.web.PaymentItemHisAction" method="cwyz">
</action>
<!-- 生成凭证 -->
<action name="scpz" class="com.jshx.paymentItemHis.web.PaymentItemHisAction" method="scpz">
</action>
</package>
</struts>
......@@ -57,4 +57,7 @@ public interface PaymentItemHisDao extends BaseDao
* @param ids 主键ID
*/
public void deleteWithFlag(String id);
public int getPzbh();
}
package com.jshx.paymentItemHis.dao.impl;
import java.util.HashMap;
import java.util.List;
import java.sql.Blob;
import java.util.Map;
......@@ -50,6 +51,17 @@ public class PaymentItemHisDaoImpl extends BaseDaoImpl implements PaymentItemHis
return (PaymentItemHis)this.getObjectById(PaymentItemHis.class, id);
}
/**
* 获取凭证编号,当前最大值+1
* @return
*/
public int getPzbh()
{
List getPzbh = this.findListByHqlId("getPzbh", new HashMap<>());
return (int)getPzbh.get(0);
}
/**
* 保存信息
* @param model 信息
......
......@@ -273,6 +273,16 @@ public class PaymentItemHis extends BaseModel
//是否一站式
private Integer yzsFlag;
/**
* 是否生成缴费凭证 (0:未生成 1:已生成)
*/
private String isCreateJfpz;
/**
* 是否财务用章
*/
private String isCwyz;
public PaymentItemHis(){
}
......@@ -918,4 +928,21 @@ public class PaymentItemHis extends BaseModel
public void setYzsFlag(Integer yzsFlag) {
this.yzsFlag = yzsFlag;
}
@Column(name="IS_CREATEJFPZ")
public String getIsCreateJfpz() {
return isCreateJfpz;
}
public void setIsCreateJfpz(String isCreateJfpz) {
this.isCreateJfpz = isCreateJfpz;
}
@Column(name="IS_CWYZ")
public String getIsCwyz() {
return isCwyz;
}
public void setIsCwyz(String isCwyz) {
this.isCwyz = isCwyz;
}
}
......@@ -70,4 +70,12 @@ public interface PaymentItemHisService extends BaseService
* @return
*/
public PaymentItemHis getByZslxdbh(String zslxdbh);
/**
* 获取上一个凭证号,去最大值
* @return
*/
public String getLastZslxdbh();
public int getPzbh();
}
......@@ -83,6 +83,11 @@ public class PaymentItemHisServiceImpl extends BaseServiceImpl implements Paymen
return paymentItemHis;
}
@Override
public int getPzbh() {
return paymentItemHisDao.getPzbh();
}
/**
* 保存信息
* @param model 信息
......
......@@ -184,8 +184,8 @@ public class PaymentItemHisAction extends BaseAction
paraMap.put("nonTaxStatus", paymentItemHis.getNonTaxStatus().trim());
}
if ((null != paymentItemHis.getIsPrintJfpz()) && (0 < paymentItemHis.getIsPrintJfpz().trim().length())){
paraMap.put("isPrintJfpz", paymentItemHis.getIsPrintJfpz().trim());
if ((null != paymentItemHis.getIsCreateJfpz()) && (0 < paymentItemHis.getIsCreateJfpz().trim().length())){
paraMap.put("isCreateJfpz", paymentItemHis.getIsCreateJfpz().trim());
}
if ((null != paymentItemHis.getZslxdbh()) && (0 < paymentItemHis.getZslxdbh().trim().length())){
paraMap.put("zslxdbh", "%" + paymentItemHis.getZslxdbh().trim() + "%");
......@@ -232,6 +232,31 @@ public class PaymentItemHisAction extends BaseAction
convObjectToJson(pagination, config);
}
/**
*财务用章
* @throws Exception
*/
public String cwyz() throws Exception {
PaymentItemHis model = paymentItemHisService.getById(paymentItemHis.getId());
model.setIsCwyz("1");
paymentItemHisService.update(model);
//TODO 新增表人防费,把他加入人防费表内
return RELOAD;
}
/**
* 生成凭证
* @throws Exception
*/
public String scpz() throws Exception {
PaymentItemHis model = paymentItemHisService.getById(paymentItemHis.getId());
model.setIsCreateJfpz("1");
model.setZslxdbh(paymentItemHisService.getPzbh() + 1 + "");//取出历史最大 + 1
paymentItemHisService.update(model);
return RELOAD;
}
/**
* 查看详细信息
*/
......
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 to comment