feat:设置代码编写的按钮显示隐藏规则，修改角色不能赋值菜单权限问题

zkqy-system/src/main/java/com/zkqy/system/service/impl/SysUserServiceImpl.java

@@ -107,7 +107,7 @@ public class SysUserServiceImpl implements ISysUserService {
     /**
      * 通过用户名查询用户
      *
-     * @param userName 用户名
+     * @param userInfo 用户名
      * @return 用户对象信息
      */
     @Override

zkqy-ui/src/views/orderMange/index.vue

@@ -1351,20 +1351,23 @@ export default {
               btnIcon: "",
               btnShowCondition:
                 '[{"fieldName":"sale_order.status","mark":"6","refValue":"1"}]',
+              btnHasPermi: "huaxian:xsglddgl:INSERT",
               children: [],
             },
             {
               btnName: "打印出库单",
               btnType: "printOutBound",
               btnIcon: "",
-              btnShowCondition: "",
+              btnShowCondition:'[{"fieldName":"sale_order.status","mark":"6","refValue":"5"}]',
+              btnHasPermi: "huaxian:xsglddgl:INSERT",
               children: [],
             },
             {
               btnName: "出库发货",
               btnType: "deliver",
               btnIcon: "",
-              btnShowCondition: "",
+              btnShowCondition:'[{"fieldName":"sale_order.status","mark":"6","refValue":"5"}]',
+              btnHasPermi: "huaxian:xsglddgl:INSERT",
               children: [],
             },
             {
@@ -1372,6 +1375,7 @@ export default {
               btnType: "myDetail",
               btnIcon: "",
               btnShowCondition: "",
+              btnHasPermi: "huaxian:xsglddgl:INSERT",
               children: [],
             },
             {
@@ -1381,6 +1385,7 @@ export default {
               btnShowCondition:
                 '[{"fieldName":"sale_order.status","mark":"6","refValue":"1"}]',
               children: [],
+              btnHasPermi: "huaxian:xsglddgl:INSERT",
             }
           );
           // }
@@ -2877,8 +2882,8 @@ export default {
           let productName = productData ? productData.productName : "";
           let productType = productData ? productData.productType : "";
           printStr += `<tr align="center">
-                    <td>${productName}</td>    
-                    <td>${productType}</td>    
+                    <td>${productName}</td>
+                    <td>${productType}</td>
                     <td>${item.productNumber}</td>
                     <td>${item.productUnitPrice}</td>
                     <td>${item.productAmounts}</td>

zkqy-ui/src/views/orderMange/purchase/listInfoTwo.vue

@@ -920,7 +920,8 @@ export default {
             btnName: "采购修改",
             btnType: "caiGouUpdate",
             btnIcon: "el-icon-edit",
-            btnShowCondition: "",
+            btnShowCondition:
+              '[{"fieldName":"purchase.data_approval_status","mark":"6","refValue":"0"}]',
             children: [],
           });
           this.topBtnArr = res.data.resultMap.button?.filter(