|
@@ -212,12 +212,30 @@
|
212
|
212
|
var zjfy = 0;
|
213
|
213
|
var xm = [[${annualbudget.mc}]];
|
214
|
214
|
var xmid = [[${annualbudget.id}]];
|
|
215
|
+ //用于审批列表重新提交
|
|
216
|
+ var spList;
|
|
217
|
+ var spListId;
|
|
218
|
+
|
215
|
219
|
//申请时间
|
216
|
220
|
laydate.render({
|
217
|
221
|
elem: '#sqsj',
|
218
|
222
|
value: new Date()
|
219
|
223
|
});
|
220
|
224
|
|
|
225
|
+ AjaxUtil.get({
|
|
226
|
+ url: AjaxUtil.ctx + 'prjApproverecord/spLists/' + xmid + '/prj_AnnualBudgetRecord',
|
|
227
|
+ success: function (res) {
|
|
228
|
+ var a = res.length -1;
|
|
229
|
+ if (res[a] != null) {
|
|
230
|
+ spList = res[a].wc
|
|
231
|
+ spListId =res[a].id
|
|
232
|
+ } else {
|
|
233
|
+ spList = -1;
|
|
234
|
+ }
|
|
235
|
+ }
|
|
236
|
+ });
|
|
237
|
+
|
|
238
|
+
|
221
|
239
|
// 监听查看任务书按钮
|
222
|
240
|
$("button[lay-filter='viewRwsBtn']").click(function (e) {
|
223
|
241
|
parent.layer.open({
|
|
@@ -517,6 +535,9 @@
|
517
|
535
|
$("button[lay-filter='saveBtnYs']").click(function () {
|
518
|
536
|
var rwsys = $("#rwsys").val();
|
519
|
537
|
var ndczje = $("#ndczje").val();
|
|
538
|
+
|
|
539
|
+ console.log(spList)
|
|
540
|
+ console.log(spListId)
|
520
|
541
|
for (let i = 0; i < dataBudget.length; i++) {
|
521
|
542
|
if (dataBudget[i].fj==''){
|
522
|
543
|
var ysje = dataBudget[i].ysje;
|
|
@@ -563,41 +584,85 @@
|
563
|
584
|
for (var i = 0; i < data.length; i++) {
|
564
|
585
|
getBudget(budgets, data[i]);
|
565
|
586
|
}
|
566
|
|
- var index = layer.load(0, {shade: 0.1});
|
567
|
|
- //添加修改记录
|
568
|
|
- AjaxUtil.post({
|
569
|
|
- url: AjaxUtil.ctx + 'PrjAnnualBudgetRecord/addUpdateApplyRecord/',
|
570
|
|
- contentType: "application/json",
|
571
|
|
- data: JSON.stringify(budgets),
|
572
|
|
- success: function (res) {
|
573
|
|
- layer.close(index);
|
574
|
|
- if (res.code === 0) {
|
575
|
|
- var project = {
|
576
|
|
- "xm":xm,
|
577
|
|
- "xmid":xmid,
|
578
|
|
- "zt":"未提交"
|
579
|
|
-
|
|
587
|
+ // var index = layer.load(0, {shade: 0.1});
|
|
588
|
+ if (spList == false){
|
|
589
|
+ layer.confirm("该年度预算的修改申请还存在未结束的审批流程,是否重新提交?",function (index) {
|
|
590
|
+ AjaxUtil.get({
|
|
591
|
+ url:AjaxUtil.ctx + 'prjApproverecord/updatSpList/'+spListId,
|
|
592
|
+ success:function (res) {
|
|
593
|
+ //添加修改记录
|
|
594
|
+ AjaxUtil.post({
|
|
595
|
+ url: AjaxUtil.ctx + 'PrjAnnualBudgetRecord/addUpdateApplyRecord/',
|
|
596
|
+ contentType: "application/json",
|
|
597
|
+ data: JSON.stringify(budgets),
|
|
598
|
+ success: function (res) {
|
|
599
|
+ layer.close(index);
|
|
600
|
+ if (res.code === 0) {
|
|
601
|
+ var project = {
|
|
602
|
+ "xm":xm,
|
|
603
|
+ "xmid":xmid,
|
|
604
|
+ "zt":"未提交"
|
|
605
|
+ }
|
|
606
|
+ //添加审批记录
|
|
607
|
+ AjaxUtil.post({
|
|
608
|
+ url: AjaxUtil.ctx + "prjApproverecord/doUpdatApprove",
|
|
609
|
+ data:project,
|
|
610
|
+ success: function (res) {
|
|
611
|
+ Message.success(res.message, 2000);
|
|
612
|
+ layer.load(0, {shade: 0.1});
|
|
613
|
+ setTimeout(function() {
|
|
614
|
+ parent.layer.close(parent.layer.getFrameIndex(window.name)); // 关闭子窗口
|
|
615
|
+ }, 1000);
|
|
616
|
+ // parent.layer.close(parent.layer.getFrameIndex(window.name));// 关闭子窗口
|
|
617
|
+ },
|
|
618
|
+ error: function (error) {
|
|
619
|
+ }
|
|
620
|
+ });
|
|
621
|
+ } else {
|
|
622
|
+ Message.error("修改记录添加失败", 2000);
|
|
623
|
+ }
|
|
624
|
+ }
|
|
625
|
+ });
|
580
|
626
|
}
|
581
|
|
- //添加审批记录
|
582
|
|
- AjaxUtil.post({
|
583
|
|
- url: AjaxUtil.ctx + "prjApproverecord/doUpdatApprove",
|
584
|
|
- data:project,
|
585
|
|
- success: function (res) {
|
586
|
|
- Message.success(res.message, 2000);
|
587
|
|
- layer.load(0, {shade: 0.1});
|
588
|
|
- setTimeout(function() {
|
589
|
|
- parent.layer.close(parent.layer.getFrameIndex(window.name)); // 关闭子窗口
|
590
|
|
- }, 1000);
|
591
|
|
- // parent.layer.close(parent.layer.getFrameIndex(window.name));// 关闭子窗口
|
592
|
|
- },
|
593
|
|
- error: function (error) {
|
|
627
|
+ })
|
|
628
|
+ })
|
|
629
|
+ }else{
|
|
630
|
+ //添加修改记录
|
|
631
|
+ AjaxUtil.post({
|
|
632
|
+ url: AjaxUtil.ctx + 'PrjAnnualBudgetRecord/addUpdateApplyRecord/',
|
|
633
|
+ contentType: "application/json",
|
|
634
|
+ data: JSON.stringify(budgets),
|
|
635
|
+ success: function (res) {
|
|
636
|
+ layer.close(index);
|
|
637
|
+ if (res.code === 0) {
|
|
638
|
+ var project = {
|
|
639
|
+ "xm":xm,
|
|
640
|
+ "xmid":xmid,
|
|
641
|
+ "zt":"未提交"
|
594
|
642
|
}
|
595
|
|
- });
|
596
|
|
- } else {
|
597
|
|
- Message.error("修改记录添加失败", 2000);
|
|
643
|
+ //添加审批记录
|
|
644
|
+ AjaxUtil.post({
|
|
645
|
+ url: AjaxUtil.ctx + "prjApproverecord/doUpdatApprove",
|
|
646
|
+ data:project,
|
|
647
|
+ success: function (res) {
|
|
648
|
+ Message.success(res.message, 2000);
|
|
649
|
+ layer.load(0, {shade: 0.1});
|
|
650
|
+ setTimeout(function() {
|
|
651
|
+ parent.layer.close(parent.layer.getFrameIndex(window.name)); // 关闭子窗口
|
|
652
|
+ }, 1000);
|
|
653
|
+ // parent.layer.close(parent.layer.getFrameIndex(window.name));// 关闭子窗口
|
|
654
|
+ },
|
|
655
|
+ error: function (error) {
|
|
656
|
+ }
|
|
657
|
+ });
|
|
658
|
+ } else {
|
|
659
|
+ Message.error("修改记录添加失败", 2000);
|
|
660
|
+ }
|
598
|
661
|
}
|
|
662
|
+ });
|
599
|
663
|
}
|
600
|
|
- });
|
|
664
|
+
|
|
665
|
+
|
601
|
666
|
|
602
|
667
|
});
|
603
|
668
|
|