完成订单模块

src/components/SelectRole/components/select-data.vue

@@ -56,7 +56,7 @@
   import { EleProTable } from 'ele-admin-pro';
   import { Role, RoleParam } from '@/api/system/role/model';
 
-  const props =  defineProps<{
+  const props = defineProps<{
     // 弹窗是否打开
     visible: boolean;
     // 标题
@@ -121,13 +121,14 @@
       ...orders,
       page,
       limit
-    }).then(res => {
+    }).then((res) => {
       if (props.type == 'merchant') {
-        return res?.list.filter(d => (d.roleCode == 'merchantClerk'))
-      }else {
+        return res?.list.filter(
+          (d) => d.roleCode == 'merchantClerk' || d.roleCode == 'merchant'
+        );
+      } else {
         return res;
       }
-
     });
   };