Browse Source

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

wangming 2 năm trước cách đây
mục cha
commit
6142986f29

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

@@ -72,7 +72,7 @@
 </div>
 <th:block th:include="include :: footer"/>
 <script th:inline="javascript">
-    var editFlag = [[${@permission.hasPermi('opt:process:edit')}]];
+    var approveFlag = [[${@permission.hasPermi('opt:process:approve')}]];
     var removeFlag = [[${@permission.hasPermi('opt:process:remove')}]];
     var processStsCdDatas = [[${@dict.getType('process_status_cd')}]];
     var prefix = ctx + "opt/process";
@@ -151,11 +151,11 @@
                     formatter: function (value, row, index) {
                         var actions = [];
                         if ('01' == 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> ');
+                            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 ' + 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 ' + approveFlag + '" href="javascript:void(0)" onclick="confirmPay(\'' + row.pId + '\')"><i class="fa fa-edit"></i>确认支付</a> ');
                         } else if ('05' == row.processStsCd) {
-                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="policySign(\'' + row.policySignUrl + '\')"><i class="fa fa-edit"></i>签署</a> ');
+                            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> ');
                         }
                         /*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>');*/