by2025/admin-vben5
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:出库记录
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details

Browse Source
This commit is contained in:
dev_ljl
2025-08-04 17:27:37 +08:00
parent 28295b283e
commit 98d6dd0d9b
9 changed files with 391 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
apps/web-antd/src/views/property/assetManage/application/application-modal.vue
View File

@@ -1,20 +1,25 @@
<script setup lang="ts">
import { computed, ref } from 'vue';
import {computed, ref} from 'vue';
import { useVbenModal } from '@vben/common-ui';
import { $t } from '@vben/locales';
import { cloneDeep } from '@vben/utils';
import {useVbenModal} from '@vben/common-ui';
import {$t} from '@vben/locales';
import {cloneDeep} from '@vben/utils';
import { type FormSchemaGetter, useVbenForm } from "#/adapter/form";
import { applicationAdd, applicationInfo, applicationUpdate } from '#/api/property/assetManage/application';
import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
import {type FormSchemaGetter, useVbenForm} from "#/adapter/form";
import {
applicationAdd,
applicationInfo,
applicationUpdate
} from '#/api/property/assetManage/application';
import {defaultFormValueGetter, useBeforeCloseDiff} from '#/utils/popup';
import { modalSchema } from './data';
import { assetTypeselect } from "#/api/property/assetType";
import { depotList } from "#/api/property/assetManage/depot";
import { suppliersList } from "#/api/property/assetManage/suppliers";
import { assetList } from "#/api/property/assetManage/asset";
import { userList } from "#/api/system/user";
import {modalSchema} from './data';
import {assetTypeselect} from "#/api/property/assetType";
import {depotList} from "#/api/property/assetManage/depot";
import {suppliersList} from "#/api/property/assetManage/suppliers";
import {assetList} from "#/api/property/assetManage/asset";
import {userList} from "#/api/system/user";
import type {AssetVO} from "#/api/property/assetManage/asset/model";
const emit = defineEmits<{ reload: [] }>();
@@ -39,7 +44,7 @@ const [BasicForm, formApi] = useVbenForm({
wrapperClass: 'grid-cols-2',
});
const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
const {onBeforeClose, markInitialized, resetInitialized} = useBeforeCloseDiff(
{
initializedGetter: defaultFormValueGetter(formApi),
currentGetter: defaultFormValueGetter(formApi),
@@ -48,15 +53,15 @@ const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
formApi.getValues().then(setupPackageSelect);
async function upSelectUser(nickName: string){
const list=await userList({
nickName:nickName,
async function upSelectUser(nickName: string) {
const list = await userList({
nickName: nickName,
pageNum: 1,
pageSize: 10,
});
const options=list.map(item=>{
item.label=item.userName;
item.value=item.id;
const options = list.map(item => {
item.label = item.userName;
item.value = item.id;
})
fromApi.updateSchema([
{
@@ -71,15 +76,15 @@ async function upSelectUser(nickName: string){
]);
}
async function upSelectAssets(assetsName: string){
const list=await assetList({
assetsName:assetsName,
async function upSelectAssets(assetsName: string) {
const list = await assetList({
assetsName: assetsName,
pageNum: 1,
pageSize: 10,
});
const options=list.map(item=>{
item.label=item.assetsName;
item.value=item.id;
const options = list.map(item => {
item.label = item.assetsName;
item.value = item.id;
})
fromApi.updateSchema([
{
@@ -94,15 +99,18 @@ async function upSelectAssets(assetsName: string){
]);
}
const assetsData = ref<AssetVO[]>([])
async function setupPackageSelect() {
const users = await userList({
pageNum: 1,
pageSize: 10,
pageSize: 1000,
});
const assets = await assetList({
pageNum: 1,
pageSize: 10,
pageSize: 1000,
});
assetsData.value = assets.rows
const options = users.rows.map((item) => ({
label: item.nickName,
value: item.userId,
@@ -121,7 +129,7 @@ async function setupPackageSelect() {
},
async select(userId) {
await upSelectUser(userId);
userId=""
userId = ""
},
fieldName: 'userId',
},
@@ -131,18 +139,30 @@ async function setupPackageSelect() {
optionLabelProp: 'label',
options: assetOptions,
showSearch: true,
onChange: async (value: string) => {
// 找到选中的服务数据
const assetInfo = assetsData.value.find(item => item.id === value);
if (assetInfo) {
formApi.updateSchema([{
componentProps: {
max:assetInfo.stock
},
fieldName: 'number',
}])
}
},
},
async select(assetsId) {
await upSelectAssets(assetsId);
assetsId=""
assetsId = ""
},
fieldName: 'assetId',
},
]);
}
const [BasicModal, modalApi] = useVbenModal({
// 在这里更改宽度
class: 'w-[550px]',
@@ -156,7 +176,7 @@ const [BasicModal, modalApi] = useVbenModal({
}
modalApi.modalLoading(true);
const { id } = modalApi.getData() as { id?: number | string };
const {id} = modalApi.getData() as { id?: number | string };
isUpdate.value = !!id;
if (isUpdate.value && id) {
@@ -172,7 +192,7 @@ const [BasicModal, modalApi] = useVbenModal({
async function handleConfirm() {
try {
modalApi.lock(true);
const { valid } = await formApi.validate();
const {valid} = await formApi.validate();
if (!valid) {
return;
}
@@ -197,7 +217,7 @@ async function handleClosed() {
<template>
<BasicModal :title="title">
<BasicForm />
<BasicForm/>
</BasicModal>
</template>

118
apps/web-antd/src/views/property/assetManage/application/data.ts
View File

@@ -2,65 +2,65 @@ import type { FormSchemaGetter } from '#/adapter/form';
import type { VxeGridProps } from '#/adapter/vxe-table';
import { renderDict } from "#/utils/render";
import { DictEnum } from '@vben/constants';
import {getDictOptions} from "#/utils/dict";
export const querySchema: FormSchemaGetter = () => [
// {
// component: 'Input',
// fieldName: 'assetId',
// label: '资产id',
// },
// {
// component: 'Input',
// fieldName: 'userId',
// label: '领用人id',
// },
// {
// component: 'Input',
// fieldName: 'number',
// label: '数量',
// },
{
component: 'Input',
fieldName: 'assetId',
label: '资产id',
},
{
component: 'Input',
fieldName: 'userId',
label: '领用人id',
},
{
component: 'Input',
fieldName: 'number',
label: '数量',
},
{
component: 'Input',
component: 'Select',
componentProps:{
options:getDictOptions(DictEnum.WY_ZCSHZT)
},
fieldName: 'state',
label: '状态',
},
{
component: 'Input',
fieldName: 'acceptanceUserId',
label: '审批人id',
},
{
component: 'DatePicker',
componentProps: {
showTime: true,
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
fieldName: 'acceptanceTime',
label: '审批时间',
},
{
component: 'DatePicker',
componentProps: {
showTime: true,
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
fieldName: 'applicationTime',
label: '申请时间',
label: '领用状态',
},
// {
// component: 'Input',
// fieldName: 'acceptanceUserId',
// label: '审批人id',
// },
// {
// component: 'DatePicker',
// componentProps: {
// showTime: true,
// format: 'YYYY-MM-DD HH:mm:ss',
// valueFormat: 'YYYY-MM-DD HH:mm:ss',
// },
// fieldName: 'acceptanceTime',
// label: '审批时间',
// },
// {
// component: 'DatePicker',
// componentProps: {
// showTime: true,
// format: 'YYYY-MM-DD HH:mm:ss',
// valueFormat: 'YYYY-MM-DD HH:mm:ss',
// },
// fieldName: 'applicationTime',
// label: '申请时间',
// },
];
// 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
// export const columns: () => VxeGridProps['columns'] = () => [
export const columns: VxeGridProps['columns'] = [
{ type: 'checkbox', width: 60 },
{
title: '主键',
field: 'id',
},
{
title: '资产',
field: 'assetName',
@@ -74,7 +74,11 @@ export const columns: VxeGridProps['columns'] = [
field: 'number',
},
{
title: '状态',
title: '申请时间',
field: 'applicationTime',
},
{
title: '领用状态',
field: 'state',
slots: {
default: ({ row }) => {
@@ -90,14 +94,6 @@ export const columns: VxeGridProps['columns'] = [
title: '审批时间',
field: 'acceptanceTime',
},
{
title: '申请时间',
field: 'applicationTime',
},
{
title: '创建时间',
field: 'createTime',
},
{
field: 'action',
fixed: 'right',
@@ -118,19 +114,25 @@ export const modalSchema: FormSchemaGetter = () => [
},
},
{
label: '资产id',
label: '资产',
fieldName: 'assetId',
component: 'Select',
rules:'selectRequired'
},
{
label: '领用人id',
label: '领用人',
fieldName: 'userId',
component: 'Select',
rules:'selectRequired'
},
{
label: '数量',
fieldName: 'number',
component: 'Input',
component: 'InputNumber',
componentProps:{
min:1,
},
rules:'required'
},
// {
// label: '状态',

61
apps/web-antd/src/views/property/assetManage/application/index.vue
View File

@@ -1,9 +1,9 @@
<script setup lang="ts">
import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
import { getVxePopupContainer } from '@vben/utils';
import {Page, useVbenModal, type VbenFormProps} from '@vben/common-ui';
import {getVxePopupContainer} from '@vben/utils';
import { Modal, Popconfirm, Space } from 'ant-design-vue';
import {Modal, Popconfirm, Space} from 'ant-design-vue';
import {
useVbenVxeGrid,
@@ -14,14 +14,15 @@ import {
import {
applicationExport,
applicationList,
applicationRemove,
applicationRemove, applicationUpdate,
} from '#/api/property/assetManage/application';
import type { ApplicationForm } from '#/api/property/assetManage/application/model';
import { commonDownloadExcel } from '#/utils/file/download';
import type {ApplicationForm} from '#/api/property/assetManage/application/model';
import {commonDownloadExcel} from '#/utils/file/download';
import applicationModal from './application-modal.vue';
import { columns, querySchema } from './data';
import {columns, querySchema} from './data';
import {useUserStore} from "@vben/stores";
import { cloneDeep } from '@vben/utils';
const formOptions: VbenFormProps = {
commonConfig: {
labelWidth: 80,
@@ -50,7 +51,7 @@ const gridOptions: VxeGridProps = {
pagerConfig: {},
proxyConfig: {
ajax: {
query: async ({ page }, formValues = {}) => {
query: async ({page}, formValues = {}) => {
return await applicationList({
pageNum: page.currentPage,
pageSize: page.pageSize,
@@ -81,7 +82,7 @@ function handleAdd() {
}
async function handleEdit(row: Required<ApplicationForm>) {
modalApi.setData({ id: row.id });
modalApi.setData({id: row.id});
modalApi.open();
}
@@ -90,6 +91,17 @@ async function handleDelete(row: Required<ApplicationForm>) {
await tableApi.query();
}
const userStore = useUserStore();
async function handleAudit(row: Required<ApplicationForm>, status: number) {
const info = cloneDeep(row)
info.state = status
info.acceptanceTime = new Date()
info.acceptanceUserId = userStore.userInfo?.userId
await applicationUpdate(info)
await tableApi.query();
}
function handleMultiDelete() {
const rows = tableApi.grid.getCheckboxRecords();
const ids = rows.map((row: Required<ApplicationForm>) => row.id);
@@ -141,12 +153,29 @@ function handleDownloadExcel() {
</template>
<template #action="{ row }">
<Space>
<ghost-button
v-access:code="['property:application:edit']"
@click.stop="handleEdit(row)"
<!-- <ghost-button-->
<!-- v-access:code="['property:application:edit']"-->
<!-- @click.stop="handleEdit(row)"-->
<!-- >-->
<!-- {{ $t('pages.common.edit') }}-->
<!-- </ghost-button>-->
<Popconfirm
:get-popup-container="getVxePopupContainer"
placement="left"
title="资产领用审核"
@confirm="handleAudit(row,1)"
cancelText="不通过"
okText="通过"
@cancel="handleAudit(row,2)"
>
{{ $t('pages.common.edit') }}
</ghost-button>
<ghost-button
v-access:code="['property:application:edit']"
@click.stop=""
:disabled="row.state!=0"
>
审核
</ghost-button>
</Popconfirm>
<Popconfirm
:get-popup-container="getVxePopupContainer"
placement="left"
@@ -164,6 +193,6 @@ function handleDownloadExcel() {
</Space>
</template>
</BasicTable>
<ApplicationModal @reload="tableApi.query()" />
<ApplicationModal @reload="tableApi.query()"/>
</Page>
</template>