新增付款申请审批流程
This commit is contained in:
jinqiming
parent
d876072ce6
commit
22797fff86
|
|
@ -247,6 +247,14 @@ public class PurchaseOrderController extends BaseController
|
|||
return prefix + "/detail";
|
||||
}
|
||||
|
||||
@GetMapping("/detailByOrderNo/{orderNo}")
|
||||
public String detailByOrderNo(@PathVariable("orderNo") String orderNo, ModelMap mmap)
|
||||
{
|
||||
PurchaseOrderMain purchaseOrderMain = purchaseOrderMainService.selectPurchaseOrderMainByOrderNo(orderNo);
|
||||
mmap.put("purchaseOrder", purchaseOrderMain);
|
||||
return prefix + "/detail";
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 重新申请
|
||||
|
|
|
|||
|
|
@ -14,12 +14,12 @@
|
|||
<form class="form-horizontal m-t" id="signupForm">
|
||||
<input class="form-control" type="hidden" name="taskId" th:value="*{taskId}"/>
|
||||
<input class="form-control" type="hidden" id="processInstanceId" name="processInstanceId" th:value="*{processInstanceId}"/>
|
||||
<input class="form-control" type="hidden" name="businessKey" th:value="${appFrom.orderNo}"/>
|
||||
<input class="form-control" type="hidden" name="businessKey" th:value="${appFrom.paymentNo}"/>
|
||||
<input name="id" th:value="${appFrom.id}" type="hidden">
|
||||
<br/>
|
||||
<h2 class="form-header h2" >采购单信息</h2>
|
||||
<div class="row">
|
||||
<div class="col-xs-4 col-sm-5 col-md-offset-1">
|
||||
<div class="col-xs-3 col-sm-4 col-md-offset-1">
|
||||
<label>付款单号：</label>
|
||||
<span th:text="${appFrom.paymentNo}"/>
|
||||
</div>
|
||||
|
|
@ -41,7 +41,11 @@
|
|||
<div class="row">
|
||||
<div class="col-xs-3 col-sm-4 col-md-offset-1">
|
||||
<label >订单单号：</label>
|
||||
<span th:text="${appFrom.relateNo}"/>
|
||||
<span class="form-control-static" >
|
||||
<a href="javascript:void(0)" onclick="getOrderDetail()">
|
||||
[[${appFrom.relateNo}]]
|
||||
</a>
|
||||
</span>
|
||||
</div>
|
||||
<div class="col-xs-3 col-sm-3">
|
||||
<label >订单类型：</label>
|
||||
|
|
@ -60,7 +64,7 @@
|
|||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">付款账户：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="accountNo" class="form-control" type="text" th:value="${appFrom.title}+'【付款单】'" required/>
|
||||
<input name="accountNo" class="form-control" type="text" required/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
|
|
@ -81,6 +85,7 @@
|
|||
<th:block th:include="include :: footer" />
|
||||
<th:block th:include="include :: bootstrap-fileinput-js"/>
|
||||
<script th:inline="javascript">
|
||||
|
||||
$(function () {
|
||||
var processInstanceId= $("#processInstanceId").val();
|
||||
var url ="/modeler/getProcessDiagram?processInstanceId="+processInstanceId;
|
||||
|
|
@ -125,7 +130,10 @@
|
|||
$.operate.saveTab("/system/payment/cashierTask", data);
|
||||
}
|
||||
}
|
||||
|
||||
var relateNo=[[${appFrom.relateNo}]];
|
||||
function getOrderDetail() {
|
||||
$.modal.openTab('订单详情', "/system/purchaseOrder/detailByOrderNo/"+relateNo);
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -46,10 +46,10 @@
|
|||
<div class="col-xs-3 col-sm-3">
|
||||
<label >订单类型：</label>
|
||||
<span class="form-control-static" th:text="${@dict.getLabel('sys_order_type',appFrom.relateNoType)}"/>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-10 col-sm-10 col-md-offset-1">
|
||||
<div class="col-xs-3 col-sm-3 col-md-offset-1">
|
||||
<label>备注：</label>
|
||||
<span th:text="${appFrom.paymentRemark}"/>
|
||||
</div>
|
||||
|
|
@ -57,6 +57,7 @@
|
|||
|
||||
<br/>
|
||||
<th:block th:include="include :: approvalpage" />
|
||||
|
||||
</form>
|
||||
<th:block th:include="include :: footer" />
|
||||
<th:block th:include="include :: bootstrap-fileinput-js"/>
|
||||
|
|
|
|||
|
|
@ -156,8 +156,10 @@
|
|||
align: 'center',
|
||||
formatter: function(value, row, index) {
|
||||
var actions = [];
|
||||
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>发起审批</a> ');
|
||||
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
|
||||
if(row.processStatus==0) {
|
||||
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>发起审批</a> ');
|
||||
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
|
||||
}
|
||||
return actions.join('');
|
||||
}
|
||||
}]
|
||||
|
|
|
|||
|
|
@ -20,6 +20,13 @@ public interface PurchaseOrderMainMapper
|
|||
*/
|
||||
public PurchaseOrderMain selectPurchaseOrderMainById(Integer id);
|
||||
|
||||
/**
|
||||
* 查询采购单根据订单编号
|
||||
* @param orderNo 采购单号
|
||||
* @return
|
||||
*/
|
||||
public PurchaseOrderMain selectPurchaseOrderMainByOrderNo(String orderNo);
|
||||
|
||||
/**
|
||||
* 查询采购单主表列表
|
||||
*
|
||||
|
|
|
|||
|
|
@ -19,6 +19,13 @@ public interface IPurchaseOrderMainService
|
|||
*/
|
||||
public PurchaseOrderMain selectPurchaseOrderMainById(Integer id);
|
||||
|
||||
/**
|
||||
* 查询采购单根据订单编号
|
||||
* @param orderNo 采购单号
|
||||
* @return
|
||||
*/
|
||||
public PurchaseOrderMain selectPurchaseOrderMainByOrderNo(String orderNo);
|
||||
|
||||
/**
|
||||
* 查询采购单主表列表
|
||||
*
|
||||
|
|
|
|||
|
|
@ -39,6 +39,11 @@ public class PurchaseOrderMainServiceImpl implements IPurchaseOrderMainService
|
|||
return purchaseOrderMainMapper.selectPurchaseOrderMainById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PurchaseOrderMain selectPurchaseOrderMainByOrderNo(String orderNo) {
|
||||
return purchaseOrderMainMapper.selectPurchaseOrderMainByOrderNo(orderNo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询采购单主表列表
|
||||
*
|
||||
|
|
|
|||
|
|
@ -69,6 +69,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
left join purchase_order_item b on b.purchase_order_no = a.order_no
|
||||
where a.id = #{id}
|
||||
</select>
|
||||
|
||||
<select id="selectPurchaseOrderMainByOrderNo" parameterType="String" resultMap="PurchaseOrderMainPurchaseOrderItemResult">
|
||||
select a.id, a.order_no, a.total_quantity, a.total_price, a.title, a.supplier_name, a.order_time, a.delivery_date, a.process_status, a.belong_user, a.is_delete, a.create_time, a.create_by, a.update_time, a.update_by, a.remark,
|
||||
b.id, b.purchase_order_no, b.goods_name, b.goods_size, b.goods_quantity, b.goods_price, b.total_price, b.remark, b.goods_no, b.is_delete, b.create_time, b.create_by
|
||||
from purchase_order_main a
|
||||
left join purchase_order_item b on b.purchase_order_no = a.order_no
|
||||
where a.order_no = #{orderNo}
|
||||
</select>
|
||||
|
||||
<insert id="insertPurchaseOrderMain" parameterType="PurchaseOrderMain" useGeneratedKeys="true" keyProperty="id">
|
||||
insert into purchase_order_main
|
||||
|
|
|
|||
Loading…
Reference in New Issue