| src/api/erp/sale/order/index.ts | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/bpm/model/form/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/bpm/model/form/modules/basic-info.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/bpm/model/form/modules/process-design.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/mes/pro/mps/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/mes/pro/mps/modules/from-sale-order.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/api/erp/sale/order/index.ts
@@ -156,3 +156,35 @@ export function importSaleOrder(file: File) { return requestClient.upload<ImportResult>('/erp/sale-order/import', { file }); } /** å¾ å®æç产çéå®è®¢åæç»ï¼å«å¯ç¨åºåä¸å»ºè®®ç产æ°éï¼ */ export interface PendingProductionItem { saleOrderId?: number; saleOrderNo?: string; saleOrderItemId?: number; customerId?: number; customerName?: string; productId?: number; productCode?: string; productName?: string; productSpecification?: string; productUnitName?: string; orderCount?: number; orderTime?: string; stockQuantity?: number; suggestQuantity?: number; } /** æ¥è¯¢å¾ 宿ç产çéå®è®¢åæç» */ export function getPendingProductionList() { return requestClient.get<PendingProductionItem[]>( '/erp/sale-order/pending-production-list', ); } /** ä»éå®è®¢åæ¹éçæç产计å */ export function generateMpsFromSaleOrder( items: Array<{ quantity: number; saleOrderItemId: number }>, ) { return requestClient.post<number>('/erp/sale-order/generate-mps', { items }); } src/views/bpm/model/form/index.vue
@@ -16,7 +16,6 @@ } from '@vben/constants'; import { useTabs } from '@vben/hooks'; import { IconifyIcon } from '@vben/icons'; import { useUserStore } from '@vben/stores'; import { Button, Card, message } from 'ant-design-vue'; @@ -49,7 +48,6 @@ const router = useRouter(); const route = useRoute(); const userStore = useUserStore(); const tabs = useTabs(); const basicInfoRef = ref<InstanceType<typeof BasicInfo>>(); // åºç¡ä¿¡æ¯ç»ä»¶å¼ç¨ @@ -188,8 +186,10 @@ } else { // æ åµä¸ï¼æ°å¢åºæ¯ formData.value.startUserType = 0; // å ¨ä½ formData.value.managerUserIds.push(userStore.userInfo?.id); } // æµç¨ç®¡çååºå®ä¸ºè¶ 级管çåï¼adminï¼ç³»ç»è´¦å· id=1ï¼ï¼ä¸å è®¸éæ©/ä¿®æ¹ formData.value.managerUserIds = [1]; // è·å表åå表 formList.value = await getFormSimpleList(); @@ -353,29 +353,9 @@ } } /** æ¥éª¤åæ¢å¤ç */ async function handleStepClick(index: number) { try { if (index !== 0) { await validateBasic(); } if (index !== 1) { await validateForm(); } if (index !== 2) { await validateProcess(); } if (index !== 3) { await validateExtra(); } // 忢æ¥éª¤ currentStep.value = index; } catch (error) { console.error('æ¥éª¤åæ¢å¤±è´¥:', error); if (currentStep.value !== 2) { message.warning('请å å®åå½åæ¥éª¤å¿ å¡«ä¿¡æ¯'); } } /** æ¥éª¤åæ¢å¤çï¼å 许èªç±åè¿/è¿åï¼ä¸åæ¥éª¤æ ¡éªï¼ä¿å/å叿¶æç»ä¸æ ¡éªï¼ */ function handleStepClick(index: number) { currentStep.value = index; } /** è¿åå表页 */ src/views/bpm/model/form/modules/basic-info.vue
@@ -61,7 +61,6 @@ const selectedStartDepts = ref<SystemDeptApi.Dept[]>([]); // éä¸çåèµ·é¨é¨ const selectedManagerUsers = ref<SystemUserApi.User[]>([]); // éä¸çæµç¨ç®¡çå const currentSelectType = ref<'manager' | 'start'>('start'); const selectedUsers = ref<number[]>(); // éä¸çç¨æ· const rules: Record<string, Rule[]> = { name: [{ required: true, message: 'æµç¨åç§°ä¸è½ä¸ºç©º', trigger: 'blur' }], @@ -121,7 +120,6 @@ /** æå¼åèµ·äººéæ© */ function openStartUserSelect() { currentSelectType.value = 'start'; selectedUsers.value = selectedStartUsers.value.map( (user) => user.id, ) as number[]; @@ -141,27 +139,12 @@ }; } /** æå¼ç®¡çåéæ© */ function openManagerUserSelect() { currentSelectType.value = 'manager'; selectedUsers.value = selectedManagerUsers.value.map( (user) => user.id, ) as number[]; userSelectModalApi.setData({ userIds: selectedUsers.value }).open(); } /** å¤çç¨æ·éæ©ç¡®è®¤ */ /** å¤çç¨æ·éæ©ç¡®è®¤ï¼åèµ·äººï¼ */ function handleUserSelectConfirm(userList: SystemUserApi.User[]) { modelData.value = currentSelectType.value === 'start' ? { ...modelData.value, startUserIds: userList.map((u) => u.id), } : { ...modelData.value, managerUserIds: userList.map((u) => u.id), }; modelData.value = { ...modelData.value, startUserIds: userList.map((u) => u.id), }; } /** ç¨æ·éæ©å¼¹çªå ³é */ @@ -219,16 +202,6 @@ ...modelData.value, startDeptIds: modelData.value.startDeptIds.filter( (id: number) => id !== dept.id, ), }; } /** ç§»é¤ç®¡çå */ function handleRemoveManagerUser(user: SystemUserApi.User) { modelData.value = { ...modelData.value, managerUserIds: modelData.value.managerUserIds.filter( (id: number) => id !== user.id, ), }; } @@ -411,22 +384,7 @@ <span class="text-gray-700 dark:text-gray-200"> {{ user.nickname }} </span> <IconifyIcon icon="lucide:x" class="ml-2 size-4 cursor-pointer text-gray-400 hover:text-red-500" @click="handleRemoveManagerUser(user)" /> </div> <Button type="link" @click="openManagerUserSelect" class="flex items-center" > <template #icon> <IconifyIcon icon="lucide:user-plus" class="size-4" /> </template> éæ©äººå </Button> </div> </Form.Item> </Form> src/views/bpm/model/form/modules/process-design.vue
@@ -47,7 +47,12 @@ /** æ¯å¦æ¾ç¤ºè®¾è®¡å¨ */ const showDesigner = computed(() => { return Boolean(modelData.value?.key && modelData.value?.name); // ç®æè®¾è®¡å¨ï¼Simple ç±»åï¼å§ç»æ¾ç¤ºï¼ä¸ä¾èµ key/nameï¼ // åªæ BPMN è®¾è®¡å¨æè¦æ±å å¡«åæµç¨æ è¯ä¸åç§° if (modelData.value?.type === BpmModelType.BPMN) { return Boolean(modelData.value?.key && modelData.value?.name); } return true; }); defineExpose({ validate }); src/views/mes/pro/mps/index.vue
@@ -23,6 +23,7 @@ import { MpsStatusEnum, useGridColumns, useGridFormSchema } from './data'; import Form from './modules/form.vue'; import FromSaleOrder from './modules/from-sale-order.vue'; /** MPS ç产主计åå表 */ defineOptions({ name: 'MesProMps' }); @@ -33,6 +34,16 @@ connectedComponent: Form, destroyOnClose: true, }); /** ä»éå®è®¢åçæç产计åï¼ç产车é´è§è§ï¼ç»ååºå夿æ¯å¦éè¦çäº§ï¼ */ const [FromSaleOrderModal, fromSaleOrderModalApi] = useVbenModal({ connectedComponent: FromSaleOrder, destroyOnClose: true, }); function handleCreateFromSaleOrder() { fromSaleOrderModalApi.open(); } const checkedIds = ref<number[]>([]); const checkedRows = ref<MesProMpsApi.Mps[]>([]); @@ -203,6 +214,7 @@ <template> <Page auto-content-height> <FormModal @success="handleRefresh" /> <FromSaleOrderModal @success="handleRefresh" /> <Grid table-title="ç产主计å(MPS)å表"> <template #toolbar-tools> <TableAction @@ -215,6 +227,13 @@ onClick: handleCreate, }, { label: 'ä»éå®è®¢åçæ', type: 'primary', icon: ACTION_ICON.ADD, auth: ['mes:pro-mps:create'], onClick: handleCreateFromSaleOrder, }, { label: $t('ui.actionTitle.export'), type: 'primary', icon: ACTION_ICON.DOWNLOAD, src/views/mes/pro/mps/modules/from-sale-order.vue
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,205 @@ <script lang="ts" setup> import type { TableColumnsType } from 'ant-design-vue'; import type { PendingProductionItem } from '#/api/erp/sale/order'; import { computed, ref } from 'vue'; import { useVbenModal } from '@vben/common-ui'; import { Alert, InputNumber, message, Spin, Table, Tag } from 'ant-design-vue'; import { generateMpsFromSaleOrder, getPendingProductionList, } from '#/api/erp/sale/order'; const emit = defineEmits(['success']); interface RowItem extends PendingProductionItem { /** 计åç产æ°éï¼å¯ç¼è¾ï¼ */ planQuantity?: number; /** æ¯å¦å¾é */ selected?: boolean; } const loading = ref(false); const submitting = ref(false); const list = ref<RowItem[]>([]); const columns: TableColumnsType = [ { title: 'éå®è®¢åå·', dataIndex: 'saleOrderNo', width: 150, fixed: 'left' }, { title: '客æ·', dataIndex: 'customerName', width: 130, ellipsis: true }, { title: '产åç¼ç ', dataIndex: 'productCode', width: 120 }, { title: '产ååç§°', dataIndex: 'productName', width: 140, ellipsis: true }, { title: 'è§æ ¼', dataIndex: 'productSpecification', width: 100 }, { title: 'è®¢è´æ°é', dataIndex: 'orderCount', width: 100, align: 'right' }, { title: 'è®¢åæ¥æ', dataIndex: 'orderTime', width: 160 }, { title: 'å¯ç¨åºå', dataIndex: 'stockQuantity', width: 100, align: 'right', }, { title: '建议ç产', dataIndex: 'suggestQuantity', width: 110, align: 'right', }, { title: 'è®¡åæ°é', dataIndex: 'planQuantity', width: 130, key: 'plan' }, ]; /** å·²å¾éçè¡ */ const selectedRows = computed(() => list.value.filter((r) => r.selected)); /** åè®¡è®¡åæ°é */ const totalPlanQuantity = computed(() => selectedRows.value.reduce((sum, r) => sum + (r.planQuantity ?? 0), 0), ); /** åºåå è¶³ï¼æ éç产ï¼çè¡æ° */ const enoughStockCount = computed( () => list.value.filter((r) => (r.suggestQuantity ?? 0) <= 0).length, ); function handleSelectAll(checked: boolean) { list.value.forEach((row) => { // åºåå¤çé»è®¤ä¸å¾éï¼ä½å 许æå·¥å¾éï¼å®¢æ·å¯è½è¦æ±å¤è´§ï¼ row.selected = checked; }); } async function loadList() { loading.value = true; try { const data = await getPendingProductionList(); list.value = (data ?? []).map((item) => { const suggest = item.suggestQuantity ?? 0; return { ...item, // é»è®¤å¾ééè¦ç产çï¼å»ºè®®ç产 > 0ï¼ selected: suggest > 0, planQuantity: suggest > 0 ? suggest : undefined, }; }); } finally { loading.value = false; } } const [Modal, modalApi] = useVbenModal({ async onConfirm() { const items = selectedRows.value .filter((r) => (r.planQuantity ?? 0) > 0) .map((r) => ({ saleOrderItemId: r.saleOrderItemId!, quantity: r.planQuantity!, })); if (items.length === 0) { message.warning('请è³å°å¾é䏿¡å¹¶å¡«åå¤§äº 0 çè®¡åæ°é'); return; } submitting.value = true; try { const count = await generateMpsFromSaleOrder(items); emit('success'); message.success(`å·²çæ ${count} æ¡ç产计å`); await modalApi.close(); } finally { submitting.value = false; } }, async onOpenChange(isOpen: boolean) { if (!isOpen) { list.value = []; return; } await loadList(); }, }); </script> <template> <Modal title="ä»éå®è®¢åçæç产计å" class="w-4/5"> <Spin :spinning="loading || submitting"> <div class="mx-4 flex flex-col gap-3"> <Alert type="info" show-icon message="æãå¯ç¨åºåã夿æ¯å¦éè¦ç产ï¼åºåå è¶³çå¯ä¸å®æï¼å»ºè®®ç产æ°é = è®¢è´æ°é â å¯ç¨åºåãå¾éåå¯ç´æ¥ä¿®æ¹è®¡åæ°éã" /> <div class="flex items-center gap-4 text-gray-600"> <span>å ± <b>{{ list.length }}</b> æ¡å¾ 宿æç»</span> <span v-if="enoughStockCount > 0" class="text-green-600"> å ¶ä¸ {{ enoughStockCount }} æ¡åºåå è¶³ </span> <span> å·²é <b>{{ selectedRows.length }}</b> æ¡ï¼åè®¡è®¡åæ°é <b>{{ totalPlanQuantity }}</b> </span> </div> <Table :data-source="list" :columns="columns" :pagination="false" :row-selection="{ selectedRowKeys: selectedRows.map((r) => r.saleOrderItemId), onSelect: (record: RowItem, checked: boolean) => { record.selected = checked; if (checked && !record.planQuantity) { record.planQuantity = (record.suggestQuantity ?? 0) > 0 ? record.suggestQuantity : undefined; } }, onSelectAll: (checked: boolean) => handleSelectAll(checked), }" :scroll="{ y: 420, x: 1400 }" row-key="saleOrderItemId" size="small" > <template #bodyCell="{ column, record }"> <template v-if="column.dataIndex === 'stockQuantity'"> <span :class=" (record.stockQuantity ?? 0) > 0 ? 'font-semibold text-green-600' : 'text-red-500' " > {{ record.stockQuantity ?? 0 }} </span> </template> <template v-else-if="column.dataIndex === 'suggestQuantity'"> <Tag v-if="(record.suggestQuantity ?? 0) > 0" color="warning" > {{ record.suggestQuantity }} </Tag> <Tag v-else color="success">åºåå¤</Tag> </template> <template v-else-if="column.key === 'plan'"> <InputNumber v-model:value="record.planQuantity" :min="0" :precision="3" class="w-full" placeholder="å¡«åè®¡åæ°é" @change=" (val: any) => { record.selected = (val ?? 0) > 0; } " /> </template> </template> </Table> </div> </Spin> </Modal> </template>