feat: develop export and domain

src/api/backend/api/domain.ts

@@ -0,0 +1,26 @@
+import { request, type RequestOptions } from '@/utils/request';
+
+/** 获取公司列表 GET /api/domain */
+export async function domainList(params: API.DomainParams, options?: RequestOptions) {
+  return request<{
+    items?: API.DomainEntity[];
+    meta?: {
+      itemCount?: number;
+      totalItems?: number;
+      itemsPerPage?: number;
+      totalPages?: number;
+      currentPage?: number;
+    };
+  }>('/api/domain', {
+    method: 'GET',
+    params: {
+      // page has a default value: 1
+      page: '1',
+      // pageSize has a default value: 10
+      pageSize: '10',
+
+      ...params,
+    },
+    ...(options || {}),
+  });
+}

src/api/backend/api/index.ts

@@ -36,9 +36,10 @@ import * as saleQuotationGroup from './saleQuotationGroup';
 import * as saleQuotationComponent from './saleQuotationComponent';
 import * as saleQuotationTemplate from './saleQuotationTemplate';
 import * as saleQuotation from './saleQuotation';
-
+import * as domain from './domain';
 export default {
   auth,
+  domain,
   account,
   captcha,
   authEmail,
@@ -71,5 +72,5 @@ export default {
   saleQuotationGroup,
   saleQuotationComponent,
   saleQuotationTemplate,
-  saleQuotation
+  saleQuotation,
 };

src/api/backend/api/materialsInOut.ts

@@ -1,5 +1,19 @@
 import { request, type RequestOptions } from '@/utils/request';
 
+/** 导出出入库记录 GET /api/materials-inventory/export*/
+export async function materialsInoutExport(
+  // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
+  params: API.MaterialsInoutExportParams,
+  options?: RequestOptions,
+) {
+  const { ...queryParams } = params;
+  return request(`/api/materials-in-out/export`, {
+    method: 'GET',
+    params: { ...queryParams },
+    ...(options || { responseType: 'blob', isReturnResult: false }),
+  });
+}
+
 /** 获取原材料出入库记录列表 GET /api/materials-in-out */
 export async function materialsInOutList(
   params: API.MaterialsInOutListParams,

src/api/backend/api/typings.d.ts

@@ -21,6 +21,8 @@ declare namespace API {
     remark: string;
     /** 头像 */
     avatar: string;
+    /** 所属域 */
+    domain: DomainType;
   };
 
   type AccountMenus = {
@@ -1213,12 +1215,13 @@ declare namespace API {
     status: number;
     roles: RoleEntity[];
     dept: DeptEntity;
+    domain: DomainType;
     accessTokens: AccessTokenEntity[];
     id: number;
     createdAt: string;
     updatedAt: string;
   };
-
+  type DomainType = number;
   type UserListParams = {
     page?: number;
     pageSize?: number;
@@ -1379,8 +1382,9 @@ declare namespace API {
   };
 
   type MaterialsInventoryExportParams = {
-    time: string;
+    time: string[];
-    projectId: number;
+    filename:string;
+    projectId?: number;
   };
 
   type MaterialsInventoryInfoParams = {
@@ -1808,6 +1812,11 @@ declare namespace API {
   };
 
   // Materials In out history
+  type MaterialsInoutExportParams = {
+    time: string[];
+    filename:string;
+  };
+
   type MaterialsInOutUpdateParams = {
     id: number;
     fileIds?: number[];
@@ -2015,4 +2024,18 @@ declare namespace API {
   type SaleQuotationTemplateDeleteParams = {
     id: number;
   };
+
+  type DomainEntity = {
+    title: string;
+    id: number;
+  };
+
+  type DomainParams = {
+    page?: number;
+    pageSize?: number;
+    title?: string;
+    field?: string;
+    order?: 'ASC' | 'DESC';
+    _t?: number;
+  };
 }

src/components/basic/excel/src/ExportExcelModal.tsx

@@ -58,11 +58,11 @@ export const useExportExcelModal = () => {
       modalProps: {
         title: t('component.excel.exportModalTitle'),
         onFinish: async (values) => {
-          const { filename, bookType } = values;
+          const { filename, bookType, time } = values;
-
           onOk({
-            filename: `${filename.split('.').shift()}.${bookType}`,
+            filename: bookType ? `${filename.split('.').shift()}.${bookType}` : filename,
             bookType,
+            time,
           });
         },
       },

src/enums/cacheEnum.ts

@@ -12,7 +12,12 @@ export const USER_INFO_KEY = 'USER__INFO__';
 
 // role info key
 export const ROLES_KEY = 'ROLES__KEY__';
+
 /** 是否锁屏 */
 export const IS_LOCKSCREEN = 'IS_LOCKSCREEN';
+
 /** 标签页 */
 export const TABS_ROUTES = 'TABS_ROUTES';
+
+/** 域 */
+export const DOMAIN_KEY = 'DOMAIN__';

src/layout/header/components/domianPicker/index.vue

@@ -0,0 +1,51 @@
+<template>
+    <div>
+        公司： <a-select ref="select"
+            v-if="options.length"
+            :disabled="!$auth('system:domain:change')"
+            v-model:value="userStore.domain"
+            style="min-width: 100px;"
+            placeholder="请选择"
+            @change="onChange"
+            :dropdownStyle="{ 'textOverflow': 'ellipsis', 'min-width': 'fit-content' }">
+            <a-select-option :value="item.value"
+                v-for="(item, index) in options"
+                :key="index">{{ item.label }}</a-select-option>
+        </a-select>
+    </div>
+</template>
+
+<script setup lang='ts'>
+import Api from '@/api';
+import { useUserStore } from '@/store/modules/user';
+import type { SelectValue } from 'ant-design-vue/es/select';
+import { onMounted, ref } from 'vue';
+
+defineOptions({
+    name: 'DomianPicker'
+})
+
+const userStore = useUserStore();
+const options = ref<{ label: string, value: number }[]>([]);
+let domains = ref<API.DomainEntity[]>([]);
+const onChange = (value: SelectValue) => {
+    userStore.changeDomain(value)
+};
+onMounted(() => {
+    Api.domain.domainList({}).then((res) => {
+        if (res) {
+            domains.value = res.items ?? [];
+            options.value = domains.value.map((item) => {
+                return {
+                    label: item.title,
+                    value: item.id
+                }
+            })
+        }
+
+    })
+})
+
+</script>
+
+<style lang='less' scoped></style>

src/layout/header/components/index.ts

@@ -1,3 +1,4 @@
 export { default as Search } from './search/index.vue';
 export { default as FullScreen } from './fullscreen/index.vue';
 export { default as ProjectSetting } from './setting/index.vue';
+export { default as DomianPicker } from './domianPicker/index.vue';

src/layout/header/index.vue

@@ -1,23 +1,26 @@
 <template>
-  <Layout.Header :style="headerStyle" class="layout-header">
+  <Layout.Header :style="headerStyle"
+    class="layout-header">
     <Space :size="20">
       <slot>
         <Space :size="20">
-          <span class="menu-fold" @click="() => emit('update:collapsed', !collapsed)">
+          <span class="menu-fold"
+            @click="() => emit('update:collapsed', !collapsed)">
             <component :is="collapsed ? MenuUnfoldOutlined : MenuFoldOutlined" />
           </span>
           <Breadcrumb>
-            <template v-for="(routeItem, rotueIndex) in menus" :key="routeItem?.name">
+            <template v-for="(routeItem, rotueIndex) in menus"
+              :key="routeItem?.name">
               <Breadcrumb.Item>
                 <TitleI18n :title="routeItem?.meta?.title" />
-                <template v-if="routeItem?.children?.length" #overlay>
+                <template v-if="routeItem?.children?.length"
+                  #overlay>
                   <Menu :selected-keys="getSelectKeys(rotueIndex)">
-                    <template v-for="childItem in routeItem?.children" :key="childItem.name">
+                    <template v-for="childItem in routeItem?.children"
-                      <Menu.Item
+                      :key="childItem.name">
-                        v-if="!childItem.meta?.hideInMenu && !childItem.meta?.hideInBreadcrumb"
+                      <Menu.Item v-if="!childItem.meta?.hideInMenu && !childItem.meta?.hideInBreadcrumb"
                         :key="childItem.name"
-                        @click="clickMenuItem(childItem)"
+                        @click="clickMenuItem(childItem)">
-                      >
                         <TitleI18n :title="childItem.meta?.title" />
                       </Menu.Item>
                     </template>
@@ -30,14 +33,17 @@
       </slot>
     </Space>
     <Space :size="20">
+      <DomianPicker />
       <Search />
-      <Tooltip :title="$t('layout.header.tooltipLock')" placement="bottom">
+      <Tooltip :title="$t('layout.header.tooltipLock')"
+        placement="bottom">
         <LockOutlined @click="lockscreenStore.setLock(true)" />
       </Tooltip>
       <FullScreen />
       <!-- <LocalePicker /> -->
       <Dropdown placement="bottomRight">
-        <Avatar :src="userInfo.avatar" :alt="userInfo.username">{{ userInfo.username }}</Avatar>
+        <Avatar :src="userInfo.avatar"
+          :alt="userInfo.username">{{ userInfo.username }}</Avatar>
         <template #overlay>
           <Menu>
             <Menu.Item @click="$router.push({ name: 'account-about' })">
@@ -81,7 +87,7 @@
   Tooltip,
   type MenuTheme,
 } from 'ant-design-vue';
-  import { Search, FullScreen, ProjectSetting } from './components/';
+import { Search, FullScreen, ProjectSetting, DomianPicker } from './components/';
 import { LocalePicker } from '@/components/basic/locale-picker';
 import { useUserStore } from '@/store/modules/user';
 import { useLockscreenStore } from '@/store/modules/lockscreen';

src/store/modules/user.ts

@@ -4,7 +4,7 @@ import { useDictStore } from './dict';
 import { useRouter, type RouteRecordRaw, useRoute } from 'vue-router';
 import { store } from '@/store';
 import Api from '@/api/';
-import { ACCESS_TOKEN_KEY } from '@/enums/cacheEnum';
+import { ACCESS_TOKEN_KEY, DOMAIN_KEY } from '@/enums/cacheEnum';
 import { Storage } from '@/utils/Storage';
 import { resetRouter } from '@/router';
 import { generateDynamicRoutes } from '@/router/helper/routeHelper';
@@ -21,12 +21,12 @@ export type MessageEvent = {
 export const useUserStore = defineStore('user', () => {
   let eventSource: EventSource | null = null;
   const token = ref(Storage.get(ACCESS_TOKEN_KEY, null));
-  const name = ref('amdin');
+  const name = ref('admin');
   const perms = ref<string[]>([]);
   const menus = ref<RouteRecordRaw[]>([]);
   const userInfo = ref<Partial<API.UserEntity>>({});
   const serverConnected = ref(true);
-
+  const domain = ref<API.DomainType>(Storage.get(DOMAIN_KEY, null));
   watch(serverConnected, (val) => {
     if (val) {
       initServerMsgListener();
@@ -87,6 +87,7 @@ export const useUserStore = defineStore('user', () => {
     // const ex = 7 * 24 * 60 * 60 * 1000;
     Storage.set(ACCESS_TOKEN_KEY, token.value);
   };
+
   /** 登录 */
   const login = async (params: API.LoginDto) => {
     try {
@@ -97,6 +98,7 @@ export const useUserStore = defineStore('user', () => {
       return Promise.reject(error);
     }
   };
+
   /** 解锁屏幕 */
   const unlock = async (params: API.LoginDto) => {
     try {
@@ -106,6 +108,17 @@ export const useUserStore = defineStore('user', () => {
       return Promise.reject(error);
     }
   };
+
+  /** 切换domain */
+  const changeDomain = (value) => {
+    domain.value = value;
+    Storage.set(DOMAIN_KEY, value);
+    setTimeout(() => {
+      // 刷新页面
+      window.location.reload();
+    }, 200);
+  };
+
   /** 登录成功之后, 获取用户信息以及生成权限路由 */
   const afterLogin = async () => {
     try {
@@ -113,9 +126,12 @@ export const useUserStore = defineStore('user', () => {
       useDictStore();
       // const wsStore = useWsStore();
       const userInfoData = await accountProfile();
-
       userInfo.value = userInfoData;
 
+      if (!Storage.get(DOMAIN_KEY)) {
+        domain.value = userInfoData.domain;
+        Storage.set(DOMAIN_KEY, domain.value);
+      }
       await fetchPermsAndMenus();
       initServerMsgListener();
     } catch (error) {
@@ -158,6 +174,8 @@ export const useUserStore = defineStore('user', () => {
     perms,
     menus,
     userInfo,
+    domain,
+    changeDomain,
     login,
     unlock,
     afterLogin,

src/utils/request.ts

@@ -123,6 +123,8 @@ export function request<T = any>(config: RequestOptions): Promise<BaseResponse<T
 export async function request(_url: string | RequestOptions, _config: RequestOptions = {}) {
   const url = isString(_url) ? _url : _url.url;
   const config = isString(_url) ? _config : _url;
+  const userStore = useUserStore();
+
   try {
     // 兼容 from data 文件上传的情况
     const { requestType, isReturnResult = true, ...rest } = config;
@@ -137,6 +139,7 @@ export async function request(_url: string | RequestOptions, _config: RequestOpt
       headers: {
         ...rest.headers,
         ...(requestType === 'form' ? { 'Content-Type': 'multipart/form-data' } : {}),
+        'sk-domain':userStore.domain 
       },
     })) as AxiosResponse<BaseResponse>;
 

src/views/materials-inventory/in-out/index.vue

@@ -21,8 +21,7 @@
   </div>
 </template>
 
-<script setup
+<script setup lang="tsx">
-  lang="tsx">
 import { useTable } from '@/components/core/dynamic-table';
 import {
   baseColumns,
@@ -32,13 +31,15 @@
 import Api from '@/api/';
 import { onMounted, ref, type FunctionalComponent } from 'vue';
 import { useFormModal, useModal } from '@/hooks/useModal';
-  import { Button } from 'ant-design-vue';
+import { Button, message } from 'ant-design-vue';
 import { formSchemas } from './formSchemas';
 import AttachmentManage from '@/components/business/attachment-manage/index.vue';
 import AttachmentUpload from '@/components/business/attachment-upload/index.vue';
 import { useExportExcelModal, jsonToSheetXlsx } from '@/components/basic/excel';
 import { MaterialsInOutEnum } from '@/enums/materialsInventoryEnum';
 import { formatToDate } from '@/utils/dateUtil';
+import dayjs from 'dayjs';
+import fileDownload from 'js-file-download';
 defineOptions({
   name: 'MaterialsInOut',
 });
@@ -100,68 +101,81 @@
   ];
 });
 
-  const openExportModal = () => {
+const openExportModal = async () => {
-    exportExcelModal.openModal({
+  const queryModel = dynamicTableInstance.queryFormRef?.formModel;
-      formSchemas: [
+  if(!queryModel?.time){
-        {
+    message.warning('请选择时间范围')
-          field: 'time',
+    return;
-          component: 'RangePicker',
-          label:'时间范围',
-          rules: [{ required: true }],
-        },
-      ],
-      onOk: ({ filename, bookType }) => {
-        const tableData: TableListItem[] = dynamicTableInstance.tableData;
-        let exportData: any[] = []
-        for (let item of tableData) {
-          exportData.push({
-            projectName: item.project?.name,
-            inOrOut: item.inOrOut === MaterialsInOutEnum.In ? '入库' : '出库',
-            inventoryInOutNumber: item.inventoryInOutNumber,
-            time: formatToDate(item.time),
-            company: item.product?.company?.name,
-            productName: item.product?.name,
-            productSpecification: item.product?.productSpecification,
-            unit: item.product?.unit?.label,
-            quantity: item.quantity,
-            unitPrice: parseFloat(item.unitPrice),
-            amount: parseFloat(item.amount),
-            agent: item.agent,
-            issuanceNumber: item.issuanceNumber,
-            remark: item.remark
-          })
   }
-        jsonToSheetXlsx({
+  const timeRange = (queryModel?.time ?? []).map(item => dayjs(item).format('YYYY-MM-DD'));
-          data: exportData,
+  const response = await Api.materialsInOut.materialsInoutExport({
-          header: {
+    time: timeRange ?? [], filename: `${timeRange[0]}-${timeRange[1]}`
-            inOrOut: '出/入库',
-            inventoryInOutNumber: '出入库单号',
-            time: '时间',
-            projectName: '项目',
-            company: '公司',
-            productName: '产品名',
-            productSpecification: "产品规格",
-            unit: '单位',
-            quantity: '数量',
-            unitPrice: '单价',
-            amount: '金额',
-            agent: '经办人',
-            issuanceNumber: '领料单号',
-            remark: '备注'
-          },
-          filename,
-          write2excelOpts: {
-            bookType,
-          },
-          json2sheetOpts: {
-            // 指定顺序
-            header: [
-              'inOrOut', 'inventoryInOutNumber', 'time', 'projectName', 'company', 'productName', 'productSpecification', 'unit', 'quantity',
-              'unitPrice', 'amount', 'agent', 'issuanceNumber', 'remark'],
-          },
-        });
-      },
   });
+  fileDownload(response, `${timeRange[0]}-${timeRange[1]}.xls`);
+  // exportExcelModal.openModal({
+  //   formSchemas: [
+  //     {
+  //       field: 'time',
+  //       component: 'RangePicker',
+  //       label: '时间范围',
+  //       rules: [{ required: true }],
+  //     },
+  //   ],
+  //   onOk: async ({ filename, bookType, time }) => {
+  //     const response = await Api.materialsInOut.materialsInoutExport({
+  //       time: (time ?? []).map(item => dayjs(item).format('YYYY-MM-DD')), filename
+  //     });
+  //     fileDownload(response, `${filename}.xls`);
+  // const tableData: TableListItem[] = dynamicTableInstance.tableData;
+  // let exportData: any[] = []
+  // for (let item of tableData) {
+  //   exportData.push({
+  //     projectName: item.project?.name,
+  //     inOrOut: item.inOrOut === MaterialsInOutEnum.In ? '入库' : '出库',
+  //     inventoryInOutNumber: item.inventoryInOutNumber,
+  //     time: formatToDate(item.time),
+  //     company: item.product?.company?.name,
+  //     productName: item.product?.name,
+  //     productSpecification: item.product?.productSpecification,
+  //     unit: item.product?.unit?.label,
+  //     quantity: item.quantity,
+  //     unitPrice: parseFloat(item.unitPrice),
+  //     amount: parseFloat(item.amount),
+  //     agent: item.agent,
+  //     issuanceNumber: item.issuanceNumber,
+  //     remark: item.remark
+  //   })
+  // }
+  // jsonToSheetXlsx({
+  //   data: exportData,
+  //   header: {
+  //     inOrOut: '出/入库',
+  //     inventoryInOutNumber: '出入库单号',
+  //     time: '时间',
+  //     projectName: '项目',
+  //     company: '公司',
+  //     productName: '产品名',
+  //     productSpecification: "产品规格",
+  //     unit: '单位',
+  //     quantity: '数量',
+  //     unitPrice: '单价',
+  //     amount: '金额',
+  //     agent: '经办人',
+  //     issuanceNumber: '领料单号',
+  //     remark: '备注'
+  //   },
+  //   filename,
+  //   write2excelOpts:
+  //     { bookType: 'xls' },
+  //   json2sheetOpts: {
+  //     // 指定顺序
+  //     header: [
+  //       'inOrOut', 'inventoryInOutNumber', 'time', 'projectName', 'company', 'productName', 'productSpecification', 'unit', 'quantity',
+  //       'unitPrice', 'amount', 'agent', 'issuanceNumber', 'remark'],
+  //   },
+  // });
+  //   },
+  // });
 };
 const openAttachmentUploadModal = async (record: TableListItem) => {
   isUploadPopupVisiable.value = true;
@@ -280,5 +294,4 @@
 };
 </script>
 
-<style lang="less"
+<style lang="less" scoped></style>
-  scoped></style>

src/views/materials-inventory/inventory-check/index.vue

@@ -18,8 +18,7 @@
   </div>
 </template>
 
-<script setup
+<script setup lang="tsx">
-  lang="tsx">
 import { useTable } from '@/components/core/dynamic-table';
 import { baseColumns, type TableColumnItem, type TableListItem } from './columns';
 import Api from '@/api/';
@@ -29,12 +28,14 @@
 import dayjs from 'dayjs';
 import fileDownload from 'js-file-download';
 import { message } from 'ant-design-vue';
+import { useExportExcelModal } from '@/components/basic/excel';
 
 defineOptions({
   name: 'MaterialsInventory',
 });
 const [DynamicTable, dynamicTableInstance] = useTable();
 const [showExportModal] = useFormModal();
+const exportExcelModal = useExportExcelModal();
 let columns = ref<TableColumnItem[]>();
 onMounted(() => {
   columns.value = [
@@ -76,30 +77,45 @@
   const { time } = unref<{ time: string; projectId: number }>(
     dynamicTableInstance?.queryFormRef?.formModel as { time: string; projectId: number },
   );
-
+  exportExcelModal.openModal({
-    const [formRef] = await showExportModal({
+    formSchemas: [
-      modalProps: {
+      {
-        title: `导出条件选择`,
+        field: 'time',
-        width: '50%',
+        component: 'RangePicker',
-        okText: '导出',
+        label: '时间范围',
-        onFinish: async (values) => {
+        rules: [{ required: true }],
-          const response = await Api.materialsInventory.materialsInventoryExport(values);
-          const { time } = values;
-          fileDownload(response, `${dayjs(time).format('YYYY.MM.盘点表')}.xls`);
-        },
-      },
-      formProps: {
-        labelWidth: 100,
-        schemas: exportSchemas,
       },
+    ],
+    onOk: async ({ filename, bookType, time }) => {
+      const response = await Api.materialsInventory.materialsInventoryExport({
+        time: (time ?? []).map(item => dayjs(item).format('YYYY-MM-DD')), filename
       });
+      fileDownload(response, `${filename}.xls`);
+    }
+  });
+  // const [formRef] = await showExportModal({
+  //   modalProps: {
+  //     title: `导出条件选择`,
+  //     width: '50%',
+  //     okText: '导出',
+  //     onFinish: async (values) => {
+  //       const response = await Api.materialsInventory.materialsInventoryExport(values);
+  //       const { time } = values;
+  //       fileDownload(response, `${dayjs(time).format('YYYY.MM.盘点表')}.xls`);
+  //     },
+  //   },
+  //   formProps: {
+  //     labelWidth: 100,
+  //     schemas: exportSchemas,
+  //   },
+  // });
 
   // auto fill export time fields
-    if (time) {
+  // if (time) {
-      formRef?.setFieldsValue({
+  //   formRef?.setFieldsValue({
-        time,
+  //     time,
-      });
+  //   });
-    }
+  // }
 };
 
 /**
@@ -149,8 +165,7 @@
 };
 </script>
 
-<style lang="less"
+<style lang="less" scoped></style>
-  scoped></style>
 import dayjs from 'dayjs'; import fileDownload from 'js-file-download'; import type { TableQueryItem
 } from '../in-out/columns'; import { exportSchemas } from '../in-out/exportSchema'; import dayjs
 from 'dayjs'; import fileDownload from 'js-file-download'; import type { TableQueryItem } from