sparkles: ✨ 处理人工盘点交互

.commitlintrc.cjs

@@ -419,7 +419,12 @@ module.exports = {
 		breaklineNumber: 100,
 		breaklineChar: '|',
 		skipQuestions: [],
-		issuePrefixes: [{ value: 'closed', name: 'closed:   ISSUES has been processed' }],
+		issuePrefixes: [
+			{
+				value: 'closed',
+				name: 'closed:   ISSUES has been processed',
+			},
+		],
 		customIssuePrefixAlign: 'top',
 		emptyIssuePrefixAlias: 'skip',
 		customIssuePrefixAlias: 'custom',

.env

@@ -1 +1,2 @@
 VITE_HTTP_PREFIX='/api'
+VITE_UPLOAD_PREFIX='http://localhost:5173/api'

.env.production

@@ -0,0 +1,2 @@
+VITE_HTTP_PREFIX='/api'
+VITE_UPLOAD_PREFIX=	'https://ims.riemann.tech/api'

.gitea/workflows/release.yaml

@@ -34,7 +34,7 @@ jobs:
           SOURCE: dist/
           REMOTE_HOST: ${{ vars.NGINX_SERVER }}
           REMOTE_USER: ${{ vars.NGINX_SERVER_USER }}
-          TARGET: ${{ vars.WWW_ROOT }}${{ vars.DOMAIN }}
+          TARGET: ${{ vars.WWW_ROOT }}${{ vars.IMS_DOMAIN }}
           EXCLUDE: ""
           SCRIPT_BEFORE: ${{ vars.BAKUP_SCRIPT }} ${{ vars.IMS_DOMAIN  }}
           SCRIPT_AFTER: echo $RSYNC_STDOUT

eslint.config.js

@@ -29,6 +29,7 @@ export default [
 				dictionary: true,
 				sensor: true,
 				station: true,
+				material: true,
 			},
 			ecmaVersion: 2020,
 			parser: parserVue,

package.json

@@ -35,8 +35,10 @@
 		"dayjs": "^1.11.13",
 		"echarts": "^5.5.1",
 		"exceljs": "^4.4.0",
+		"jsbarcode": "^3.11.6",
 		"pinia": "^2.2.4",
 		"pinia-plugin-persistedstate": "^4.1.1",
+		"print-js": "^1.6.0",
 		"sortablejs": "^1.15.3",
 		"vue": "^3.5.11",
 		"vue-codemirror": "^6.1.1",
@@ -52,6 +54,7 @@
 		"@commitlint/cli": "^19.5.0",
 		"@commitlint/config-conventional": "^19.5.0",
 		"@eslint/js": "^9.12.0",
+		"@types/jsbarcode": "^3.11.4",
 		"@types/sortablejs": "^1.15.8",
 		"@vitejs/plugin-vue": "^5.1.4",
 		"@vitejs/plugin-vue-jsx": "^4.0.1",

pnpm-lock.yaml

@@ -65,12 +65,18 @@ importers:
       exceljs:
         specifier: ^4.4.0
         version: 4.4.0
+      jsbarcode:
+        specifier: ^3.11.6
+        version: 3.11.6
       pinia:
         specifier: ^2.2.4
         version: 2.2.4(typescript@5.6.3)(vue@3.5.11(typescript@5.6.3))
       pinia-plugin-persistedstate:
         specifier: ^4.1.1
         version: 4.1.1(pinia@2.2.4(typescript@5.6.3)(vue@3.5.11(typescript@5.6.3)))(rollup@4.21.2)(webpack-sources@3.2.3)
+      print-js:
+        specifier: ^1.6.0
+        version: 1.6.0
       sortablejs:
         specifier: ^1.15.3
         version: 1.15.3
@@ -111,6 +117,9 @@ importers:
       '@eslint/js':
         specifier: ^9.12.0
         version: 9.12.0
+      '@types/jsbarcode':
+        specifier: ^3.11.4
+        version: 3.11.4
       '@types/sortablejs':
         specifier: ^1.15.8
         version: 1.15.8
@@ -967,6 +976,9 @@ packages:
   '@types/http-errors@1.8.2':
     resolution: {integrity: sha512-EqX+YQxINb+MeXaIqYDASb6U6FCHbWjkj4a1CKDBks3d/QiB2+PqBLyO72vLDgAO1wUI4O+9gweRcQK11bTL/w==}
 
+  '@types/jsbarcode@3.11.4':
+    resolution: {integrity: sha512-VBcpTAnEMH0Gbh8JpV14CgOtJjCYjsvR2FoDRyoYPE0gUxtApf8N4c+HKEOyz/iiIZkMzqrzBA3XX7+KgKxxsA==}
+
   '@types/json-schema@7.0.15':
     resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
 
@@ -2383,6 +2395,9 @@ packages:
     resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
     hasBin: true
 
+  jsbarcode@3.11.6:
+    resolution: {integrity: sha512-G5TKGyKY1zJo0ZQKFM1IIMfy0nF2rs92BLlCz+cU4/TazIc4ZH+X1GYeDRt7TKjrYqmPfTjwTBkU/QnQlsYiuA==}
+
   jsbn@0.1.1:
     resolution: {integrity: sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==}
 
@@ -2988,6 +3003,9 @@ packages:
     engines: {node: '>=14'}
     hasBin: true
 
+  print-js@1.6.0:
+    resolution: {integrity: sha512-BfnOIzSKbqGRtO4o0rnj/K3681BSd2QUrsIZy/+WdCIugjIswjmx3lDEZpXB2ruGf9d4b3YNINri81+J0FsBWg==}
+
   process-nextick-args@2.0.1:
     resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}
 
@@ -4758,6 +4776,10 @@ snapshots:
 
   '@types/http-errors@1.8.2': {}
 
+  '@types/jsbarcode@3.11.4':
+    dependencies:
+      '@types/node': 22.5.3
+
   '@types/json-schema@7.0.15': {}
 
   '@types/node@12.20.55': {}
@@ -6384,6 +6406,8 @@ snapshots:
     dependencies:
       argparse: 2.0.1
 
+  jsbarcode@3.11.6: {}
+
   jsbn@0.1.1: {}
 
   jsesc@2.5.2: {}
@@ -6942,6 +6966,8 @@ snapshots:
 
   prettier@3.3.3: {}
 
+  print-js@1.6.0: {}
+
   process-nextick-args@2.0.1: {}
 
   proxy-from-env@1.1.0: {}

pont-config.json

@@ -5,30 +5,27 @@
 	"origins": [
 		{
 			"name": "auth",
-			"originUrl": "http://127.0.0.1:7777/v3/api-docs/auth",
+			"originUrl": "http://127.0.0.1:8888/v3/api-docs/auth",
 			"originType": "SwaggerV3",
 			"usingOperationId": true
 		},
 		{
 			"name": "acl",
-			"originUrl": "http://127.0.0.1:7777/v3/api-docs/acl",
+			"originUrl": "http://127.0.0.1:8888/v3/api-docs/acl",
 			"originType": "SwaggerV3",
 			"usingOperationId": true
 		},
 		{
 			"name": "dictionary",
-			"originUrl": "http://127.0.0.1:7777/v3/api-docs/dictionary",
+			"originUrl": "http://127.0.0.1:8888/v3/api-docs/dictionary",
 			"originType": "SwaggerV3",
 			"usingOperationId": true
 		},
 		{
 			"name": "material",
-			"originUrl": "http://127.0.0.1:7777/v3/api-docs/material",
+			"originUrl": "http://127.0.0.1:8888/v3/api-docs/material",
 			"originType": "SwaggerV3",
 			"usingOperationId": true
 		}
-
-
-
 	]
 }

pontTemplate.ts

@@ -447,7 +447,6 @@ export default class MyGenerator extends CodeGenerator {
 		const hasPagination = inter.response.typeName.indexOf('Pagination') >= 0
 		const hasCodebook = inter.response.typeArgs[0] && inter.response.typeArgs[0].typeName.indexOf('Codebook') >= 0
 		const hasVxe = !!inter.parameters.find((p) => p.dataType.typeName.indexOf('VXETableSaveDTO') >= 0)
-		// const defTypes = this.getAllRefTypeNames(inter);
 		const imports = [
 			hasResult ? 'Result' : null,
 			hasIPage ? 'IPage' : null,

src/api/acl/api.d.ts

@@ -4,34 +4,34 @@ declare namespace acl {
 	 */
 	export interface Permission {
 		/** createdTime */
-    createdTime?: string;
+		createdTime?: string
 
 		/** 权限描述 */
-    description?: string;
+		description?: string
 
 		/** id */
-    id?: number;
+		id?: number
 
 		/** 权限key,英文 */
-    key?: string;
+		key?: string
 
 		/** 权限keyPath,用来做业务,(父级keyPath.key) */
-    keyPath?: string;
+		keyPath?: string
 
 		/** 权限名称,中文用来做标识 */
-    name?: string;
+		name?: string
 
 		/** 父权限key */
-    parentKey?: string;
+		parentKey?: string
 
 		/** 权限类型 */
-    type?: 'MENU' | 'BUTTON' | 'OTHER';
+		type?: 'MENU' | 'BUTTON' | 'OTHER'
 
 		/** typeInfo */
-    typeInfo?: acl.Codebook;
+		typeInfo?: acl.Codebook
 
 		/** updatedTime */
-    updatedTime?: string;
+		updatedTime?: string
 	}
 
 	/**
@@ -39,37 +39,37 @@ declare namespace acl {
 	 */
 	export interface PermissionInfo {
 		/** createdTime */
-    createdTime?: string;
+		createdTime?: string
 
 		/** 权限描述 */
-    description?: string;
+		description?: string
 
 		/** id */
-    id?: number;
+		id?: number
 
 		/** 权限key,英文 */
-    key?: string;
+		key?: string
 
 		/** 权限keyPath,用来做业务,(父级keyPath.key) */
-    keyPath?: string;
+		keyPath?: string
 
 		/** 权限名称,中文用来做标识 */
-    name?: string;
+		name?: string
 
 		/** 父权限key */
-    parentKey?: string;
+		parentKey?: string
 
 		/** 权限是否选中标识 */
-    selected: boolean;
+		selected: boolean
 
 		/** 权限类型 */
-    type?: 'MENU' | 'BUTTON' | 'OTHER';
+		type?: 'MENU' | 'BUTTON' | 'OTHER'
 
 		/** typeInfo */
-    typeInfo?: acl.Codebook;
+		typeInfo?: acl.Codebook
 
 		/** updatedTime */
-    updatedTime?: string;
+		updatedTime?: string
 	}
 
 	/**
@@ -77,22 +77,22 @@ declare namespace acl {
 	 */
 	export interface Role {
 		/** createdTime */
-    createdTime?: string;
+		createdTime?: string
 
 		/** 角色描述 */
-    description?: string;
+		description?: string
 
 		/** id */
-    id?: number;
+		id?: number
 
 		/** 角色key,英文,用来做业务 */
-    key: string;
+		key?: string
 
 		/** 角色名称,中文用来做标识 */
-    name?: string;
+		name?: string
 
 		/** updatedTime */
-    updatedTime?: string;
+		updatedTime?: string
 	}
 
 	/**
@@ -100,25 +100,25 @@ declare namespace acl {
 	 */
 	export interface RoleInfo {
 		/** createdTime */
-    createdTime?: string;
+		createdTime?: string
 
 		/** 角色描述 */
-    description?: string;
+		description?: string
 
 		/** id */
-    id?: number;
+		id?: number
 
 		/** 角色key,英文,用来做业务 */
-    key: string;
+		key?: string
 
 		/** 角色名称,中文用来做标识 */
-    name?: string;
+		name?: string
 
 		/** 角色是否选中标识 */
-    selected: boolean;
+		selected: boolean
 
 		/** updatedTime */
-    updatedTime?: string;
+		updatedTime?: string
 	}
 
 	/**
@@ -126,22 +126,22 @@ declare namespace acl {
 	 */
 	export interface TreeString {
 		/** 下级列表 */
-    children?: Array<acl.TreeString>;
+		children?: Array<acl.TreeString>
 
 		/** 描述 */
-    description?: string;
+		description?: string
 
 		/** ID */
-    key: string;
+		key: string
 
 		/** 名称 */
-    name: string;
+		name: string
 
 		/** originData */
-    originData: acl.TreeableString;
+		originData: acl.TreeableString
 
 		/** 父级 ID */
-    parentKey?: string;
+		parentKey?: string
 	}
 
 	/**
@@ -149,16 +149,16 @@ declare namespace acl {
 	 */
 	export interface TreeableString {
 		/** description */
-    description?: string;
+		description?: string
 
 		/** key */
-    key?: string;
+		key?: string
 
 		/** name */
-    name?: string;
+		name?: string
 
 		/** parentKey */
-    parentKey?: string;
+		parentKey?: string
 	}
 
 	/**
@@ -166,33 +166,33 @@ declare namespace acl {
 	 */
 	export interface User {
 		/** createdTime */
-    createdTime?: string;
+		createdTime?: string
 
 		/** 邮箱 */
-    email?: string;
+		email?: string
 
 		/** 真实姓名 */
-    fullName?: string;
+		fullName?: string
 
 		/** id */
-    id?: number;
+		id?: number
 
 		/** 手机号 */
-    mobile?: string;
+		mobile?: string
 
 		/** 用户名 */
-    name: string;
+		name: string
 
 		/** 密码 */
-    password?: string;
+		password?: string
 
 		/** 性别 */
-    sex?: 'MALE' | 'FEMALE';
+		sex?: 'MALE' | 'FEMALE'
 
 		/** sexInfo */
-    sexInfo?: acl.Codebook;
+		sexInfo?: acl.Codebook
 
 		/** updatedTime */
-    updatedTime?: string;
+		updatedTime?: string
 	}
 }

src/api/acl/mods/user/existName.ts

@@ -0,0 +1,26 @@
+/**
+ * @desc 检查用户名是否存在,true存在,false不存在
+ */
+import { defaultSuccess, defaultError, http } from '@/plugins/axios'
+import type { AxiosResponse } from 'axios'
+export interface Params {
+	/** name */
+	name: string
+}
+
+export default async function (
+	params: Params,
+	success: (data: boolean) => void = defaultSuccess,
+	fail: (error: { code: string; error?: string }) => void = defaultError,
+): Promise<void> {
+	return http({
+		method: 'get',
+		url: `/user/exist-name`,
+
+		params,
+	})
+		.then((data: AxiosResponse<boolean, unknown>) => {
+			success(data.data)
+		})
+		.catch((error: { code: string; error?: string }) => fail(error))
+}

src/api/acl/mods/user/index.ts

@@ -2,22 +2,24 @@
  * @description 用户
  *
  */
-import saveOrUpdateUser from './saveOrUpdateUser';
-import all from './all';
-import sexes from './sexes';
-import detail from './detail';
-import deleteUser from './deleteUser';
-import resetPassword from './resetPassword';
-import permissionInfos from './permissionInfos';
-import permissions from './permissions';
-import grant from './grant';
-import roleInfos from './roleInfos';
-import grantRole from './grantRole';
-import users from './users';
+import saveOrUpdateUser from './saveOrUpdateUser'
+import all from './all'
+import existName from './existName'
+import sexes from './sexes'
+import detail from './detail'
+import deleteUser from './deleteUser'
+import resetPassword from './resetPassword'
+import permissionInfos from './permissionInfos'
+import permissions from './permissions'
+import grant from './grant'
+import roleInfos from './roleInfos'
+import grantRole from './grantRole'
+import users from './users'
 
 export default {
 	saveOrUpdateUser,
 	all,
+	existName,
 	sexes,
 	detail,
 	deleteUser,
@@ -28,4 +30,4 @@ export default {
 	roleInfos,
 	grantRole,
 	users,
-};
+}

src/api/auth/api.d.ts

@@ -4,46 +4,46 @@ declare namespace auth {
 	 */
 	export interface AuthUser {
 		/** anonymous */
-    anonymous?: boolean;
+		anonymous?: boolean
 
 		/** 用户头像 */
-    avatar?: string;
+		avatar?: string
 
 		/** 邮箱 */
-    email?: string;
+		email?: string
 
 		/** extInfo */
-    extInfo?: auth.NutMap;
+		extInfo?: auth.NutMap
 
 		/** 姓名 */
-    fullName: string;
+		fullName: string
 
 		/** 电话 */
-    mobile?: string;
+		mobile?: string
 
 		/** 密码 */
-    password: string;
+		password: string
 
 		/** 权限列表 */
-    permissions: Array<string>;
+		permissions: Array<string>
 
 		/** jwt refreshToken */
-    refreshToken: string;
+		refreshToken: string
 
 		/** 角色列表 */
-    roles: Array<string>;
+		roles: Array<string>
 
 		/** 性别 */
-    sex?: 'MALE' | 'FEMALE';
+		sex?: 'MALE' | 'FEMALE'
 
 		/** sexInfo */
-    sexInfo?: auth.Codebook;
+		sexInfo?: auth.Codebook
 
 		/** jwt Token */
-    token: string;
+		token: string
 
 		/** 用户名 */
-    userName: string;
+		userName: string
 	}
 
 	/**
@@ -51,21 +51,21 @@ declare namespace auth {
 	 */
 	export interface LoginDTO {
 		/** 验证码 */
-    captcha?: string;
+		captcha?: string
 
 		/** 手机号 */
-    mobile?: string;
+		mobile?: string
 
 		/** 密码 */
-    password?: string;
+		password?: string
 
 		/** 登录类型 */
-    type: 'ACCOUNT' | 'WECHAT';
+		type: 'ACCOUNT' | 'WECHAT'
 
 		/** 用户名 */
-    userName?: string;
+		userName?: string
 
 		/** uuid */
-    uuid?: string;
+		uuid?: string
 	}
 }

src/api/auth/mods/auth/currentUser.ts

@@ -1,8 +1,8 @@
 /**
  * @desc 当前用户
  */
-import { defaultSuccess, defaultError, http } from '@/plugins/axios';
-import type { AxiosResponse } from 'axios';
+import { defaultSuccess, defaultError, http } from '@/plugins/axios'
+import type { AxiosResponse } from 'axios'
 export default async function (
 	success: (data: auth.AuthUser) => void = defaultSuccess,
 	fail: (error: { code: string; error?: string }) => void = defaultError,
@@ -12,7 +12,7 @@ export default async function (
 		url: `/auth/current-user`,
 	})
 		.then((data: AxiosResponse<auth.AuthUser, unknown>) => {
-      success(data.data);
+			success(data.data)
 		})
-    .catch((error: { code: string; error?: string }) => fail(error));
+		.catch((error: { code: string; error?: string }) => fail(error))
 }

src/api/auth/mods/auth/login.ts

@@ -1,8 +1,8 @@
 /**
  * @desc 登录
  */
-import { defaultSuccess, defaultError, http } from '@/plugins/axios';
-import type { AxiosResponse } from 'axios';
+import { defaultSuccess, defaultError, http } from '@/plugins/axios'
+import type { AxiosResponse } from 'axios'
 export default async function (
 	/** 请求体 */
 	requestBody: auth.LoginDTO,
@@ -16,7 +16,7 @@ export default async function (
 		data: requestBody,
 	})
 		.then((data: AxiosResponse<auth.AuthUser, unknown>) => {
-      success(data.data);
+			success(data.data)
 		})
-    .catch((error: { code: string; error?: string }) => fail(error));
+		.catch((error: { code: string; error?: string }) => fail(error))
 }

src/api/material/api.d.ts

@@ -4,34 +4,52 @@ declare namespace material {
 	 */
 	export interface ApplyDTO {
 		/** 申请人 */
-    applicant?: string;
+		applicant?: string
 
 		/** 申请日期 */
-    applyDate?: string;
+		applyDate?: string
+
+		/** 申请id */
+		applyId?: number
 
 		/** 申请数量 */
-    applyNum?: string;
+		applyNum?: string
 
 		/** 申请类型 */
-    applyType?: 'PURCHASE_RECEIPT' | 'RETURN_RECEIPT' | 'LOAN_OUT' | 'AUDIT';
+		applyType?: 'PURCHASE_RECEIPT' | 'RETURN_RECEIPT' | 'LOAN_OUT' | 'AUDIT' | 'SCRAP_OUT'
+
+		/** applyTypeInfo */
+		applyTypeInfo?: material.Codebook
 
 		/** 物料编码 */
-    code?: string;
+		code?: string
+
+		/** 是否确认 */
+		confirm?: boolean
 
 		/** 确认数量 */
-    confirmNum?: string;
+		confirmNum?: string
 
 		/** 物料名称 */
-    name?: string;
+		name?: string
 
 		/** 备注 */
-    remark?: string;
+		remark?: string
+
+		/** 审核状态 */
+		reviewResult?: 'WAIT_SCAN' | 'WAIT_SUBMIT' | 'WAIT_REVIEW' | 'PASS' | 'REJECT'
+
+		/** 审核人 */
+		reviewer?: string
 
 		/** 物料规格 */
-    spec?: string;
+		spec?: string
 
 		/** 物料类型 */
-    type?: string;
+		type?: string
+
+		/** 类型名称 */
+		typeName?: string
 	}
 
 	/**
@@ -39,31 +57,31 @@ declare namespace material {
 	 */
 	export interface ApplyDetail {
 		/** 申请单ID */
-    applyId?: number;
+		applyId?: number
 
-    /** assignRule */
-    assignRule?: 'LOW_VALUE' | 'HIGH_VALUE';
+		/** 是否需要赋码 */
+		assignRule?: boolean
 
 		/** 确认数量 */
-    confirmQuantity?: number;
+		confirmQuantity?: number
 
 		/** createdTime */
-    createdTime?: string;
+		createdTime?: string
 
 		/** 异常情况说明 */
-    exceptionRemark?: string;
+		exceptionRemark?: string
 
 		/** id */
-    id?: number;
+		id?: number
 
 		/** 物料Id */
-    materialId?: number;
+		materialId?: number
 
 		/** 申请数量 */
-    quantity?: number;
+		quantity?: number
 
 		/** updatedTime */
-    updatedTime?: string;
+		updatedTime?: string
 	}
 
 	/**
@@ -71,51 +89,40 @@ declare namespace material {
 	 */
 	export interface ApplyForm {
 		/** 申请人 */
-    applicant?: string;
+		applicant?: string
 
 		/** 申请日期 */
-    applyDate?: string;
+		applyDate?: string
 
-    /** 盘点类型（1: 全盘 2: 部分盘点） */
-    auditType?: 'ALL' | 'PARTIAL';
-
-    /** createdTime */
-    createdTime?: string;
-
-    /** 异常原因 */
-    exception?: string;
-
-    /** 处理摘要 */
-    handle?: string;
-
-    /** id */
-    id?: number;
+		/** 盘点类型（1: 扫码 2: 人工） */
+		auditType?: 'SCAN' | 'MANUAL'
 
 		/** 是否确认（0: 未确认 1: 已确认） */
-    isConfirm?: boolean;
+		confirm?: boolean
 
-    /** 结果(系统自动生成) */
-    result?: string;
+		/** createdTime */
+		createdTime?: string
+
+		/** id */
+		id?: number
+
+		/** 审核意见 */
+		reviewRemark?: string
 
 		/** 审核结果(1-待扫码 2-待提交 3-待审核 4-审核通过 5退回) */
-    reviewResult?:
-      | 'WAIT_SCAN'
-      | 'WAIT_SUBMIT'
-      | 'WAIT_REVIEW'
-      | 'PASS'
-      | 'REJECT';
+		reviewResult?: 'WAIT_SCAN' | 'WAIT_SUBMIT' | 'WAIT_REVIEW' | 'PASS' | 'REJECT'
 
 		/** 盘点审核人 */
-    reviewer?: string;
+		reviewer?: string
 
 		/** 盘点人 */
-    taker?: string;
+		taker?: string
 
 		/** 类型（1: 采购入库申请 2: 归还入库申请 3: 出库外借申请 4: 盘点申请） */
-    type?: 'PURCHASE_RECEIPT' | 'RETURN_RECEIPT' | 'LOAN_OUT' | 'AUDIT';
+		type?: 'PURCHASE_RECEIPT' | 'RETURN_RECEIPT' | 'LOAN_OUT' | 'AUDIT' | 'SCRAP_OUT'
 
 		/** updatedTime */
-    updatedTime?: string;
+		updatedTime?: string
 	}
 
 	/**
@@ -123,13 +130,13 @@ declare namespace material {
 	 */
 	export interface ApplyInfo {
 		/** 申请单明细 */
-    applyDetails?: Array<material.ApplyDetail>;
+		applyDetails?: Array<material.ApplyDetail>
 
 		/** applyForm */
-    applyForm?: material.ApplyForm;
+		applyForm?: material.ApplyForm
 
 		/** 扫码的条码集合 */
-    detailList?: Array<material.MaterialStockDetail>;
+		detailList?: Array<material.MaterialStockDetail>
 	}
 
 	/**
@@ -137,54 +144,46 @@ declare namespace material {
 	 */
 	export interface AuditApplyInfo {
 		/** 申请人 */
-    applicant?: string;
+		applicant?: string
 
 		/** 申请日期 */
-    applyDate?: string;
+		applyDate?: string
 
-    /** 盘点类型（1: 全盘 2: 部分盘点） */
-    auditType?: 'ALL' | 'PARTIAL';
-
-    /** createdTime */
-    createdTime?: string;
-
-    /** 异常原因 */
-    exception?: string;
-
-    /** 处理摘要 */
-    handle?: string;
-
-    /** id */
-    id?: number;
-
-    /** 物料ids */
-    ids?: Array<string>;
+		/** 盘点类型（1: 扫码 2: 人工） */
+		auditType?: 'SCAN' | 'MANUAL'
 
 		/** 是否确认（0: 未确认 1: 已确认） */
-    isConfirm?: boolean;
+		confirm?: boolean
 
-    /** 结果(系统自动生成) */
-    result?: string;
+		/** createdTime */
+		createdTime?: string
+
+		/** id */
+		id?: number
+
+		/** 物料ids */
+		ids?: Array<string>
+
+		/** 审核意见 */
+		reviewRemark?: string
 
 		/** 审核结果(1-待扫码 2-待提交 3-待审核 4-审核通过 5退回) */
-    reviewResult?:
-      | 'WAIT_SCAN'
-      | 'WAIT_SUBMIT'
-      | 'WAIT_REVIEW'
-      | 'PASS'
-      | 'REJECT';
+		reviewResult?: 'WAIT_SCAN' | 'WAIT_SUBMIT' | 'WAIT_REVIEW' | 'PASS' | 'REJECT'
 
 		/** 盘点审核人 */
-    reviewer?: string;
+		reviewer?: string
 
 		/** 盘点人 */
-    taker?: string;
+		taker?: string
 
 		/** 类型（1: 采购入库申请 2: 归还入库申请 3: 出库外借申请 4: 盘点申请） */
-    type?: 'PURCHASE_RECEIPT' | 'RETURN_RECEIPT' | 'LOAN_OUT' | 'AUDIT';
+		type?: 'PURCHASE_RECEIPT' | 'RETURN_RECEIPT' | 'LOAN_OUT' | 'AUDIT' | 'SCRAP_OUT'
+
+		/** 物料类型 */
+		types?: Array<string>
 
 		/** updatedTime */
-    updatedTime?: string;
+		updatedTime?: string
 	}
 
 	/**
@@ -192,45 +191,118 @@ declare namespace material {
 	 */
 	export interface ComparisonResDTO {
 		/** 库存明细 */
-    details?: Array<material.StockDetailInfo>;
+		details?: Array<material.StockDetailInfo>
 
 		/** 差异数据 */
-    exceptionalData?: Array<material.StocktakingScanExceptionalData>;
+		exceptionalData?: Array<material.StocktakingScanExceptionalData>
+	}
+
+	/**
+	 * ManualStockDTO
+	 */
+	export interface ManualStockDTO {
+		/** 申请id */
+		applyId?: number
+
+		/** 编码 */
+		code?: string
+
+		/** 手动核实库存数量 */
+		manualStock?: number
+
+		/** 物料id */
+		materialId?: number
+
+		/** 异常原因 */
+		msg?: string
+
+		/** 名称 */
+		name?: string
+
+		/** 价格 */
+		price?: number
+
+		/** 规格 */
+		spec?: string
+
+		/** 库存数量 */
+		stock?: number
+
+		/** 类型 */
+		type?: string
+
+		/** typeName */
+		typeName?: string
+	}
+
+	/**
+	 * 人工手动核实物料库存明细
+	 */
+	export interface ManualStockDetail {
+		/** 申请id */
+		applyId?: number
+
+		/** createdTime */
+		createdTime?: string
+
+		/** id */
+		id?: number
+
+		/** 手动核实库存数量 */
+		manualStock?: number
+
+		/** 物料id */
+		materialId?: number
+
+		/** 异常原因 */
+		msg?: string
+
+		/** 库存数量 */
+		stock?: number
+
+		/** updatedTime */
+		updatedTime?: string
 	}
 
 	/**
 	 * 物料信息
 	 */
 	export interface Material {
-    /** 赋码规则(2-低值易耗品（不参与赋码） 1-高价值工具类（参与唯一赋码） */
-    assignRule?: 'LOW_VALUE' | 'HIGH_VALUE';
+		/** 是否赋码 */
+		assignRule?: boolean
 
 		/** 编码 */
-    code?: string;
+		code?: string
 
 		/** createdTime */
-    createdTime?: string;
+		createdTime?: string
 
 		/** 备注 */
-    description?: string;
+		description?: string
 
 		/** id */
-    id?: number;
+		id?: number
 
 		/** 名称 */
-    name?: string;
+		name?: string
+
+		/** 价格 */
+		price?: number
 
 		/** 规格 */
-    spec?: string;
+		spec?: string
 
 		/** 库存数量 */
-    stock?: number;
+		stock?: number
 
 		/** 类型 */
-    type?: string;
+		type?: string
+
+		/** typeName */
+		typeName?: string
 
 		/** updatedTime */
-    updatedTime?: string;
+		updatedTime?: string
 	}
 
 	/**
@@ -238,25 +310,71 @@ declare namespace material {
 	 */
 	export interface MaterialStockDetail {
 		/** 入库申请单 */
-    applyId?: number;
+		applyId?: number
 
 		/** 条码 */
-    barcode?: string;
+		barcode?: string
 
 		/** createdTime */
-    createdTime?: string;
+		createdTime?: string
 
 		/** id */
-    id?: number;
+		id?: number
 
 		/** 物料ID */
-    materialId?: number;
+		materialId?: number
 
 		/** 状态 */
-    status?: 'IN' | 'OUT' | 'OFF' | 'LOST';
+		status?: 'IN' | 'OUT' | 'OFF' | 'LOST' | 'SCRAP_OUT'
 
 		/** updatedTime */
-    updatedTime?: string;
+		updatedTime?: string
+	}
+
+	/**
+	 * 异常数据列表
+	 */
+	export interface ReviewDTO {
+		/** 申请单 */
+		applyId?: string
+
+		/** 审核意见 */
+		remark?: string
+
+		/** 审核结果 */
+		reviewResult?: 'WAIT_SCAN' | 'WAIT_SUBMIT' | 'WAIT_REVIEW' | 'PASS' | 'REJECT'
+	}
+
+	/**
+	 * ScrapOutApplyDTO
+	 */
+	export interface ScrapOutApplyDTO {
+		/** 申请人 */
+		applicant?: string
+
+		/** 条码集合 */
+		barcodeList?: string
+
+		/** 确认数量 */
+		confirmQuantity?: number
+
+		/** 物料名称 */
+		name?: string
+
+		/** 单价 */
+		price?: string
+
+		/** 报废原因 */
+		remark?: string
+
+		/** 物料规格 */
+		spec?: string
+
+		/** 类型 */
+		type?: string
+
+		/** 类型名称 */
+		typeName?: string
 	}
 
 	/**
@@ -264,22 +382,22 @@ declare namespace material {
 	 */
 	export interface StockDetailInfo {
 		/** 物料编码 */
-    materialCode?: string;
+		materialCode?: string
 
 		/** 物料名称 */
-    materialId?: number;
+		materialId?: number
 
 		/** 物料名称 */
-    materialName?: string;
+		materialName?: string
 
 		/** 实际库存（明细数据中统计来的） */
-    stockReal?: number;
+		stockReal?: number
 
 		/** 在存总数（物料表） */
-    stockTotal?: number;
+		stockTotal?: number
 
 		/** 扫码数量 */
-    stockTotalScan?: number;
+		stockTotalScan?: number
 	}
 
 	/**
@@ -287,22 +405,22 @@ declare namespace material {
 	 */
 	export interface StocktakingScanDetail {
 		/** 申请单id */
-    applyId?: number;
+		applyId?: number
 
 		/** 条码 */
-    barcode?: string;
+		barcode?: string
 
 		/** createdTime */
-    createdTime?: string;
+		createdTime?: string
 
 		/** id */
-    id?: number;
+		id?: number
 
 		/** 物料ID */
-    materialId?: number;
+		materialId?: number
 
 		/** updatedTime */
-    updatedTime?: string;
+		updatedTime?: string
 	}
 
 	/**
@@ -310,36 +428,90 @@ declare namespace material {
 	 */
 	export interface StocktakingScanExceptionalData {
 		/** 申请单id */
-    applyId?: number;
+		applyId?: number
 
 		/** 条码 */
-    barcode?: string;
+		barcode?: string
 
 		/** createdTime */
-    createdTime?: string;
+		createdTime?: string
 
 		/** 异常处理 */
-    exceptionHandle?: 'INBOUND' | 'OUTBOUND' | 'DISCARD';
+		exceptionHandle?: 'MARK_LOST' | 'MARK_KEEP' | 'MARK_RETURN' | 'MARK_DISCARD' | 'MARK_NEW'
 
 		/** 异常类型 */
-    exceptionReason?:
-      | 'SOCK_IN_BUT_SCAN_NOT_EXIST'
-      | 'SOCK_OUT_BUT_SCAN_EXIST'
-      | 'SOCK_NOT_EXIST_BUT_SCAN_EXIST';
+		exceptionReason?: 'SOCK_IN_BUT_SCAN_NOT_EXIST' | 'SOCK_OUT_BUT_SCAN_EXIST' | 'SOCK_NOT_EXIST_BUT_SCAN_EXIST'
 
 		/** id */
-    id?: number;
+		id?: number
 
 		/** 物料ID */
-    materialId?: number;
+		materialId?: number
 
 		/** materialName */
-    materialName?: string;
+		materialName?: string
 
 		/** 备注 */
-    remark?: string;
+		remark?: string
 
 		/** updatedTime */
-    updatedTime?: string;
+		updatedTime?: string
+	}
+
+	/**
+	 * 类型
+	 */
+	export interface Type {
+		/** createdTime */
+		createdTime?: string
+
+		/** id */
+		id?: number
+
+		/** 类型级别 */
+		level: 'ONE' | 'TWO'
+
+		/** levelInfo */
+		levelInfo?: material.Codebook
+
+		/** 类型名称 */
+		name: string
+
+		/** 类型编码 */
+		no: string
+
+		/** 上级类型编码 */
+		parentNo?: string
+
+		/** updatedTime */
+		updatedTime?: string
+	}
+
+	/**
+	 * TypeTree
+	 */
+	export interface TypeTree {
+		/** children */
+		children?: Array<material.TypeTree>
+
+		/** 类型名称 */
+		label: string
+
+		/** parentNo */
+		parentNo?: string
+
+		/** 类型编码 */
+		value: string
+	}
+
+	/**
+	 * WaitScanInfo
+	 */
+	export interface WaitScanInfo {
+		/** 物料数量 */
+		count?: number
+
+		/** 物料名称 */
+		materialName?: string
 	}
 }

src/api/material/mods/apply/downloadAuditExcel.ts

@@ -0,0 +1,32 @@
+/**
+ * @desc 导出盘点申请单列表
+ */
+import { defaultSuccess, defaultError, http } from '@/plugins/axios'
+import type { AxiosResponse } from 'axios'
+export interface Params {
+	/** 盘点类型 */
+	auditType?: 'SCAN' | 'MANUAL'
+	/** 盘点人 */
+	taker?: string
+	/** 创建日期 */
+	createDate?: string
+	/** 审核状态 */
+	reviewResults?: Array<'WAIT_SCAN' | 'WAIT_SUBMIT' | 'WAIT_REVIEW' | 'PASS' | 'REJECT'>
+}
+
+export default async function (
+	params: Params,
+	success: (data: void) => void = defaultSuccess,
+	fail: (error: { code: string; error?: string }) => void = defaultError,
+): Promise<void> {
+	return http({
+		method: 'get',
+		url: `/apply/audit/download-excel`,
+
+		params,
+	})
+		.then((data: AxiosResponse<void, unknown>) => {
+			success(data.data)
+		})
+		.catch((error: { code: string; error?: string }) => fail(error))
+}

src/api/material/mods/apply/downloadExcel.ts

@@ -0,0 +1,30 @@
+/**
+ * @desc 导出申请单列表
+ */
+import { defaultSuccess, defaultError, http } from '@/plugins/axios'
+import type { AxiosResponse } from 'axios'
+export interface Params {
+	/** 申请类型(1入库 3出库 4盘点) */
+	applyType: number
+	/** 物料类型 */
+	type?: string
+	/** 编码/名称 */
+	key?: string
+}
+
+export default async function (
+	params: Params,
+	success: (data: void) => void = defaultSuccess,
+	fail: (error: { code: string; error?: string }) => void = defaultError,
+): Promise<void> {
+	return http({
+		method: 'get',
+		url: `/apply/download-excel`,
+
+		params,
+	})
+		.then((data: AxiosResponse<void, unknown>) => {
+			success(data.data)
+		})
+		.catch((error: { code: string; error?: string }) => fail(error))
+}

src/api/material/mods/apply/getManualCheckData.ts

@@ -0,0 +1,21 @@
+/**
+ * @desc 查询人工盘点选中物料的待核查数据
+ */
+import { defaultSuccess, defaultError, http } from '@/plugins/axios'
+import type { AxiosResponse } from 'axios'
+export default async function (
+	/** 申请单ID */
+	applyId: number,
+
+	success: (data: Array<material.Material>) => void = defaultSuccess,
+	fail: (error: { code: string; error?: string }) => void = defaultError,
+): Promise<void> {
+	return http({
+		method: 'get',
+		url: `/manual/check-data/${applyId}`,
+	})
+		.then((data: AxiosResponse<Array<material.Material>, unknown>) => {
+			success(data.data)
+		})
+		.catch((error: { code: string; error?: string }) => fail(error))
+}

src/api/material/mods/apply/getManualStock.ts

@@ -0,0 +1,21 @@
+/**
+ * @desc 获取人工盘点数据
+ */
+import { defaultSuccess, defaultError, http } from '@/plugins/axios'
+import type { AxiosResponse } from 'axios'
+export default async function (
+	/** 申请单ID */
+	applyId: number,
+
+	success: (data: Array<material.ManualStockDTO>) => void = defaultSuccess,
+	fail: (error: { code: string; error?: string }) => void = defaultError,
+): Promise<void> {
+	return http({
+		method: 'get',
+		url: `/manual/data/${applyId}`,
+	})
+		.then((data: AxiosResponse<Array<material.ManualStockDTO>, unknown>) => {
+			success(data.data)
+		})
+		.catch((error: { code: string; error?: string }) => fail(error))
+}

src/api/material/mods/apply/getScrapOutById.ts

@@ -0,0 +1,21 @@
+/**
+ * @desc 获取报废出库申请单
+ */
+import { defaultSuccess, defaultError, http } from '@/plugins/axios'
+import type { AxiosResponse } from 'axios'
+export default async function (
+	/** 申请单ID */
+	applyId: number,
+
+	success: (data: Array<material.ScrapOutApplyDTO>) => void = defaultSuccess,
+	fail: (error: { code: string; error?: string }) => void = defaultError,
+): Promise<void> {
+	return http({
+		method: 'get',
+		url: `/scrap-out/${applyId}`,
+	})
+		.then((data: AxiosResponse<Array<material.ScrapOutApplyDTO>, unknown>) => {
+			success(data.data)
+		})
+		.catch((error: { code: string; error?: string }) => fail(error))
+}

src/api/material/mods/apply/getWaitScanData.ts

@@ -0,0 +1,21 @@
+/**
+ * @desc 获取盘点的待扫码信息
+ */
+import { defaultSuccess, defaultError, http } from '@/plugins/axios'
+import type { AxiosResponse } from 'axios'
+export default async function (
+	/** 申请单ID */
+	applyId: number,
+
+	success: (data: Array<material.WaitScanInfo>) => void = defaultSuccess,
+	fail: (error: { code: string; error?: string }) => void = defaultError,
+): Promise<void> {
+	return http({
+		method: 'get',
+		url: `/wait-scan-data/${applyId}`,
+	})
+		.then((data: AxiosResponse<Array<material.WaitScanInfo>, unknown>) => {
+			success(data.data)
+		})
+		.catch((error: { code: string; error?: string }) => fail(error))
+}

src/api/material/mods/apply/index.ts

@@ -2,22 +2,40 @@
  * @description 入库/出库 申请单管理
  *
  */
-import searchPage from './searchPage';
-import saveApply from './saveApply';
-import detail from './detail';
-import searchAuditPage from './searchAuditPage';
-import auditApply from './auditApply';
-import getComparisonRes from './getComparisonRes';
-import updateReviewResult from './updateReviewResult';
-import saveScanData from './saveScanData';
+import searchPage from './searchPage'
+import saveApply from './saveApply'
+import downloadAuditExcel from './downloadAuditExcel'
+import downloadExcel from './downloadExcel'
+import detail from './detail'
+import searchAuditPage from './searchAuditPage'
+import auditApply from './auditApply'
+import getComparisonRes from './getComparisonRes'
+import updateReviewResult from './updateReviewResult'
+import submitManualStock from './submitManualStock'
+import getManualCheckData from './getManualCheckData'
+import getManualStock from './getManualStock'
+import saveScanData from './saveScanData'
+import submitScrapOutReview from './submitScrapOutReview'
+import getScrapOutById from './getScrapOutById'
+import submitReview from './submitReview'
+import getWaitScanData from './getWaitScanData'
 
 export default {
 	searchPage,
 	saveApply,
+	downloadAuditExcel,
+	downloadExcel,
 	detail,
 	searchAuditPage,
 	auditApply,
 	getComparisonRes,
 	updateReviewResult,
+	submitManualStock,
+	getManualCheckData,
+	getManualStock,
 	saveScanData,
-};
+	submitScrapOutReview,
+	getScrapOutById,
+	submitReview,
+	getWaitScanData,
+}

src/api/material/mods/apply/searchAuditPage.ts

@@ -1,24 +1,22 @@
 /**
  * @desc 分页查询盘点列表
  */
-import { defaultSuccess, defaultError, http } from '@/plugins/axios';
-import type { AxiosResponse } from 'axios';
-import type { IPage } from '@/api/api';
+import { defaultSuccess, defaultError, http } from '@/plugins/axios'
+import type { AxiosResponse } from 'axios'
+import type { IPage } from '@/api/api'
 export interface Params {
 	/** 页码 */
-  page?: number;
+	page?: number
 	/** 页面大小 */
-  size?: number;
+	size?: number
 	/** 盘点类型 */
-  auditType?: 'ALL' | 'PARTIAL';
+	auditType?: 'SCAN' | 'MANUAL'
 	/** 盘点人 */
-  taker?: string;
+	taker?: string
 	/** 创建日期 */
-  createDate?: string;
+	createDate?: string
 	/** 审核状态 */
-  reviewResults?: Array<
-    'WAIT_SCAN' | 'WAIT_SUBMIT' | 'WAIT_REVIEW' | 'PASS' | 'REJECT'
-  >;
+	reviewResults?: Array<'WAIT_SCAN' | 'WAIT_SUBMIT' | 'WAIT_REVIEW' | 'PASS' | 'REJECT'>
 }
 
 export default async function (
@@ -33,7 +31,7 @@ export default async function (
 		params,
 	})
 		.then((data: AxiosResponse<IPage<material.ApplyForm>, unknown>) => {
-      success(data.data);
+			success(data.data)
 		})
-    .catch((error: { code: string; error?: string }) => fail(error));
+		.catch((error: { code: string; error?: string }) => fail(error))
 }

src/api/material/mods/apply/searchPage.ts

@@ -1,22 +1,20 @@
 /**
  * @desc 分页查询申请列表
  */
-import { defaultSuccess, defaultError, http } from '@/plugins/axios';
-import type { AxiosResponse } from 'axios';
-import type { IPage } from '@/api/api';
+import { defaultSuccess, defaultError, http } from '@/plugins/axios'
+import type { AxiosResponse } from 'axios'
+import type { IPage } from '@/api/api'
 export interface Params {
 	/** 申请类型(1入库 3出库 4盘点) */
-  applyType: number;
+	applyType: number
 	/** 页码 */
-  page?: number;
+	page?: number
 	/** 页面大小 */
-  size?: number;
+	size?: number
 	/** 物料类型 */
-  type?: string;
-  /** 物料编码 */
-  code?: string;
-  /** 物料名称 */
-  name?: string;
+	type?: string
+	/** 编码/名称 */
+	key?: string
 }
 
 export default async function (
@@ -31,7 +29,7 @@ export default async function (
 		params,
 	})
 		.then((data: AxiosResponse<IPage<material.ApplyDTO>, unknown>) => {
-      success(data.data);
+			success(data.data)
 		})
-    .catch((error: { code: string; error?: string }) => fail(error));
+		.catch((error: { code: string; error?: string }) => fail(error))
 }

src/api/material/mods/apply/submitManualStock.ts

@@ -0,0 +1,22 @@
+/**
+ * @desc 提交人工盘点数据
+ */
+import { defaultSuccess, defaultError, http } from '@/plugins/axios'
+import type { AxiosResponse } from 'axios'
+export default async function (
+	/** 请求体 */
+	requestBody: Array<material.ManualStockDetail>,
+
+	success: (data: void) => void = defaultSuccess,
+	fail: (error: { code: string; error?: string }) => void = defaultError,
+): Promise<void> {
+	return http({
+		method: 'post',
+		url: `/manual/audit-apply`,
+		data: requestBody,
+	})
+		.then((data: AxiosResponse<void, unknown>) => {
+			success(data.data)
+		})
+		.catch((error: { code: string; error?: string }) => fail(error))
+}

src/api/material/mods/apply/submitReview.ts

@@ -0,0 +1,22 @@
+/**
+ * @desc 提交审核
+ */
+import { defaultSuccess, defaultError, http } from '@/plugins/axios'
+import type { AxiosResponse } from 'axios'
+export default async function (
+	/** 请求体 */
+	requestBody: material.ReviewDTO,
+
+	success: (data: void) => void = defaultSuccess,
+	fail: (error: { code: string; error?: string }) => void = defaultError,
+): Promise<void> {
+	return http({
+		method: 'post',
+		url: `/submit-review`,
+		data: requestBody,
+	})
+		.then((data: AxiosResponse<void, unknown>) => {
+			success(data.data)
+		})
+		.catch((error: { code: string; error?: string }) => fail(error))
+}

src/api/material/mods/apply/submitScrapOutReview.ts

@@ -0,0 +1,22 @@
+/**
+ * @desc 提交报废出库审核
+ */
+import { defaultSuccess, defaultError, http } from '@/plugins/axios'
+import type { AxiosResponse } from 'axios'
+export default async function (
+	/** 请求体 */
+	requestBody: material.ReviewDTO,
+
+	success: (data: void) => void = defaultSuccess,
+	fail: (error: { code: string; error?: string }) => void = defaultError,
+): Promise<void> {
+	return http({
+		method: 'post',
+		url: `/scrap-out-review`,
+		data: requestBody,
+	})
+		.then((data: AxiosResponse<void, unknown>) => {
+			success(data.data)
+		})
+		.catch((error: { code: string; error?: string }) => fail(error))
+}

src/api/material/mods/index.ts

@@ -1,8 +1,11 @@
-import apply from './apply';
+import apply from './apply'
 
-import material from './material';
+import material from './material'
+
+import type from './type'
 
 export default {
 	apply,
 	material,
-};
+	type,
+}

src/api/material/mods/material/all.ts

@@ -1,18 +1,28 @@
 /**
  * @desc 查询所有物料列表
  */
-import { defaultSuccess, defaultError, http } from '@/plugins/axios';
-import type { AxiosResponse } from 'axios';
+import { defaultSuccess, defaultError, http } from '@/plugins/axios'
+import type { AxiosResponse } from 'axios'
+export interface Params {
+	/** 类型 */
+	type?: string
+	/** 是否赋码 */
+	assignRule?: boolean
+}
+
 export default async function (
+	params: Params,
 	success: (data: Array<material.Material>) => void = defaultSuccess,
 	fail: (error: { code: string; error?: string }) => void = defaultError,
 ): Promise<void> {
 	return http({
-    method: 'get',
+		method: 'post',
 		url: `/material/list`,
+
+		params,
 	})
 		.then((data: AxiosResponse<Array<material.Material>, unknown>) => {
-      success(data.data);
+			success(data.data)
 		})
-    .catch((error: { code: string; error?: string }) => fail(error));
+		.catch((error: { code: string; error?: string }) => fail(error))
 }

src/api/material/mods/material/downloadExcel.ts

@@ -0,0 +1,28 @@
+/**
+ * @desc 导出物料列表
+ */
+import { defaultSuccess, defaultError, http } from '@/plugins/axios'
+import type { AxiosResponse } from 'axios'
+export interface Params {
+	/** 类型 */
+	type?: string
+	/** 搜索关键词 */
+	key?: string
+}
+
+export default async function (
+	params: Params,
+	success: (data: void) => void = defaultSuccess,
+	fail: (error: { code: string; error?: string }) => void = defaultError,
+): Promise<void> {
+	return http({
+		method: 'get',
+		url: `/material/download-excel`,
+
+		params,
+	})
+		.then((data: AxiosResponse<void, unknown>) => {
+			success(data.data)
+		})
+		.catch((error: { code: string; error?: string }) => fail(error))
+}

src/api/material/mods/material/generateBarcodes.ts

@@ -0,0 +1,29 @@
+/**
+ * @desc 批量生成条形码
+ */
+import { defaultSuccess, defaultError, http } from '@/plugins/axios'
+import type { AxiosResponse } from 'axios'
+export interface Params {
+	/** 条形码数量 */
+	count: number
+}
+
+export default async function (
+	/** 物料id */
+	id: number,
+
+	params: Params,
+	success: (data: Array<string>) => void = defaultSuccess,
+	fail: (error: { code: string; error?: string }) => void = defaultError,
+): Promise<void> {
+	return http({
+		method: 'post',
+		url: `/material/${id}/generate-barcodes`,
+
+		params,
+	})
+		.then((data: AxiosResponse<Array<string>, unknown>) => {
+			success(data.data)
+		})
+		.catch((error: { code: string; error?: string }) => fail(error))
+}

src/api/material/mods/material/index.ts

@@ -2,16 +2,20 @@
  * @description 物料管理
  *
  */
-import saveOrUpdateMaterial from './saveOrUpdateMaterial';
-import all from './all';
-import detail from './detail';
-import deleteMaterial from './deleteMaterial';
-import materials from './materials';
+import saveOrUpdateMaterial from './saveOrUpdateMaterial'
+import downloadExcel from './downloadExcel'
+import all from './all'
+import detail from './detail'
+import deleteMaterial from './deleteMaterial'
+import generateBarcodes from './generateBarcodes'
+import materials from './materials'
 
 export default {
 	saveOrUpdateMaterial,
+	downloadExcel,
 	all,
 	detail,
 	deleteMaterial,
+	generateBarcodes,
 	materials,
-};
+}

src/api/material/mods/material/materials.ts

@@ -1,18 +1,18 @@
 /**
  * @desc 分页查询物料列表
  */
-import { defaultSuccess, defaultError, http } from '@/plugins/axios';
-import type { AxiosResponse } from 'axios';
-import type { IPage } from '@/api/api';
+import { defaultSuccess, defaultError, http } from '@/plugins/axios'
+import type { AxiosResponse } from 'axios'
+import type { IPage } from '@/api/api'
 export interface Params {
 	/** 页码 */
-  page?: number;
+	page?: number
 	/** 页面大小 */
-  size?: number;
+	size?: number
 	/** 类型 */
-  type?: number;
+	type?: string
 	/** 搜索关键词 */
-  key?: string;
+	key?: string
 }
 
 export default async function (
@@ -27,7 +27,7 @@ export default async function (
 		params,
 	})
 		.then((data: AxiosResponse<IPage<material.Material>, unknown>) => {
-      success(data.data);
+			success(data.data)
 		})
-    .catch((error: { code: string; error?: string }) => fail(error));
+		.catch((error: { code: string; error?: string }) => fail(error))
 }

src/api/material/mods/material/saveOrUpdateMaterial.ts

@@ -1,8 +1,8 @@
 /**
  * @desc 增加/编辑物料
  */
-import { defaultSuccess, defaultError, http } from '@/plugins/axios';
-import type { AxiosResponse } from 'axios';
+import { defaultSuccess, defaultError, http } from '@/plugins/axios'
+import type { AxiosResponse } from 'axios'
 export default async function (
 	/** 请求体 */
 	requestBody: material.Material,
@@ -16,7 +16,7 @@ export default async function (
 		data: requestBody,
 	})
 		.then((data: AxiosResponse<material.Material, unknown>) => {
-      success(data.data);
+			success(data.data)
 		})
-    .catch((error: { code: string; error?: string }) => fail(error));
+		.catch((error: { code: string; error?: string }) => fail(error))
 }

src/api/material/mods/type/addAndModify.ts

@@ -0,0 +1,22 @@
+/**
+ * @desc 增加/更新地区
+ */
+import { defaultSuccess, defaultError, http } from '@/plugins/axios'
+import type { AxiosResponse } from 'axios'
+export default async function (
+	/** 请求体 */
+	requestBody: material.Type,
+
+	success: (data: material.Type) => void = defaultSuccess,
+	fail: (error: { code: string; error?: string }) => void = defaultError,
+): Promise<void> {
+	return http({
+		method: 'post',
+		url: `/area`,
+		data: requestBody,
+	})
+		.then((data: AxiosResponse<material.Type, unknown>) => {
+			success(data.data)
+		})
+		.catch((error: { code: string; error?: string }) => fail(error))
+}

src/api/material/mods/type/areas.ts

@@ -0,0 +1,26 @@
+/**
+ * @desc 查询类型
+ */
+import { defaultSuccess, defaultError, http } from '@/plugins/axios'
+import type { AxiosResponse } from 'axios'
+export interface Params {
+	/** 搜索关键词 */
+	key?: string
+}
+
+export default async function (
+	params: Params,
+	success: (data: Array<material.Type>) => void = defaultSuccess,
+	fail: (error: { code: string; error?: string }) => void = defaultError,
+): Promise<void> {
+	return http({
+		method: 'get',
+		url: `/areas`,
+
+		params,
+	})
+		.then((data: AxiosResponse<Array<material.Type>, unknown>) => {
+			success(data.data)
+		})
+		.catch((error: { code: string; error?: string }) => fail(error))
+}

src/api/material/mods/type/deleteArea.ts

@@ -0,0 +1,21 @@
+/**
+ * @desc 删除类型
+ */
+import { defaultSuccess, defaultError, http } from '@/plugins/axios'
+import type { AxiosResponse } from 'axios'
+export default async function (
+	/** id */
+	id: number,
+
+	success: (data: void) => void = defaultSuccess,
+	fail: (error: { code: string; error?: string }) => void = defaultError,
+): Promise<void> {
+	return http({
+		method: 'delete',
+		url: `/area/${id}`,
+	})
+		.then((data: AxiosResponse<void, unknown>) => {
+			success(data.data)
+		})
+		.catch((error: { code: string; error?: string }) => fail(error))
+}

src/api/material/mods/type/index.ts

@@ -0,0 +1,17 @@
+/**
+ * @description 物料类型管理
+ *
+ */
+import addAndModify from './addAndModify'
+import levels from './levels'
+import trees from './trees'
+import deleteArea from './deleteArea'
+import areas from './areas'
+
+export default {
+	addAndModify,
+	levels,
+	trees,
+	deleteArea,
+	areas,
+}

src/api/material/mods/type/levels.ts

@@ -0,0 +1,20 @@
+/**
+ * @desc 级别
+ */
+import { defaultSuccess, defaultError, http } from '@/plugins/axios'
+import type { AxiosResponse } from 'axios'
+import type { Codebook } from '@/api/api'
+
+export default async function (
+	success: (data: Array<Codebook>) => void = defaultSuccess,
+	fail: (error: { code: string; error?: string }) => void = defaultError,
+): Promise<void> {
+	return http({
+		method: 'get',
+		url: `/area/levels`,
+	})
+		.then((data: AxiosResponse<Array<Codebook>, unknown>) => {
+			success(data.data)
+		})
+		.catch((error: { code: string; error?: string }) => fail(error))
+}

src/api/material/mods/type/trees.ts

@@ -0,0 +1,18 @@
+/**
+ * @desc 类型树
+ */
+import { defaultSuccess, defaultError, http } from '@/plugins/axios'
+import type { AxiosResponse } from 'axios'
+export default async function (
+	success: (data: Array<material.TypeTree>) => void = defaultSuccess,
+	fail: (error: { code: string; error?: string }) => void = defaultError,
+): Promise<void> {
+	return http({
+		method: 'get',
+		url: `/area/trees`,
+	})
+		.then((data: AxiosResponse<Array<material.TypeTree>, unknown>) => {
+			success(data.data)
+		})
+		.catch((error: { code: string; error?: string }) => fail(error))
+}

src/api/pontCore.ts

@@ -1,73 +0,0 @@
-/**
- * @description pont内置请求单例
- */
-
-class PontCoreManager {
-  // static singleInstance = undefined as PontCoreManager;
-  private static singleInstance: PontCoreManager | null = null;
-
-  static getSignleInstance() {
-    if (!PontCoreManager.singleInstance) {
-      PontCoreManager.singleInstance = new PontCoreManager();
-      return PontCoreManager.singleInstance;
-    }
-    return PontCoreManager.singleInstance;
-  }
-
-  /**
-   * fetch请求
-   * @param url 请求url
-   * @param options fetch 请求配置
-   */
-  fetch(url: string, options = {}) {
-    return fetch(url, options).then((res) => {
-      return res.json();
-    });
-  }
-
-  /**
-   * 使用外部传入的请求方法替换默认的fetch请求
-   */
-  useFetch(fetch: (url: string, options?: any) => Promise<any>) {
-    if (typeof fetch !== 'function') {
-      console.error('fetch should be a function ');
-      return;
-    }
-
-    this.fetch = fetch;
-  }
-
-  getUrl(path: string, queryParams: any) {
-    const params = {
-      ...(queryParams || ({} as any)),
-    };
-
-    const url = path.replace(/\{([^\\}]*(?:\\.[^\\}]*)*)\}/gm, ( key) => {
-      // eslint-disable-next-line no-param-reassign
-      key = key.trim();
-
-      if (params[key] !== undefined) {
-        const value = params[key];
-        delete params[key];
-        return value;
-      }
-      console.warn('Please set value for template key: ', key);
-      return '';
-    });
-
-    const paramStr = Object.keys(params)
-      .map((key) => {
-        return params[key] === undefined ? '' : `${key}=${params[key]}`;
-      })
-      .filter((id) => id)
-      .join('&');
-
-    if (paramStr) {
-      return `${url}?${paramStr}`;
-    }
-
-    return url;
-  }
-}
-
-export const PontCore = PontCoreManager.getSignleInstance();

src/auto-imports.d.ts

@@ -6,292 +6,304 @@
 // biome-ignore lint: disable
 export {}
 declare global {
-  const EffectScope: typeof import('vue')['EffectScope']
-  const asyncComputed: typeof import('@vueuse/core')['asyncComputed']
-  const autoResetRef: typeof import('@vueuse/core')['autoResetRef']
-  const computed: typeof import('vue')['computed']
-  const computedAsync: typeof import('@vueuse/core')['computedAsync']
-  const computedEager: typeof import('@vueuse/core')['computedEager']
-  const computedInject: typeof import('@vueuse/core')['computedInject']
-  const computedWithControl: typeof import('@vueuse/core')['computedWithControl']
-  const controlledComputed: typeof import('@vueuse/core')['controlledComputed']
-  const controlledRef: typeof import('@vueuse/core')['controlledRef']
-  const createApp: typeof import('vue')['createApp']
-  const createEventHook: typeof import('@vueuse/core')['createEventHook']
-  const createGlobalState: typeof import('@vueuse/core')['createGlobalState']
-  const createInjectionState: typeof import('@vueuse/core')['createInjectionState']
-  const createReactiveFn: typeof import('@vueuse/core')['createReactiveFn']
-  const createReusableTemplate: typeof import('@vueuse/core')['createReusableTemplate']
-  const createSharedComposable: typeof import('@vueuse/core')['createSharedComposable']
-  const createTemplatePromise: typeof import('@vueuse/core')['createTemplatePromise']
-  const createUnrefFn: typeof import('@vueuse/core')['createUnrefFn']
-  const customRef: typeof import('vue')['customRef']
-  const debouncedRef: typeof import('@vueuse/core')['debouncedRef']
-  const debouncedWatch: typeof import('@vueuse/core')['debouncedWatch']
-  const defineAsyncComponent: typeof import('vue')['defineAsyncComponent']
-  const defineComponent: typeof import('vue')['defineComponent']
-  const eagerComputed: typeof import('@vueuse/core')['eagerComputed']
-  const effectScope: typeof import('vue')['effectScope']
-  const extendRef: typeof import('@vueuse/core')['extendRef']
-  const getCurrentInstance: typeof import('vue')['getCurrentInstance']
-  const getCurrentScope: typeof import('vue')['getCurrentScope']
-  const h: typeof import('vue')['h']
-  const ignorableWatch: typeof import('@vueuse/core')['ignorableWatch']
-  const inject: typeof import('vue')['inject']
-  const injectLocal: typeof import('@vueuse/core')['injectLocal']
-  const isDefined: typeof import('@vueuse/core')['isDefined']
-  const isProxy: typeof import('vue')['isProxy']
-  const isReactive: typeof import('vue')['isReactive']
-  const isReadonly: typeof import('vue')['isReadonly']
-  const isRef: typeof import('vue')['isRef']
-  const makeDestructurable: typeof import('@vueuse/core')['makeDestructurable']
-  const markRaw: typeof import('vue')['markRaw']
-  const nextTick: typeof import('vue')['nextTick']
-  const onActivated: typeof import('vue')['onActivated']
-  const onBeforeMount: typeof import('vue')['onBeforeMount']
-  const onBeforeRouteLeave: typeof import('vue-router')['onBeforeRouteLeave']
-  const onBeforeRouteUpdate: typeof import('vue-router')['onBeforeRouteUpdate']
-  const onBeforeUnmount: typeof import('vue')['onBeforeUnmount']
-  const onBeforeUpdate: typeof import('vue')['onBeforeUpdate']
-  const onClickOutside: typeof import('@vueuse/core')['onClickOutside']
-  const onDeactivated: typeof import('vue')['onDeactivated']
-  const onErrorCaptured: typeof import('vue')['onErrorCaptured']
-  const onKeyStroke: typeof import('@vueuse/core')['onKeyStroke']
-  const onLongPress: typeof import('@vueuse/core')['onLongPress']
-  const onMounted: typeof import('vue')['onMounted']
-  const onRenderTracked: typeof import('vue')['onRenderTracked']
-  const onRenderTriggered: typeof import('vue')['onRenderTriggered']
-  const onScopeDispose: typeof import('vue')['onScopeDispose']
-  const onServerPrefetch: typeof import('vue')['onServerPrefetch']
-  const onStartTyping: typeof import('@vueuse/core')['onStartTyping']
-  const onUnmounted: typeof import('vue')['onUnmounted']
-  const onUpdated: typeof import('vue')['onUpdated']
-  const onWatcherCleanup: typeof import('vue')['onWatcherCleanup']
-  const pausableWatch: typeof import('@vueuse/core')['pausableWatch']
-  const provide: typeof import('vue')['provide']
-  const provideLocal: typeof import('@vueuse/core')['provideLocal']
-  const reactify: typeof import('@vueuse/core')['reactify']
-  const reactifyObject: typeof import('@vueuse/core')['reactifyObject']
-  const reactive: typeof import('vue')['reactive']
-  const reactiveComputed: typeof import('@vueuse/core')['reactiveComputed']
-  const reactiveOmit: typeof import('@vueuse/core')['reactiveOmit']
-  const reactivePick: typeof import('@vueuse/core')['reactivePick']
-  const readonly: typeof import('vue')['readonly']
-  const ref: typeof import('vue')['ref']
-  const refAutoReset: typeof import('@vueuse/core')['refAutoReset']
-  const refDebounced: typeof import('@vueuse/core')['refDebounced']
-  const refDefault: typeof import('@vueuse/core')['refDefault']
-  const refThrottled: typeof import('@vueuse/core')['refThrottled']
-  const refWithControl: typeof import('@vueuse/core')['refWithControl']
-  const resolveComponent: typeof import('vue')['resolveComponent']
-  const resolveRef: typeof import('@vueuse/core')['resolveRef']
-  const resolveUnref: typeof import('@vueuse/core')['resolveUnref']
-  const shallowReactive: typeof import('vue')['shallowReactive']
-  const shallowReadonly: typeof import('vue')['shallowReadonly']
-  const shallowRef: typeof import('vue')['shallowRef']
-  const syncRef: typeof import('@vueuse/core')['syncRef']
-  const syncRefs: typeof import('@vueuse/core')['syncRefs']
-  const templateRef: typeof import('@vueuse/core')['templateRef']
-  const throttledRef: typeof import('@vueuse/core')['throttledRef']
-  const throttledWatch: typeof import('@vueuse/core')['throttledWatch']
-  const toRaw: typeof import('vue')['toRaw']
-  const toReactive: typeof import('@vueuse/core')['toReactive']
-  const toRef: typeof import('vue')['toRef']
-  const toRefs: typeof import('vue')['toRefs']
-  const toValue: typeof import('vue')['toValue']
-  const triggerRef: typeof import('vue')['triggerRef']
-  const tryOnBeforeMount: typeof import('@vueuse/core')['tryOnBeforeMount']
-  const tryOnBeforeUnmount: typeof import('@vueuse/core')['tryOnBeforeUnmount']
-  const tryOnMounted: typeof import('@vueuse/core')['tryOnMounted']
-  const tryOnScopeDispose: typeof import('@vueuse/core')['tryOnScopeDispose']
-  const tryOnUnmounted: typeof import('@vueuse/core')['tryOnUnmounted']
-  const unref: typeof import('vue')['unref']
-  const unrefElement: typeof import('@vueuse/core')['unrefElement']
-  const until: typeof import('@vueuse/core')['until']
-  const useActiveElement: typeof import('@vueuse/core')['useActiveElement']
-  const useAnimate: typeof import('@vueuse/core')['useAnimate']
-  const useArrayDifference: typeof import('@vueuse/core')['useArrayDifference']
-  const useArrayEvery: typeof import('@vueuse/core')['useArrayEvery']
-  const useArrayFilter: typeof import('@vueuse/core')['useArrayFilter']
-  const useArrayFind: typeof import('@vueuse/core')['useArrayFind']
-  const useArrayFindIndex: typeof import('@vueuse/core')['useArrayFindIndex']
-  const useArrayFindLast: typeof import('@vueuse/core')['useArrayFindLast']
-  const useArrayIncludes: typeof import('@vueuse/core')['useArrayIncludes']
-  const useArrayJoin: typeof import('@vueuse/core')['useArrayJoin']
-  const useArrayMap: typeof import('@vueuse/core')['useArrayMap']
-  const useArrayReduce: typeof import('@vueuse/core')['useArrayReduce']
-  const useArraySome: typeof import('@vueuse/core')['useArraySome']
-  const useArrayUnique: typeof import('@vueuse/core')['useArrayUnique']
-  const useAsyncQueue: typeof import('@vueuse/core')['useAsyncQueue']
-  const useAsyncState: typeof import('@vueuse/core')['useAsyncState']
-  const useAttrs: typeof import('vue')['useAttrs']
-  const useBase64: typeof import('@vueuse/core')['useBase64']
-  const useBattery: typeof import('@vueuse/core')['useBattery']
-  const useBluetooth: typeof import('@vueuse/core')['useBluetooth']
-  const useBreakpoints: typeof import('@vueuse/core')['useBreakpoints']
-  const useBroadcastChannel: typeof import('@vueuse/core')['useBroadcastChannel']
-  const useBrowserLocation: typeof import('@vueuse/core')['useBrowserLocation']
-  const useCached: typeof import('@vueuse/core')['useCached']
-  const useClipboard: typeof import('@vueuse/core')['useClipboard']
-  const useClipboardItems: typeof import('@vueuse/core')['useClipboardItems']
-  const useCloned: typeof import('@vueuse/core')['useCloned']
-  const useColorMode: typeof import('@vueuse/core')['useColorMode']
-  const useConfirmDialog: typeof import('@vueuse/core')['useConfirmDialog']
-  const useCounter: typeof import('@vueuse/core')['useCounter']
-  const useCssModule: typeof import('vue')['useCssModule']
-  const useCssVar: typeof import('@vueuse/core')['useCssVar']
-  const useCssVars: typeof import('vue')['useCssVars']
-  const useCurrentElement: typeof import('@vueuse/core')['useCurrentElement']
-  const useCycleList: typeof import('@vueuse/core')['useCycleList']
-  const useDark: typeof import('@vueuse/core')['useDark']
-  const useDateFormat: typeof import('@vueuse/core')['useDateFormat']
-  const useDebounce: typeof import('@vueuse/core')['useDebounce']
-  const useDebounceFn: typeof import('@vueuse/core')['useDebounceFn']
-  const useDebouncedRefHistory: typeof import('@vueuse/core')['useDebouncedRefHistory']
-  const useDeviceMotion: typeof import('@vueuse/core')['useDeviceMotion']
-  const useDeviceOrientation: typeof import('@vueuse/core')['useDeviceOrientation']
-  const useDevicePixelRatio: typeof import('@vueuse/core')['useDevicePixelRatio']
-  const useDevicesList: typeof import('@vueuse/core')['useDevicesList']
-  const useDisplayMedia: typeof import('@vueuse/core')['useDisplayMedia']
-  const useDocumentVisibility: typeof import('@vueuse/core')['useDocumentVisibility']
-  const useDraggable: typeof import('@vueuse/core')['useDraggable']
-  const useDropZone: typeof import('@vueuse/core')['useDropZone']
-  const useElementBounding: typeof import('@vueuse/core')['useElementBounding']
-  const useElementByPoint: typeof import('@vueuse/core')['useElementByPoint']
-  const useElementHover: typeof import('@vueuse/core')['useElementHover']
-  const useElementSize: typeof import('@vueuse/core')['useElementSize']
-  const useElementVisibility: typeof import('@vueuse/core')['useElementVisibility']
-  const useEventBus: typeof import('@vueuse/core')['useEventBus']
-  const useEventListener: typeof import('@vueuse/core')['useEventListener']
-  const useEventSource: typeof import('@vueuse/core')['useEventSource']
-  const useEyeDropper: typeof import('@vueuse/core')['useEyeDropper']
-  const useFavicon: typeof import('@vueuse/core')['useFavicon']
-  const useFetch: typeof import('@vueuse/core')['useFetch']
-  const useFileDialog: typeof import('@vueuse/core')['useFileDialog']
-  const useFileSystemAccess: typeof import('@vueuse/core')['useFileSystemAccess']
-  const useFocus: typeof import('@vueuse/core')['useFocus']
-  const useFocusWithin: typeof import('@vueuse/core')['useFocusWithin']
-  const useFps: typeof import('@vueuse/core')['useFps']
-  const useFullscreen: typeof import('@vueuse/core')['useFullscreen']
-  const useGamepad: typeof import('@vueuse/core')['useGamepad']
-  const useGeolocation: typeof import('@vueuse/core')['useGeolocation']
-  const useId: typeof import('vue')['useId']
-  const useIdle: typeof import('@vueuse/core')['useIdle']
-  const useImage: typeof import('@vueuse/core')['useImage']
-  const useInfiniteScroll: typeof import('@vueuse/core')['useInfiniteScroll']
-  const useIntersectionObserver: typeof import('@vueuse/core')['useIntersectionObserver']
-  const useInterval: typeof import('@vueuse/core')['useInterval']
-  const useIntervalFn: typeof import('@vueuse/core')['useIntervalFn']
-  const useKeyModifier: typeof import('@vueuse/core')['useKeyModifier']
-  const useLastChanged: typeof import('@vueuse/core')['useLastChanged']
-  const useLink: typeof import('vue-router')['useLink']
-  const useLocalStorage: typeof import('@vueuse/core')['useLocalStorage']
-  const useMagicKeys: typeof import('@vueuse/core')['useMagicKeys']
-  const useManualRefHistory: typeof import('@vueuse/core')['useManualRefHistory']
-  const useMediaControls: typeof import('@vueuse/core')['useMediaControls']
-  const useMediaQuery: typeof import('@vueuse/core')['useMediaQuery']
-  const useMemoize: typeof import('@vueuse/core')['useMemoize']
-  const useMemory: typeof import('@vueuse/core')['useMemory']
-  const useModel: typeof import('vue')['useModel']
-  const useMounted: typeof import('@vueuse/core')['useMounted']
-  const useMouse: typeof import('@vueuse/core')['useMouse']
-  const useMouseInElement: typeof import('@vueuse/core')['useMouseInElement']
-  const useMousePressed: typeof import('@vueuse/core')['useMousePressed']
-  const useMutationObserver: typeof import('@vueuse/core')['useMutationObserver']
-  const useNavigatorLanguage: typeof import('@vueuse/core')['useNavigatorLanguage']
-  const useNetwork: typeof import('@vueuse/core')['useNetwork']
-  const useNow: typeof import('@vueuse/core')['useNow']
-  const useObjectUrl: typeof import('@vueuse/core')['useObjectUrl']
-  const useOffsetPagination: typeof import('@vueuse/core')['useOffsetPagination']
-  const useOnline: typeof import('@vueuse/core')['useOnline']
-  const usePageLeave: typeof import('@vueuse/core')['usePageLeave']
-  const useParallax: typeof import('@vueuse/core')['useParallax']
-  const useParentElement: typeof import('@vueuse/core')['useParentElement']
-  const usePerformanceObserver: typeof import('@vueuse/core')['usePerformanceObserver']
-  const usePermission: typeof import('@vueuse/core')['usePermission']
-  const usePointer: typeof import('@vueuse/core')['usePointer']
-  const usePointerLock: typeof import('@vueuse/core')['usePointerLock']
-  const usePointerSwipe: typeof import('@vueuse/core')['usePointerSwipe']
-  const usePreferredColorScheme: typeof import('@vueuse/core')['usePreferredColorScheme']
-  const usePreferredContrast: typeof import('@vueuse/core')['usePreferredContrast']
-  const usePreferredDark: typeof import('@vueuse/core')['usePreferredDark']
-  const usePreferredLanguages: typeof import('@vueuse/core')['usePreferredLanguages']
-  const usePreferredReducedMotion: typeof import('@vueuse/core')['usePreferredReducedMotion']
-  const usePrevious: typeof import('@vueuse/core')['usePrevious']
-  const useRafFn: typeof import('@vueuse/core')['useRafFn']
-  const useRefHistory: typeof import('@vueuse/core')['useRefHistory']
-  const useResizeObserver: typeof import('@vueuse/core')['useResizeObserver']
-  const useRoute: typeof import('vue-router')['useRoute']
-  const useRouter: typeof import('vue-router')['useRouter']
-  const useScreenOrientation: typeof import('@vueuse/core')['useScreenOrientation']
-  const useScreenSafeArea: typeof import('@vueuse/core')['useScreenSafeArea']
-  const useScriptTag: typeof import('@vueuse/core')['useScriptTag']
-  const useScroll: typeof import('@vueuse/core')['useScroll']
-  const useScrollLock: typeof import('@vueuse/core')['useScrollLock']
-  const useSessionStorage: typeof import('@vueuse/core')['useSessionStorage']
-  const useShare: typeof import('@vueuse/core')['useShare']
-  const useSlots: typeof import('vue')['useSlots']
-  const useSorted: typeof import('@vueuse/core')['useSorted']
-  const useSpeechRecognition: typeof import('@vueuse/core')['useSpeechRecognition']
-  const useSpeechSynthesis: typeof import('@vueuse/core')['useSpeechSynthesis']
-  const useStepper: typeof import('@vueuse/core')['useStepper']
-  const useStorage: typeof import('@vueuse/core')['useStorage']
-  const useStorageAsync: typeof import('@vueuse/core')['useStorageAsync']
-  const useStyleTag: typeof import('@vueuse/core')['useStyleTag']
-  const useSupported: typeof import('@vueuse/core')['useSupported']
-  const useSwipe: typeof import('@vueuse/core')['useSwipe']
-  const useTemplateRef: typeof import('vue')['useTemplateRef']
-  const useTemplateRefsList: typeof import('@vueuse/core')['useTemplateRefsList']
-  const useTextDirection: typeof import('@vueuse/core')['useTextDirection']
-  const useTextSelection: typeof import('@vueuse/core')['useTextSelection']
-  const useTextareaAutosize: typeof import('@vueuse/core')['useTextareaAutosize']
-  const useThrottle: typeof import('@vueuse/core')['useThrottle']
-  const useThrottleFn: typeof import('@vueuse/core')['useThrottleFn']
-  const useThrottledRefHistory: typeof import('@vueuse/core')['useThrottledRefHistory']
-  const useTimeAgo: typeof import('@vueuse/core')['useTimeAgo']
-  const useTimeout: typeof import('@vueuse/core')['useTimeout']
-  const useTimeoutFn: typeof import('@vueuse/core')['useTimeoutFn']
-  const useTimeoutPoll: typeof import('@vueuse/core')['useTimeoutPoll']
-  const useTimestamp: typeof import('@vueuse/core')['useTimestamp']
-  const useTitle: typeof import('@vueuse/core')['useTitle']
-  const useToNumber: typeof import('@vueuse/core')['useToNumber']
-  const useToString: typeof import('@vueuse/core')['useToString']
-  const useToggle: typeof import('@vueuse/core')['useToggle']
-  const useTransition: typeof import('@vueuse/core')['useTransition']
-  const useUrlSearchParams: typeof import('@vueuse/core')['useUrlSearchParams']
-  const useUserMedia: typeof import('@vueuse/core')['useUserMedia']
-  const useVModel: typeof import('@vueuse/core')['useVModel']
-  const useVModels: typeof import('@vueuse/core')['useVModels']
-  const useVibrate: typeof import('@vueuse/core')['useVibrate']
-  const useVirtualList: typeof import('@vueuse/core')['useVirtualList']
-  const useWakeLock: typeof import('@vueuse/core')['useWakeLock']
-  const useWebNotification: typeof import('@vueuse/core')['useWebNotification']
-  const useWebSocket: typeof import('@vueuse/core')['useWebSocket']
-  const useWebWorker: typeof import('@vueuse/core')['useWebWorker']
-  const useWebWorkerFn: typeof import('@vueuse/core')['useWebWorkerFn']
-  const useWindowFocus: typeof import('@vueuse/core')['useWindowFocus']
-  const useWindowScroll: typeof import('@vueuse/core')['useWindowScroll']
-  const useWindowSize: typeof import('@vueuse/core')['useWindowSize']
-  const watch: typeof import('vue')['watch']
-  const watchArray: typeof import('@vueuse/core')['watchArray']
-  const watchAtMost: typeof import('@vueuse/core')['watchAtMost']
-  const watchDebounced: typeof import('@vueuse/core')['watchDebounced']
-  const watchDeep: typeof import('@vueuse/core')['watchDeep']
-  const watchEffect: typeof import('vue')['watchEffect']
-  const watchIgnorable: typeof import('@vueuse/core')['watchIgnorable']
-  const watchImmediate: typeof import('@vueuse/core')['watchImmediate']
-  const watchOnce: typeof import('@vueuse/core')['watchOnce']
-  const watchPausable: typeof import('@vueuse/core')['watchPausable']
-  const watchPostEffect: typeof import('vue')['watchPostEffect']
-  const watchSyncEffect: typeof import('vue')['watchSyncEffect']
-  const watchThrottled: typeof import('@vueuse/core')['watchThrottled']
-  const watchTriggerable: typeof import('@vueuse/core')['watchTriggerable']
-  const watchWithFilter: typeof import('@vueuse/core')['watchWithFilter']
-  const whenever: typeof import('@vueuse/core')['whenever']
+	const EffectScope: (typeof import('vue'))['EffectScope']
+	const asyncComputed: (typeof import('@vueuse/core'))['asyncComputed']
+	const autoResetRef: (typeof import('@vueuse/core'))['autoResetRef']
+	const computed: (typeof import('vue'))['computed']
+	const computedAsync: (typeof import('@vueuse/core'))['computedAsync']
+	const computedEager: (typeof import('@vueuse/core'))['computedEager']
+	const computedInject: (typeof import('@vueuse/core'))['computedInject']
+	const computedWithControl: (typeof import('@vueuse/core'))['computedWithControl']
+	const controlledComputed: (typeof import('@vueuse/core'))['controlledComputed']
+	const controlledRef: (typeof import('@vueuse/core'))['controlledRef']
+	const createApp: (typeof import('vue'))['createApp']
+	const createEventHook: (typeof import('@vueuse/core'))['createEventHook']
+	const createGlobalState: (typeof import('@vueuse/core'))['createGlobalState']
+	const createInjectionState: (typeof import('@vueuse/core'))['createInjectionState']
+	const createReactiveFn: (typeof import('@vueuse/core'))['createReactiveFn']
+	const createReusableTemplate: (typeof import('@vueuse/core'))['createReusableTemplate']
+	const createSharedComposable: (typeof import('@vueuse/core'))['createSharedComposable']
+	const createTemplatePromise: (typeof import('@vueuse/core'))['createTemplatePromise']
+	const createUnrefFn: (typeof import('@vueuse/core'))['createUnrefFn']
+	const customRef: (typeof import('vue'))['customRef']
+	const debouncedRef: (typeof import('@vueuse/core'))['debouncedRef']
+	const debouncedWatch: (typeof import('@vueuse/core'))['debouncedWatch']
+	const defineAsyncComponent: (typeof import('vue'))['defineAsyncComponent']
+	const defineComponent: (typeof import('vue'))['defineComponent']
+	const eagerComputed: (typeof import('@vueuse/core'))['eagerComputed']
+	const effectScope: (typeof import('vue'))['effectScope']
+	const extendRef: (typeof import('@vueuse/core'))['extendRef']
+	const getCurrentInstance: (typeof import('vue'))['getCurrentInstance']
+	const getCurrentScope: (typeof import('vue'))['getCurrentScope']
+	const h: (typeof import('vue'))['h']
+	const ignorableWatch: (typeof import('@vueuse/core'))['ignorableWatch']
+	const inject: (typeof import('vue'))['inject']
+	const injectLocal: (typeof import('@vueuse/core'))['injectLocal']
+	const isDefined: (typeof import('@vueuse/core'))['isDefined']
+	const isProxy: (typeof import('vue'))['isProxy']
+	const isReactive: (typeof import('vue'))['isReactive']
+	const isReadonly: (typeof import('vue'))['isReadonly']
+	const isRef: (typeof import('vue'))['isRef']
+	const makeDestructurable: (typeof import('@vueuse/core'))['makeDestructurable']
+	const markRaw: (typeof import('vue'))['markRaw']
+	const nextTick: (typeof import('vue'))['nextTick']
+	const onActivated: (typeof import('vue'))['onActivated']
+	const onBeforeMount: (typeof import('vue'))['onBeforeMount']
+	const onBeforeRouteLeave: (typeof import('vue-router'))['onBeforeRouteLeave']
+	const onBeforeRouteUpdate: (typeof import('vue-router'))['onBeforeRouteUpdate']
+	const onBeforeUnmount: (typeof import('vue'))['onBeforeUnmount']
+	const onBeforeUpdate: (typeof import('vue'))['onBeforeUpdate']
+	const onClickOutside: (typeof import('@vueuse/core'))['onClickOutside']
+	const onDeactivated: (typeof import('vue'))['onDeactivated']
+	const onErrorCaptured: (typeof import('vue'))['onErrorCaptured']
+	const onKeyStroke: (typeof import('@vueuse/core'))['onKeyStroke']
+	const onLongPress: (typeof import('@vueuse/core'))['onLongPress']
+	const onMounted: (typeof import('vue'))['onMounted']
+	const onRenderTracked: (typeof import('vue'))['onRenderTracked']
+	const onRenderTriggered: (typeof import('vue'))['onRenderTriggered']
+	const onScopeDispose: (typeof import('vue'))['onScopeDispose']
+	const onServerPrefetch: (typeof import('vue'))['onServerPrefetch']
+	const onStartTyping: (typeof import('@vueuse/core'))['onStartTyping']
+	const onUnmounted: (typeof import('vue'))['onUnmounted']
+	const onUpdated: (typeof import('vue'))['onUpdated']
+	const onWatcherCleanup: (typeof import('vue'))['onWatcherCleanup']
+	const pausableWatch: (typeof import('@vueuse/core'))['pausableWatch']
+	const provide: (typeof import('vue'))['provide']
+	const provideLocal: (typeof import('@vueuse/core'))['provideLocal']
+	const reactify: (typeof import('@vueuse/core'))['reactify']
+	const reactifyObject: (typeof import('@vueuse/core'))['reactifyObject']
+	const reactive: (typeof import('vue'))['reactive']
+	const reactiveComputed: (typeof import('@vueuse/core'))['reactiveComputed']
+	const reactiveOmit: (typeof import('@vueuse/core'))['reactiveOmit']
+	const reactivePick: (typeof import('@vueuse/core'))['reactivePick']
+	const readonly: (typeof import('vue'))['readonly']
+	const ref: (typeof import('vue'))['ref']
+	const refAutoReset: (typeof import('@vueuse/core'))['refAutoReset']
+	const refDebounced: (typeof import('@vueuse/core'))['refDebounced']
+	const refDefault: (typeof import('@vueuse/core'))['refDefault']
+	const refThrottled: (typeof import('@vueuse/core'))['refThrottled']
+	const refWithControl: (typeof import('@vueuse/core'))['refWithControl']
+	const resolveComponent: (typeof import('vue'))['resolveComponent']
+	const resolveRef: (typeof import('@vueuse/core'))['resolveRef']
+	const resolveUnref: (typeof import('@vueuse/core'))['resolveUnref']
+	const shallowReactive: (typeof import('vue'))['shallowReactive']
+	const shallowReadonly: (typeof import('vue'))['shallowReadonly']
+	const shallowRef: (typeof import('vue'))['shallowRef']
+	const syncRef: (typeof import('@vueuse/core'))['syncRef']
+	const syncRefs: (typeof import('@vueuse/core'))['syncRefs']
+	const templateRef: (typeof import('@vueuse/core'))['templateRef']
+	const throttledRef: (typeof import('@vueuse/core'))['throttledRef']
+	const throttledWatch: (typeof import('@vueuse/core'))['throttledWatch']
+	const toRaw: (typeof import('vue'))['toRaw']
+	const toReactive: (typeof import('@vueuse/core'))['toReactive']
+	const toRef: (typeof import('vue'))['toRef']
+	const toRefs: (typeof import('vue'))['toRefs']
+	const toValue: (typeof import('vue'))['toValue']
+	const triggerRef: (typeof import('vue'))['triggerRef']
+	const tryOnBeforeMount: (typeof import('@vueuse/core'))['tryOnBeforeMount']
+	const tryOnBeforeUnmount: (typeof import('@vueuse/core'))['tryOnBeforeUnmount']
+	const tryOnMounted: (typeof import('@vueuse/core'))['tryOnMounted']
+	const tryOnScopeDispose: (typeof import('@vueuse/core'))['tryOnScopeDispose']
+	const tryOnUnmounted: (typeof import('@vueuse/core'))['tryOnUnmounted']
+	const unref: (typeof import('vue'))['unref']
+	const unrefElement: (typeof import('@vueuse/core'))['unrefElement']
+	const until: (typeof import('@vueuse/core'))['until']
+	const useActiveElement: (typeof import('@vueuse/core'))['useActiveElement']
+	const useAnimate: (typeof import('@vueuse/core'))['useAnimate']
+	const useArrayDifference: (typeof import('@vueuse/core'))['useArrayDifference']
+	const useArrayEvery: (typeof import('@vueuse/core'))['useArrayEvery']
+	const useArrayFilter: (typeof import('@vueuse/core'))['useArrayFilter']
+	const useArrayFind: (typeof import('@vueuse/core'))['useArrayFind']
+	const useArrayFindIndex: (typeof import('@vueuse/core'))['useArrayFindIndex']
+	const useArrayFindLast: (typeof import('@vueuse/core'))['useArrayFindLast']
+	const useArrayIncludes: (typeof import('@vueuse/core'))['useArrayIncludes']
+	const useArrayJoin: (typeof import('@vueuse/core'))['useArrayJoin']
+	const useArrayMap: (typeof import('@vueuse/core'))['useArrayMap']
+	const useArrayReduce: (typeof import('@vueuse/core'))['useArrayReduce']
+	const useArraySome: (typeof import('@vueuse/core'))['useArraySome']
+	const useArrayUnique: (typeof import('@vueuse/core'))['useArrayUnique']
+	const useAsyncQueue: (typeof import('@vueuse/core'))['useAsyncQueue']
+	const useAsyncState: (typeof import('@vueuse/core'))['useAsyncState']
+	const useAttrs: (typeof import('vue'))['useAttrs']
+	const useBase64: (typeof import('@vueuse/core'))['useBase64']
+	const useBattery: (typeof import('@vueuse/core'))['useBattery']
+	const useBluetooth: (typeof import('@vueuse/core'))['useBluetooth']
+	const useBreakpoints: (typeof import('@vueuse/core'))['useBreakpoints']
+	const useBroadcastChannel: (typeof import('@vueuse/core'))['useBroadcastChannel']
+	const useBrowserLocation: (typeof import('@vueuse/core'))['useBrowserLocation']
+	const useCached: (typeof import('@vueuse/core'))['useCached']
+	const useClipboard: (typeof import('@vueuse/core'))['useClipboard']
+	const useClipboardItems: (typeof import('@vueuse/core'))['useClipboardItems']
+	const useCloned: (typeof import('@vueuse/core'))['useCloned']
+	const useColorMode: (typeof import('@vueuse/core'))['useColorMode']
+	const useConfirmDialog: (typeof import('@vueuse/core'))['useConfirmDialog']
+	const useCounter: (typeof import('@vueuse/core'))['useCounter']
+	const useCssModule: (typeof import('vue'))['useCssModule']
+	const useCssVar: (typeof import('@vueuse/core'))['useCssVar']
+	const useCssVars: (typeof import('vue'))['useCssVars']
+	const useCurrentElement: (typeof import('@vueuse/core'))['useCurrentElement']
+	const useCycleList: (typeof import('@vueuse/core'))['useCycleList']
+	const useDark: (typeof import('@vueuse/core'))['useDark']
+	const useDateFormat: (typeof import('@vueuse/core'))['useDateFormat']
+	const useDebounce: (typeof import('@vueuse/core'))['useDebounce']
+	const useDebounceFn: (typeof import('@vueuse/core'))['useDebounceFn']
+	const useDebouncedRefHistory: (typeof import('@vueuse/core'))['useDebouncedRefHistory']
+	const useDeviceMotion: (typeof import('@vueuse/core'))['useDeviceMotion']
+	const useDeviceOrientation: (typeof import('@vueuse/core'))['useDeviceOrientation']
+	const useDevicePixelRatio: (typeof import('@vueuse/core'))['useDevicePixelRatio']
+	const useDevicesList: (typeof import('@vueuse/core'))['useDevicesList']
+	const useDisplayMedia: (typeof import('@vueuse/core'))['useDisplayMedia']
+	const useDocumentVisibility: (typeof import('@vueuse/core'))['useDocumentVisibility']
+	const useDraggable: (typeof import('@vueuse/core'))['useDraggable']
+	const useDropZone: (typeof import('@vueuse/core'))['useDropZone']
+	const useElementBounding: (typeof import('@vueuse/core'))['useElementBounding']
+	const useElementByPoint: (typeof import('@vueuse/core'))['useElementByPoint']
+	const useElementHover: (typeof import('@vueuse/core'))['useElementHover']
+	const useElementSize: (typeof import('@vueuse/core'))['useElementSize']
+	const useElementVisibility: (typeof import('@vueuse/core'))['useElementVisibility']
+	const useEventBus: (typeof import('@vueuse/core'))['useEventBus']
+	const useEventListener: (typeof import('@vueuse/core'))['useEventListener']
+	const useEventSource: (typeof import('@vueuse/core'))['useEventSource']
+	const useEyeDropper: (typeof import('@vueuse/core'))['useEyeDropper']
+	const useFavicon: (typeof import('@vueuse/core'))['useFavicon']
+	const useFetch: (typeof import('@vueuse/core'))['useFetch']
+	const useFileDialog: (typeof import('@vueuse/core'))['useFileDialog']
+	const useFileSystemAccess: (typeof import('@vueuse/core'))['useFileSystemAccess']
+	const useFocus: (typeof import('@vueuse/core'))['useFocus']
+	const useFocusWithin: (typeof import('@vueuse/core'))['useFocusWithin']
+	const useFps: (typeof import('@vueuse/core'))['useFps']
+	const useFullscreen: (typeof import('@vueuse/core'))['useFullscreen']
+	const useGamepad: (typeof import('@vueuse/core'))['useGamepad']
+	const useGeolocation: (typeof import('@vueuse/core'))['useGeolocation']
+	const useId: (typeof import('vue'))['useId']
+	const useIdle: (typeof import('@vueuse/core'))['useIdle']
+	const useImage: (typeof import('@vueuse/core'))['useImage']
+	const useInfiniteScroll: (typeof import('@vueuse/core'))['useInfiniteScroll']
+	const useIntersectionObserver: (typeof import('@vueuse/core'))['useIntersectionObserver']
+	const useInterval: (typeof import('@vueuse/core'))['useInterval']
+	const useIntervalFn: (typeof import('@vueuse/core'))['useIntervalFn']
+	const useKeyModifier: (typeof import('@vueuse/core'))['useKeyModifier']
+	const useLastChanged: (typeof import('@vueuse/core'))['useLastChanged']
+	const useLink: (typeof import('vue-router'))['useLink']
+	const useLocalStorage: (typeof import('@vueuse/core'))['useLocalStorage']
+	const useMagicKeys: (typeof import('@vueuse/core'))['useMagicKeys']
+	const useManualRefHistory: (typeof import('@vueuse/core'))['useManualRefHistory']
+	const useMediaControls: (typeof import('@vueuse/core'))['useMediaControls']
+	const useMediaQuery: (typeof import('@vueuse/core'))['useMediaQuery']
+	const useMemoize: (typeof import('@vueuse/core'))['useMemoize']
+	const useMemory: (typeof import('@vueuse/core'))['useMemory']
+	const useModel: (typeof import('vue'))['useModel']
+	const useMounted: (typeof import('@vueuse/core'))['useMounted']
+	const useMouse: (typeof import('@vueuse/core'))['useMouse']
+	const useMouseInElement: (typeof import('@vueuse/core'))['useMouseInElement']
+	const useMousePressed: (typeof import('@vueuse/core'))['useMousePressed']
+	const useMutationObserver: (typeof import('@vueuse/core'))['useMutationObserver']
+	const useNavigatorLanguage: (typeof import('@vueuse/core'))['useNavigatorLanguage']
+	const useNetwork: (typeof import('@vueuse/core'))['useNetwork']
+	const useNow: (typeof import('@vueuse/core'))['useNow']
+	const useObjectUrl: (typeof import('@vueuse/core'))['useObjectUrl']
+	const useOffsetPagination: (typeof import('@vueuse/core'))['useOffsetPagination']
+	const useOnline: (typeof import('@vueuse/core'))['useOnline']
+	const usePageLeave: (typeof import('@vueuse/core'))['usePageLeave']
+	const useParallax: (typeof import('@vueuse/core'))['useParallax']
+	const useParentElement: (typeof import('@vueuse/core'))['useParentElement']
+	const usePerformanceObserver: (typeof import('@vueuse/core'))['usePerformanceObserver']
+	const usePermission: (typeof import('@vueuse/core'))['usePermission']
+	const usePointer: (typeof import('@vueuse/core'))['usePointer']
+	const usePointerLock: (typeof import('@vueuse/core'))['usePointerLock']
+	const usePointerSwipe: (typeof import('@vueuse/core'))['usePointerSwipe']
+	const usePreferredColorScheme: (typeof import('@vueuse/core'))['usePreferredColorScheme']
+	const usePreferredContrast: (typeof import('@vueuse/core'))['usePreferredContrast']
+	const usePreferredDark: (typeof import('@vueuse/core'))['usePreferredDark']
+	const usePreferredLanguages: (typeof import('@vueuse/core'))['usePreferredLanguages']
+	const usePreferredReducedMotion: (typeof import('@vueuse/core'))['usePreferredReducedMotion']
+	const usePrevious: (typeof import('@vueuse/core'))['usePrevious']
+	const useRafFn: (typeof import('@vueuse/core'))['useRafFn']
+	const useRefHistory: (typeof import('@vueuse/core'))['useRefHistory']
+	const useResizeObserver: (typeof import('@vueuse/core'))['useResizeObserver']
+	const useRoute: (typeof import('vue-router'))['useRoute']
+	const useRouter: (typeof import('vue-router'))['useRouter']
+	const useScreenOrientation: (typeof import('@vueuse/core'))['useScreenOrientation']
+	const useScreenSafeArea: (typeof import('@vueuse/core'))['useScreenSafeArea']
+	const useScriptTag: (typeof import('@vueuse/core'))['useScriptTag']
+	const useScroll: (typeof import('@vueuse/core'))['useScroll']
+	const useScrollLock: (typeof import('@vueuse/core'))['useScrollLock']
+	const useSessionStorage: (typeof import('@vueuse/core'))['useSessionStorage']
+	const useShare: (typeof import('@vueuse/core'))['useShare']
+	const useSlots: (typeof import('vue'))['useSlots']
+	const useSorted: (typeof import('@vueuse/core'))['useSorted']
+	const useSpeechRecognition: (typeof import('@vueuse/core'))['useSpeechRecognition']
+	const useSpeechSynthesis: (typeof import('@vueuse/core'))['useSpeechSynthesis']
+	const useStepper: (typeof import('@vueuse/core'))['useStepper']
+	const useStorage: (typeof import('@vueuse/core'))['useStorage']
+	const useStorageAsync: (typeof import('@vueuse/core'))['useStorageAsync']
+	const useStyleTag: (typeof import('@vueuse/core'))['useStyleTag']
+	const useSupported: (typeof import('@vueuse/core'))['useSupported']
+	const useSwipe: (typeof import('@vueuse/core'))['useSwipe']
+	const useTemplateRef: (typeof import('vue'))['useTemplateRef']
+	const useTemplateRefsList: (typeof import('@vueuse/core'))['useTemplateRefsList']
+	const useTextDirection: (typeof import('@vueuse/core'))['useTextDirection']
+	const useTextSelection: (typeof import('@vueuse/core'))['useTextSelection']
+	const useTextareaAutosize: (typeof import('@vueuse/core'))['useTextareaAutosize']
+	const useThrottle: (typeof import('@vueuse/core'))['useThrottle']
+	const useThrottleFn: (typeof import('@vueuse/core'))['useThrottleFn']
+	const useThrottledRefHistory: (typeof import('@vueuse/core'))['useThrottledRefHistory']
+	const useTimeAgo: (typeof import('@vueuse/core'))['useTimeAgo']
+	const useTimeout: (typeof import('@vueuse/core'))['useTimeout']
+	const useTimeoutFn: (typeof import('@vueuse/core'))['useTimeoutFn']
+	const useTimeoutPoll: (typeof import('@vueuse/core'))['useTimeoutPoll']
+	const useTimestamp: (typeof import('@vueuse/core'))['useTimestamp']
+	const useTitle: (typeof import('@vueuse/core'))['useTitle']
+	const useToNumber: (typeof import('@vueuse/core'))['useToNumber']
+	const useToString: (typeof import('@vueuse/core'))['useToString']
+	const useToggle: (typeof import('@vueuse/core'))['useToggle']
+	const useTransition: (typeof import('@vueuse/core'))['useTransition']
+	const useUrlSearchParams: (typeof import('@vueuse/core'))['useUrlSearchParams']
+	const useUserMedia: (typeof import('@vueuse/core'))['useUserMedia']
+	const useVModel: (typeof import('@vueuse/core'))['useVModel']
+	const useVModels: (typeof import('@vueuse/core'))['useVModels']
+	const useVibrate: (typeof import('@vueuse/core'))['useVibrate']
+	const useVirtualList: (typeof import('@vueuse/core'))['useVirtualList']
+	const useWakeLock: (typeof import('@vueuse/core'))['useWakeLock']
+	const useWebNotification: (typeof import('@vueuse/core'))['useWebNotification']
+	const useWebSocket: (typeof import('@vueuse/core'))['useWebSocket']
+	const useWebWorker: (typeof import('@vueuse/core'))['useWebWorker']
+	const useWebWorkerFn: (typeof import('@vueuse/core'))['useWebWorkerFn']
+	const useWindowFocus: (typeof import('@vueuse/core'))['useWindowFocus']
+	const useWindowScroll: (typeof import('@vueuse/core'))['useWindowScroll']
+	const useWindowSize: (typeof import('@vueuse/core'))['useWindowSize']
+	const watch: (typeof import('vue'))['watch']
+	const watchArray: (typeof import('@vueuse/core'))['watchArray']
+	const watchAtMost: (typeof import('@vueuse/core'))['watchAtMost']
+	const watchDebounced: (typeof import('@vueuse/core'))['watchDebounced']
+	const watchDeep: (typeof import('@vueuse/core'))['watchDeep']
+	const watchEffect: (typeof import('vue'))['watchEffect']
+	const watchIgnorable: (typeof import('@vueuse/core'))['watchIgnorable']
+	const watchImmediate: (typeof import('@vueuse/core'))['watchImmediate']
+	const watchOnce: (typeof import('@vueuse/core'))['watchOnce']
+	const watchPausable: (typeof import('@vueuse/core'))['watchPausable']
+	const watchPostEffect: (typeof import('vue'))['watchPostEffect']
+	const watchSyncEffect: (typeof import('vue'))['watchSyncEffect']
+	const watchThrottled: (typeof import('@vueuse/core'))['watchThrottled']
+	const watchTriggerable: (typeof import('@vueuse/core'))['watchTriggerable']
+	const watchWithFilter: (typeof import('@vueuse/core'))['watchWithFilter']
+	const whenever: (typeof import('@vueuse/core'))['whenever']
 }
 // for type re-export
 declare global {
 	// @ts-ignore
-  export type { Component, ComponentPublicInstance, ComputedRef, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue'
+	export type {
+		Component,
+		ComponentPublicInstance,
+		ComputedRef,
+		ExtractDefaultPropTypes,
+		ExtractPropTypes,
+		ExtractPublicPropTypes,
+		InjectionKey,
+		PropType,
+		Ref,
+		VNode,
+		WritableComputedRef,
+	} from 'vue'
 	import('vue')
 }

src/components.d.ts

@@ -17,11 +17,13 @@ declare module 'vue' {
     ADivider: typeof import('ant-design-vue/es')['Divider']
     ADrawer: typeof import('ant-design-vue/es')['Drawer']
     ADropdown: typeof import('ant-design-vue/es')['Dropdown']
+    AFlex: typeof import('ant-design-vue/es')['Flex']
     AFloatButton: typeof import('ant-design-vue/es')['FloatButton']
     AForm: typeof import('ant-design-vue/es')['Form']
     AFormItem: typeof import('ant-design-vue/es')['FormItem']
     AImage: typeof import('ant-design-vue/es')['Image']
     AInput: typeof import('ant-design-vue/es')['Input']
+    AInputNumber: typeof import('ant-design-vue/es')['InputNumber']
     AInputPassword: typeof import('ant-design-vue/es')['InputPassword']
     AInputSearch: typeof import('ant-design-vue/es')['InputSearch']
     ALayout: typeof import('ant-design-vue/es')['Layout']
@@ -50,9 +52,11 @@ declare module 'vue' {
     ATabPane: typeof import('ant-design-vue/es')['TabPane']
     ATabs: typeof import('ant-design-vue/es')['Tabs']
     ATag: typeof import('ant-design-vue/es')['Tag']
+    ATextarea: typeof import('ant-design-vue/es')['Textarea']
     ATooltip: typeof import('ant-design-vue/es')['Tooltip']
     ATransfer: typeof import('ant-design-vue/es')['Transfer']
     ATree: typeof import('ant-design-vue/es')['Tree']
+    ATreeSelect: typeof import('ant-design-vue/es')['TreeSelect']
     ATypographyLink: typeof import('ant-design-vue/es')['TypographyLink']
     ATypographyParagraph: typeof import('ant-design-vue/es')['TypographyParagraph']
     ATypographyTitle: typeof import('ant-design-vue/es')['TypographyTitle']

src/components/page-container/page-container.vue

@@ -169,7 +169,7 @@
 		line-height: 28px;
 	}
 
-	@media (width <= 576px) {
+	@media (width <=576px) {
 		.content {
 			display: block;
 		}

src/layout/components/menu.ts

@@ -2,6 +2,7 @@ import { RouteRecordRaw } from 'vue-router'
 import XEUtils from 'xe-utils'
 import i18n from '@/locales'
 import { routes } from '@/router'
+import { useUserStore } from '@/stores/user'
 const { t } = i18n.global
 export interface MenuNode {
 	key: string
@@ -73,8 +74,8 @@ export function menuTree() {
 
 export function hasPermission(key?: string) {
 	console.log(key)
-	//   return useUserStore().hasPermission(key);
-	return true
+	return useUserStore().hasPermission(key) // 过滤菜单是否显示
+	// return true
 }
 
 export function permissions() {
@@ -91,6 +92,7 @@ export function fliteredMenus() {
 			return !item.hidden
 		})
 		.filter((item) => {
+			if (item.key === 'Dashboard') return true //   首页显示
 			return hasPermission(item.keyPath)
 		})
 }

src/layout/components/right-content.vue

@@ -67,6 +67,7 @@
 	import { config } from '@/settings/application'
 	import { MenuInfo } from 'ant-design-vue/es/menu/src/interface'
 	import { useUserStore } from '@/stores/user'
+	import api from '@/api'
 	const t = useI18n()
 	const user = useUserStore()
 
@@ -81,11 +82,13 @@
 	}
 	const logout = () => {
 		Modal.confirm({
-			title: t.t('layout.user.modal.logout.title'),
+			title: '退出登录',
 			icon: createVNode(ExclamationCircleOutlined),
-			content: createVNode('div', { style: 'color:red;' }, t.t('layout.user.modal.logout.content')),
+			content: createVNode('div', { style: 'color:red;' }, '确定退出系统吗？'),
 			onOk() {
-				console.log(1)
+				api.authApi.auth.logout(() => {
+					user.logout()
+				})
 			},
 		})
 	}

src/layout/components/side-menu.vue

@@ -29,13 +29,18 @@
 	import SubMenu from './sub-menu.vue'
 	import XEUtils from 'xe-utils'
 	import { fliteredMenuTree } from './menu'
+	import { useRoute } from 'vue-router'
 
 	const app = useAppStore()
 
+	// const router = useRouter()
+
 	const theme = computed(() => {
 		return app.layout.navTheme === 'light' ? 'light' : 'dark'
 	})
 	const menuTree = computed(() => {
+		// 重新去计算路由的菜单
+		// router.currentRoute();
 		return fliteredMenuTree()
 	})
 	const route = useRoute()

src/locales/zh/menus.json

@@ -1,5 +1,6 @@
 {
 	"index": "首页",
+	"dashboard": "首页",
 	"acl": {
 		"name": "系统管理",
 		"users": "用户管理",

src/plugins/axios.ts

@@ -2,7 +2,7 @@ import { http } from '@/settings/http'
 import { useUserStore } from '@/stores/user'
 import axios, { InternalAxiosRequestConfig, type AxiosError, type AxiosResponse } from 'axios'
 import type { App } from 'vue'
-import router from '@/router'
+import { notification } from 'ant-design-vue'
 
 export interface GlobalError {
 	/** 错误码 */
@@ -24,9 +24,13 @@ export function defaultSuccess(data: unknown): void {
 	console.log(data)
 }
 export function defaultError(error: { code: string; error?: string }): void {
-	if (error) {
-		router.push({ path: '/message', query: { status: error.code, message: error.error } })
-	}
+	window.console.log(error)
+	notification.error({
+		message: '操作异常: ',
+		placement: 'top',
+		description: error.error + '(' + error.code + ')',
+		duration: 6,
+	})
 }
 const config = {
 	baseURL: http.prefix,

src/router/index.ts

@@ -1,9 +1,16 @@
-import { createRouter, createWebHashHistory } from 'vue-router'
+import { createRouter, createWebHashHistory, RouteRecordRaw } from 'vue-router'
 import UserLayout from '@/layout/user-layout.vue'
 import AdminLayout from '@/layout/admin-layout.vue'
 import BlankLayout from '@/layout/blank-layout.vue'
+import router from '@/router'
 
-export const routes = [
+export const routes: Array<RouteRecordRaw> = [
+	{
+		path: '/admin/dashboard',
+		meta: { title: 'menus.dashboard', icon: 'icon-dashboard', flat: true },
+		name: 'Dashboard',
+		component: () => import('../views/admin/dashboard-page.vue'),
+	},
 	{
 		path: '/admin/acl', // 系统管理
 		name: 'ACL',
@@ -32,14 +39,20 @@ export const routes = [
 			{
 				path: '/admin/acl/material', //物料
 				name: 'Material',
-				meta: {title: 'menus.acl.material',icon: 'icon-permission'},
-				component: ()=> import('../views/stock/material/material-page.vue'),
-			}
+				meta: { title: 'menus.acl.material', icon: 'icon-permission' },
+				component: () => import('../views/stock/material/material-page.vue'),
+			},
+			{
+				path: '/admin/acl/type', //物料类型
+				name: 'Type',
+				meta: { title: '物料类型', icon: 'icon-permission' },
+				component: () => import('../views/stock/type/type-page.vue'),
+			},
 		],
 	},
 	{
 		path: '/stock/name', // 库存管理
-		name: 'STOCK',
+		name: 'Stock',
 		meta: { title: 'menus.stock.name', icon: 'icon-acl', flat: true },
 		component: BlankLayout,
 		redirect: () => ({ name: 'Inbound' }),
@@ -47,56 +60,56 @@ export const routes = [
 			{
 				path: '/stock/inbound', //入库
 				name: 'Inbound',
-				meta: {title: 'menus.stock.inbound',icon: 'icon-permission'},
-				component: ()=> import('../views/stock/inboud/inboud-page.vue'),
+				meta: { title: 'menus.stock.inbound', icon: 'icon-permission' },
+				component: () => import('../views/stock/inboud/inboud-page.vue'),
 			},
 			{
 				path: '/stock/outbound', //出库
 				name: 'Outbound',
-				meta: {title: 'menus.stock.outbound',icon: 'icon-permission'},
-				component: ()=> import('../views/stock/outboud/outbound-page.vue'),
+				meta: { title: 'menus.stock.outbound', icon: 'icon-permission' },
+				component: () => import('../views/stock/outboud/outbound-page.vue'),
 			},
 			{
 				path: '/stock/stocktaking', //盘点
 				name: 'Stocktaking',
-				meta: {title: 'menus.stock.stocktaking',icon: 'icon-permission'},
-				component: ()=> import('../views/stock/stocktaking/stocktaking-page.vue')
+				meta: { title: 'menus.stock.stocktaking', icon: 'icon-permission' },
+				component: () => import('../views/stock/stocktaking/stocktaking-page.vue'),
 			},
-		]
+		],
 	},
 	{
 		path: '/statistic/name', // 统计报表
-		name: 'STATISTIC',
+		name: 'Statistic',
 		meta: { title: 'menus.statistic.name', icon: 'icon-acl', flat: true },
 		component: BlankLayout,
-		redirect: () => ({ name: 'S-Inbound' }),
+		redirect: () => ({ name: 'Query-Stock' }),
 		children: [
 			{
 				path: '/statistic/stock', //库存
-				name: 'S-stock',
-				meta: {title: 'menus.statistic.stock',icon: 'icon-permission'},
-				component: ()=> import('../views/stock/report/materialReport-page.vue'),
+				name: 'Query-Stock',
+				meta: { title: 'menus.statistic.stock', icon: 'icon-permission' },
+				component: () => import('../views/stock/report/materialReport-page.vue'),
 			},
 			{
 				path: '/statistic/inbound', //入库
-				name: 'S-Inbound',
-				meta: {title: 'menus.statistic.inbound',icon: 'icon-permission'},
-				component: ()=> import('../views/stock/report/inboundReport-page.vue'),
+				name: 'Query-Inbound',
+				meta: { title: 'menus.statistic.inbound', icon: 'icon-permission' },
+				component: () => import('../views/stock/report/inboundReport-page.vue'),
 			},
 			{
 				path: '/statistic/outbound', //出库
-				name: 'S-Outbound',
-				meta: {title: 'menus.statistic.outbound',icon: 'icon-permission'},
-				component: ()=> import('../views/stock/report/outboundReport-page.vue'),
+				name: 'Query-Outbound',
+				meta: { title: 'menus.statistic.outbound', icon: 'icon-permission' },
+				component: () => import('../views/stock/report/outboundReport-page.vue'),
 			},
 			{
 				path: '/statistic/stocktaking', //盘点
-				name: 'S-stocktaking',
-				meta: {title: 'menus.statistic.stocktaking',icon: 'icon-permission'},
-				component: ()=> import('../views/stock/report/stocktakingReport-page.vue'),
+				name: 'Query-Stocktaking',
+				meta: { title: 'menus.statistic.stocktaking', icon: 'icon-permission' },
+				component: () => import('../views/stock/report/stocktakingReport-page.vue'),
+			},
+		],
 	},
-		]
-	}
 ]
 
 export default createRouter({
@@ -139,3 +152,77 @@ export default createRouter({
 		},
 	],
 })
+
+export const getP = (permissions: Array<string>): RouteRecordRaw => {
+	const newRoutes: RouteRecordRaw[] = filterRoutesByPermission(routes, permissions)
+	return {
+		path: '/admin',
+		name: 'Admin',
+		redirect: '/admin/dashboard',
+		component: AdminLayout,
+		meta: { title: 'menus.index', icon: 'icon-home' },
+		children: newRoutes,
+	}
+}
+
+// 过滤路由，最多两层
+const filterRoutesByPermission = (routes: RouteRecordRaw[], permissions: string[]): RouteRecordRaw[] => {
+	return routes
+		.map((route) => {
+			// 确保 route.name 是字符串
+			const parentName = typeof route.name === 'string' ? route.name : undefined
+			if ('Dashboard' === parentName) return route // 首页不做权限过滤
+
+			const hasParentPermission = parentName && permissions.includes(parentName)
+
+			// 如果有子路由，过滤子路由
+			if (Array.isArray(route.children) && route.children.length > 0) {
+				route.children = route.children.filter((child) => {
+					// 确保 child.name 是字符串
+					const childName = typeof child.name === 'string' ? child.name : undefined
+
+					// 拼接父级和子级的权限字符串
+					const fullName = parentName && childName ? `${parentName}.${childName}` : childName
+
+					// 确保 fullName 是字符串并且存在于 permissions 中
+					return typeof fullName === 'string' && permissions.includes(fullName)
+				})
+
+				// 如果子路由中有任何一个有权限，或者父级路由本身有权限，则保留该父级路由
+				if (route.children.length > 0 || hasParentPermission) {
+					return route
+				}
+			} else if (hasParentPermission) {
+				// 如果没有子路由，直接检查父级路由的权限
+				return route
+			}
+
+			// 如果不符合任何条件，返回 undefined，表示该路由将被过滤掉
+			return undefined
+		})
+		.filter((route): route is RouteRecordRaw => route !== undefined) // 过滤掉 undefined 的项并确保类型正确
+}
+
+// 白名单
+const whiteList = ['Index', 'Admin', 'Message', 'LoginPage', 'Login']
+
+// 路由守卫
+router.beforeEach(async (to, _, next) => {
+	// 使用 _ 来忽略 from 参数
+	if (to.name && whiteList.includes(to.name as string)) {
+		next()
+		return
+	}
+	// 其他页面需要登录 用pinia会报错
+	const user = localStorage.getItem('user')
+	if (user) {
+		// 将json字符串转换为对象auth.AuthUser
+		const obj: auth.AuthUser = JSON.parse(user)
+		if (obj.token && obj.token.length > 0) {
+			next()
+			return
+		}
+	}
+	window.console.log('没有登录')
+	next({ name: 'LoginPage' })
+})

src/settings/http.ts

@@ -1,9 +1,11 @@
 export interface Http {
 	prefix: string // 前缀
 	timeout: number
+	downloadUrl: string
 }
 
 export const http: Http = {
 	prefix: import.meta.env.VITE_HTTP_PREFIX,
 	timeout: 10 * 1000,
+	downloadUrl: import.meta.env.VITE_UPLOAD_PREFIX,
 }

src/stores/user.ts

@@ -1,5 +1,5 @@
 import { defineStore } from 'pinia'
-import router from '@/router'
+import router, { getP } from '@/router'
 
 export const useUserStore = defineStore('user', {
 	state: (): auth.AuthUser => ({
@@ -18,6 +18,12 @@ export const useUserStore = defineStore('user', {
 		isAdmin(state) {
 			return state.roles.includes('admin')
 		},
+		isLogin(state) {
+			return state.token && state.refreshToken
+		},
+		getPermission(state) {
+			return state.permissions
+		},
 	},
 	actions: {
 		refreshUserInfo(user: auth.AuthUser) {
@@ -25,7 +31,13 @@ export const useUserStore = defineStore('user', {
 		},
 		userLogin(user: auth.AuthUser) {
 			Object.assign(this, user)
-			router.push({ path: '/admin/acl/users' }) // 登录后跳转到用户列表页面
+			// 根据权限动态添加地址
+			if (!this.isAdmin) {
+				const path = getP(this.permissions)
+				router.addRoute(path)
+				// router.replace(router.currentRoute.value.fullPath)
+			}
+			router.push({ path: '/admin/dashboard' })
 		},
 		logout() {
 			this.mobile = ''
@@ -38,6 +50,11 @@ export const useUserStore = defineStore('user', {
 			this.sex = 'FEMALE'
 			this.token = ''
 			this.refreshToken = ''
+			router.push({ path: '/login/user' })
+		},
+		hasPermission(permission?: string) {
+			if (this.isAdmin) return true
+			return permission !== undefined && this.permissions.includes(permission)
 		},
 	},
 	persist: {

src/views/admin/acl/components/role-select-modal.vue

@@ -40,7 +40,7 @@
 	watch(
 		roles,
 		(newVal: acl.RoleInfo[]) => {
-			targetKeys.value = newVal.filter((item) => item.selected).map((item) => item.key)
+			targetKeys.value = newVal.filter((item) => item.selected).map((item) => item.key as string)
 		},
 		{ immediate: true, deep: true },
 	)

src/views/admin/acl/role/role-list.vue

@@ -100,10 +100,6 @@
 		)
 	}
 	const columns = [
-		{
-			title: t('pages.acl.role.table.columns.key'),
-			dataIndex: 'key',
-		},
 		{
 			title: t('pages.acl.role.table.columns.name'),
 			dataIndex: 'name',
@@ -115,7 +111,6 @@
 		{
 			title: t('pages.acl.role.table.columns.operation'),
 			dataIndex: 'operation',
-			width: 300,
 		},
 	]
 	const pagination = computed(() => {
@@ -178,7 +173,7 @@
 
 	const tryLoadPermissions = (expanded: boolean, record: acl.Role & { permissions?: acl.Permission[] }) => {
 		if (expanded && !record.permissions) {
-			api.aclApi.role.permissions(record.key, (data) => {
+			api.aclApi.role.permissions(record.key as unknown as string, (data) => {
 				record.permissions = data
 			})
 		}

src/views/admin/acl/role/roleForm.ts

@@ -15,26 +15,6 @@ export const config: FormConfig = {
 }
 
 export const formItems: FormItem[] = [
-	{
-		group: 'form',
-		type: 'input',
-		config: {
-			autoLink: true,
-			hasFeedback: false,
-			label: t('pages.acl.role.form.add.filed.key'),
-			name: 'key',
-			required: true,
-		},
-		properties: {
-			size: 'default',
-			type: 'text',
-			allowClear: true,
-			bordered: true,
-			showCount: true,
-			placeholder: t('pages.acl.role.form.add.placeholder.key'),
-		},
-		rules: [],
-	},
 	{
 		group: 'form',
 		type: 'input',

src/views/admin/acl/users/user-list.vue

@@ -177,12 +177,10 @@
 		{
 			title: t('pages.acl.user.table.columns.sex'),
 			dataIndex: 'sex',
-			width: 75,
 		},
 		{
 			title: t('pages.acl.user.table.columns.operation'),
 			dataIndex: 'operation',
-			width: 400,
 		},
 	]
 

src/views/admin/acl/users/userForm.ts

@@ -5,6 +5,8 @@ const { t } = i18n.global
 import { useAppStore } from '@/stores/app'
 
 import { FormItem, FormConfig } from '@/components/form-render/form-render-types'
+import { Rule } from 'ant-design-vue/es/form'
+import api from '@/api'
 
 export const config: FormConfig = {
 	layout: 'horizontal',
@@ -40,7 +42,12 @@ export const formItems = (sexes: Codebook[]): FormItem[] => {
 				placeholder: t('pages.acl.user.form.add.placeholder.name'),
 				maxlength: 20,
 			},
-			rules: [],
+			rules: [
+				{
+					validator: validate,
+					trigger: ['blur', 'change'],
+				},
+			],
 		},
 		{
 			type: 'radio',
@@ -80,7 +87,16 @@ export const formItems = (sexes: Codebook[]): FormItem[] => {
 				showCount: true,
 				placeholder: t('pages.acl.user.form.add.placeholder.password'),
 			},
-			rules: [],
+			rules: [
+				{
+					type: 'string',
+					required: true,
+					whitespace: true,
+					trigger: ['blur', 'change'],
+					pattern: new RegExp('^(?=.*[A-Za-z])(?=.*\\d)[A-Za-z\\d]{8,}$'),
+					message: '8位数字字母组合',
+				},
+			],
 		},
 		{
 			group: 'form',
@@ -143,3 +159,19 @@ export const formItems = (sexes: Codebook[]): FormItem[] => {
 		},
 	]
 }
+
+const validate = async (_rule: Rule, value: string): Promise<void> => {
+	const regex = /^[a-zA-Z0-9]{4,8}$/
+	if (!regex.test(value)) {
+		return Promise.reject('用户名只能是4-8位字母或数字')
+	}
+	return new Promise<void>((resolve, reject) => {
+		api.aclApi.user.existName({ name: value }, (data) => {
+			if (data) {
+				reject('用户名已经存在')
+			} else {
+				resolve()
+			}
+		})
+	})
+}

src/views/admin/dashboard-page.vue

@@ -0,0 +1,4 @@
+<template>
+	<p>这是首页，欢迎使用库管系统！！</p>
+</template>
+<script setup lang="ts"></script>

src/views/stock/component/Stocktaking.vue

@@ -1,27 +0,0 @@
-<template>
-  <a-row bordered>
-    <a-col :span="8">
-      <a-button type="primary" width="90%">开始扫码</a-button>
-    </a-col>
-    <a-col :span="8">
-    </a-col>
-    <a-col :span="8">
-      <a-input bordered size="large" ref="snInput" placeholder="输入条形码"  style="width: 90%" />
-    </a-col>
-  </a-row>
-
-
-  <vxe-table border stripe show-overflow ref="applyDetailTableRef" max-height="500" :column-config="{ resizable: true }"
-    :keyboard-config="{ isEsc: true }" size="medium">
-    <vxe-column type="seq" title="序号" width="60"></vxe-column>
-    <vxe-column field="id" title="物料id" :visible="false"></vxe-column>
-    <vxe-column field="name" title="物料名称" />
-    <vxe-column field="code" title="编码" />
-    <vxe-column field="spec" title="规格" />
-    <vxe-column field="type" title="类型" />
-    <vxe-column field="times" title="库存数量" />
-    <vxe-column field="oprator" title="盘点数量" />
-  </vxe-table>
-</template>
-<script setup lang="ts">
-</script>

src/views/stock/component/apply-confirm.vue

@@ -14,13 +14,13 @@
 			<vxe-column field="name" title="物料名称" />
 			<vxe-column field="assignRule" title="是否扫码">
 				<template #default="{ row }">
-          {{ row.assignRule === 'HIGH_VALUE' ? '是' : '否' }}
+					{{ row.assignRule ? '是' : '否' }}
 				</template>
 			</vxe-column>
 			<vxe-column field="applyNum" title="申请数量" :edit-render="{ name: 'VxeInput', props: { type: 'integer' } }" />
-			<vxe-column field="scanNum" title="扫码数量" :edit-render="{ name: 'VxeInput', props: { type: 'integer' } }" >
+			<vxe-column field="scanNum" title="扫码数量">
 				<template #default="{ row }">
-          {{ row.assignRule === 'LOW_VALUE' ? '~' : row.scanNum }}
+					{{ row.assignRule ? row.scanNum : '~' }}
 				</template>
 			</vxe-column>
 			<vxe-column field="remark" title="备注" :edit-render="{ name: 'VxeInput' }" />

src/views/stock/component/apply-form.vue

@@ -0,0 +1,269 @@
+<template>
+	<!-- 基本信息的表单 -->
+	<div>
+		<a-form :model="formData" name="basic" layout="horizontal" label-wrap>
+			<a-form-item label="申请人" name="applicant">
+				<a-input v-model:value="formData.applicant" style="width: 40%" />
+			</a-form-item>
+
+			<a-form-item label="申请类型" name="applyType">
+				<a-radio-group v-model:value="formData.applyType" button-style="solid" style="width: 40%">
+					<a-radio-button v-if="applyType === 'PURCHASE_RECEIPT'" value="PURCHASE_RECEIPT">采购入库</a-radio-button>
+					<a-radio-button v-if="applyType === 'PURCHASE_RECEIPT'" value="RETURN_RECEIPT">归还入库</a-radio-button>
+					<a-radio-button v-if="applyType === 'LOAN_OUT'" value="LOAN_OUT">出库外借</a-radio-button>
+					<a-radio-button v-if="applyType === 'LOAN_OUT'" value="SCRAP_OUT">报废出库</a-radio-button>
+				</a-radio-group>
+			</a-form-item>
+			<a-form-item v-if="formData.applyType === 'SCRAP_OUT'" label="审核人" name="reviewer">
+				<a-select v-model:value="formData.reviewer" style="width: 40%" :options="personList"></a-select>
+			</a-form-item>
+			<a-form-item label="申请日期" name="applyDate" style="width: 40%">
+				<a-date-picker v-model:value="formData.applyDate" />
+			</a-form-item>
+			<a-form-item label="选择物料" name="selected">
+				<div style="display: flex; justify-content: space-between">
+					<a-tree-select
+						v-model:value="typeVal"
+						show-search
+						style="width: 49%"
+						:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+						placeholder="请选择物料类型"
+						allow-clear
+						:tree-data="types"
+						tree-node-filter-prop="label"
+					/>
+					<a-select
+						v-model:value="formData.slectedList"
+						mode="multiple"
+						bordered
+						placeholder="请选择物料"
+						style="width: 49%"
+						show-search
+						:options="options"
+						:filter-option="filterOption"
+						@deselect="removeEvent($event)"
+						@select="insertEvent($event)"
+					></a-select>
+				</div>
+			</a-form-item>
+		</a-form>
+	</div>
+
+	<!-- vxe-table -->
+	<div>
+		<vxe-table
+			ref="tableRef"
+			v-model:data="tableData"
+			border
+			show-overflow
+			max-height="500"
+			size="medium"
+			empty-text="请先选择物料"
+			:edit-config="{ trigger: 'click', mode: 'cell', autoFocus: true }"
+		>
+			<vxe-column type="seq" title="序号" width="60" />
+			<vxe-column field="id" title="物料id" :visible="false" />
+			<vxe-column field="name" title="物料名称" />
+			<vxe-column field="code" title="编码" />
+			<vxe-column field="spec" title="规格" />
+			<vxe-column field="price" title="价格" />
+			<vxe-column field="typeName" title="类型" />
+			<vxe-column field="assignRule" title="是否赋码">
+				<template #default="{ row }">
+					{{ row.assignRule ? '是' : '否' }}
+				</template>
+			</vxe-column>
+			<vxe-column
+				field="quantity"
+				title="申请数量(点击修改)"
+				:edit-render="{ name: 'input', autoSelect: true }"
+				keyboard-config="{edit: true, del: true}"
+				cell-type="number"
+			>
+				<template #edit="{ row }">
+					<vxe-number-input v-model="row.quantity" type="integer"></vxe-number-input>
+				</template>
+			</vxe-column>
+
+			<vxe-column field="oprator" title="操作">
+				<template #default="{ row }">
+					<vxe-button mode="text" status="error" @click="removeRow(row)">删除</vxe-button>
+				</template>
+			</vxe-column>
+		</vxe-table>
+	</div>
+</template>
+
+<script setup lang="ts">
+	import { VxeTableInstance } from 'vxe-table'
+	import api from '@/api'
+	import dayjs, { Dayjs } from 'dayjs'
+	import { LabeledValue, DefaultOptionType } from 'ant-design-vue/es/select'
+	import { SelectHandler } from 'ant-design-vue/es/vc-select/Select'
+	import { TreeDataNode } from 'ant-design-vue/es/vc-tree-select/interface'
+
+	// 和外层界面的数据交互
+	const props = defineProps(
+		{
+			applyType: {
+				type: String,
+				default: '',
+			},
+		}, // 申请类型 applyType页面传值的使用1和2，1: 采购入库 和 归还入库 2: 出库外借
+	)
+	const getTableData = () => {
+		const $table = tableRef.value
+		return $table?.getTableData().fullData
+	}
+	const getApplyForm = () => {
+		return {
+			type: formData.value.applyType,
+			applicant: formData.value.applicant,
+			applyDate: formData.value.applyDate.format('YYYY-MM-DD HH:mm:ss'),
+			isConfirm: true,
+			result: '',
+			reviewer: formData.value.reviewer,
+		}
+	}
+	defineExpose({ getTableData, getApplyForm })
+
+	interface FormData {
+		applicant: string // 申请人
+		applyDate: Dayjs // 申请日期
+		applyType: string // 申请类型
+		slectedList: number[] // 入库物料
+		reviewer: string // 审核人
+	}
+	const formData = ref<FormData>({
+		applicant: '',
+		applyDate: dayjs(),
+		applyType: props.applyType,
+		slectedList: [],
+		reviewer: '',
+	})
+
+	// 审核人
+	const personList = ref<Array<{ value: string | undefined; label: string | undefined }>>([])
+	api.aclApi.user.all((data) => {
+		personList.value = data.map((item) => {
+			return {
+				value: item?.name,
+				label: item?.fullName,
+			}
+		})
+	})
+
+	// 物料类型树
+	const types = ref<Array<TreeDataNode>>([])
+	api.materialApi.type.trees((data) => {
+		types.value = children(data)
+	})
+	const children = (res: Array<material.TypeTree>): Array<TreeDataNode> => {
+		return res.map((areaTree) => ({
+			label: areaTree.label,
+			value: areaTree.value,
+			children: areaTree.children ? children(areaTree.children) : [],
+			key: areaTree.value,
+		}))
+	}
+
+	// vxe-table相关的设置
+	export interface RowVO {
+		id: number
+		name: string
+		code: string
+		spec: string
+		type: string
+		typeName: string
+		quantity: number
+		disabled: boolean
+		checked: boolean
+		price: number
+		assignRule: boolean
+	}
+	const tableRef = ref<VxeTableInstance<RowVO>>()
+	// vxe-table 数据结果
+	const tableData = ref<Array<RowVO>>([])
+
+	// 物料选择器
+	const typeVal = ref<string>()
+	const options = ref<{ label: string; value: number }[]>([])
+	const materialList = ref<material.Material[]>([])
+	const getMaterialList = async () => {
+		await api.materialApi.material.all({ type: typeVal.value }, (data) => {
+			materialList.value = data
+		})
+		options.value = materialList.value.map((item) => {
+			return { label: item.name ? item.name + '(' + item.spec + ')' : '未知', value: item.id ? item.id : -1 }
+		})
+	}
+	watch(
+		typeVal,
+		(newVal) => {
+			if (newVal !== '') {
+				getMaterialList()
+			}
+		},
+		{ immediate: true, deep: true },
+	)
+
+	// 选中时在末尾新增一行
+	// value: number, option: { label: string, value: number }
+	type Insert = SelectHandler<LabeledValue, DefaultOptionType> | undefined
+	const insertEvent = (value: Insert) => {
+		// 根据value找到对应的物料信息
+		const m = materialList.value.find((item) => item.id === value)
+		if (m) {
+			const row: RowVO = {
+				id: m.id ? m.id : -1,
+				name: m.name ? m.name : '',
+				code: m.code ? m.code : '',
+				spec: m.spec ? m.spec : '',
+				typeName: m.typeName ? m.typeName : '',
+				type: m.type ? m.type : '',
+				price: m.price ? m.price : 0,
+				quantity: 1,
+				assignRule: m.assignRule ? m.assignRule : false,
+				disabled: false,
+				checked: false,
+			}
+			const $table = tableRef.value
+			if ($table) {
+				$table.insertAt(row, -1)
+			}
+		}
+	}
+	// 过滤选项
+	const filterOption = (input: string, option: { label: string; value: number }) => {
+		return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+	}
+
+	// 取消选中时，删除table中的行
+	const removeEvent = (value: Insert) => {
+		const $table = tableRef.value
+		// 根据value找到对应的行
+		if ($table) {
+			$table.getTableData().fullData.forEach((item) => {
+				if (item.id === value) {
+					$table.remove(item)
+				}
+			})
+		}
+	}
+
+	// 手动删除table中的行
+	const removeRow = async (row: RowVO) => {
+		//打印tableData数组
+		const $table = tableRef.value
+		if ($table) {
+			// 根据row.id找到对应选中列表中的数据
+			formData.value.slectedList.forEach((item, index) => {
+				if (item.toString() === row.id.toString()) {
+					formData.value.slectedList.splice(index, 1)
+				}
+			})
+
+			$table.remove(row)
+		}
+	}
+</script>

src/views/stock/component/apply-modal.vue

@@ -18,7 +18,7 @@
 		<apply-confirm ref="applyConfirmRef" :table-data="conformData"></apply-confirm>
 	</div>
 	<div v-show="current === 3" class="step-4">
-		<successResul></successResul>
+		<successResult :apply-type="applyType"></successResult>
 	</div>
 
 	<!-- 按钮 -->
@@ -30,10 +30,10 @@
 </template>
 
 <script setup lang="ts">
-	import applyForm,{RowVO} from '../component/applyForm.vue'
-	import scanForm from '../component/scanForm.vue'
-	import applyConfirm from '../component/applyConfirm.vue'
-	import successResul from '../component/successResul.vue'
+	import applyForm, { RowVO } from './apply-form.vue'
+	import scanForm from './scan-form.vue'
+	import applyConfirm from './apply-confirm.vue'
+	import successResult from './success-result.vue'
 	import api from '@/api'
 	// 和外层界面的数据交互
 	defineProps(
@@ -56,17 +56,17 @@
 	const loading = ref(false) // 提交按钮的loading状态
 
 	const items = [{ title: '录入申请' }, { title: '扫码点货' }, { title: '人工确认' }]
-
 	/**
 	 * 点击下一步
 	 */
+	type GroupedSums = Record<string, number>
 	const nextStep = () => {
 		if (applyFormRef.value && current.value === 0) {
 			totalValue.value = 0
 			// 再step1中点击下一步的时候，就去获取step1中的表单数据
 			selectData.value = applyFormRef.value.getTableData()
-			selectData.value.forEach((item:RowVO) => {
-				if (item.assignRule === 'HIGH_VALUE') {
+			selectData.value.forEach((item: RowVO) => {
+				if (item.assignRule) {
 					totalValue.value += item.quantity
 				}
 			})
@@ -74,7 +74,7 @@
 		if (scanFormRef.value && current.value === 1) {
 			// 再step2中点击下一步的时候，就去获取step2中的表单数据
 			const items = scanFormRef.value.getTableData()
-			const groupedSums = items.reduce((acc:any, item:RowVO) => {
+			const groupedSums = items.reduce((acc: GroupedSums, item: RowVO) => {
 				if (!acc[item.code]) {
 					acc[item.code] = 0
 				}
@@ -82,7 +82,7 @@
 				return acc
 			}, {})
 			// 组装步骤三的原始数据
-      conformData.value = selectData.value.map((item :RowVO) => {
+			conformData.value = selectData.value.map((item: RowVO) => {
 				return {
 					id: item.id,
 					name: item.name,
@@ -90,7 +90,7 @@
 					applyNum: item.quantity,
 					assignRule: item.assignRule,
 					scanNum: groupedSums[item.code] || 0,
-					remark: (item.quantity != groupedSums[item.code] && item.assignRule === 'HIGH_VALUE') ? `数量不一致` : '',
+					remark: item.quantity != groupedSums[item.code] && item.assignRule ? `数量不一致` : '',
 				}
 			})
 		}
@@ -111,12 +111,15 @@
 		const applyForm = applyFormRef.value.getApplyForm() // 申请表单数据
 		const detailList = scanFormRef.value.getTableData() // 扫码明细数据
 
-    api.materialApi.apply.saveApply({ applyForm: applyForm, applyDetails: applyDetails, detailList: detailList }, () => {
+		api.materialApi.apply.saveApply(
+			{ applyForm: applyForm, applyDetails: applyDetails, detailList: detailList },
+			() => {
 				console.log('申请成功')
 				// 清理缓存数据
 				loading.value = false
 				current.value = 3
-		})
+			},
+		)
 	}
 </script>
 

src/views/stock/component/apply-page.vue

@@ -1,153 +0,0 @@
-<template>
-  <page-container>
-    <!-- 页面操作栏 -->
-    <template #ops>
-      <a-row>
-        <a-col :span="18">
-          <a-input-search v-model:value="searchKey" :placeholder="`请输入`" allow-clear enter-button
-            @search="loadData()"></a-input-search>
-        </a-col>
-        <a-col :span="6">
-          <a-button type="primary" style="margin-left: 10px" @click="showModal">
-            <template #icon>
-              <icon-font type="icon-plus" />
-            </template>
-            {{ pageType === '1' ? '申请入库' : '申请出库' }}
-          </a-button>
-        </a-col>
-      </a-row>
-    </template>
-    <!-- 页面表格内容 -->
-    <div style="min-height: calc(100vh - 305px)">
-      <!-- 表格行 -->
-      <a-table :columns="columns" :data-source="pagedata?.records" bordered :pagination="pagination" :loading="loading"
-        row-key="key">
-
-      </a-table>
-    </div>
-  </page-container>
-
-  <!-- 弹窗 -->
-  <a-modal v-model:open="open" title="Basic Modal" width="100%" wrap-class-name="full-modal" @ok="handleOk">
-    <apply></apply>
-  </a-modal>
-</template>
-
-<script setup lang="ts">
-
-import api from '@/api'
-import { IPage } from '@/api/api'
-import apply from './applyModal.vue';
-
-
-const props = defineProps({
-  pageType: {
-    type: String as PropType<'1' | '2'>, // 1 入库 2 出库
-    required: false,
-    default: '1'
-  }
-})
-
-const { pageType } = toRefs(props)
-
-const searchKey = ref('')
-const pagedata = ref<IPage<material.ApplyDTO>>()
-const loading = ref(false)
-
-
-
-// 加载数据的方法
-const loadData = async (page = 1, size = 10) => {
-  loading.value = true
-  api.materialApi.apply.searchPage(
-    //1: 采购入库 2: 归还入库 3: 出库外借
-    {
-      applyType: 1,
-      page: page || pagedata.value?.current,
-      size: size || pagedata.value?.size,
-      type: searchKey.value,
-      code: searchKey.value,
-      name: searchKey.value
-    },
-    (data) => {
-      loading.value = false
-      pagedata.value = data
-    },
-  )
-}
-//初始加载
-loadData()
-
-//表格列
-const columns = [
-  {
-    title: '类型',
-    dataIndex: 'type',
-  },
-  {
-    title: '申请人',
-    dataIndex: 'applicant',
-  },
-  {
-    title: '申请日期',
-    dataIndex: 'applyDate',
-  },
-  {
-    title: '是否确认',
-    dataIndex: 'isConfirm',
-  },
-  {
-    title: '创建人',
-    dataIndex: 'createdBy',
-  },
-  {
-    title: '创建时间',
-    dataIndex: 'createdTime',
-  }
-]
-
-//分页信息
-const pagination = computed(() => {
-  return {
-    current: pagedata.value?.current,
-    pageSize: pagedata.value?.size,
-    total: pagedata.value?.total,
-    onChange: (page: number, pageSize: number) => {
-      loadData(page, pageSize)
-    },
-  }
-})
-
-const open = ref<boolean>(false);
-
-const showModal = () => {
-  open.value = true;
-};
-
-const handleOk = (e: MouseEvent) => {
-  console.log(e);
-  open.value = false;
-};
-
-</script>
-
-<style lang="less">
-.full-modal {
-  .ant-modal {
-    max-width: 100%;
-    top: 0;
-    padding-bottom: 0;
-    margin: 0;
-  }
-
-  .ant-modal-content {
-    display: flex;
-    flex-direction: column;
-    height: calc(100vh);
-  }
-
-  .ant-modal-body {
-    flex: 1;
-  }
-}
-</style>

src/views/stock/component/applyForm.vue

@@ -1,189 +0,0 @@
-<template>
-  <!-- 基本信息的表单 -->
-  <div>
-    <a-form :model="formData" name="basic" layout="horizontal" labelWrap>
-      <a-form-item label="申请人" name="applicant">
-        <a-input :value="formData.applicant" style="width: 40%;" />
-      </a-form-item>
-
-      <a-form-item label="申请类型" name="applyType">
-        <a-radio-group v-model:value="formData.applyType" button-style="solid" style="width: 40%;">
-          <a-radio-button value='PURCHASE_RECEIPT' v-if="applyType === 'PURCHASE_RECEIPT'">采购入库</a-radio-button>
-          <a-radio-button value='RETURN_RECEIPT' v-if="applyType === 'PURCHASE_RECEIPT'">归还入库</a-radio-button>
-          <a-radio-button value='LOAN_OUT' v-if="applyType === 'LOAN_OUT'">出库外借</a-radio-button>
-        </a-radio-group>
-      </a-form-item>
-      <a-form-item label="申请日期" name="applyDate" style="width: 40%;">
-        <a-date-picker v-model:value="formData.applyDate" />
-      </a-form-item>
-      <a-form-item label="选择物料" name="selected">
-        <a-select v-model:value="formData.slectedList" mode="multiple" bordered placeholder="请选择物料" style="width: 40%;"
-          show-search :options="options" @deselect="removeEvent" @select="insertEvent"></a-select>
-      </a-form-item>
-    </a-form>
-  </div>
-
-  <!-- vxe-table -->
-  <div>
-    <vxe-table border show-overflow ref="tableRef" max-height="500" size="medium" v-model:data="tableData"
-      empty-text="请先选择物料" :edit-config="{ trigger: 'click', mode: 'cell', autoFocus: true }">
-      <vxe-column type="seq" title="序号" width="60" />
-      <vxe-column field="id" title="物料id" :visible="false" />
-      <vxe-column field="name" title="物料名称" />
-      <vxe-column field="code" title="编码" />
-      <vxe-column field="spec" title="规格" />
-      <vxe-column field="type" title="类型" />
-      <vxe-column field="assignRule" title="是否赋码">
-        <template #default="{ row }">
-          {{ row.assignRule === 'HIGH_VALUE' ? '是' : '否' }}
-        </template>
-      </vxe-column>
-      <vxe-column field="quantity" title="申请数量(点击修改)" :edit-render="{ name: 'input', autoSelect: true }"
-        keyboard-config="{edit: true, del: true}" cell-type="number">
-        <template #edit="{ row }">
-          <vxe-number-input v-model="row.quantity" type="integer"></vxe-number-input>
-        </template>
-      </vxe-column>
-
-      <vxe-column field="oprator" title="操作">
-        <template #default="{ row }">
-          <vxe-button mode="text" status="error" @click="removeRow(row)">删除</vxe-button>
-        </template>
-      </vxe-column>
-
-    </vxe-table>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { VxeTableInstance } from 'vxe-table'
-import api from '@/api'
-import { useUserStore } from '@/stores/user'
-import dayjs, { Dayjs } from 'dayjs';
-
-// 和外层界面的数据交互
-const props = defineProps(
-  {
-    applyType: {
-      type: String,
-      default: ''
-    }
-  } // 申请类型 applyType页面传值的使用1和2，1: 采购入库 和 归还入库 2: 出库外借
-)
-const getTableData = ()=> {
-  const $table = tableRef.value
-  return $table?.getTableData().fullData;
-}
-const getApplyForm = () => {
-  return {
-    type: formData.value.applyType,
-    applicant: formData.value.applicant,
-    applyDate: formData.value.applyDate.format('YYYY-MM-DD HH:mm:ss'),
-    isConfirm: true,
-    result: ''
-  }
-}
-defineExpose({ getTableData, getApplyForm })
-
-interface FormData {
-  applicant: string; // 申请人
-  applyDate: Dayjs; // 申请日期
-  applyType: string; // 申请类型
-  slectedList: number[]; // 入库物料
-}
-
-const userStore = useUserStore()
-const formData = ref<FormData>({
-  applicant: userStore.userName,
-  applyDate: dayjs(),
-  applyType: props.applyType,
-  slectedList: []
-
-});
-
-
-// vxe-table相关的设置
-export interface RowVO {
-  id: number
-  name: string
-  code: string
-  spec: string
-  type: string
-  quantity: number
-  disabled: boolean
-  checked: boolean
-  assignRule: string
-}
-const tableRef = ref<VxeTableInstance<RowVO>>()
-// vxe-table 数据结果
-const tableData = ref<Array<RowVO>>([])
-// 物料选择器
-const options = ref<{ label: string, value: number }[]>([])
-const materialList = ref<material.Material[]>([])
-const getMaterialList = async () => {
-  await api.materialApi.material.all((data) => {
-    materialList.value = data
-  })
-  options.value = materialList.value.map((item) => {
-    return { label: item.name ? item.name : '未知', value: item.id ? item.id : -1 }
-  })
-}
-getMaterialList()
-
-
-
-// 选中时在末尾新增一行
-// value: number, option: { label: string, value: number }
-const insertEvent = (value: any) => {
-  // 根据value找到对应的物料信息
-  const m = materialList.value.find((item) => item.id === (value ? parseInt(value) : -1))
-  if (m) {
-    const row: RowVO = {
-      id: m.id ? m.id : -1,
-      name: m.name ? m.name : '未知',
-      code: m.code ? m.code : '未知',
-      spec: m.spec ? m.spec : '未知',
-      type: m.type ? m.type : '未知',
-      quantity: 1,
-      assignRule: m.assignRule ? m.assignRule : 'HIGH_VALUE',
-      disabled: false,
-      checked: false
-    }
-    const $table = tableRef.value
-    if ($table) {
-      $table.insertAt(row, -1)
-    }
-  }
-
-}
-
-// 取消选中时，删除table中的行
-const removeEvent = (value: any) => {
-  const $table = tableRef.value
-  // 根据value找到对应的行
-  if ($table) {
-    $table.getTableData().fullData.forEach((item) => {
-      if (item.id === (value ? parseInt(value) : -1)) {
-        $table.remove(item)
-      }
-    })
-  }
-}
-
-// 手动删除table中的行
-const removeRow = async (row: RowVO) => {
-  //打印tableData数组
-  const $table = tableRef.value
-  if ($table) {
-    // 根据row.id找到对应选中列表中的数据
-    formData.value.slectedList.forEach((item, index) => {
-      if (item.toString() === row.id.toString()) {
-        formData.value.slectedList.splice(index, 1)
-      }
-    })
-
-    $table.remove(row)
-  }
-}
-
-</script>

src/views/stock/component/manual-form.vue

@@ -0,0 +1,170 @@
+<template>
+	<!-- vxe-table -->
+	<div>
+		<vxe-table
+			ref="tableRef"
+			v-model:data="tableData"
+			border
+			show-overflow
+			max-height="500"
+			size="medium"
+			empty-text="请先选择物料"
+			:edit-config="{ trigger: 'click', mode: 'cell', autoFocus: true }"
+		>
+			<vxe-column type="seq" title="序号" width="60" />
+			<vxe-column field="id" title="物料id" :visible="false" />
+			<vxe-column field="name" title="物料名称" />
+			<vxe-column field="code" title="编码" />
+			<vxe-column field="spec" title="规格" />
+			<vxe-column field="price" title="价格" />
+			<vxe-column field="typeName" title="类型" />
+			<vxe-column field="stock" title="库存数量" />
+
+			<vxe-column
+				field="manualStock"
+				title="手动核实数量"
+				:edit-render="{ name: 'input', autoSelect: true }"
+				keyboard-config="{edit: true, del: true}"
+				cell-type="number"
+			>
+				<template #edit="{ row }">
+					<vxe-number-input v-model="row.manualStock" type="integer"></vxe-number-input>
+				</template>
+			</vxe-column>
+			<vxe-column
+				field="msg"
+				title="异常原因"
+				:edit-render="{ name: 'input', autoSelect: true }"
+				keyboard-config="{edit: true, del: true}"
+				cell-type="string"
+			>
+				<template #edit="{ row }">
+					<vxe-input v-model="row.msg" placeholder="请输入异常原因" type="text"></vxe-input>
+				</template>
+			</vxe-column>
+
+			<vxe-column field="oprator" title="操作">
+				<template #default="{ row }">
+					<vxe-button mode="text" status="error" @click="removeRow(row)">删除</vxe-button>
+				</template>
+			</vxe-column>
+		</vxe-table>
+	</div>
+</template>
+
+<script lang="ts" setup>
+	import api from '@/api'
+	import dayjs, { Dayjs } from 'dayjs'
+	import { VxeTableInstance } from 'vxe-table'
+
+	//组件交互
+
+	const props = defineProps({
+		applyId: {
+			type: Number,
+			required: false,
+			default: 0,
+		},
+	})
+	const getTableData = (): Array<material.ManualStockDetail> => {
+		const $table = tableRef.value
+		if (!$table) {
+			return []
+		}
+		return $table?.getTableData().fullData.map((item) => {
+			// 只需要保存哪一个物料id,库存数量，手动核实数量
+			return {
+				materialId: item.id,
+				stock: item.stock,
+				manualStock: item.manualStock,
+				msg: item.msg,
+				applyId: props.applyId,
+			}
+		})
+	}
+	defineExpose({ getTableData })
+
+	// vxe-table相关的设置
+	export interface RowVO {
+		id: number
+		name: string
+		code: string
+		spec: string
+		type: string
+		typeName: string
+		stock: number
+		manualStock: number
+		disabled: boolean
+		checked: boolean
+		price: number
+		assignRule: boolean
+		msg: string
+	}
+	// vxe引用
+	const tableRef = ref<VxeTableInstance<RowVO>>()
+
+	// vxe-table 数据结果
+	const tableData = ref<Array<RowVO>>([])
+	// 获取接口数据
+	const fetchData = () => {
+		api.materialApi.apply.getManualCheckData(props.applyId, (data) => {
+			tableData.value = data.map((item) => {
+				return {
+					id: item.id ? item.id : 0,
+					name: item.name ? item.name : '',
+					code: item.code ? item.code : '',
+					spec: item.spec ? item.spec : '',
+					type: item.type ? item.type : '',
+					typeName: item.typeName ? item.typeName : '',
+					stock: item.stock ? item.stock : 0,
+					manualStock: 0,
+					disabled: false,
+					checked: false,
+					price: item.price ? item.price : 0,
+					assignRule: false,
+					msg: '',
+				}
+			})
+		})
+	}
+
+	// 监测applyId变化，重新获取数据
+	fetchData()
+	watch(
+		() => props.applyId,
+		(newVal, oldVal) => {
+			if (newVal !== oldVal) {
+				fetchData()
+			}
+		},
+	)
+
+	interface FormData {
+		applicant: string // 申请人
+		applyDate: Dayjs // 申请日期
+		slectedList: number[] // 入库物料
+		reviewer: string // 审核人
+	}
+	const formData = ref<FormData>({
+		applicant: '',
+		applyDate: dayjs(),
+		slectedList: [],
+		reviewer: '',
+	})
+
+	// 手动删除table中的行
+	const removeRow = async (row: RowVO) => {
+		//打印tableData数组
+		const $table = tableRef.value
+		if ($table) {
+			// 根据row.id找到对应选中列表中的数据
+			formData.value.slectedList.forEach((item, index) => {
+				if (item.toString() === row.id.toString()) {
+					formData.value.slectedList.splice(index, 1)
+				}
+			})
+
+			$table.remove(row)
+		}
+	}
+</script>

src/views/stock/component/scan-form.vue

@@ -0,0 +1,220 @@
+<template>
+	<a-button type="primary" @click="beiginScan">开始扫码</a-button>
+	<a-button type="primary" danger style="left: 20px" @click="clearScanData">全部重扫</a-button>
+	<a-input
+		ref="snInput"
+		v-model:value="value"
+		bordered
+		size="large"
+		placeholder="输入条形码"
+		style="margin-top: 20px; margin-bottom: 20px"
+		@press-enter="autoInsertOneRow"
+	/>
+	<slot></slot>
+	<a-row style="margin-bottom: 20px">
+		<a-col :span="12">
+			<a-statistic title="扫码合计" :value="totalValue" style="margin-right: 50px" />
+		</a-col>
+		<a-col :span="12">
+			<a-statistic title="已扫码" :value="remainderValue" />
+		</a-col>
+	</a-row>
+	<!-- Esc键退出编辑功能 -->
+	<vxe-table
+		ref="applyDetailTableRef"
+		border
+		stripe
+		show-overflow
+		max-height="500"
+		:column-config="{ resizable: true }"
+		:keyboard-config="{ isEsc: true }"
+		size="medium"
+		empty-text="请先扫码物料体条码"
+		:edit-config="{ trigger: 'click', mode: 'cell' }"
+	>
+		<vxe-column type="seq" title="序号" width="60"></vxe-column>
+		<vxe-column field="id" title="物料id" :visible="false"></vxe-column>
+		<vxe-column field="barcode" title="物料条码" />
+		<vxe-column field="name" title="物料名称" />
+		<vxe-column field="code" title="编码" />
+		<vxe-column field="spec" title="规格" />
+		<vxe-column field="typeName" title="类型" />
+		<vxe-column field="times" title="扫码时间" />
+		<vxe-column field="oprator" title="操作">
+			<template #default="{ row }">
+				<vxe-button mode="text" status="error" @click="removeStep2Row(row)">删除</vxe-button>
+			</template>
+		</vxe-column>
+	</vxe-table>
+</template>
+
+<script lang="ts" setup>
+	import { VxeTableInstance } from 'vxe-table'
+	import { useTemplateRef } from 'vue'
+	import { api } from '@/api'
+	import { message } from 'ant-design-vue'
+
+	// 父组件数据交互
+	const props = defineProps({
+		totalValue: {
+			type: Number,
+			default: 0,
+		},
+		applyId: {
+			type: Number,
+			required: false,
+			default: 0,
+		},
+	})
+
+	//获取扫码的集合
+	const getTableData = () => {
+		const $table = applyDetailTableRef.value
+		if ($table) {
+			return $table.getTableData().fullData.map((item) => ({
+				assignRule: item.assignRule,
+				materialId: item.id,
+				barcode: item.barcode,
+				code: item.code,
+				date: item.times,
+			}))
+		}
+	}
+
+	// 获取盘点审核的数据
+	const getApplyData = () => {
+		const $table = applyDetailTableRef.value
+		if ($table) {
+			return $table.getTableData().fullData.map((item) => ({
+				applyId: props.applyId,
+				materialId: item.id,
+				barcode: item.barcode,
+			}))
+		}
+	}
+
+	defineExpose({ getTableData, getApplyData })
+
+	const remainderValue = ref(0)
+
+	//扫码的条形码字符串
+	const value = ref('')
+	const input = useTemplateRef('snInput')
+
+	const snListCache = ref<string[]>([]) // 缓存扫码的条形码列表
+	// 定义一个map缓存物料信息
+	const materialMapCache = ref<Map<string, material.Material>>(new Map<string, material.Material>()) // 缓存物料信息,key是code
+
+	/**
+	 * 请求接口获取缓存数据
+	 */
+	const getCache = () => {
+		api.materialApi.material.all({}, (data) => {
+			data.forEach((item) => {
+				if (item.code) {
+					materialMapCache.value.set(item.code, item) // 物料编码定义为6位
+				}
+			})
+		})
+	}
+	getCache()
+
+	interface TableRowVO {
+		id: number
+		barcode: string
+		assignRule: boolean
+		name: string
+		code: string
+		spec: string
+		type: string
+		typeName: string
+		times: string
+	}
+
+	// 扫码点货的table对象
+	const applyDetailTableRef = ref<VxeTableInstance<TableRowVO>>()
+
+	// 移除table中的行
+	const removeStep2Row = async (row: TableRowVO) => {
+		const $table = applyDetailTableRef.value
+		if ($table) {
+			$table.remove(row)
+			//删除缓存的sn
+			snListCache.value = snListCache.value.filter((item) => item !== row.barcode)
+
+			// 已扫码数量-1
+			remainderValue.value = remainderValue.value - 1
+		}
+	}
+
+	function beiginScan() {
+		// input.value?.focus()
+		const el = input.value as HTMLInputElement | null
+		if (el) {
+			el.focus()
+		}
+	}
+
+	// 点击开始扫码按钮，自动新增一行 或者 扫码结束后也自动新增一行
+	const autoInsertOneRow = async () => {
+		const $table = applyDetailTableRef.value
+		const sn = value.value.trim()
+
+		/**
+		 * 1. 判断sn是否合法
+		 * 2. 判断sn是否已经存在于表格中，需要缓存sn列表
+		 * 3. 根据sn获取物料信息，并新增一行到表格中,需要缓存物料信息
+		 * 4. 插入成功后缓存sn
+		 */
+		if (sn.length === 0) {
+			value.value = ''
+			message.warning('【' + sn + '】条形码为空，请重新扫码', 5)
+			return
+		}
+		if (snListCache.value.includes(sn)) {
+			value.value = ''
+			message.warning('【' + sn + '】条形码重复，请重新扫码', 5)
+			return
+		}
+		// 找到条形码对应的物料编码
+		const code = sn.slice(0, 5)
+		const materialInfo = materialMapCache.value.get(code)
+		if (!materialInfo) {
+			value.value = ''
+			message.warning('【' + sn + '】条形码不合法，请重新扫码', 5)
+			return
+		}
+
+		if ($table) {
+			const row: TableRowVO = {
+				id: materialInfo?.id ?? 0,
+				barcode: sn,
+				assignRule: materialInfo?.assignRule ?? false,
+				name: materialInfo?.name ?? '',
+				code: materialInfo?.code ?? '',
+				spec: materialInfo?.spec ?? '',
+				type: materialInfo?.type ?? '',
+				typeName: materialInfo?.typeName ?? '',
+				times: new Date().toLocaleString(),
+			}
+			$table.insert(row)
+			// 缓存sn
+			snListCache.value.push(sn)
+			//已扫码数量+1
+
+			remainderValue.value = remainderValue.value + 1
+			// 添加后就清空输入框
+			value.value = ''
+		}
+	}
+
+	// 清空扫码数据
+	const clearScanData = () => {
+		const $table = applyDetailTableRef.value
+		if ($table) {
+			$table.remove()
+			snListCache.value = []
+			remainderValue.value = 0
+		}
+	}
+</script>

src/views/stock/component/scanForm.vue

@@ -1,202 +0,0 @@
-<template>
-  <a-button type="primary" @click="beiginScan">开始扫码</a-button>
-  <a-button type="primary" danger style="left: 20px;">重新扫码</a-button>
-  <a-input bordered size="large" ref="snInput" v-model:value="value" placeholder="输入条形码" @pressEnter="autoInsertOneRow"
-    style="margin-top: 20px; margin-bottom: 20px;" />
-  <a-row style="margin-bottom: 20px;">
-    <a-col :span="12">
-      <a-statistic title="扫码合计" :value="totalValue" style="margin-right: 50px" />
-    </a-col>
-    <a-col :span="12">
-      <a-statistic title="已扫码" :value="remainderValue" />
-    </a-col>
-  </a-row>
-  <!-- Esc键退出编辑功能 -->
-  <vxe-table border stripe show-overflow ref="applyDetailTableRef" max-height="500" :column-config="{ resizable: true }"
-    :keyboard-config="{ isEsc: true }" size="medium" empty-text="请先扫码物料体条码"
-    :edit-config="{ trigger: 'click', mode: 'cell' }">
-
-    <vxe-column type="seq" title="序号" width="60"></vxe-column>
-    <vxe-column field="id" title="物料id" :visible="false"></vxe-column>
-    <vxe-column field="barcode" title="物料条码"  />
-    <vxe-column field="name" title="物料名称" />
-    <vxe-column field="code" title="编码" />
-    <vxe-column field="spec" title="规格" />
-    <vxe-column field="type" title="类型" />
-    <vxe-column field="times" title="扫码时间" />
-    <vxe-column field="oprator" title="操作">
-      <template #default="{ row }">
-        <vxe-button mode="text" status="error" @click="removeStep2Row(row)">删除</vxe-button>
-      </template>
-    </vxe-column>
-
-  </vxe-table>
-</template>
-
-<script lang="ts" setup>
-import { VxeTableInstance } from 'vxe-table'
-import { useTemplateRef } from 'vue'
-import { api } from '@/api'
-import { message } from 'ant-design-vue';
-
-// 父组件数据交互
-const props = defineProps(
-  {
-    totalValue: {
-      type: Number,
-      default: 0
-    },
-    applyId: {
-      type: Number,
-      required: false
-    }
-  }
-)
-
-//获取扫码的集合
-const getTableData = () => {
-  const $table = applyDetailTableRef.value
-  if ($table) {
-    return $table.getTableData().fullData.map(item => ({
-      assignRule: item.assignRule,
-      materialId: item.id,
-      barcode: item.barcode,
-      code: item.code,
-      date: item.times
-    }))
-  }
-}
-
-// 获取盘点审核的数据
-const getApplyData = () => {
-  const $table = applyDetailTableRef.value
-  if ($table) {
-    return $table.getTableData().fullData.map(item => ({
-      applyId: props.applyId,
-      materialId: item.id,
-      barcode: item.barcode
-    }))
-
-}}
-
-
-defineExpose({ getTableData,getApplyData })
-
-
-
-const remainderValue = ref(0)
-
-//扫码的条形码字符串
-const value = ref('')
-const input = useTemplateRef('snInput');
-
-const snListCache = ref<string[]>([]) // 缓存扫码的条形码列表
-// 定义一个map缓存物料信息
-const materialMapCache = ref<Map<string, material.Material>>(new Map<string, material.Material>()) // 缓存物料信息,key是code
-
-
-/**
- * 请求接口获取缓存数据
- */
-const getCache = () => {
-
-  api.materialApi.material.all((data) => {
-    data.forEach(item => {
-      if (item.code) {
-        materialMapCache.value.set(item.code, item)  // 物料编码定义为6位
-      }
-    })
-  })
-}
-getCache();
-
-interface TableRowVO {
-  id: number
-  barcode: string
-  assignRule: string
-  name: string
-  code: string
-  spec: string
-  type: string
-  times: string
-}
-
-// 扫码点货的table对象
-const applyDetailTableRef = ref<VxeTableInstance<TableRowVO>>()
-
-// 移除table中的行
-const removeStep2Row = async (row: TableRowVO) => {
-  const $table = applyDetailTableRef.value
-  if ($table) {
-    $table.remove(row)
-    //删除缓存的sn
-    snListCache.value = snListCache.value.filter(item => item!== row.barcode)
-
-    // 已扫码数量-1
-    remainderValue.value = remainderValue.value - 1
-  }
-}
-
-function beiginScan() {
-  // input.value?.focus()
-  const el = input.value as HTMLInputElement | null;
-  if (el) {
-    el.focus();
-  }
-}
-
-// 点击开始扫码按钮，自动新增一行 或者 扫码结束后也自动新增一行
-const autoInsertOneRow = async () => {
-  const $table = applyDetailTableRef.value
-  const sn = value.value.trim();
-
-
-  /**
-   * 1. 判断sn是否合法
-   * 2. 判断sn是否已经存在于表格中，需要缓存sn列表
-   * 3. 根据sn获取物料信息，并新增一行到表格中,需要缓存物料信息
-   * 4. 插入成功后缓存sn
-   */
-  if (sn.length === 0) {
-    value.value = ''
-    message.warning('【' + sn + '】条形码为空，请重新扫码', 5)
-    return;
-  }
-  if (snListCache.value.includes(sn)) {
-    value.value = ''
-    message.warning('【' + sn + '】条形码重复，请重新扫码', 5)
-    return;
-  }
-  // 找到条形码对应的物料编码
-  const code = sn.slice(0, 6)
-  const materialInfo = materialMapCache.value.get(code)
-  if (!materialInfo) {
-    value.value = ''
-    message.warning('【' + sn + '】条形码不合法，请重新扫码', 5)
-    return;
-  }
-
-
-  if ($table) {
-    const row: TableRowVO = {
-      id: materialInfo?.id ?? 0,
-      barcode: sn,
-      assignRule: materialInfo?.assignRule ?? '',
-      name: materialInfo?.name ?? '',
-      code: materialInfo?.code ?? '',
-      spec: materialInfo?.spec ?? '',
-      type: materialInfo?.type ?? '',
-      times: new Date().toLocaleString()
-    }
-    $table.insert(row)
-    // 缓存sn
-    snListCache.value.push(sn)
-    //已扫码数量+1
-
-    remainderValue.value = remainderValue.value + 1
-    // 添加后就清空输入框
-    value.value = ''
-  }
-}
-
-</script>

src/views/stock/component/success-result.vue

@@ -0,0 +1,34 @@
+<template>
+	<a-result status="success" title="操作成功!" sub-title="操作已完成，请仔细核对实物与清单，确保无误。">
+		<template #extra>
+			<a-button type="primary" @click="select">查询申请</a-button>
+			<a-button @click="again">继续提交申请</a-button>
+		</template>
+	</a-result>
+</template>
+
+<script lang="ts" setup>
+	import router from '@/router'
+
+	// 和外层界面的数据交互
+	const props = defineProps(
+		{
+			applyType: {
+				type: String,
+				default: '',
+			},
+		}, // 申请类型 applyType页面传值的使用PURCHASE_RECEIPT和LOAN_OUT，PURCHASE_RECEIPT: 采购入库 和 归还入库 LOAN_OUT: 出库外借
+	)
+
+	const select = () => {
+		if (props.applyType === 'PURCHASE_RECEIPT') {
+			router.push({ path: '/statistic/inbound' })
+		} else {
+			router.push({ path: '/statistic/outbound' })
+		}
+	}
+
+	const again = () => {
+		router.go(0)
+	}
+</script>

src/views/stock/component/successResul.vue

@@ -1,24 +0,0 @@
-<template>
-	<a-result
-		status="success"
-		title="Successfully Purchased Cloud Server ECS!"
-		sub-title="Order number: 2017182818828182881 Cloud server configuration takes 1-5 minutes, please wait."
-	>
-		<template #extra>
-			<a-button type="primary" @click="select">查询申请</a-button>
-			<a-button @click="again">继续提交申请</a-button>
-		</template>
-	</a-result>
-</template>
-
-<script lang="ts" setup>
-	import router from '@/router'
-
-	const select = () => {
-		router.push({ path: '/statistic/inbound' }) // 未生效
-	}
-
-	const again = () => {
-		router.push({ path: '/stock/inbound' })
-	}
-</script>

src/views/stock/inboud/inboud-page.vue

@@ -1,8 +1,7 @@
 <template>
-  <apply-modal apply-type='PURCHASE_RECEIPT'></apply-modal>
+	<apply-modal apply-type="PURCHASE_RECEIPT"></apply-modal>
 </template>
 
 <script setup lang="ts">
-import applyModal from "@/views/stock/component/applyModal.vue";
-
+	import applyModal from '@/views/stock/component/apply-modal.vue'
 </script>

src/views/stock/material/form.ts

@@ -1,4 +1,5 @@
 import { FormItem, FormConfig } from '@/components/form-render/form-render-types'
+import { TreeDataNode } from 'ant-design-vue/es/vc-tree-select/interface'
 
 export const config: FormConfig = {
 	layout: 'horizontal',
@@ -13,7 +14,7 @@ export const config: FormConfig = {
 	},
 }
 
-export const formItems: FormItem[] = [
+export const formItems = (types: TreeDataNode[]): FormItem[] => [
 	{
 		group: 'form',
 		type: 'input',
@@ -34,22 +35,24 @@ export const formItems: FormItem[] = [
 		},
 		rules: [],
 	},
+
 	{
+		type: 'tree-select',
 		group: 'form',
-		type: 'input',
 		config: {
 			autoLink: true,
 			hasFeedback: false,
 			label: '物料类型',
 			name: 'type',
+			required: true,
+			extra: '',
+			help: '',
+			htmlFor: 'sgsg',
 		},
 		properties: {
 			size: 'default',
-			type: 'text',
-			allowClear: false,
-			bordered: true,
-			showCount: false,
-			placeholder: '请输入物料类型',
+			treeData: types,
+			placeholder: '请选择物料类型',
 		},
 		rules: [],
 	},
@@ -71,24 +74,37 @@ export const formItems: FormItem[] = [
 		rules: [],
 	},
 	{
-		type: 'select',
+		type: 'input-number',
 		group: 'form',
 		config: {
 			autoLink: true,
 			hasFeedback: false,
-			label: '赋码规则',
-			name: 'assignRule',
+			label: '价格',
+			name: 'price',
 			required: true,
-
 		},
 		properties: {
 			size: 'default',
 			controls: true,
-			placeholder: '请填写赋码规则',
-			options: [{ label: '低值易耗品', value: 'LOW_VALUE' }, { label: '高价值工具类', value: 'HIGH_VALUE' }]
+			placeholder: '请填写价格',
 		},
 		rules: [],
+	},
 
+	{
+		type: 'switch',
+		group: 'form',
+		config: {
+			autoLink: true,
+			hasFeedback: false,
+			label: '是否赋码',
+			name: 'assignRule',
+			required: true,
+		},
+		properties: {
+			size: 'default',
+		},
+		rules: [],
 	},
 	{
 		type: 'input',
@@ -106,5 +122,5 @@ export const formItems: FormItem[] = [
 			placeholder: '',
 		},
 		rules: [],
-	}
+	},
 ]

src/views/stock/material/material-page.vue

@@ -2,17 +2,29 @@
 	<page-container>
 		<!-- 页面操作栏 -->
 		<template #ops>
-			<a-row>
-				<a-col :span="18">
+			<a-row style="width: 600px">
+				<a-col :span="8">
+					<a-tree-select
+						v-model:value="typeVal"
+						show-search
+						style="width: 100%"
+						:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+						placeholder="请选择物料类型"
+						allow-clear
+						:tree-data="types"
+						tree-node-filter-prop="label"
+					/>
+				</a-col>
+				<a-col :span="8">
 					<a-input-search
 						v-model:value="searchKey"
-						:placeholder="`请输入物料名称`"
+						:placeholder="`名称/编码`"
 						allow-clear
 						enter-button
 						@search="loadData()"
 					></a-input-search>
 				</a-col>
-				<a-col :span="6">
+				<a-col :span="8">
 					<a-button type="primary" style="margin-left: 10px" @click="addOrEdit()">
 						<template #icon>
 							<icon-font type="icon-plus" />
@@ -36,7 +48,7 @@
 				<!-- 操作按钮列 -->
 				<template #bodyCell="{ column, record }">
 					<template v-if="column.dataIndex === 'assignRule'">
-							{{ record.assignRule === 'HIGH_VALUE' ? '高价值工具类' : '低值易耗品' }}
+						{{ record.assignRule ? '是' : '否' }}
 					</template>
 					<template v-if="column.dataIndex === 'operation'">
 						<a-button type="link" :style="{ color: token.colorPrimary }" @click="addOrEdit(record)">
@@ -46,7 +58,12 @@
 							编辑
 						</a-button>
 
-						<a-button type="link" :style="{ color: token.colorPrimary }">
+						<a-button
+							v-if="record.assignRule"
+							type="link"
+							:style="{ color: token.colorPrimary }"
+							@click="showPrintModal(record.id)"
+						>
 							<template #icon>
 								<icon-font type="icon-print" />
 							</template>
@@ -74,6 +91,17 @@
 		:title="modalTitle"
 		@ok="doSave"
 	/>
+	<!-- 打印条码弹窗 -->
+	<a-modal
+		v-model:open="openPrint"
+		title="条形码打印"
+		width="100%"
+		wrap-class-name="full-modal"
+		@ok="closePrint"
+		@cancel="closePrint"
+	>
+		<printCode ref="printcodeRef" :material-id="materialIdRef"></printCode>
+	</a-modal>
 </template>
 
 <script setup lang="ts">
@@ -81,20 +109,46 @@
 	import api from '@/api'
 	import { IPage } from '@/api/api'
 	import { notification, theme } from 'ant-design-vue'
-	import {config, formItems} from './form'
+	import { config, formItems } from './form'
 	import { FormDataType } from '@/components/form-render/form-render-types'
+	import printCode from './print-code.vue'
+	import { TreeDataNode } from 'ant-design-vue/es/vc-tree-select/interface'
+
 	const { useToken } = theme
 	const { token } = useToken()
 	const searchKey = ref('')
-
+	const openPrint = ref(false)
 	const materialPage = ref<IPage<material.Material>>()
 	const loading = ref(false)
+	const materialIdRef = ref<number>()
+	const printcodeRef = ref()
+	const typeVal = ref<string>() // 物料类型选择值
+
+	//类型树
+
+	const types = ref<Array<TreeDataNode>>([])
+	api.materialApi.type.trees((data) => {
+		types.value = children(data)
+	})
+	const children = (res: Array<material.TypeTree>): Array<TreeDataNode> => {
+		return res.map((areaTree) => ({
+			label: areaTree.label,
+			value: areaTree.value,
+			children: areaTree.children ? children(areaTree.children) : [],
+			key: areaTree.value,
+		}))
+	}
 
 	// 加载数据的方法
 	const loadData = async (page = 1, size = 10) => {
 		loading.value = true
 		api.materialApi.material.materials(
-			{ page: page || materialPage.value?.current, size: size || materialPage.value?.size, key: searchKey.value },
+			{
+				page: page || materialPage.value?.current,
+				size: size || materialPage.value?.size,
+				key: searchKey.value,
+				type: typeVal.value,
+			},
 			(data) => {
 				loading.value = false
 				materialPage.value = data
@@ -106,6 +160,11 @@
 
 	//表格列
 	const columns = [
+		{
+			title: '序号',
+			dataIndex: 'key',
+			customRender: ({ index }: { index: number }) => `${index + 1}`,
+		},
 		{
 			title: '物料编码',
 			dataIndex: 'code',
@@ -114,16 +173,20 @@
 			title: '物料名称',
 			dataIndex: 'name',
 		},
+		{
+			title: '价格',
+			dataIndex: 'price',
+		},
 		{
 			title: '物料类型',
-			dataIndex: 'type',
+			dataIndex: 'typeName',
 		},
 		{
 			title: '物料型号',
 			dataIndex: 'spec',
 		},
 		{
-			title: '赋码规则',
+			title: '是否赋码',
 			dataIndex: 'assignRule',
 		},
 		{
@@ -133,7 +196,6 @@
 		{
 			title: '操作',
 			dataIndex: 'operation',
-			width: 400,
 		},
 	]
 
@@ -159,7 +221,7 @@
 	})
 	//表单配置
 	const items = computed(() => {
-		return formItems
+		return formItems(types.value)
 	})
 
 	//弹窗标题
@@ -167,7 +229,6 @@
 		return material.value.id ? '编辑物料' : '添加物料'
 	})
 
-
 	//新增或编辑,只是打开弹窗
 	const addOrEdit = (u?: Record<string, unknown>) => {
 		/*
@@ -184,7 +245,7 @@
   这是为了避免因访问不存在的对象属性而引发错误。
   */
 		// material.value = { ...(u ?? { channels: 3 }) }
-		material.value = { ...u}; // 如果 u 存在，则使用 u 的值；否则使用空对象 {}
+		material.value = { ...u } // 如果 u 存在，则使用 u 的值；否则使用空对象 {}
 		formDrawer.value?.show()
 	}
 
@@ -199,8 +260,7 @@
 					loadData(1)
 				},
 			})
-		});
-
+		})
 	}
 
 	//删除
@@ -215,4 +275,22 @@
 			})
 		})
 	}
+
+	// 打开打印弹窗
+	const showPrintModal = (applyId: number) => {
+		openPrint.value = true
+		materialIdRef.value = applyId
+	}
+
+	// 关闭打印弹窗
+	const closePrint = () => {
+		openPrint.value = false
+		printcodeRef.value.clearContent()
+	}
 </script>
+
+<style lang="less">
+	.notshow {
+		display: none;
+	}
+</style>

src/views/stock/material/print-code.vue

@@ -0,0 +1,132 @@
+<template>
+	<div>
+		<a-flex gap="middle" horizontal>
+			<span class="ant-form-text">请输入打印的条码数量:</span>
+			<a-form-item name="input-number" no-style>
+				<a-input-number v-model:value="inputRef" :min="1" :max="30" />
+			</a-form-item>
+
+			<button @click="printCode">打印条形码</button>
+		</a-flex>
+		<div id="barcodes-container">
+			<!-- 条形码将被动态插入到这里 -->
+		</div>
+	</div>
+</template>
+
+<script setup lang="ts">
+	import { ref } from 'vue'
+	import JsBarcode from 'jsbarcode'
+	import printJS from 'print-js'
+	import api from '@/api'
+
+	const props = defineProps({
+		// 接收父组件传递的条形码数量
+		materialId: {
+			type: Number,
+			default: 0,
+		},
+	})
+	const clearContent = () => {
+		inputRef.value = 0
+		const container = document.getElementById('barcodes-container')
+		if (container) container.innerHTML = ''
+	}
+	// 向父组件暴露清空条形码容器的函数
+	defineExpose({ clearContent })
+
+	const inputRef = ref(0)
+
+	watch(inputRef, (newVal) => {
+		fetchAndPrintBarcodes(newVal)
+	})
+
+	const printCode = () => {
+		const container = document.getElementById('barcodes-container')
+		if (!container) {
+			window.console.log('条形码容器未找到')
+			return
+		}
+		// 设置页面大小以适应小纸张（40mm x 30mm）
+		const widthInches = (40 * 0.0393701).toFixed(3) // 约1.575英寸
+		const heightInches = (30 * 0.0393701).toFixed(3) // 约1.181英寸
+
+		// 打印配置
+		const printOptions: printJS.Configuration = {
+			printable: 'barcodes-container',
+			type: 'html',
+			scanStyles: false,
+			honorMarginPadding: false,
+			targetStyles: ['*'],
+			style: `
+		        @page {
+		          size: ${widthInches}in ${heightInches}in;
+		          margin: 0;
+		        }
+		        body {
+		          margin: 0;
+		          padding: 0;
+		          font-size: 6px;
+		        }
+		        #barcodes-container canvas {
+		          display: block;
+		          margin-bottom: 2mm; /* 调整条形码之间的间距 */
+		        }
+		      `,
+			onLoadingStart: () => console.log('开始加载'),
+			onLoadingEnd: () => console.log('加载完成'),
+			onError: (err: unknown) => console.error('打印出错:', err),
+		}
+
+		// 显示条形码容器以便打印
+		container.style.display = 'block'
+
+		// 调用 printJS 进行打印
+		printJS(printOptions)
+	}
+	// 定义一个函数来从后端获取条形码字符串并打印
+	const fetchAndPrintBarcodes = (count: number) => {
+		if (count <= 0) return
+		// 清空之前的条形码容器
+		const container = document.getElementById('barcodes-container')
+		if (!container) throw new Error('条形码容器未找到')
+		container.innerHTML = ''
+
+		// 从后端获取条形码字符串数组
+		api.materialApi.material.generateBarcodes(props.materialId, { count: count }, (res: Array<string>) => {
+			res.forEach((barcodeString: string, index: number) => {
+				const canvasId = `barcode-${index}`
+				const canvasElement = document.createElement('canvas')
+				// 设置画布大小
+				canvasElement.width = 472 // 宽度接近 40mm
+				canvasElement.height = 354 // 高度接近 30mm
+
+				canvasElement.id = canvasId
+				container.appendChild(canvasElement)
+				// 使用JsBarcode生成条形码
+				JsBarcode(`#${canvasId}`, barcodeString, {
+					// format: "EAN13", // 或者根据需要选择其他格式
+					width: 1, // 条形码线条宽度
+					height: 70, // 条形码高度
+					displayValue: true, // 显示条形码下方的文本
+					fontOptions: 'bold', // 文本样式
+					fontSize: 12, // 文本大小
+					textMargin: 5, // 文本与条形码之间的间距
+					margin: 10, // 条形码周围的空白边距
+				})
+			})
+		})
+	}
+
+	// 如果需要在组件挂载时自动执行打印，请取消注释以下代码
+	// onMounted(fetchAndPrintBarcodes);
+</script>
+
+<style scoped>
+	/* 针对打印样式的样式 */
+	@media print {
+		#barcodes-container {
+			display: block;
+		}
+	}
+</style>

src/views/stock/outboud/outbound-page.vue

@@ -1,8 +1,7 @@
 <template>
-  <apply-modal apply-type='LOAN_OUT'></apply-modal>
+	<apply-modal apply-type="LOAN_OUT"></apply-modal>
 </template>
 
 <script setup lang="ts">
-import applyModal from "@/views/stock/component/applyModal.vue";
-
+	import applyModal from '@/views/stock/component/apply-modal.vue'
 </script>

src/views/stock/report/inboundReport-page.vue

@@ -2,62 +2,135 @@
 	<page-container>
 		<!-- 页面操作栏 -->
 		<template #ops>
-			<a-row>
-				<a-col :span="18">
-					<a-input-search v-model:value="searchKey" :placeholder="`请输入`" allow-clear enter-button
-						@search="loadData()"></a-input-search>
+			<a-row style="width: 600px">
+				<a-col :span="8">
+					<a-tree-select
+						v-model:value="typeVal"
+						show-search
+						style="width: 100%"
+						:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+						placeholder="请选择物料类型"
+						allow-clear
+						:tree-data="types"
+						tree-node-filter-prop="label"
+					/>
+				</a-col>
+				<a-col :span="8">
+					<a-input-search
+						v-model:value="searchKey"
+						:placeholder="`名称/编码/型号`"
+						allow-clear
+						enter-button
+						@search="loadData()"
+					></a-input-search>
+				</a-col>
+				<a-col :span="8">
+					<a-button type="primary" @click="downloadData()">导出</a-button>
 				</a-col>
 			</a-row>
 		</template>
 		<!-- 页面表格内容 -->
 		<div style="min-height: calc(100vh - 305px)">
 			<!-- 表格行 -->
-			<a-table :columns="columns" :data-source="pagedata?.records" bordered :pagination="pagination"
-				:loading="loading" row-key="key">
-
+			<a-table
+				:columns="columns"
+				:data-source="pagedata?.records"
+				bordered
+				:pagination="pagination"
+				:loading="loading"
+				row-key="key"
+			>
+				<template #bodyCell="{ column, record }">
+					<template v-if="column.dataIndex === 'applyTypeInfo'">
+						{{ record.applyTypeInfo.description }}
+					</template>
+				</template>
 			</a-table>
 		</div>
 	</page-container>
 </template>
 
 <script setup lang="ts">
+	import api from '@/api'
+	import { IPage } from '@/api/api'
+	import { http } from '@/settings/http'
+	import { TreeDataNode } from 'ant-design-vue/es/vc-tree-select/interface'
 
-import api from '@/api'
-import { IPage } from '@/api/api'
+	const searchKey = ref('')
+	const pagedata = ref<IPage<material.ApplyDTO>>()
+	const loading = ref(false)
+	const typeVal = ref<string>() // 物料类型选择值
 
-const searchKey = ref('')
-const pagedata = ref<IPage<material.ApplyDTO>>()
-const loading = ref(false)
-
-// 加载数据的方法
-const loadData = async (page = 1, size = 10) => {
+	// 加载数据的方法
+	const loadData = async (page = 1, size = 10) => {
 		loading.value = true
 		api.materialApi.apply.searchPage(
 			{
 				page: page,
 				size: size,
 				applyType: 1,
-        type:searchKey.value,
-        code: searchKey.value,
-        name: searchKey.value
-    },(data)=>{
+				type: typeVal.value,
+				key: searchKey.value,
+			},
+			(data) => {
 				pagedata.value = data
 				loading.value = false
-  })
-}
-//初始加载
-loadData()
+			},
+		)
+	}
+	//初始加载
+	loadData()
 
-//表格列
-const columns = [
+	//导出数据
+	const downloadData = () => {
+		// 创建 URLSearchParams 对象
+		const params = new URLSearchParams()
+		if (typeVal.value) {
+			params.append('type', typeVal.value)
+		}
+		if (searchKey.value) {
+			params.append('key', searchKey.value)
+		}
+		params.append('applyType', '1')
+		const url = `${http.prefix}/apply/download-excel?${params.toString()}`
+		window.open(url)
+	}
+	//表格列
+	const columns = [
+		{
+			title: '序号',
+			dataIndex: 'key',
+			customRender: ({ index }: { index: number }) => `${index + 1}`,
+		},
 		{
 			title: '物料名称',
 			dataIndex: 'name',
 		},
+		{
+			title: '物料类型',
+			dataIndex: 'typeName',
+		},
 		{
 			title: '物料编码',
 			dataIndex: 'code',
 		},
+		{
+			title: '物料型号',
+			dataIndex: 'spec',
+		},
+		{
+			title: '入库类型',
+			dataIndex: 'applyTypeInfo',
+		},
+
+		{
+			title: '申请数量',
+			dataIndex: 'applyNum',
+		},
+		{
+			title: '确认数量',
+			dataIndex: 'confirmNum',
+		},
 		{
 			title: '申请人',
 			dataIndex: 'applicant',
@@ -66,22 +139,14 @@ const columns = [
 			title: '申请日期',
 			dataIndex: 'applyDate',
 		},
-	{
-		title: '申请数量',
-		dataIndex: 'applyNum',
-	},
-	{
-		title: '确认数量',
-		dataIndex: 'confirmNum',
-	},
 		{
 			title: '备注',
 			dataIndex: 'remark',
-	}
-]
+		},
+	]
 
-//分页信息
-const pagination = computed(() => {
+	//分页信息
+	const pagination = computed(() => {
 		return {
 			current: pagedata.value?.current,
 			pageSize: pagedata.value?.size,
@@ -90,8 +155,19 @@ const pagination = computed(() => {
 				loadData(page, pageSize)
 			},
 		}
-})
-
+	})
 
+	// 物料类型树
+	const types = ref<Array<TreeDataNode>>([])
+	api.materialApi.type.trees((data) => {
+		types.value = children(data)
+	})
+	const children = (res: Array<material.TypeTree>): Array<TreeDataNode> => {
+		return res.map((areaTree) => ({
+			label: areaTree.label,
+			value: areaTree.value,
+			children: areaTree.children ? children(areaTree.children) : [],
+			key: areaTree.value,
+		}))
+	}
 </script>
-

src/views/stock/report/materialReport-page.vue

@@ -2,17 +2,32 @@
 	<page-container>
 		<!-- 页面操作栏 -->
 		<template #ops>
-			<a-row>
-				<a-col :span="18">
+			<a-row style="width: 600px">
+				<a-col :span="8">
+					<a-tree-select
+						v-model:value="typeVal"
+						show-search
+						style="width: 100%"
+						:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+						placeholder="请选择物料类型"
+						allow-clear
+						:tree-data="types"
+						tree-node-filter-prop="label"
+					/>
+				</a-col>
+				<a-col :span="8">
 					<a-input-search
 						v-model:value="searchKey"
-						:placeholder="`请输入物料名称`"
+						placeholder="名称/编码/型号"
 						allow-clear
 						enter-button
+						width="100%"
 						@search="loadData()"
 					></a-input-search>
 				</a-col>
-				
+				<a-col :span="8">
+					<a-button type="primary" @click="downloadData()">导出</a-button>
+				</a-col>
 			</a-row>
 		</template>
 		<!-- 页面表格内容 -->
@@ -29,29 +44,37 @@
 				<!-- 操作按钮列 -->
 				<template #bodyCell="{ column, record }">
 					<template v-if="column.dataIndex === 'assignRule'">
-							{{ record.assignRule === 1 ? '高价值工具类' : '低值易耗品' }}  <!-- 这里定义为0和1，0再回显的时候不展示？--> 
+						{{ record.assignRule ? '是' : '否' }}
+						<!-- 这里定义为0和1，0再回显的时候不展示？-->
 					</template>
-					
 				</template>
 			</a-table>
 		</div>
 	</page-container>
-	
 </template>
 
 <script setup lang="ts">
 	import api from '@/api'
 	import { IPage } from '@/api/api'
+	import { http } from '@/settings/http'
+	import { TreeDataNode } from 'ant-design-vue/es/vc-tree-select/interface'
+
 	const searchKey = ref('')
 
 	const materialPage = ref<IPage<material.Material>>()
 	const loading = ref(false)
+	const typeVal = ref<string>() // 物料类型选择值
 
 	// 加载数据的方法
 	const loadData = async (page = 1, size = 10) => {
 		loading.value = true
 		api.materialApi.material.materials(
-			{ page: page || materialPage.value?.current, size: size || materialPage.value?.size, key: searchKey.value },
+			{
+				page: page || materialPage.value?.current,
+				size: size || materialPage.value?.size,
+				key: searchKey.value,
+				type: typeVal.value,
+			},
 			(data) => {
 				loading.value = false
 				materialPage.value = data
@@ -61,28 +84,53 @@
 	//初始加载
 	loadData()
 
+	//导出数据
+	const downloadData = () => {
+		// 创建 URLSearchParams 对象
+		const params = new URLSearchParams()
+		if (typeVal.value) {
+			params.append('type', typeVal.value)
+		}
+		if (searchKey.value) {
+			params.append('key', searchKey.value)
+		}
+
+		const url = `${http.prefix}/material/download-excel?${params.toString()}`
+		window.open(url)
+	}
+
 	//表格列
 	const columns = [
 		{
-			title: '物料编码',
-			dataIndex: 'code',
+			title: '序号',
+			dataIndex: 'key',
+			customRender: ({ index }: { index: number }) => `${index + 1}`,
 		},
 		{
 			title: '物料名称',
 			dataIndex: 'name',
 		},
+		{
+			title: '物料编码',
+			dataIndex: 'code',
+		},
+
 		{
 			title: '物料类型',
-			dataIndex: 'type',
+			dataIndex: 'typeName',
 		},
 		{
 			title: '物料型号',
 			dataIndex: 'spec',
 		},
 		{
-			title: '赋码规则',
+			title: '是否赋码',
 			dataIndex: 'assignRule',
 		},
+		{
+			title: '价格',
+			dataIndex: 'price',
+		},
 		{
 			title: '库存数量',
 			dataIndex: 'stock',
@@ -91,7 +139,7 @@
 		{
 			title: '备注',
 			dataIndex: 'description',
-		}
+		},
 	]
 
 	//分页信息
@@ -106,5 +154,17 @@
 		}
 	})
 
-
+	// 物料类型树
+	const types = ref<Array<TreeDataNode>>([])
+	api.materialApi.type.trees((data) => {
+		types.value = children(data)
+	})
+	const children = (res: Array<material.TypeTree>): Array<TreeDataNode> => {
+		return res.map((areaTree) => ({
+			label: areaTree.label,
+			value: areaTree.value,
+			children: areaTree.children ? children(areaTree.children) : [],
+			key: areaTree.value,
+		}))
+	}
 </script>

src/views/stock/report/outboundReport-page.vue

@@ -2,70 +2,169 @@
 	<page-container>
 		<!-- 页面操作栏 -->
 		<template #ops>
-			<a-row>
-				<a-col :span="18">
-					<a-input-search v-model:value="searchKey" :placeholder="`请输入`" allow-clear enter-button
-						@search="loadData()"></a-input-search>
+			<a-row style="width: 600px">
+				<a-col :span="8">
+					<a-tree-select
+						v-model:value="typeVal"
+						show-search
+						style="width: 100%"
+						:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+						placeholder="请选择物料类型"
+						allow-clear
+						:tree-data="types"
+						tree-node-filter-prop="label"
+					/>
+				</a-col>
+				<a-col :span="8">
+					<a-input-search
+						v-model:value="searchKey"
+						:placeholder="`名称/编码/型号`"
+						allow-clear
+						enter-button
+						@search="loadData()"
+					></a-input-search>
+				</a-col>
+				<a-col :span="8">
+					<a-button type="primary" @click="downloadData()">导出</a-button>
 				</a-col>
 			</a-row>
 		</template>
 		<!-- 页面表格内容 -->
 		<div style="min-height: calc(100vh - 305px)">
 			<!-- 表格行 -->
-			<a-table :columns="columns" :data-source="pagedata?.records" bordered :pagination="pagination"
-				:loading="loading" row-key="key">
-
+			<a-table
+				:columns="columns"
+				:data-source="pagedata?.records"
+				bordered
+				:pagination="pagination"
+				:loading="loading"
+				row-key="key"
+			>
+				<template #bodyCell="{ column, record }">
+					<template v-if="column.dataIndex === 'applyTypeInfo'">
+						{{ record.applyTypeInfo.description }}
+					</template>
+					<template v-if="column.dataIndex === 'reviewResult'">
+						<template v-if="record.reviewResult === 'PASS'"><span style="color: #52c41a">审核通过</span></template>
+						<template v-if="record.reviewResult === 'REJECT'"><span style="color: #f5222d">审核不通过</span></template>
+					</template>
+					<template v-if="column.dataIndex === 'operation'">
+						<a-button
+							v-if="record.applyType === 'SCRAP_OUT' && !record.confirm && record.reviewer === userStore.userName"
+							type="link"
+							style="margin-left: 10px"
+							@click="showResultModal(record.applyId)"
+						>
+							审核
+						</a-button>
+					</template>
+				</template>
 			</a-table>
 		</div>
 	</page-container>
+	<!-- 审核弹窗 -->
+	<a-modal v-model:open="openResult" title="报废出库数据：" width="80%" :confirm-loading="confirmLoading" @ok="submit">
+		<vxe-table border show-overflow max-height="500" size="medium" :data="reviewData">
+			<vxe-column type="seq" width="70" />
+			<vxe-column field="name" title="物料名称" />
+			<vxe-column field="typeName" title="类型" />
+			<vxe-column field="spec" title="规格" />
+			<vxe-column field="price" title="价格" />
+			<vxe-column field="applicant" title="申请人" />
+			<vxe-column field="confirmQuantity" title="报废数量" />
+			<vxe-column field="remark" title="报废原因" />
+		</vxe-table>
+		<a-form layout="vertical" style="margin-top: 20px">
+			<a-form-item label="审核意见">
+				<a-textarea v-model:value="remark" placeholder="请输入审核意见" :row="3" :maxlength="1000" />
+			</a-form-item>
+
+			<a-form-item label="审核结果">
+				<a-radio-group v-model:value="reviewResult" button-style="solid">
+					<a-radio-button value="PASS">审核通过</a-radio-button>
+					<a-radio-button value="REJECT" style="margin-left: 20px">审核不通过</a-radio-button>
+				</a-radio-group>
+			</a-form-item>
+		</a-form>
+	</a-modal>
 </template>
 
 <script setup lang="ts">
+	import api from '@/api'
+	import { IPage } from '@/api/api'
+	import { useUserStore } from '@/stores/user'
+	import { http } from '@/settings/http'
+	import { TreeDataNode } from 'ant-design-vue/es/vc-tree-select/interface'
 
-import api from '@/api'
-import { IPage } from '@/api/api'
+	const searchKey = ref()
+	const pagedata = ref<IPage<material.ApplyDTO>>()
+	const loading = ref(false)
+	const typeVal = ref<string>() // 物料类型选择值
 
-const searchKey = ref('')
-const pagedata = ref<IPage<material.ApplyDTO>>()
-const loading = ref(false)
-
-// 加载数据的方法
-const loadData = async (page = 1, size = 10) => {
+	const userStore = useUserStore()
+	// 加载数据的方法
+	const loadData = async (page = 1, size = 10) => {
 		loading.value = true
 		api.materialApi.apply.searchPage(
 			{
 				page: page,
 				size: size,
 				applyType: 3,
-        type:searchKey.value,
-        code: searchKey.value,
-        name: searchKey.value
-    },(data)=>{
+				type: typeVal.value,
+				key: searchKey.value,
+			},
+			(data) => {
 				pagedata.value = data
 				loading.value = false
-  })
-}
-//初始加载
-loadData()
+			},
+		)
+	}
+	//初始加载
+	loadData()
 
-//表格列
-const columns = [
+	//导出数据
+	const downloadData = () => {
+		// 创建 URLSearchParams 对象
+		const params = new URLSearchParams()
+		if (typeVal.value) {
+			params.append('type', typeVal.value)
+		}
+		if (searchKey.value) {
+			params.append('key', searchKey.value)
+		}
+		params.append('applyType', '3')
+		const url = `${http.prefix}/apply/download-excel?${params.toString()}`
+		window.open(url)
+	}
+
+	//表格列
+	const columns = [
+		{
+			title: '序号',
+			dataIndex: 'key',
+			customRender: ({ index }: { index: number }) => `${index + 1}`,
+		},
 		{
 			title: '物料名称',
 			dataIndex: 'name',
 		},
+		{
+			title: '物料类型',
+			dataIndex: 'typeName',
+		},
 		{
 			title: '物料编码',
 			dataIndex: 'code',
 		},
 		{
-		title: '申请人',
-		dataIndex: 'applicant',
+			title: '物料型号',
+			dataIndex: 'spec',
 		},
 		{
-		title: '申请日期',
-		dataIndex: 'applyDate',
+			title: '出库类型',
+			dataIndex: 'applyTypeInfo',
 		},
+
 		{
 			title: '申请数量',
 			dataIndex: 'applyNum',
@@ -74,14 +173,34 @@ const columns = [
 			title: '确认数量',
 			dataIndex: 'confirmNum',
 		},
+		{
+			title: '申请人',
+			dataIndex: 'applicant',
+		},
+		{
+			title: '审核人',
+			dataIndex: 'reviewer',
+		},
+		{
+			title: '审核状态',
+			dataIndex: 'reviewResult',
+		},
+		{
+			title: '申请日期',
+			dataIndex: 'applyDate',
+		},
 		{
 			title: '备注',
 			dataIndex: 'remark',
-	}
-]
+		},
+		{
+			title: '操作',
+			dataIndex: 'operation',
+		},
+	]
 
-//分页信息
-const pagination = computed(() => {
+	//分页信息
+	const pagination = computed(() => {
 		return {
 			current: pagedata.value?.current,
 			pageSize: pagedata.value?.size,
@@ -90,8 +209,51 @@ const pagination = computed(() => {
 				loadData(page, pageSize)
 			},
 		}
-})
+	})
 
+	// 审核
+	const openResult = ref<boolean>(false)
+	const confirmLoading = ref(false)
+	const reviewResult = ref<'PASS' | 'REJECT'>('PASS')
+	const remark = ref('')
+	const reviewData = ref<Array<material.ScrapOutApplyDTO>>([])
+	const applyIdRef = ref(0)
+	//点击审核
+	const showResultModal = (applyId: number) => {
+		openResult.value = true
+		applyIdRef.value = applyId
+		api.materialApi.apply.getScrapOutById(applyId, (data) => {
+			reviewData.value = data
+		})
+	}
 
+	// 审核提交
+	const submit = () => {
+		confirmLoading.value = true
+		api.materialApi.apply.submitScrapOutReview(
+			{
+				applyId: applyIdRef.value.toString(),
+				reviewResult: reviewResult.value,
+				remark: remark.value,
+			},
+			() => {
+				confirmLoading.value = false
+				openResult.value = false
+				loadData()
+			},
+		)
+	}
+	// 物料类型树
+	const types = ref<Array<TreeDataNode>>([])
+	api.materialApi.type.trees((data) => {
+		types.value = children(data)
+	})
+	const children = (res: Array<material.TypeTree>): Array<TreeDataNode> => {
+		return res.map((areaTree) => ({
+			label: areaTree.label,
+			value: areaTree.value,
+			children: areaTree.children ? children(areaTree.children) : [],
+			key: areaTree.value,
+		}))
+	}
 </script>
-

src/views/stock/report/stocktakingReport-page.vue

@@ -3,67 +3,204 @@
 		<!-- 页面操作栏 -->
 		<template #ops>
 			<a-row>
-        <a-col :span="18">
-          <a-input-search v-model:value="searchKey" :placeholder="`请输入`" allow-clear enter-button
-            @search="loadData()"></a-input-search>
+				<a-col :span="6" style="width: 280px">
+					<a-date-picker
+						v-model:value="startDate"
+						:format="'YYYY-MM-DD HH:mm:ss'"
+						placeholder="开始日期大于"
+						style="width: 100%"
+					/>
+				</a-col>
+				<a-col :span="6" style="width: 180px">
+					<a-select
+						v-model:value="status"
+						placeholder="盘点状态"
+						:max-tag-count="1"
+						mode="multiple"
+						style="width: 100%"
+					>
+						<a-select-option value="WAIT_SCAN">待扫码</a-select-option>
+						<a-select-option value="WAIT_SUBMIT">待提交</a-select-option>
+						<a-select-option value="WAIT_REVIEW">待审核</a-select-option>
+						<a-select-option value="PASS">审核通过</a-select-option>
+						<a-select-option value="REJECT">退回</a-select-option>
+					</a-select>
+				</a-col>
+
+				<a-col :span="6" style="width: 180px">
+					<a-select v-model:value="auditType" :allow-clear="true" placeholder="盘点类型" style="width: 100%">
+						<a-select-option value="SCAN">扫码盘点</a-select-option>
+						<a-select-option value="MANUAL">人工盘点</a-select-option>
+					</a-select>
+				</a-col>
+				<a-col :span="6" style="width: 180px">
+					<a-input-search v-model:value="taker" :placeholder="`盘点人`" allow-clear enter-button @search="loadData()" />
 				</a-col>
 			</a-row>
+			<a-button type="primary" @click="downloadData()">导出</a-button>
 		</template>
 		<!-- 页面表格内容 -->
 		<div style="min-height: calc(100vh - 305px)">
 			<!-- 表格行 -->
-      <a-table :columns="columns" :data-source="auditPage?.records" bordered :pagination="pagination" :loading="loading"
-        row-key="key">
+			<a-table
+				:columns="columns"
+				:data-source="auditPage?.records"
+				bordered
+				:pagination="pagination"
+				:loading="loading"
+				row-key="key"
+			>
 				<template #bodyCell="{ column, record }">
 					<template v-if="column.dataIndex === 'auditType'">
-            {{ record.auditType === 'ALL' ? '全部盘点' : '部分盘点' }}
+						{{ record.auditType === 'SCAN' ? '扫码盘点' : '人工盘点' }}
 					</template>
 					<template v-if="column.dataIndex === 'reviewResult'">
-            <template v-if="record.reviewResult === 'WAIT_CHECK'"> 待盘点</template>
-            <template v-if="record.reviewResult === 'PASS'">  通过</template>
-            <template v-if="record.reviewResult === 'REJECT'">  拒绝 </template>
-            <template v-if="record.reviewResult === 'UN_PASS'">  未通过</template>
-            <template v-if="record.reviewResult === 'WAIT_AUDIT'"> 待审核</template>
+						<!-- 不同状态不同颜色 -->
+						<template v-if="record.reviewResult === 'WAIT_SCAN'"><span style="color: #faad14">待扫码</span></template>
+						<template v-if="record.reviewResult === 'WAIT_SUBMIT'"><span style="color: #1890ff">待提交</span></template>
+						<template v-if="record.reviewResult === 'WAIT_REVIEW'"><span style="color: #722ed1">待审核</span></template>
+						<template v-if="record.reviewResult === 'PASS'"><span style="color: #52c41a">审核通过</span></template>
+						<template v-if="record.reviewResult === 'REJECT'"><span style="color: #f5222d">退回</span></template>
+					</template>
+					<template v-if="column.dataIndex === 'operation'">
+						<a-button
+							v-if="record.reviewResult === 'WAIT_REVIEW'"
+							type="link"
+							style="margin-left: 10px"
+							@click="showResultModal(record.id, record.auditType, true)"
+						>
+							审核
+						</a-button>
+						<a-button
+							type="link"
+							style="margin-left: 10px"
+							@click="showResultModal(record.id, record.auditType, false)"
+						>
+							查看
+						</a-button>
 					</template>
 				</template>
-
 			</a-table>
 		</div>
 	</page-container>
 
+	<!-- 审核弹窗 -->
+	<a-modal v-model:open="openResult" title="盘点异常数据：" width="80%" :confirm-loading="confirmLoading" @ok="submit">
+		<result-form v-if="auditTypeRef === 'SCAN'" :apply-id="applyIdRef" />
+		<vxe-table
+			v-if="auditTypeRef === 'MANUAL'"
+			v-model:data="manualData"
+			border
+			show-overflow
+			max-height="500"
+			size="medium"
+		>
+			<vxe-column type="seq" title="序号" width="60" />
+			<vxe-column field="id" title="物料id" :visible="false" />
+			<vxe-column field="name" title="物料名称" />
+			<vxe-column field="code" title="编码" />
+			<vxe-column field="spec" title="规格" />
+			<vxe-column field="price" title="价格" />
+			<vxe-column field="typeName" title="类型" />
+			<vxe-column field="stock" title="库存数量" />
+			<vxe-column field="manualStock" title="手动核实数量" />
+			<vxe-column field="msg" title="异常原因" />
+		</vxe-table>
+		<a-form v-if="flag" layout="vertical" style="margin-top: 20px">
+			<a-form-item label="审核意见">
+				<a-textarea v-model:value="remark" placeholder="请输入审核意见" :row="3" :maxlength="1000" />
+			</a-form-item>
 
+			<a-form-item label="审核结果">
+				<a-radio-group v-model:value="reviewResult" button-style="solid">
+					<a-radio-button value="PASS">审核通过</a-radio-button>
+					<a-radio-button value="REJECT" style="margin-left: 20px">退回重盘</a-radio-button>
+				</a-radio-group>
+			</a-form-item>
+		</a-form>
+	</a-modal>
 </template>
 
 <script setup lang="ts">
-import api from '@/api';
-import { IPage } from '@/api/api'
-import { useUserStore } from '@/stores/user'
+	import api from '@/api'
+	import { IPage } from '@/api/api'
+	import resultForm from '../stocktaking/result-form.vue'
+	import { Dayjs } from 'dayjs'
+	import { http } from '@/settings/http'
 
+	const applyIdRef = ref()
+	const auditPage = ref<IPage<material.ApplyForm>>()
+	const loading = ref(false)
+	const confirmLoading = ref(false)
+	const reviewResult = ref<'PASS' | 'REJECT'>('PASS')
+	const remark = ref('')
+	// 搜索条件
+	const startDate = ref<Dayjs>()
+	const taker = ref('')
+	const status = ref<Array<'PASS' | 'REJECT' | 'WAIT_SCAN' | 'WAIT_SUBMIT' | 'WAIT_REVIEW'>>()
+	const auditType = ref<'SCAN' | 'MANUAL'>()
 
-const searchKey = ref('')
-const auditPage = ref<IPage<material.ApplyForm>>()
-const loading = ref(false)
-
-
-const userStore = useUserStore()
-// 加载数据的方法
-const loadData = async (page = 1, size = 10) => {
+	// 加载数据的方法
+	const loadData = async (page = 1, size = 10) => {
 		loading.value = true
 		api.materialApi.apply.searchAuditPage(
 			{
 				page: page,
 				size: size,
-      taker: userStore.userName
-    }, (data) => {
+				auditType: auditType.value,
+				//ISO 8601 的完整日期时间格式为：YYYY-MM-DDTHH:mm:ss，其中 T 是日期和时间之间的分隔符。
+				// 对于 LocalDateTime，不需要时区信息（即不包含 Z 或者 +/-HH:mm），因为 LocalDateTime 本身没有时区概念。
+				// 获取 ISO 8601 格式的字符串，但需要去掉 'Z' 和时区部分
+				createDate: startDate.value?.toISOString().replace('Z', '').slice(0, -1),
+				taker: taker.value,
+				reviewResults: status.value,
+			},
+			(data) => {
 				auditPage.value = data
 				loading.value = false
-    });
-}
-//初始加载
-loadData()
+			},
+		)
+	}
+	//初始加载
+	loadData()
 
-//表格列
-const columns = [
+	//导出数据
+	const downloadData = () => {
+		// 创建 URLSearchParams 对象
+		const params = new URLSearchParams()
+
+		// 动态添加参数
+		if (auditType.value) {
+			params.append('auditType', auditType.value)
+		}
+		if (startDate.value) {
+			// 格式化日期并移除 'Z' 和毫秒部分
+			const formattedDate = startDate.value.toISOString().replace('Z', '').slice(0, -4)
+			params.append('createDate', formattedDate)
+		}
+		if (taker.value) {
+			params.append('taker', taker.value)
+		}
+		if (status.value && status.value.length > 0) {
+			// 为数组中的每个值单独添加参数
+			status.value.forEach((value) => {
+				params.append('reviewResults', value)
+			})
+		}
+
+		// 构建完整的 URL
+		const url = `${http.prefix}/apply/audit/download-excel?${params.toString()}`
+
+		// 打开下载链接
+		window.open(url)
+	}
+	//表格列
+	const columns = [
+		{
+			title: '序号',
+			dataIndex: 'key',
+			customRender: ({ index }: { index: number }) => `${index + 1}`,
+		},
 		{
 			title: '盘点类型',
 			dataIndex: 'auditType',
@@ -76,36 +213,30 @@ const columns = [
 			title: '盘点人',
 			dataIndex: 'taker',
 		},
-  {
-    title: '任务状态',
-    dataIndex: 'reviewResult',
-  },
 		{
 			title: '盘点审核人',
 			dataIndex: 'reviewer',
 		},
 		{
-    title: '创建时间',
-    dataIndex: 'createdTime',
+			title: '申请日期',
+			dataIndex: 'applyDate',
 		},
 		{
-    title: '盘点结果(系统生成)',
-    dataIndex: 'result',
+			title: '审核意见',
+			dataIndex: 'reviewRemark',
 		},
 		{
-    title: '异常原因',
-    dataIndex: 'exception',
+			title: '审核结果',
+			dataIndex: 'reviewResult',
 		},
 		{
-    title: '处理方式',
-    dataIndex: 'handle',
+			title: '操作',
+			dataIndex: 'operation',
 		},
+	]
 
-
-]
-
-//分页信息
-const pagination = computed(() => {
+	//分页信息
+	const pagination = computed(() => {
 		return {
 			current: auditPage.value?.current,
 			pageSize: auditPage.value?.size,
@@ -114,7 +245,51 @@ const pagination = computed(() => {
 				loadData(page, pageSize)
 			},
 		}
-})
+	})
 
+	// 定义一个标记，用于控制是查看还是审核 flag=true审核，flag=false查看
+	const flag = ref(false)
+	const openResult = ref<boolean>(false)
+	const auditTypeRef = ref<'SCAN' | 'MANUAL'>()
 
+	// 点击 审核或者查看 按钮
+	const showResultModal = (applyId: number, auditType: 'SCAN' | 'MANUAL', select: boolean) => {
+		flag.value = select
+		auditTypeRef.value = auditType
+		applyIdRef.value = applyId
+		openResult.value = true
+		if (auditType === 'MANUAL') {
+			getManualData(applyId)
+		}
+	}
+
+	// 查询人工盘点数据
+	const manualData = ref<Array<material.ManualStockDTO>>()
+	const getManualData = (applyId: number) => {
+		api.materialApi.apply.getManualStock(applyId, (data) => {
+			manualData.value = data
+		})
+	}
+
+	//提交审核结果
+	const submit = () => {
+		confirmLoading.value = true
+		if (!flag.value) {
+			confirmLoading.value = false
+			openResult.value = false
+			return
+		}
+		api.materialApi.apply.submitReview(
+			{
+				applyId: applyIdRef.value,
+				reviewResult: reviewResult.value,
+				remark: remark.value,
+			},
+			() => {
+				confirmLoading.value = false
+				openResult.value = false
+				loadData()
+			},
+		)
+	}
 </script>

src/views/stock/stocktaking/form.ts

@@ -1,5 +1,5 @@
 import { FormItem, FormConfig } from '@/components/form-render/form-render-types'
-
+import { TreeDataNode } from 'ant-design-vue/es/vc-tree-select/interface'
 
 export const config: FormConfig = {
 	layout: 'horizontal',
@@ -14,9 +14,12 @@ export const config: FormConfig = {
 	},
 }
 
-export const formItems = (materialOptions: Array<{ value: string | undefined, label: string | undefined }>,
-  required : Ref<boolean>,
-  persons: Array<{ value: string | undefined, label: string | undefined }>): FormItem[] => [
+export const formItems = (
+	materialOptions: Array<{ value: string | undefined; label: string | undefined }>,
+	required: boolean,
+	persons: Array<{ value: string | undefined; label: string | undefined }>,
+	types: Array<TreeDataNode>,
+): FormItem[] => [
 	{
 		group: 'form',
 		type: 'radio',
@@ -31,8 +34,27 @@ export const formItems = (materialOptions: Array<{ value: string | undefined, la
 			size: 'default',
 			optionType: 'button',
 			buttonStyle: 'solid',
-        defaultValue: "ALL",
-        options: [{ value: "ALL", label: "全部盘点" }, { value: "PARTIAL", label: "部分盘点" }]
+			defaultValue: 'SCAN',
+			options: [
+				{ value: 'SCAN', label: '扫码盘点' },
+				{ value: 'MANUAL', label: '人工盘点' },
+			],
+		},
+		rules: [],
+	},
+	{
+		type: 'tree-select',
+		group: 'form',
+		config: {
+			label: '物料类型选择',
+			name: 'types',
+			required: true,
+		},
+		properties: {
+			size: 'default',
+			placeholder: '请选择物料类型',
+			multiple: true,
+			treeData: types,
 		},
 		rules: [],
 	},
@@ -45,11 +67,12 @@ export const formItems = (materialOptions: Array<{ value: string | undefined, la
 			hasFeedback: false,
 			label: '物料选择',
 			name: 'ids',
+			required: true,
 		},
 		properties: {
 			size: 'default',
 			mode: 'multiple',
-        required: required.value,
+			required: required,
 			placeholder: '请选择物料',
 			options: materialOptions,
 		},
@@ -93,5 +116,5 @@ export const formItems = (materialOptions: Array<{ value: string | undefined, la
 			options: persons,
 		},
 		rules: [],
-    }
-  ]
+	},
+]

src/views/stock/stocktaking/result-form.vue

@@ -0,0 +1,84 @@
+<template>
+	<vxe-table
+		ref="resulRef"
+		border
+		stripe
+		show-overflow
+		max-height="500"
+		:column-config="{ resizable: true }"
+		:data="tableData"
+		:keyboard-config="{ isEsc: true }"
+		size="medium"
+		empty-text="盘点数据和库存数据一致，可以直接提交审核"
+		:edit-config="{ trigger: 'click', mode: 'cell' }"
+	>
+		<vxe-column type="seq" title="序号" width="60"></vxe-column>
+		<vxe-column field="id" title="ID" :visible="false" />
+		<vxe-column field="materialName" title="物料名称" />
+		<vxe-column field="barcode" title="物料条码" />
+		<vxe-column field="exceptionReason" title="异常原因">
+			<template #default="{ row }">
+				<template v-if="row.exceptionReason === 'SOCK_IN_BUT_SCAN_NOT_EXIST'">库房在库状态但是扫码不存在</template>
+				<template v-if="row.exceptionReason === 'SOCK_OUT_BUT_SCAN_EXIST'">库房不是在库状态但是扫码存在</template>
+				<template v-if="row.exceptionReason === 'SOCK_NOT_EXIST_BUT_SCAN_EXIST'">库房不存在该条码但是扫码存在</template>
+			</template>
+		</vxe-column>
+		<vxe-column field="exceptionHandle" title="异常处理（手动选择）" :edit-render="handelEditRender"></vxe-column>
+		<vxe-column field="remark" title="备注说明" width="25%" :edit-render="{ name: 'textarea' }"></vxe-column>
+	</vxe-table>
+	<slot></slot>
+</template>
+<script setup lang="ts">
+	import api from '@/api'
+	import { toRefs } from 'vue'
+	import type { VxeColumnPropTypes, VxeTableInstance } from 'vxe-table'
+	import type { VxeSelectProps } from 'vxe-pc-ui'
+
+	// 父组件数据交互
+	const props = defineProps({
+		applyId: {
+			type: Number,
+			required: false,
+			default: 0,
+		},
+	})
+	const resulRef = ref<VxeTableInstance<material.StocktakingScanExceptionalData>>()
+	const getTableData = () => {
+		const $table = resulRef.value
+		if ($table) {
+			return $table.getTableData().fullData.map((item) => ({
+				id: item.id,
+				exceptionHandle: item.exceptionHandle,
+				remark: item.remark,
+			}))
+		}
+	}
+	defineExpose({ getTableData })
+
+	const { applyId } = toRefs(props)
+	const tableData = ref<Array<material.StocktakingScanExceptionalData>>()
+	const result = ref()
+
+	api.materialApi.apply.getComparisonRes(props.applyId + '', (data) => {
+		result.value = data
+		tableData.value = data.exceptionalData
+	})
+	//监听id的变化
+	watch(applyId, () => {
+		api.materialApi.apply.getComparisonRes(props.applyId + '', (data) => {
+			result.value = data
+			tableData.value = data.exceptionalData
+		})
+	})
+	//下拉框
+	const handelEditRender = ref<VxeColumnPropTypes.EditRender<undefined, VxeSelectProps>>({
+		name: 'VxeSelect',
+		options: [
+			{ label: '标记为丢失', value: 'MARK_LOST' },
+			{ label: '保持不变', value: 'MARK_KEEP' },
+			{ label: '标记为归还', value: 'MARK_RETURN' },
+			{ label: '标记为舍弃', value: 'MARK_DISCARD' },
+			{ label: '标记为新入库', value: 'MARK_NEW' },
+		],
+	})
+</script>

src/views/stock/stocktaking/resultForm.vue

@@ -1,79 +0,0 @@
-<template>
-  <vxe-table border stripe show-overflow ref="resulRef" max-height="500" :column-config="{ resizable: true }"
-    :data="tableData" :keyboard-config="{ isEsc: true }" size="medium" empty-text="盘点数据和库存数据一致，可以直接提交审核"
-    :edit-config="{ trigger: 'click', mode: 'cell' }">
-
-    <vxe-column type="seq" title="序号" width="60"></vxe-column>
-    <vxe-column field="id" title="ID" :visible="false" />
-    <vxe-column field="materialName" title="物料名称" />
-    <vxe-column field="barcode" title="物料条码" />
-    <vxe-column field="exceptionReason" title="异常原因">
-      <template #default="{ row }">
-        <template v-if="row.exceptionReason === 'SOCK_IN_BUT_SCAN_NOT_EXIST'"> 库房在库状态但是扫码不存在</template>
-        <template v-if="row.exceptionReason === 'SOCK_OUT_BUT_SCAN_EXIST'"> 库房不是在库状态但是扫码存在</template>
-        <template v-if="row.exceptionReason === 'SOCK_NOT_EXIST_BUT_SCAN_EXIST'"> 库房不存在该条码但是扫码存在</template>
-      </template>
-    </vxe-column>
-    <vxe-column field="exceptionHandle" title="异常处理（手动选择）"  :edit-render="handelEditRender"></vxe-column>
-    <vxe-column field="remark" title="备注说明"  width="25%" :edit-render="{ name: 'textarea' }"></vxe-column>
-  </vxe-table>
-</template>
-<script setup lang="ts">
-
-import api from '@/api'
-import { toRefs } from 'vue';
-import type { VxeColumnPropTypes,VxeTableInstance } from 'vxe-table'
-import type { VxeSelectProps } from 'vxe-pc-ui'
-
-// 父组件数据交互
-const props = defineProps(
-  {
-    applyId: {
-      type: Number,
-      required: false,
-      default: 0
-    }
-  }
-)
-const resulRef = ref<VxeTableInstance<material.StocktakingScanExceptionalData>>()
-const getTableData = () => {
-  const $table = resulRef.value
-  if ($table) {
-    return $table.getTableData().fullData.map(item => ({
-      id: item.id,
-      exceptionHandle: item.exceptionHandle,
-      remark: item.remark
-    }))
-}}
-defineExpose({getTableData});
-
-const { applyId } = toRefs(props)
-const tableData = ref<Array<material.StocktakingScanExceptionalData>>()
-const result = ref()
-
-api.materialApi.apply.getComparisonRes(props.applyId + '', (data) => {
-  result.value = data
-  tableData.value = data.exceptionalData
-})
-//监听id的变化
-watch(applyId, () => {
-  api.materialApi.apply.getComparisonRes(props.applyId + '', (data) => {
-    result.value = data
-    tableData.value = data.exceptionalData
-  })
-})
-//下拉框
-const handelEditRender = ref<VxeColumnPropTypes.EditRender<undefined, VxeSelectProps>>({
-  name: 'VxeSelect',
-  options: [
-    { label: '入库+1', value: 'INBOUND' },
-    { label: '不入库-1', value: 'OUTBOUND' },
-    { label: '丢弃-1', value: 'DISCARD' },
-  ]
-})
-
-
-
-
-
-</script>

src/views/stock/stocktaking/stocktaking-page.vue

@@ -4,171 +4,239 @@
 		<template #ops>
 			<a-row>
 				<a-col :span="18">
-          <a-input-search v-model:value="searchKey" :placeholder="`请输入`" allow-clear enter-button
-            @search="loadData()"></a-input-search>
+					<a-input-search
+						v-model:value="searchKey"
+						:placeholder="`请输入`"
+						allow-clear
+						enter-button
+						@search="loadData()"
+					></a-input-search>
 				</a-col>
 				<a-col :span="6">
 					<a-button type="primary" style="margin-left: 10px" @click="formDrawer?.show()">
 						<template #icon>
 							<icon-font type="icon-plus" />
 						</template>
-            申请扫码
+						新增盘点
 					</a-button>
-
 				</a-col>
 			</a-row>
 		</template>
 		<!-- 页面表格内容 -->
 		<div style="min-height: calc(100vh - 305px)">
 			<!-- 表格行 -->
-      <a-table :columns="columns" :data-source="auditPage?.records" bordered :pagination="pagination" :loading="loading"
-        row-key="key">
+			<a-table
+				:columns="columns"
+				:data-source="auditPage?.records"
+				bordered
+				:pagination="pagination"
+				:loading="loading"
+				row-key="key"
+			>
 				<template #bodyCell="{ column, record }">
 					<template v-if="column.dataIndex === 'auditType'">
-            {{ record.auditType === 'ALL' ? '全部盘点' : '部分盘点' }}
+						{{ record.auditType === 'SCAN' ? '扫码盘点' : '人工盘点' }}
 					</template>
 					<template v-if="column.dataIndex === 'reviewResult'">
-            <template v-if="record.reviewResult === 'WAIT_SCAN'"> 待扫码</template>
-            <template v-if="record.reviewResult === 'WAIT_SUBMIT'"> 待提交</template>
-            <template v-if="record.reviewResult === 'WAIT_REVIEW'"> 待审核 </template>
-            <template v-if="record.reviewResult === 'PASS'"> 审核通过</template>
-            <template v-if="record.reviewResult === 'REJECT'"> 退回</template>
+						<template v-if="record.reviewResult === 'WAIT_SCAN'"><span style="color: #faad14">待盘点</span></template>
+						<template v-if="record.reviewResult === 'WAIT_SUBMIT'"><span style="color: #1890ff">待提交</span></template>
+						<template v-if="record.reviewResult === 'WAIT_REVIEW'"><span style="color: #722ed1">待审核</span></template>
+						<template v-if="record.reviewResult === 'PASS'"><span style="color: #52c41a">审核通过</span></template>
+						<template v-if="record.reviewResult === 'REJECT'"><span style="color: #f5222d">退回</span></template>
 					</template>
 					<template v-if="column.dataIndex === 'operation'">
-            <a-button type="link" @click="showModal(record.id)" v-if="record.reviewResult === 'WAIT_SCAN'
-              || record.reviewResult === 'REJECT'">
+						<a-button
+							v-if="record.reviewResult === 'WAIT_SCAN' || record.reviewResult === 'REJECT'"
+							type="link"
+							@click="showModal(record.id, record.auditType)"
+						>
 							<template #icon>
 								<icon-font type="icon-edit" />
 							</template>
-              开始扫码
+							开始盘点
 						</a-button>
-            <a-button type="link" style="margin-left: 10px" @click="showResultModal(record.id)"
-              v-if="record.reviewResult === 'WAIT_SUBMIT' || record.reviewResult === 'WAIT_SCAN'">
+						<a-button
+							v-if="record.reviewResult === 'WAIT_SUBMIT'"
+							type="link"
+							style="margin-left: 10px"
+							@click="showResultModal(record.id)"
+						>
 							<template #icon>
 								<icon-font type="icon-plus" />
 							</template>
 							生成结果
 						</a-button>
-            <a-button type="link" style="margin-left: 10px" v-if="record.reviewResult === 'WAIT_REVIEW'">
-              <template #icon>
-                <icon-font type="icon-plus" />
-              </template>
-              审核
-            </a-button>
 					</template>
 				</template>
-
 			</a-table>
 		</div>
 	</page-container>
 
 	<!-- 新增申请抽屉 -->
-  <form-drawer ref="formDrawer" v-model="applyForm" :form-items="items" :config="formConfig"
-    :disabled-fields=disabledFields @ok="doSave" title="扫码盘点" />
+	<form-drawer
+		ref="formDrawer"
+		v-model="applyForm"
+		:form-items="items"
+		:config="formConfig"
+		title="扫码盘点"
+		@ok="doSave"
+	/>
 	<!-- 盘点作业弹窗 -->
-  <a-modal v-model:open="open" title="盘点作业" width="100%" wrap-class-name="full-modal" @ok="handleOk"
-    :confirm-loading="confirmLoading">
-    <scan-form ref="scanFormRef" :apply-id="applyIdRef" :total-value="88"></scan-form>
+	<a-modal
+		v-model:open="open"
+		title="盘点作业"
+		width="100%"
+		wrap-class-name="full-modal"
+		:confirm-loading="confirmLoading"
+		@ok="handleOk"
+		@cancel="cancel"
+	>
+		<scan-form ref="scanFormRef" :apply-id="applyIdRef" :total-value="totalValue">
+			<p>
+				{{ msg }}
+			</p>
+		</scan-form>
 	</a-modal>
 	<!-- 盘点结果弹窗 -->
-  <a-modal v-model:open="openResult" title="盘点异常数据：" okText= "提交审核" @ok="submitHandle" width="80%" :confirm-loading="confirmLoading">
+	<a-modal
+		v-model:open="openResult"
+		title="盘点异常数据："
+		ok-text="提交审核"
+		width="80%"
+		:confirm-loading="confirmLoading"
+		@ok="submitHandle"
+	>
 		<result-form ref="handleResultRef" :apply-id="applyIdRef"></result-form>
 	</a-modal>
-
-
+	<!-- 手动盘点弹窗 -->
+	<a-modal v-model:open="openManual" title="手动盘点" width="80%" :confirm-loading="confirmLoading" @ok="manualHandle">
+		<manual-form ref="manualFormRef" :apply-id="applyIdRef"></manual-form>
+	</a-modal>
 </template>
 
 <script setup lang="ts">
-import api from '@/api';
-import { IPage } from '@/api/api'
-import FormDrawer from '@/components/form-render/form-drawer.vue'
-import { config, formItems } from './form'
-import { notification } from 'ant-design-vue'
-import dayjs from 'dayjs';
-import { useUserStore } from '@/stores/user'
-import scanForm from '../component/scanForm.vue'
-import resultForm from '../stocktaking/resultForm.vue'
+	import api from '@/api'
+	import { IPage } from '@/api/api'
+	import FormDrawer from '@/components/form-render/form-drawer.vue'
+	import { config, formItems } from './form'
+	import { notification } from 'ant-design-vue'
+	import dayjs from 'dayjs'
+	import { useUserStore } from '@/stores/user'
+	import scanForm from '../component/scan-form.vue'
+	import resultForm from './result-form.vue'
+	import { TreeDataNode } from 'ant-design-vue/es/vc-tree-select/interface'
+	import manualForm from '../component/manual-form.vue'
 
-
-const searchKey = ref('')
-const userStore = useUserStore()
-const scanFormRef = ref(); // 盘点作业弹窗组件
-const handleResultRef = ref(); // 盘点结果弹窗组件
-const confirmLoading = ref(false) // 盘点作业弹窗提交按钮loading
-// 新增申请表单对象
-const applyForm = ref<Partial<material.AuditApplyInfo>>({
-  auditType: 'ALL',
-  applicant: userStore.userName,
+	const searchKey = ref('')
+	const userStore = useUserStore()
+	const scanFormRef = ref() // 盘点作业弹窗组件
+	const handleResultRef = ref() // 盘点结果弹窗组件
+	const confirmLoading = ref(false) // 盘点作业弹窗提交按钮loading
+	const manualFormRef = ref() // 手动盘点弹窗组件
+	// 新增申请表单对象
+	const applyForm = ref<Partial<material.AuditApplyInfo>>({
+		auditType: 'SCAN',
+		applicant: userStore.fullName,
 		type: 'AUDIT',
 		applyDate: dayjs() + '',
-  isConfirm: false,
-  reviewResult: 'WAIT_SCAN'
+		confirm: false,
+		reviewResult: 'WAIT_SCAN',
+		types: [],
+	})
+	const msg = ref()
+	const totalValue = ref(0) // 盘点总值
 
-})
+	//列表数据
+	const auditPage = ref<IPage<material.ApplyForm>>()
+	const loading = ref(false)
 
-//列表数据
-const auditPage = ref<IPage<material.ApplyForm>>()
-const loading = ref(false)
+	//新增申请的下拉框选择对象
+	const materialList = ref<Array<{ value: string | undefined; label: string | undefined }>>([])
+	const personList = ref<Array<{ value: string | undefined; label: string | undefined }>>([])
+	const required = ref(true)
+	api.aclApi.user.all((data) => {
+		personList.value = data.map((item) => {
+			return {
+				value: item?.fullName,
+				label: item?.fullName,
+			}
+		})
+	})
 
-//新增申请的下拉框选择对象
-const materialList = ref<Array<{ value: string | undefined, label: string | undefined }>>([])
-const personList = ref<Array<{ value: string | undefined, label: string | undefined }>>([])
-const required = ref(false)
-api.materialApi.material.all((data) => {
-  materialList.value = data.map(item => {
+	// //是否必填
+	// const disabledFields = computed(() => {
+	// 	return applyForm.value?.auditType === 'ALL' ? ['ids'] : []
+	// })
+
+	// 监听选择类型后查询物料
+	watch(
+		applyForm,
+		() => {
+			if (applyForm.value && applyForm.value.types && applyForm.value.types.length > 0) {
+				api.materialApi.material.all({ type: applyForm.value.types.join(',') }, (data) => {
+					materialList.value = data.map((item) => {
 						return {
 							value: item?.id + '',
-      label: item?.name
+							label: item?.name + '(' + item.spec + ')',
 						}
 					})
-})
-api.aclApi.user.all((data) => {
-  personList.value = data.map(item => {
-    return {
-      value: item?.name,
-      label: item?.fullName
-    }
 				})
-})
-
-//是否必填
-const disabledFields = computed(() => {
-  if (applyForm.value?.auditType !== 'ALL') {
-    required.value = true
 			}
-  return applyForm.value?.auditType === 'ALL' ? ['materials'] : []
-})
+		},
+		{
+			immediate: true,
+			deep: true,
+		},
+	)
 
-//抽屉组件
-const formDrawer = ref<typeof FormDrawer>()
-const formConfig = computed(() => {
+	// 物料类型树
+	const types = ref<Array<TreeDataNode>>([])
+	api.materialApi.type.trees((data) => {
+		types.value = children(data)
+	})
+	const children = (res: Array<material.TypeTree>): Array<TreeDataNode> => {
+		return res.map((areaTree) => ({
+			label: areaTree.label,
+			value: areaTree.value,
+			children: areaTree.children ? children(areaTree.children) : [],
+			key: areaTree.value,
+		}))
+	}
+
+	//抽屉组件
+	const formDrawer = ref<typeof FormDrawer>()
+	const formConfig = computed(() => {
 		return config
-})
-//表单配置
-const items = computed(() => {
-  return formItems(materialList.value, required, personList.value)
-})
-// 加载数据的方法
-const loadData = async (page = 1, size = 10) => {
+	})
+	//表单配置
+	const items = computed(() => {
+		//required 参数未生效
+		return formItems(materialList.value, required.value, personList.value, types.value)
+	})
+	// 加载数据的方法
+	const loadData = async (page = 1, size = 10) => {
 		loading.value = true
 		api.materialApi.apply.searchAuditPage(
 			{
 				page: page,
 				size: size,
-      reviewResults: ['WAIT_SUBMIT', 'WAIT_SCAN', 'WAIT_REVIEW', 'PASS'],
-    }, (data) => {
+				reviewResults: ['WAIT_SUBMIT', 'WAIT_SCAN', 'WAIT_REVIEW', 'REJECT'],
+			},
+			(data) => {
 				auditPage.value = data
 				loading.value = false
-    });
-}
-//初始加载
-loadData()
+			},
+		)
+	}
+	//初始加载
+	loadData()
 
-//表格列
-const columns = [
+	//表格列
+	const columns = [
 		{
-    title: '申请ID',
-    dataIndex: 'id',
+			title: '序号',
+			dataIndex: 'key',
+			customRender: ({ index }: { index: number }) => `${index + 1}`,
 		},
 		{
 			title: '盘点类型',
@@ -186,6 +254,10 @@ const columns = [
 			title: '任务状态',
 			dataIndex: 'reviewResult',
 		},
+		{
+			title: '审核意见',
+			dataIndex: 'reviewRemark',
+		},
 		{
 			title: '盘点审核人',
 			dataIndex: 'reviewer',
@@ -198,12 +270,11 @@ const columns = [
 		{
 			title: '操作',
 			dataIndex: 'operation',
-    width: 400,
-  }
-]
+		},
+	]
 
-//分页信息
-const pagination = computed(() => {
+	//分页信息
+	const pagination = computed(() => {
 		return {
 			current: auditPage.value?.current,
 			pageSize: auditPage.value?.size,
@@ -212,10 +283,10 @@ const pagination = computed(() => {
 				loadData(page, pageSize)
 			},
 		}
-})
+	})
 
-// 新增申请保存
-const doSave = (_data: material.AuditApplyInfo) => {
+	// 新增申请保存
+	const doSave = (_data: material.AuditApplyInfo) => {
 		api.materialApi.apply.auditApply(_data, () => {
 			formDrawer.value?.close()
 			notification.success({
@@ -226,63 +297,92 @@ const doSave = (_data: material.AuditApplyInfo) => {
 				},
 			})
 		})
+	}
 
-}
+	// 盘点作业弹窗相关
+	const open = ref<boolean>(false)
+	const applyIdRef = ref()
+	const showModal = (applyId: number, auditType: string) => {
+		if (auditType === 'SCAN') {
+			showScanModal(applyId)
+		} else {
+			showManualModal(applyId)
+		}
+	}
 
-// 盘点作业弹窗相关
-const open = ref<boolean>(false);
-const applyIdRef = ref();
-const showModal = (applyId: number) => {
-  open.value = true;
-  applyIdRef.value = applyId;
-
-};
-// 盘点作业提交数据
-
-
-//关闭弹窗 提交数据
-const handleOk = () => {
-  confirmLoading.value = true;
-  if (scanFormRef.value) {
-    const data = scanFormRef.value.getApplyData();
-    api.materialApi.apply.saveScanData(applyIdRef.value, data, () => {
-      open.value = false;
-      confirmLoading.value = false;
+	// 人工盘点
+	const openManual = ref<boolean>(false)
+	const showManualModal = (applyId: number) => {
+		applyIdRef.value = applyId
+		openManual.value = true
+	}
+	const manualHandle = () => {
+		//提交数据
+		if (manualFormRef.value) {
+			const res: Array<material.ManualStockDetail> = manualFormRef.value.getTableData()
+			api.materialApi.apply.submitManualStock(res, () => {
+				openManual.value = false
 				loadData(1)
 			})
 		}
+	}
 
-};
+	// 扫码弹窗
+	const showScanModal = (applyId: number) => {
+		open.value = true
+		applyIdRef.value = applyId
+		let m = '需要扫码的物料: '
+		//请求获取数据
+		api.materialApi.apply.getWaitScanData(applyId, (data) => {
+			const m = `需要扫码的物料: ${data.map((item) => item.materialName).join(', ') || '无'}`
+			data.forEach((item) => (totalValue.value += item.count || 0))
+			msg.value = m
+		})
+		msg.value = m
+	}
 
-// 盘点结果弹窗相关
-const openResult = ref<boolean>(false);
-const showResultModal = (applyId: number) => {
-  window.console.log("点击传参" + applyId);
-  openResult.value = true;
-  applyIdRef.value = applyId;
-};
+	// 盘点作业提交数据
 
-// 盘点结果提交数据
-const submitHandle = () => {
-  confirmLoading.value = true;
-  const handleData =handleResultRef.value.getTableData();
-  api.materialApi.apply.updateReviewResult(applyIdRef.value, handleData, () => {
-    openResult.value = false;
+	//关闭弹窗 提交数据
+	const handleOk = () => {
+		confirmLoading.value = true
+		if (scanFormRef.value) {
+			const data = scanFormRef.value.getApplyData()
+			api.materialApi.apply.saveScanData(applyIdRef.value, data, () => {
+				open.value = false
+				confirmLoading.value = false
 				loadData(1)
-  });
-  confirmLoading.value = false;
-}
-
-
-
-
-
+			})
+		}
+	}
+	// 关闭弹窗事件
+	const cancel = () => {
+		totalValue.value = 0
+		msg.value = ''
+	}
 
+	// 盘点结果弹窗相关
+	const openResult = ref<boolean>(false)
+	const showResultModal = (applyId: number) => {
+		window.console.log('点击传参' + applyId)
+		openResult.value = true
+		applyIdRef.value = applyId
+	}
 
+	// 盘点结果提交数据
+	const submitHandle = () => {
+		confirmLoading.value = true
+		const handleData = handleResultRef.value.getTableData()
+		api.materialApi.apply.updateReviewResult(applyIdRef.value, handleData, () => {
+			openResult.value = false
+			loadData(1)
+		})
+		confirmLoading.value = false
+	}
 </script>
 
 <style lang="less">
-.full-modal {
+	.full-modal {
 		.ant-modal {
 			max-width: 100%;
 			top: 0;
@@ -299,5 +399,5 @@ const submitHandle = () => {
 		.ant-modal-body {
 			flex: 1;
 		}
-}
+	}
 </style>

src/views/stock/type/form.ts

@@ -0,0 +1,101 @@
+import { Codebook } from '@/api/api'
+import { FormItem, FormConfig } from '@/components/form-render/form-render-types'
+
+export const config: FormConfig = {
+	layout: 'horizontal',
+	colon: true,
+	hideRequiredMark: false,
+	labelAlign: 'right',
+	scrollToFirstError: false,
+	validateOnRuleChange: true,
+	labelCol: {
+		span: 4,
+		offset: 0,
+	},
+}
+
+export const formItems = (levels: Codebook[]): FormItem[] => [
+	{
+		group: 'form',
+		type: 'input',
+		config: {
+			autoLink: true,
+			hasFeedback: false,
+			label: '类型编码',
+			name: 'no',
+			required: true,
+			help: '格式：一级编码两位组成，00-99取值，只要保证唯一即可；二级编码，四位组成,父级的两位+00-99取值，只要保证唯一即可；',
+		},
+		properties: {
+			size: 'default',
+			type: 'text',
+			allowClear: true,
+			bordered: true,
+			showCount: true,
+		},
+		rules: [],
+	},
+	{
+		group: 'form',
+		type: 'input',
+		config: {
+			autoLink: true,
+			hasFeedback: false,
+			label: '上级编码',
+			name: 'parentNo',
+		},
+		properties: {
+			size: 'default',
+			type: 'text',
+			allowClear: true,
+			bordered: true,
+			showCount: true,
+		},
+		rules: [],
+	},
+	{
+		type: 'select',
+		group: 'form',
+		config: {
+			autoLink: true,
+			hasFeedback: false,
+			label: '类型级别',
+			name: 'level',
+			required: true,
+		},
+		properties: {
+			size: 'default',
+			allowClear: false,
+			autoClearSearchValue: true,
+			autofocus: false,
+			bordered: true,
+			defaultActiveFirstOption: true,
+			dropdownMatchSelectWidth: true,
+			labelInValue: false,
+			showSearch: false,
+			options: levels.map((item) => {
+				return { value: item.name, label: item.description }
+			}),
+		},
+		rules: [],
+	},
+	{
+		group: 'form',
+		type: 'input',
+		config: {
+			autoLink: true,
+			hasFeedback: false,
+			label: '类型名称',
+			name: 'name',
+			required: true,
+		},
+		properties: {
+			size: 'default',
+			type: 'text',
+			allowClear: true,
+			bordered: true,
+			showCount: true,
+		},
+		rules: [],
+	},
+]

src/views/stock/type/type-page.vue

@@ -0,0 +1,179 @@
+<template>
+	<page-container sub-title="物料类型管理">
+		<template #ops>
+			<a-row>
+				<a-col :span="16">
+					<a-input-search
+						v-model:value="searchKey"
+						placeholder="搜索物料"
+						enter-button
+						@search="loadData()"
+					></a-input-search>
+				</a-col>
+				<a-col :span="8">
+					<a-button type="primary" @click="addOrEdit()">
+						<template #icon>
+							<icon-font type="icon-plus"></icon-font>
+						</template>
+						添加
+					</a-button>
+				</a-col>
+			</a-row>
+		</template>
+		<div style="min-height: calc(100vh - 218px)">
+			<vxe-table
+				ref="xTree"
+				border
+				show-overflow
+				size="medium"
+				:loading="loading"
+				height="600"
+				:column-config="{ resizable: true }"
+				:scroll-y="{ enabled: true, gt: 0 }"
+				:expand-config="{
+					expandAll: true,
+				}"
+				:tree-config="{
+					iconOpen: 'vxe-icon-square-minus',
+					iconClose: 'vxe-icon-square-plus',
+					transform: true,
+					rowField: 'no',
+					parentField: 'parentNo',
+					expandAll: true,
+					line: true,
+				}"
+				:data="areas"
+			>
+				<vxe-column field="name" title="类型" tree-node></vxe-column>
+				<vxe-column field="no" title="类型编码"></vxe-column>
+				<vxe-column field="levelInfo.description" title="类型级别"></vxe-column>
+				<vxe-column field="parentNo" title="上级类型编码"></vxe-column>
+				<vxe-column field="ops" title="操作" width="350">
+					<template #default="{ row }">
+						<a-button type="link" @click="addOrEdit({ parentNo: row.no })">
+							<template #icon>
+								<icon-font type="icon-children" />
+							</template>
+							添加子级
+						</a-button>
+						<a-button type="link" style="margin-left: 10px" @click="addOrEdit(row)">
+							<template #icon>
+								<icon-font type="icon-edit" />
+							</template>
+							编辑
+						</a-button>
+						<a-popconfirm :title="$t('确定要删除地区', { name: row.name })" @confirm="deleteArea(row.id)">
+							<a-button type="link" danger style="margin-left: 10px">
+								<template #icon>
+									<icon-font type="icon-delete" />
+								</template>
+								删除
+							</a-button>
+						</a-popconfirm>
+					</template>
+				</vxe-column>
+			</vxe-table>
+		</div>
+	</page-container>
+
+	<form-drawer
+		ref="formDrawer"
+		v-model="area"
+		:form-items="items"
+		:config="formConfig"
+		:title="modalTitle"
+		:disabled-fields="disabledFields"
+		:hidden-fields="hiddenFields"
+		@ok="doSave"
+	/>
+</template>
+
+<script lang="ts" setup>
+	import api from '@/api'
+	import { config, formItems } from './form'
+	import FormDrawer from '@/components/form-render/form-drawer.vue'
+	import { notification } from 'ant-design-vue'
+	import { Codebook } from '@/api/api'
+	import { FormDataType } from '@/components/form-render/form-render-types'
+
+	const areas = ref<Array<material.Type>>([])
+	const loading = ref(false)
+	const searchKey = ref('')
+	const area = ref<Partial<material.Type>>({})
+	const levels = ref<Codebook[]>([])
+	api.materialApi.type.levels((data) => {
+		levels.value = data
+	})
+	//表单
+	const formDrawer = ref<typeof FormDrawer>()
+
+	const formConfig = computed(() => {
+		return config
+	})
+	//表单配置
+	const items = computed(() => {
+		return formItems(levels.value)
+	})
+	//表单不可用字段
+	const disabledFields = computed(() => {
+		const no = area.value && area.value.id ? 'no' : ''
+		const parentNo = area.value && area.value.parentNo ? 'parentNo' : ''
+		return [no, parentNo]
+	})
+	//表单隐藏字段
+	const hiddenFields = computed(() => {
+		return area.value && area.value.parentNo ? [] : ['parentNo']
+	})
+
+	//弹窗标题
+	const modalTitle = computed(() => {
+		return area.value.id ? '编辑物料类型' : '添加物料类型'
+	})
+
+	// 加载数据
+	const loadData = () => {
+		loading.value = true
+		api.materialApi.type.areas(
+			{
+				key: searchKey.value,
+			},
+			(data) => {
+				areas.value = data
+				loading.value = false
+			},
+		)
+	}
+	loadData()
+
+	// 新增或编辑
+	const addOrEdit = (u?: Record<string, unknown>) => {
+		area.value = { ...u }
+		formDrawer.value?.show()
+	}
+
+	// 抽屉保存
+	const doSave = (_data: FormDataType) => {
+		api.materialApi.type.addAndModify(_data as unknown as material.Type, () => {
+			formDrawer.value?.close()
+			notification.success({
+				message: '操作成功',
+				description: '新增保存成功,页面将自动刷新!',
+				onClose: () => {
+					loadData()
+				},
+			})
+		})
+	}
+	// 删除
+	const deleteArea = (id: number) => {
+		api.materialApi.type.deleteArea(id, () => {
+			notification.success({
+				message: '操作成功',
+				description: '删除成功,页面将自动刷新!',
+				onClose: () => {
+					loadData()
+				},
+			})
+		})
+	}
+</script>

vite.config.ts

@@ -59,8 +59,8 @@ export default defineConfig(({ mode }) => {
 			open: true,
 			proxy: {
 				'/api': {
-					// target: 'https://iot.riemann.tech/api/',
-          			target: 'http://127.0.0.1:7777',
+					// target: 'https://ims.riemann.tech/api/',
+					target: 'http://127.0.0.1:8888',
 					changeOrigin: true,
 					rewrite: (path) => path.replace(/^\/api/, ''),
 				},