.env.production

@@ -4,7 +4,7 @@ ENV = 'production'
 # base api url
 # VITE_BASE_API_URL = 'https://nest-api.buqiyuan.site'
 # VITE_BASE_API_URL = 'http://123.249.107.55' 
-VITE_BASE_API_URL = 'http://192.168.60.213:3001' 
+VITE_BASE_API_URL = 'http://144.123.43.138:3001' 
 
 # 公共基础路径, 所有资源的路径都将据此配置重写。
 VITE_BASE_URL = /api

Dockerfile

@@ -9,7 +9,7 @@ COPY ./ $PROJECT_DIR
 # 若网络不通，可以使用淘宝源
 # RUN pnpm config set registry https://registry.npmmirror.com
 # 若不存在安装pnpm
-RUN npm install -g pnpm@8.10.2
+RUN npm install -g pnpm
 
 # 构建项目
 # 安装生成依赖

nginx.conf

@@ -34,7 +34,7 @@ http {
 
   server {
       listen 3001;
-      server_name localhost;
+      server_name 144.123.43.138;
       absolute_redirect off; #取消绝对路径的重定向
       sendfile on;
       default_type application/octet-stream;

src/api/backend/api/domain.ts

@@ -1,26 +0,0 @@
-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

@@ -35,11 +35,9 @@ import * as vehicleUsage from './vehicleUsage';
 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,
@@ -72,5 +70,4 @@ export default {
   saleQuotationGroup,
   saleQuotationComponent,
   saleQuotationTemplate,
-  saleQuotation,
 };

src/api/backend/api/materialsInOut.ts

@@ -1,19 +1,5 @@
 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/saleQuotation.ts

@@ -1,9 +0,0 @@
-import { request, type RequestOptions } from '@/utils/request';
-const baseApi = '/api/sale_quotation/sale_quotation';
-/** 导出原材料盘点表 GET /api/sale_quotation/export*/
-export async function exportSaleQuotation(id: number, options?: RequestOptions) {
-  return request(`${baseApi}/export/${id}`, {
-    method: 'GET',
-    ...(options || { responseType: 'blob', isReturnResult: false }),
-  });
-}

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

@@ -21,8 +21,6 @@ declare namespace API {
     remark: string;
     /** 头像 */
     avatar: string;
-    /** 所属域 */
-    domain: DomainType;
   };
 
   type AccountMenus = {
@@ -1215,13 +1213,12 @@ 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;
@@ -1382,9 +1379,8 @@ declare namespace API {
   };
 
   type MaterialsInventoryExportParams = {
-    time: string[];
+    time: string;
-    filename:string;
+    projectId: number;
-    projectId?: number;
   };
 
   type MaterialsInventoryInfoParams = {
@@ -1812,11 +1808,6 @@ declare namespace API {
   };
 
   // Materials In out history
-  type MaterialsInoutExportParams = {
-    time: string[];
-    filename:string;
-  };
-
   type MaterialsInOutUpdateParams = {
     id: number;
     fileIds?: number[];
@@ -2024,18 +2015,4 @@ 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, time } = values;
+          const { filename, bookType } = values;
+
           onOk({
-            filename: bookType ? `${filename.split('.').shift()}.${bookType}` : filename,
+            filename: `${filename.split('.').shift()}.${bookType}`,
             bookType,
-            time,
           });
         },
       },

src/enums/cacheEnum.ts

@@ -12,12 +12,7 @@ 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

@@ -1,51 +0,0 @@
-<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,4 +1,3 @@
 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,26 +1,23 @@
 <template>
-  <Layout.Header :style="headerStyle"
+  <Layout.Header :style="headerStyle" class="layout-header">
-    class="layout-header">
     <Space :size="20">
       <slot>
         <Space :size="20">
-          <span class="menu-fold"
+          <span class="menu-fold" @click="() => emit('update:collapsed', !collapsed)">
-            @click="() => emit('update:collapsed', !collapsed)">
             <component :is="collapsed ? MenuUnfoldOutlined : MenuFoldOutlined" />
           </span>
           <Breadcrumb>
-            <template v-for="(routeItem, rotueIndex) in menus"
+            <template v-for="(routeItem, rotueIndex) in menus" :key="routeItem?.name">
-              :key="routeItem?.name">
               <Breadcrumb.Item>
                 <TitleI18n :title="routeItem?.meta?.title" />
-                <template v-if="routeItem?.children?.length"
+                <template v-if="routeItem?.children?.length" #overlay>
-                  #overlay>
                   <Menu :selected-keys="getSelectKeys(rotueIndex)">
-                    <template v-for="childItem in routeItem?.children"
+                    <template v-for="childItem in routeItem?.children" :key="childItem.name">
-                      :key="childItem.name">
+                      <Menu.Item
-                      <Menu.Item v-if="!childItem.meta?.hideInMenu && !childItem.meta?.hideInBreadcrumb"
+                        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>
@@ -33,17 +30,14 @@
       </slot>
     </Space>
     <Space :size="20">
-      <DomianPicker />
       <Search />
-      <Tooltip :title="$t('layout.header.tooltipLock')"
+      <Tooltip :title="$t('layout.header.tooltipLock')" placement="bottom">
-        placement="bottom">
         <LockOutlined @click="lockscreenStore.setLock(true)" />
       </Tooltip>
       <FullScreen />
       <!-- <LocalePicker /> -->
       <Dropdown placement="bottomRight">
-        <Avatar :src="userInfo.avatar"
+        <Avatar :src="userInfo.avatar" :alt="userInfo.username">{{ userInfo.username }}</Avatar>
-          :alt="userInfo.username">{{ userInfo.username }}</Avatar>
         <template #overlay>
           <Menu>
             <Menu.Item @click="$router.push({ name: 'account-about' })">
@@ -67,16 +61,16 @@
 </template>
 
 <script lang="tsx" setup>
-import { computed, type CSSProperties } from 'vue';
+  import { computed, type CSSProperties } from 'vue';
-import { useRouter, useRoute, type RouteRecordRaw } from 'vue-router';
+  import { useRouter, useRoute, type RouteRecordRaw } from 'vue-router';
-import {
+  import {
     QuestionCircleOutlined,
     MenuFoldOutlined,
     MenuUnfoldOutlined,
     PoweroffOutlined,
     LockOutlined,
-} from '@ant-design/icons-vue';
+  } from '@ant-design/icons-vue';
-import {
+  import {
     Layout,
     Modal,
     Dropdown,
@@ -86,40 +80,40 @@ import {
     Avatar,
     Tooltip,
     type MenuTheme,
-} from 'ant-design-vue';
+  } from 'ant-design-vue';
-import { Search, FullScreen, ProjectSetting, DomianPicker } from './components/';
+  import { Search, FullScreen, ProjectSetting } from './components/';
-import { LocalePicker } from '@/components/basic/locale-picker';
+  import { LocalePicker } from '@/components/basic/locale-picker';
-import { useUserStore } from '@/store/modules/user';
+  import { useUserStore } from '@/store/modules/user';
-import { useLockscreenStore } from '@/store/modules/lockscreen';
+  import { useLockscreenStore } from '@/store/modules/lockscreen';
-import { TitleI18n } from '@/components/basic/title-i18n';
+  import { TitleI18n } from '@/components/basic/title-i18n';
-import { useLayoutSettingStore } from '@/store/modules/layoutSetting';
+  import { useLayoutSettingStore } from '@/store/modules/layoutSetting';
 
-defineProps({
+  defineProps({
     collapsed: {
       type: Boolean,
     },
     theme: {
       type: String as PropType<MenuTheme>,
     },
-});
+  });
-const emit = defineEmits(['update:collapsed']);
+  const emit = defineEmits(['update:collapsed']);
-const userStore = useUserStore();
+  const userStore = useUserStore();
-const layoutSettingStore = useLayoutSettingStore();
+  const layoutSettingStore = useLayoutSettingStore();
-const lockscreenStore = useLockscreenStore();
+  const lockscreenStore = useLockscreenStore();
 
-const router = useRouter();
+  const router = useRouter();
-const route = useRoute();
+  const route = useRoute();
-const userInfo = computed(() => userStore.userInfo);
+  const userInfo = computed(() => userStore.userInfo);
-const headerStyle = computed<CSSProperties>(() => {
+  const headerStyle = computed<CSSProperties>(() => {
     const { navTheme, layout } = layoutSettingStore.layoutSetting;
     const isDark = navTheme === 'dark' && layout === 'topmenu';
     return {
       backgroundColor: navTheme === 'realDark' || isDark ? '' : 'rgba(255, 255, 255, 0.85)',
       color: isDark ? 'rgba(255, 255, 255, 0.85)' : '',
     };
-});
+  });
 
-const menus = computed(() => {
+  const menus = computed(() => {
     if (route.meta?.namePath) {
       let children = userStore.menus;
       const paths = route.meta?.namePath?.map((item) => {
@@ -139,13 +133,13 @@ const menus = computed(() => {
       ];
     }
     return route.matched;
-});
+  });
 
-const getSelectKeys = (rotueIndex: number) => {
+  const getSelectKeys = (rotueIndex: number) => {
     return [menus.value[rotueIndex + 1]?.name] as string[];
-};
+  };
 
-const findLastChild = (route?: RouteRecordRaw) => {
+  const findLastChild = (route?: RouteRecordRaw) => {
     if (typeof route?.redirect === 'object') {
       const redirectValues = Object.values(route.redirect);
       if (route?.children?.length) {
@@ -165,11 +159,11 @@ const findLastChild = (route?: RouteRecordRaw) => {
       return route?.redirect;
     }
     return route;
-};
+  };
-const getRouteByName = (name: string) => router.getRoutes().find((n) => n.name === name);
+  const getRouteByName = (name: string) => router.getRoutes().find((n) => n.name === name);
 
-// 点击菜单
+  // 点击菜单
-const clickMenuItem = (menuItem: RouteRecordRaw) => {
+  const clickMenuItem = (menuItem: RouteRecordRaw) => {
     const lastChild = findLastChild(menuItem);
     console.log('lastChild', menuItem, lastChild);
 
@@ -180,10 +174,10 @@ const clickMenuItem = (menuItem: RouteRecordRaw) => {
     } else {
       router.push({ name: lastChild?.name });
     }
-};
+  };
 
-// 退出登录
+  // 退出登录
-const doLogout = () => {
+  const doLogout = () => {
     Modal.confirm({
       title: '您确定要退出登录吗？',
       icon: <QuestionCircleOutlined />,
@@ -196,11 +190,11 @@ const doLogout = () => {
         }
       },
     });
-};
+  };
 </script>
 
 <style lang="less" scoped>
-.layout-header {
+  .layout-header {
     display: flex;
     position: sticky;
     z-index: 10;
@@ -213,5 +207,5 @@ const doLogout = () => {
     * {
       cursor: pointer;
     }
-}
+  }
 </style>

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, DOMAIN_KEY } from '@/enums/cacheEnum';
+import { ACCESS_TOKEN_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('admin');
+  const name = ref('amdin');
   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,7 +87,6 @@ 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 {
@@ -98,7 +97,6 @@ export const useUserStore = defineStore('user', () => {
       return Promise.reject(error);
     }
   };
-
   /** 解锁屏幕 */
   const unlock = async (params: API.LoginDto) => {
     try {
@@ -108,17 +106,6 @@ 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 {
@@ -126,12 +113,9 @@ 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) {
@@ -174,8 +158,6 @@ export const useUserStore = defineStore('user', () => {
     perms,
     menus,
     userInfo,
-    domain,
-    changeDomain,
     login,
     unlock,
     afterLogin,

src/utils/request.ts

@@ -123,8 +123,6 @@ 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;
@@ -139,7 +137,6 @@ 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/login/index.vue

@@ -7,7 +7,7 @@
     </div>
     <a-form layout="horizontal" :model="state.formInline" @submit.prevent="handleSubmit">
       <a-form-item>
-        <a-input v-model:value="state.formInline.username" size="large" placeholder="用户名">
+        <a-input v-model:value="state.formInline.username" size="large" placeholder="admin">
           <template #prefix><user-outlined type="user" /></template>
         </a-input>
       </a-form-item>
@@ -16,7 +16,7 @@
           v-model:value="state.formInline.password"
           size="large"
           type="password"
-          placeholder="密码"
+          placeholder="huaxin123"
           autocomplete="new-password"
         >
           <template #prefix><lock-outlined type="user" /></template>
@@ -61,8 +61,8 @@
     loading: false,
     captcha: '',
     formInline: {
-      username: '',
+      username: 'admin',
-      password: '',
+      password: 'huaxin123',
       verifyCode: '',
       captchaId: '',
     }, 

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

@@ -21,37 +21,36 @@
   </div>
 </template>
 
-<script setup lang="tsx">
+<script setup
-import { useTable } from '@/components/core/dynamic-table';
+  lang="tsx">
-import {
+  import { useTable } from '@/components/core/dynamic-table';
+  import {
     baseColumns,
     type TableColumnItem,
     type TableListItem,
-} from './columns';
+  } from './columns';
-import Api from '@/api/';
+  import Api from '@/api/';
-import { onMounted, ref, type FunctionalComponent } from 'vue';
+  import { onMounted, ref, type FunctionalComponent } from 'vue';
-import { useFormModal, useModal } from '@/hooks/useModal';
+  import { useFormModal, useModal } from '@/hooks/useModal';
-import { Button, message } from 'ant-design-vue';
+  import { Button } from 'ant-design-vue';
-import { formSchemas } from './formSchemas';
+  import { formSchemas } from './formSchemas';
-import AttachmentManage from '@/components/business/attachment-manage/index.vue';
+  import AttachmentManage from '@/components/business/attachment-manage/index.vue';
-import AttachmentUpload from '@/components/business/attachment-upload/index.vue';
+  import AttachmentUpload from '@/components/business/attachment-upload/index.vue';
-import { useExportExcelModal, jsonToSheetXlsx } from '@/components/basic/excel';
+  import { useExportExcelModal, jsonToSheetXlsx } from '@/components/basic/excel';
-import { MaterialsInOutEnum } from '@/enums/materialsInventoryEnum';
+  import { MaterialsInOutEnum } from '@/enums/materialsInventoryEnum';
-import { formatToDate } from '@/utils/dateUtil';
+  import { formatToDate } from '@/utils/dateUtil';
-import dayjs from 'dayjs';
+  defineOptions({
-import fileDownload from 'js-file-download';
-defineOptions({
     name: 'MaterialsInOut',
-});
+  });
 
-const [DynamicTable, dynamicTableInstance] = useTable({ formProps: { autoSubmitOnEnter: true } });
+  const [DynamicTable, dynamicTableInstance] = useTable({ formProps: { autoSubmitOnEnter: true } });
-const [showModal] = useFormModal();
+  const [showModal] = useFormModal();
-const exportExcelModal = useExportExcelModal();
+  const exportExcelModal = useExportExcelModal();
-const [fnModal] = useModal();
+  const [fnModal] = useModal();
-const isUploadPopupVisiable = ref(false);
+  const isUploadPopupVisiable = ref(false);
 
-let columns = ref<TableColumnItem[]>();
+  let columns = ref<TableColumnItem[]>();
-onMounted(() => {
+  onMounted(() => {
     columns.value = [
       ...baseColumns,
       {
@@ -99,85 +98,72 @@ onMounted(() => {
         ],
       },
     ];
-});
-
-const openExportModal = async () => {
-  const queryModel = dynamicTableInstance.queryFormRef?.formModel;
-  if(!queryModel?.time){
-    message.warning('请选择时间范围')
-    return;
-  }
-  const timeRange = (queryModel?.time ?? []).map(item => dayjs(item).format('YYYY-MM-DD'));
-  const response = await Api.materialsInOut.materialsInoutExport({
-    time: timeRange ?? [], filename: `${timeRange[0]}-${timeRange[1]}`
   });
-  fileDownload(response, `${timeRange[0]}-${timeRange[1]}.xls`);
+
-  // exportExcelModal.openModal({
+  const openExportModal = () => {
-  //   formSchemas: [
+    exportExcelModal.openModal({
-  //     {
+      formSchemas: [
-  //       field: 'time',
+        {
-  //       component: 'RangePicker',
+          field: 'time',
-  //       label: '时间范围',
+          component: 'RangePicker',
-  //       rules: [{ required: true }],
+          label:'时间范围',
-  //     },
+          rules: [{ required: true }],
-  //   ],
+        },
-  //   onOk: async ({ filename, bookType, time }) => {
+      ],
-  //     const response = await Api.materialsInOut.materialsInoutExport({
+      onOk: ({ filename, bookType }) => {
-  //       time: (time ?? []).map(item => dayjs(item).format('YYYY-MM-DD')), filename
+        const tableData: TableListItem[] = dynamicTableInstance.tableData;
-  //     });
+        let exportData: any[] = []
-  //     fileDownload(response, `${filename}.xls`);
+        for (let item of tableData) {
-  // const tableData: TableListItem[] = dynamicTableInstance.tableData;
+          exportData.push({
-  // let exportData: any[] = []
+            projectName: item.project?.name,
-  // for (let item of tableData) {
+            inOrOut: item.inOrOut === MaterialsInOutEnum.In ? '入库' : '出库',
-  //   exportData.push({
+            inventoryInOutNumber: item.inventoryInOutNumber,
-  //     projectName: item.project?.name,
+            time: formatToDate(item.time),
-  //     inOrOut: item.inOrOut === MaterialsInOutEnum.In ? '入库' : '出库',
+            company: item.product?.company?.name,
-  //     inventoryInOutNumber: item.inventoryInOutNumber,
+            productName: item.product?.name,
-  //     time: formatToDate(item.time),
+            productSpecification: item.product?.productSpecification,
-  //     company: item.product?.company?.name,
+            unit: item.product?.unit?.label,
-  //     productName: item.product?.name,
+            quantity: item.quantity,
-  //     productSpecification: item.product?.productSpecification,
+            unitPrice: parseFloat(item.unitPrice),
-  //     unit: item.product?.unit?.label,
+            amount: parseFloat(item.amount),
-  //     quantity: item.quantity,
+            agent: item.agent,
-  //     unitPrice: parseFloat(item.unitPrice),
+            issuanceNumber: item.issuanceNumber,
-  //     amount: parseFloat(item.amount),
+            remark: item.remark
-  //     agent: item.agent,
+          })
-  //     issuanceNumber: item.issuanceNumber,
+        }
-  //     remark: item.remark
+        jsonToSheetXlsx({
-  //   })
+          data: exportData,
-  // }
+          header: {
-  // jsonToSheetXlsx({
+            inOrOut: '出/入库',
-  //   data: exportData,
+            inventoryInOutNumber: '出入库单号',
-  //   header: {
+            time: '时间',
-  //     inOrOut: '出/入库',
+            projectName: '项目',
-  //     inventoryInOutNumber: '出入库单号',
+            company: '公司',
-  //     time: '时间',
+            productName: '产品名',
-  //     projectName: '项目',
+            productSpecification: "产品规格",
-  //     company: '公司',
+            unit: '单位',
-  //     productName: '产品名',
+            quantity: '数量',
-  //     productSpecification: "产品规格",
+            unitPrice: '单价',
-  //     unit: '单位',
+            amount: '金额',
-  //     quantity: '数量',
+            agent: '经办人',
-  //     unitPrice: '单价',
+            issuanceNumber: '领料单号',
-  //     amount: '金额',
+            remark: '备注'
-  //     agent: '经办人',
+          },
-  //     issuanceNumber: '领料单号',
+          filename,
-  //     remark: '备注'
+          write2excelOpts: {
-  //   },
+            bookType,
-  //   filename,
+          },
-  //   write2excelOpts:
+          json2sheetOpts: {
-  //     { bookType: 'xls' },
+            // 指定顺序
-  //   json2sheetOpts: {
+            header: [
-  //     // 指定顺序
+              'inOrOut', 'inventoryInOutNumber', 'time', 'projectName', 'company', 'productName', 'productSpecification', 'unit', 'quantity',
-  //     header: [
+              'unitPrice', 'amount', 'agent', 'issuanceNumber', 'remark'],
-  //       'inOrOut', 'inventoryInOutNumber', 'time', 'projectName', 'company', 'productName', 'productSpecification', 'unit', 'quantity',
+          },
-  //       'unitPrice', 'amount', 'agent', 'issuanceNumber', 'remark'],
+        });
-  //   },
+      },
-  // });
+    });
-  //   },
+  };
-  // });
+  const openAttachmentUploadModal = async (record: TableListItem) => {
-};
-const openAttachmentUploadModal = async (record: TableListItem) => {
     isUploadPopupVisiable.value = true;
     fnModal.show({
       width: 800,
@@ -198,26 +184,26 @@ const openAttachmentUploadModal = async (record: TableListItem) => {
       open: isUploadPopupVisiable.value,
       footer: null,
     });
-};
+  };
-const handleUploadClose = (hasSuccess: boolean) => {
+  const handleUploadClose = (hasSuccess: boolean) => {
     fnModal.hide();
     isUploadPopupVisiable.value = false;
-};
+  };
-const afterUploadCallback = async (
+  const afterUploadCallback = async (
     files: { filename: { path: string; id: number } }[],
     id: number,
-) => {
+  ) => {
     await Api.materialsInOut.materialsInOutUpdate(
       { id },
       { fileIds: files.map((item) => item.filename.id) },
     );
     dynamicTableInstance?.reload();
-};
+  };
 
-/**
+  /**
    * @description 打开新增/编辑弹窗
    */
-const openEditModal = async (record: Partial<TableListItem>) => {
+  const openEditModal = async (record: Partial<TableListItem>) => {
     const [formRef] = await showModal({
       modalProps: {
         title: `${record.id ? '编辑' : '新增'}出入库记录`,
@@ -251,13 +237,13 @@ const openEditModal = async (record: Partial<TableListItem>) => {
         ...info,
       });
     }
-};
+  };
-const delRowConfirm = async (record) => {
+  const delRowConfirm = async (record) => {
     await Api.materialsInOut.materialsInOutDelete({ id: record });
     dynamicTableInstance?.reload();
-};
+  };
 
-const FilesRender: FunctionalComponent<TableListItem> = (materialsInOut: TableListItem) => {
+  const FilesRender: FunctionalComponent<TableListItem> = (materialsInOut: TableListItem) => {
     const [fnModal] = useModal();
     return (
       <Button
@@ -269,9 +255,9 @@ const FilesRender: FunctionalComponent<TableListItem> = (materialsInOut: TableLi
         {materialsInOut.files?.length || 0}
       </Button>
     );
-};
+  };
 
-const openFilesManageModal = (fnModal, tableData: TableListItem) => {
+  const openFilesManageModal = (fnModal, tableData: TableListItem) => {
     const fileIds = tableData.files?.map((item) => item.id) || [];
     fnModal.show({
       width: 1200,
@@ -287,11 +273,12 @@ const openFilesManageModal = (fnModal, tableData: TableListItem) => {
       destroyOnClose: true,
       footer: null,
     });
-};
+  };
-const unlinkAttachments = async (id: number, unlinkIds: number[]) => {
+  const unlinkAttachments = async (id: number, unlinkIds: number[]) => {
     await Api.materialsInOut.unlinkAttachments({ id }, { fileIds: unlinkIds });
     dynamicTableInstance?.reload();
-};
+  };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less"
+  scoped></style>

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

@@ -18,26 +18,25 @@
   </div>
 </template>
 
-<script setup lang="tsx">
+<script setup
-import { useTable } from '@/components/core/dynamic-table';
+  lang="tsx">
-import { baseColumns, type TableColumnItem, type TableListItem } from './columns';
+  import { useTable } from '@/components/core/dynamic-table';
-import Api from '@/api/';
+  import { baseColumns, type TableColumnItem, type TableListItem } from './columns';
-import { onMounted, ref, unref } from 'vue';
+  import Api from '@/api/';
-import { useFormModal } from '@/hooks/useModal';
+  import { onMounted, ref, unref } from 'vue';
-import { exportSchemas } from './exportSchema';
+  import { useFormModal } from '@/hooks/useModal';
-import dayjs from 'dayjs';
+  import { exportSchemas } from './exportSchema';
-import fileDownload from 'js-file-download';
+  import dayjs from 'dayjs';
-import { message } from 'ant-design-vue';
+  import fileDownload from 'js-file-download';
-import { useExportExcelModal } from '@/components/basic/excel';
+  import { message } from 'ant-design-vue';
 
-defineOptions({
+  defineOptions({
     name: 'MaterialsInventory',
-});
+  });
-const [DynamicTable, dynamicTableInstance] = useTable();
+  const [DynamicTable, dynamicTableInstance] = useTable();
-const [showExportModal] = useFormModal();
+  const [showExportModal] = useFormModal();
-const exportExcelModal = useExportExcelModal();
+  let columns = ref<TableColumnItem[]>();
-let columns = ref<TableColumnItem[]>();
+  onMounted(() => {
-onMounted(() => {
     columns.value = [
       ...baseColumns,
 
@@ -72,56 +71,41 @@ onMounted(() => {
       //   ],
       // },
     ];
-});
+  });
-const exportMI = async () => {
+  const exportMI = async () => {
     const { time } = unref<{ time: string; projectId: number }>(
       dynamicTableInstance?.queryFormRef?.formModel as { time: string; projectId: number },
     );
-  exportExcelModal.openModal({
+
-    formSchemas: [
+    const [formRef] = await showExportModal({
-      {
+      modalProps: {
-        field: 'time',
+        title: `导出条件选择`,
-        component: 'RangePicker',
+        width: '50%',
-        label: '时间范围',
+        okText: '导出',
-        rules: [{ required: true }],
+        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,
       },
-    ],
-    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,
-  //   });
+      });
-  // }
+    }
-};
+  };
 
-/**
+  /**
    * @description 打开新增/编辑弹窗
    */
-const openEditModal = async (record: Partial<TableListItem>) => {
+  const openEditModal = async (record: Partial<TableListItem>) => {
     message.warning(
       <div>
         暂不支持编辑功能,等待后期需求确认
@@ -158,14 +142,15 @@ const openEditModal = async (record: Partial<TableListItem>) => {
     //     ...info,
     //   });
     // }
-};
+  };
-const delRowConfirm = async (record) => {
+  const delRowConfirm = async (record) => {
     await Api.contract.contractDelete({ id: record });
     dynamicTableInstance?.reload();
-};
+  };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less"
+  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

src/views/sale_quotation/template/index.vue

@@ -26,7 +26,6 @@ import { useFormModal, useModal } from '@/hooks/useModal';
 import { formSchemas } from './formSchemas';
 
 import { ref, onMounted } from 'vue';
-import fileDownload from 'js-file-download';
 defineOptions({
   name: 'SaleQuotationTemplate',
 });
@@ -47,7 +46,6 @@ onMounted(() => {
       dataIndex: 'ACTION',
       hideInSearch: true,
       actions: ({ record }) => [
-
         {
           icon: 'ant-design:edit-outlined',
           tooltip: '编辑',
@@ -68,25 +66,14 @@ onMounted(() => {
             onConfirm: () => delRowConfirm(record.id),
           },
         },
-        {
+
-          icon: 'ant-design:file-excel-outlined',
-          tooltip: '导出',
-          auth: {
-            perm: 'sale_quotation:sale_quotation:export',
-            effect: 'disable',
-          },
-          onClick: () => onExport(record),
-        },
       ],
     },
   ];
 });
 
 
-const onExport = async (record:TableListItem) => {
+
-  const response = await Api.saleQuotation.exportSaleQuotation(record.id);
-  fileDownload(response, `${record.name}.xls`);
-}
 
 /**
  * @description 打开新增/编辑弹窗