Merge remote-tracking branch 'origin/dev' into dev

ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/purchasePlan.html

@@ -52,7 +52,7 @@
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-warning" onclick="addPurchaseOrder()" shiro:hasPermission="purchase:plan:export">
+                <a class="btn btn-warning" onclick="addPurchaseOrder()" shiro:hasPermission="purchase:purchasePlan:add">
                     <i class="fa fa-download"></i> 添加采购单
                 </a>
             </div>
@@ -63,10 +63,10 @@
     </div>
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('purchase:plan:edit')}]];
+        var editFlag = [[${@permission.hasPermi('purchase:purchasePlan:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('purchase:plan:remove')}]];
+        var removeFlag = [[${@permission.hasPermi('purchase:purchasePlan:remove')}]];
-        var cancelFlag = [[${@permission.hasPermi('purchase:plan:cancel')}]];
+        var cancelFlag = [[${@permission.hasPermi('purchase:purchasePlan:cancel')}]];
-        var restoreFlag = [[${@permission.hasPermi('purchase:plan:restore')}]];
+        var restoreFlag = [[${@permission.hasPermi('purchase:purchasePlan:restore')}]];
         var purchasePlanStatusDatas = [[${@dict.getType('purchase_plan_status')}]];
         var auditStatusDatas = [[${@dict.getType('auditStatus')}]];
         var useStatusDatas = [[${@dict.getType('useStatus')}]];
@@ -103,7 +103,9 @@
                     },
                     {title: '采购计划单号',field: 'purchasePlanCode'},
                     {title: '关联单号', field: 'correlationCode',},
-                    {title: '采购来源',field: 'purchasePlanType',formatter: function(value, row, index) {return $.table.selectDictLabel(purchasePlanTypeDatas, value);}},
+                    {title: '采购来源',field: 'purchasePlanType',
+                        formatter: function(value, row, index) {return $.table.selectDictLabel(purchasePlanTypeDatas, value);}
+                    },
                     {title: '物料合计',field: 'materialAmount',},
                     {title: '数量总计', field: 'materialSum',},
                     {title: '不含税总价(RMB)',field: 'noRmbSum',},