Merge branch 'master' of http://114.115.215.112:3000/yuncaikeji_gogs/RuoYi

ruoyi-admin/src/main/resources/templates/opt/process/process.html

@@ -158,7 +158,7 @@
                         if ('01' == row.processStsCd) { // 待审核
                             actions.push('<a class="btn btn-success btn-xs ' + approveFlag + '" href="javascript:void(0)" onclick="approve(\'' + row.pId + '\')"><i class="fa fa-edit"></i>审核</a> ');
                         } else if ('04' == row.processStsCd) { //待支付
-                            actions.push('<a class="btn btn-success btn-xs ' + approveFlag + '" href="javascript:void(0)" onclick="confirmPay(\'' + row.pId + '\')"><i class="fa fa-edit"></i>确认支付</a> ');
+                            actions.push('<a class="btn btn-success btn-xs ' + approveFlag + '" href="javascript:void(0)" onclick="confirmPay(\'' + row.pId + '\''+',\''+row.processId+'\')"><i class="fa fa-edit"></i>确认支付</a> ');
                         } else if ('05' == row.processStsCd) { // 支付未出函
                             actions.push('<a class="btn btn-success btn-xs ' + approveFlag + '" href="javascript:void(0)" onclick="policySign(\'' + row.policySignUrl + '\')"><i class="fa fa-edit"></i>签署</a> ');
                         } else if ('08' == row.processStsCd) { // 已出函
@@ -179,9 +179,9 @@
     }
 
     // 确认支付
-    function confirmPay(id) {
+    function confirmPay(pId, processId) {
         $.modal.confirm("已收到此笔保费金额?", function () {
-            $.operate.save(prefix + "/edit", {"pId": id, "processStsCd": "05"});
+            $.operate.save(prefix + "/edit", {"pId": pId, "processId":processId, "processStsCd": "05"});
         })
     }