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

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

@@ -163,11 +163,12 @@
                     formatter: function(value, row, index) {
                         var actions = [];
                         if('01' == row.processStsCd){
-                            console.log(row.processStsCd)
                             actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" 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 ' + editFlag + '" href="javascript:void(0)" onclick="confirmPay(\'' + row.pId + '\')"><i class="fa fa-edit"></i>确认支付</a> ');
                         }
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.pId + '\')"><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.pId + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        /*actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.pId + '\')"><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.pId + '\')"><i class="fa fa-remove"></i>删除</a>');*/
                         return actions.join('');
                     }
                 }]
@@ -178,6 +179,10 @@
         function approve(id){
             $.modal.open("审批", "/opt/process/approve/"+id, '800', '350');
         }
+        // 确认支付
+        function confirmPay(id){
+            $.operate.save(prefix + "/edit", {"pId":id, "processStsCd":"05"});
+        }
     </script>
 </body>
 </html>