From b9128255d4438ae73db9e5ef01b5cb1f8e328aa2 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期四, 05 十一月 2026 17:10:50 +0800
Subject: [PATCH] feat: add process knowledge and after-sales workflows
---
src/api/aftersales/collaboration.ts | 44 ++++
src/views/aftersales/collaboration/index.vue | 154 +++++++++++++++
src/views/mes/process-design/knowledge/index.vue | 208 ++++++++++++++++++++
src/views/erp/sale/order/index.vue | 2
src/api/aftersales/ticket.ts | 5
src/views/erp/finance/after-sale-draft/index.vue | 64 ++++++
src/api/erp/finance/after-sale-draft.ts | 22 ++
src/views/aftersales/ticket/index.vue | 34 +++
src/api/mes/pro/processdesign/knowledge/index.ts | 39 +++
9 files changed, 569 insertions(+), 3 deletions(-)
diff --git a/src/api/aftersales/collaboration.ts b/src/api/aftersales/collaboration.ts
new file mode 100644
index 0000000..a983ecb
--- /dev/null
+++ b/src/api/aftersales/collaboration.ts
@@ -0,0 +1,44 @@
+import type { PageParam, PageResult } from '@vben/request';
+import { requestClient } from '#/api/request';
+
+export interface Collaboration {
+ id: number;
+ ticketId: number;
+ category: string;
+ title: string;
+ content: string;
+ assigneeUserId: number;
+ requestedBy: number;
+ status: number;
+ result?: string;
+ createTime?: string;
+ completedTime?: string;
+ amount?: string;
+ direction?: string;
+ partyName?: string;
+ partyType?: string;
+ partyId?: number;
+ financeDraftId?: number;
+ previousId?: number;
+ businessApproverId?: number;
+ businessRemark?: string;
+ financeReview?: { status: number; remark?: string; reviewTime?: string };
+}
+export interface CreateCollaboration {
+ ticketId?: number;
+ category?: string;
+ title: string;
+ content: string;
+ assigneeUserId?: number;
+ amount?: string;
+ direction?: string;
+ partyName?: string;
+ partyId?: number;
+ previousId?: number;
+}
+export const getMyCollaborations = (params: PageParam) => requestClient.get<PageResult<Collaboration>>('/aftersales/collaboration/my-page', { params });
+export const createCollaboration = (data: CreateCollaboration) => requestClient.post<number>('/aftersales/collaboration/create', data);
+export const completeCollaboration = (id: number, result: string) => requestClient.put('/aftersales/collaboration/complete', { result }, { params: { id } });
+export const cancelCollaboration = (id: number) => requestClient.put('/aftersales/collaboration/cancel', undefined, { params: { id } });
+export const reviewCollaborationFinancial = (id: number, approved: boolean, remark?: string) =>
+ requestClient.put('/aftersales/collaboration/review-financial', { approved, remark }, { params: { id } });
diff --git a/src/api/aftersales/ticket.ts b/src/api/aftersales/ticket.ts
index ad1056e..b005eb1 100644
--- a/src/api/aftersales/ticket.ts
+++ b/src/api/aftersales/ticket.ts
@@ -2,6 +2,11 @@
import { requestClient } from '#/api/request';
+/** 鎸夊綋鍓嶅満鏅拰鐢ㄦ埛鏉冮檺缁熻鍚勭姸鎬佺殑鍞悗宸ュ崟鏁� */
+export function getTicketOverview(sceneType: number) {
+ return requestClient.get<Record<string, number>>('/aftersales/ticket/overview', { params: { sceneType } });
+}
+
export namespace AftersalesTicketApi {
/** 宸ュ崟鏄庣粏琛� */
export interface TicketItem {
diff --git a/src/api/erp/finance/after-sale-draft.ts b/src/api/erp/finance/after-sale-draft.ts
new file mode 100644
index 0000000..7555665
--- /dev/null
+++ b/src/api/erp/finance/after-sale-draft.ts
@@ -0,0 +1,22 @@
+import type { PageParam, PageResult } from '@vben/request';
+import { requestClient } from '#/api/request';
+
+export interface AfterSaleFinanceDraft {
+ id: number;
+ collaborationId: number;
+ ticketId: number;
+ category: string;
+ direction: string;
+ amount: string;
+ partyName?: string;
+ description: string;
+ businessApproverId: number;
+ status: number;
+ reviewerId?: number;
+ reviewRemark?: string;
+ reviewTime?: string;
+}
+export const getAfterSaleFinanceDraftPage = (params: PageParam & { status?: number }) =>
+ requestClient.get<PageResult<AfterSaleFinanceDraft>>('/erp/finance/after-sale-draft/page', { params });
+export const reviewAfterSaleFinanceDraft = (id: number, approved: boolean, remark?: string) =>
+ requestClient.put('/erp/finance/after-sale-draft/review', { approved, remark }, { params: { id } });
diff --git a/src/api/mes/pro/processdesign/knowledge/index.ts b/src/api/mes/pro/processdesign/knowledge/index.ts
new file mode 100644
index 0000000..8fd868a
--- /dev/null
+++ b/src/api/mes/pro/processdesign/knowledge/index.ts
@@ -0,0 +1,39 @@
+import type { PageParam, PageResult } from '@vben/request';
+import { requestClient } from '#/api/request';
+
+export interface KnowledgeResource {
+ processId?: number;
+ resourceType: 'MACHINE' | 'WORKSTATION' | 'OTHER';
+ resourceId?: number;
+ capabilityDescription: string;
+}
+export interface KnowledgeReference { id: number; targetType: string; targetId: number; knowledgeVersion: number; createTime?: string }
+export interface Knowledge {
+ id?: number;
+ code: string;
+ name: string;
+ version?: number;
+ productItemId?: number;
+ bomId?: number;
+ voltageMin?: number;
+ voltageMax?: number;
+ market: 'ALL' | 'DOMESTIC' | 'EXPORT';
+ routeId?: number;
+ templateId?: number;
+ description?: string;
+ status?: number;
+ standards?: string[];
+ resources?: KnowledgeResource[];
+}
+
+export const getKnowledgePage = (params: PageParam & { name?: string }) =>
+ requestClient.get<PageResult<Knowledge>>('/mes/pd/knowledge/page', { params });
+export const getKnowledge = (id: number) =>
+ requestClient.get<{ knowledge: Knowledge; standards: string[]; resources: KnowledgeResource[]; references: KnowledgeReference[] }>('/mes/pd/knowledge/get', { params: { id } });
+export const createKnowledge = (data: Knowledge) => requestClient.post<number>('/mes/pd/knowledge/create', data);
+export const updateKnowledge = (data: Knowledge) => requestClient.put('/mes/pd/knowledge/update', data);
+export const publishKnowledge = (id: number) => requestClient.put('/mes/pd/knowledge/publish', undefined, { params: { id } });
+export const reviseKnowledge = (id: number) => requestClient.post<number>('/mes/pd/knowledge/revise', undefined, { params: { id } });
+export const referenceKnowledgeRoute = (id: number, routeId: number) => requestClient.post('/mes/pd/knowledge/reference-route', undefined, { params: { id, routeId } });
+export const matchKnowledge = (params: { productId?: number; bomId?: number; voltage?: number; market?: string; standards?: string[] }) =>
+ requestClient.get<Knowledge[]>('/mes/pd/knowledge/match', { params: { ...params, standards: params.standards?.join(',') } });
diff --git a/src/views/aftersales/collaboration/index.vue b/src/views/aftersales/collaboration/index.vue
new file mode 100644
index 0000000..51564cf
--- /dev/null
+++ b/src/views/aftersales/collaboration/index.vue
@@ -0,0 +1,154 @@
+<script setup lang="ts">
+import type { Collaboration, CreateCollaboration } from '#/api/aftersales/collaboration';
+import { computed, onMounted, reactive, ref } from 'vue';
+import { Page } from '@vben/common-ui';
+import { useUserStore } from '@vben/stores';
+import { Button, Form, FormItem, Input, InputNumber, Modal, Popconfirm, Select, Space, Table, Tag, message } from 'ant-design-vue';
+import { cancelCollaboration, completeCollaboration, createCollaboration, getMyCollaborations, reviewCollaborationFinancial } from '#/api/aftersales/collaboration';
+import { getTicketPage } from '#/api/aftersales/ticket';
+import { UserSelect } from '#/views/system/user/components';
+import SrmSupplierSelect from '#/views/srm/supplier/components/select.vue';
+
+const userStore = useUserStore();
+const items = ref<Collaboration[]>([]);
+const page = ref(1);
+const total = ref(0);
+const loading = ref(false);
+const saving = ref(false);
+const createOpen = ref(false);
+const finishOpen = ref(false);
+const finishId = ref<number>();
+const finishResult = ref('');
+const reviewOpen = ref(false);
+const reviewId = ref<number>();
+const reviewApproved = ref(true);
+const reviewRemark = ref('');
+const tickets = ref<{ label: string; value: number }[]>([]);
+let ticketRequest = 0;
+const form = reactive<CreateCollaboration>({ title: '', content: '' });
+const allowsAmount = computed(() => ['FINANCE', 'SUPPLIER', 'WARRANTY', 'QUALITY'].includes(form.category || ''));
+const requiresAmount = computed(() => ['FINANCE', 'SUPPLIER', 'WARRANTY'].includes(form.category || ''));
+const categories = [
+ { value: 'QUALITY', label: '璐ㄩ噺澶勭悊' }, { value: 'FINANCE', label: '璐㈠姟鍗忓悓' },
+ { value: 'SUPPLIER', label: '渚涘簲鍟嗙储璧�' }, { value: 'WARRANTY', label: '涓夊寘澶勭悊' },
+ { value: 'RESEARCH', label: '鐮斿彂鍙嶉' }, { value: 'PROCESS', label: '宸ヨ壓鍙嶉' },
+];
+const columns = [
+ { title: '浜嬮」', dataIndex: 'title' }, { title: '绫诲瀷', key: 'category' },
+ { title: '宸ュ崟缂栧彿', dataIndex: 'ticketId' }, { title: '鍙戣捣浜�', dataIndex: 'requestedBy' },
+ { title: '鎺ユ敹浜�', dataIndex: 'assigneeUserId' }, { title: '鐘舵��', key: 'status' },
+ { title: '鎿嶄綔', key: 'actions', width: 160 },
+];
+async function load() {
+ loading.value = true;
+ try { const result = await getMyCollaborations({ pageNo: page.value, pageSize: 20 }); items.value = result.list; total.value = result.total; }
+ catch { /* 璇锋眰灞傛樉绀洪敊璇�� */ } finally { loading.value = false; }
+}
+async function searchTickets(keyword = '') {
+ const request = ++ticketRequest;
+ try {
+ // 濮嬬粓鎸囧畾鏁版嵁鏉冮檺鍦烘櫙锛岄伩鍏嶆棤鍦烘櫙鏉′欢鏃舵墿澶у彲瑙佽寖鍥淬��
+ const [owned, involved] = await Promise.all([
+ getTicketPage({ pageNo: 1, pageSize: 100, sceneType: 1, no: keyword || undefined }),
+ getTicketPage({ pageNo: 1, pageSize: 100, sceneType: 2, no: keyword || undefined }),
+ ]);
+ if (request !== ticketRequest) return;
+ const unique = new Map<number, { label: string; value: number }>();
+ for (const ticket of [...owned.list, ...involved.list]) if (ticket.id != null) unique.set(ticket.id, { label: `${ticket.no || ticket.id} ${ticket.name || ''}`, value: ticket.id });
+ tickets.value = [...unique.values()];
+ } catch { /* 璇锋眰灞傛樉绀洪敊璇�� */ }
+}
+async function openCreate() {
+ Object.assign(form, { ticketId: undefined, category: undefined, title: '', content: '', assigneeUserId: undefined,
+ amount: undefined, direction: undefined, partyName: undefined, partyId: undefined, previousId: undefined });
+ createOpen.value = true;
+ await searchTickets();
+}
+async function retry(record: Collaboration) {
+ Object.assign(form, { ticketId: record.ticketId, category: record.category, title: record.title, content: record.content,
+ assigneeUserId: record.assigneeUserId, amount: record.amount, direction: record.direction, partyName: record.partyName, partyId: record.partyId,
+ previousId: record.id });
+ createOpen.value = true;
+ await searchTickets();
+ if (!tickets.value.some(ticket => ticket.value === record.ticketId))
+ tickets.value.push({ value: record.ticketId, label: `宸ュ崟 #${record.ticketId}` });
+}
+async function create() {
+ if (!form.ticketId || !form.category || !form.title.trim() || !form.content.trim() || !form.assigneeUserId) { message.warning('璇峰畬鏁村~鍐欎簨椤�'); return; }
+ if ((requiresAmount.value && form.amount == null) || (form.amount != null && (Number(form.amount) <= 0 || !form.direction
+ || (form.category === 'SUPPLIER' && !form.partyId)
+ || (!['SUPPLIER', 'WARRANTY'].includes(form.category) && form.direction !== 'INTERNAL' && !form.partyName?.trim())))) { message.warning('璇峰~鍐欐湁鏁堥噾棰濄�佽祫閲戞柟鍚戝強寰�鏉ユ柟'); return; }
+ saving.value = true;
+ try { await createCollaboration(form); message.success('鍗忓悓浜嬮」宸插彂璧�'); createOpen.value = false; await load(); }
+ catch { /* 璇锋眰灞傛樉绀洪敊璇�� */ } finally { saving.value = false; }
+}
+function openFinish(id: number) { finishId.value = id; finishResult.value = ''; finishOpen.value = true; }
+async function finish() {
+ if (!finishId.value || !finishResult.value.trim()) { message.warning('璇峰~鍐欏鐞嗙粨鏋�'); return; }
+ saving.value = true;
+ try { await completeCollaboration(finishId.value, finishResult.value); message.success('鍗忓悓浜嬮」宸插畬鎴�'); finishOpen.value = false; await load(); }
+ catch { /* 璇锋眰灞傛樉绀洪敊璇�� */ } finally { saving.value = false; }
+}
+async function cancel(id: number) {
+ try { await cancelCollaboration(id); message.success('鍗忓悓浜嬮」宸插彇娑�'); await load(); }
+ catch { /* 璇锋眰灞傛樉绀洪敊璇�� */ }
+}
+function changeCategory() { form.partyId = undefined; form.partyName = undefined; if (!allowsAmount.value) { form.amount = undefined; form.direction = undefined; } }
+function openReview(id: number, approved: boolean) { reviewId.value = id; reviewApproved.value = approved; reviewRemark.value = ''; reviewOpen.value = true; }
+async function review() {
+ if (!reviewId.value || (!reviewApproved.value && !reviewRemark.value.trim())) { message.warning('閫�鍥炴椂璇峰~鍐欏鏍告剰瑙�'); return; }
+ saving.value = true;
+ try { await reviewCollaborationFinancial(reviewId.value, reviewApproved.value, reviewRemark.value || undefined);
+ message.success(reviewApproved.value ? '涓氬姟瀹℃牳閫氳繃锛屽凡鐢熸垚璐㈠姟鑽夌' : '宸查��鍥�'); reviewOpen.value = false; await load(); }
+ catch { /* 璇锋眰灞傛樉绀洪敊璇�� */ } finally { saving.value = false; }
+}
+onMounted(load);
+</script>
+
+<template>
+ <Page title="鍞悗鍗忓悓">
+ <p class="mb-3 text-gray-500">娑夊強閲戦鐨勪簨椤瑰湪涓氬姟瀹℃牳閫氳繃鍚庣敓鎴愯储鍔¤崏绋匡紱鑽夌瀹℃牳涓嶄細鑷姩浠樻鎴栬璐︺��</p>
+ <Button v-access:code="['aftersales:collaboration:create']" type="primary" class="mb-3" @click="openCreate">鍙戣捣鍗忓悓</Button>
+ <Table :columns="columns" :data-source="items" :loading="loading" row-key="id"
+ :pagination="{ current: page, pageSize: 20, total, showSizeChanger: false, onChange: (p: number) => { page = p; load(); } }">
+ <template #expandedRowRender="{ record }"><p>浜嬮」鍐呭锛歿{ record.content }}</p><p v-if="record.result">澶勭悊缁撴灉锛歿{ record.result }}</p>
+ <p v-if="record.amount != null">閲戦锛歿{ record.amount }} 鍏冿紱鏂瑰悜锛歿{ record.direction }}锛涘線鏉ユ柟锛歿{ record.partyName || '鈥�' }}</p>
+ <p v-if="record.financeDraftId">璐㈠姟鑽夌缂栧彿锛歿{ record.financeDraftId }}锛涜储鍔″鏍革細{{ record.financeReview?.status === 0 ? '寰呭鏍�' : record.financeReview?.status === 1 ? '瀹℃牳閫氳繃' : record.financeReview?.status === 2 ? '宸查��鍥�' : '鐘舵�佸緟纭' }}</p>
+ <p v-if="record.previousId">涓婁竴鍗忓悓浜嬮」缂栧彿锛歿{ record.previousId }}</p>
+ <p v-if="record.financeReview?.remark">璐㈠姟瀹℃牳鎰忚锛歿{ record.financeReview.remark }}</p><p v-if="record.businessRemark">涓氬姟瀹℃牳鎰忚锛歿{ record.businessRemark }}</p>
+ </template>
+ <template #bodyCell="{ column, record }">
+ <template v-if="column.key === 'category'">{{ categories.find(item => item.value === record.category)?.label || record.category }}</template>
+ <template v-else-if="column.key === 'status'"><Tag>{{ record.status === 1 ? (record.amount != null ? '寰呬笟鍔″鏍�' : '宸插畬鎴�') : record.status === 2 ? '宸插彇娑�' : record.status === 3 ? '宸茬敓鎴愯储鍔¤崏绋�' : record.status === 4 ? '涓氬姟宸查��鍥�' : '寰呭鐞�' }}</Tag></template>
+ <template v-else-if="column.key === 'actions'"><Space>
+ <Button v-if="record.status === 0 && record.assigneeUserId === Number(userStore.userInfo?.id)" v-access:code="['aftersales:collaboration:update']" type="link" @click="openFinish(record.id)">澶勭悊</Button>
+ <Popconfirm v-if="record.status === 0 && record.requestedBy === Number(userStore.userInfo?.id)" title="纭鍙栨秷璇ヤ簨椤癸紵" @confirm="cancel(record.id)"><Button v-access:code="['aftersales:collaboration:update']" type="link" danger>鍙栨秷</Button></Popconfirm>
+ <Button v-if="record.status === 1 && record.amount != null" v-access:code="['aftersales:collaboration:approve']" type="link" @click="openReview(record.id, true)">涓氬姟閫氳繃</Button>
+ <Button v-if="record.status === 1 && record.amount != null" v-access:code="['aftersales:collaboration:approve']" type="link" danger @click="openReview(record.id, false)">涓氬姟閫�鍥�</Button>
+ <Button v-if="record.requestedBy === Number(userStore.userInfo?.id) && (record.status === 4 || (record.status === 2 && record.previousId != null) || (record.status === 3 && record.financeReview?.status === 2))" v-access:code="['aftersales:collaboration:create']" type="link" @click="retry(record as Collaboration)">閲嶆柊鍙戣捣</Button>
+ </Space></template>
+ </template>
+ </Table>
+ <Modal v-model:open="createOpen" title="鍙戣捣鍞悗鍗忓悓" :confirm-loading="saving" @ok="create">
+ <Form layout="vertical">
+ <FormItem label="鍞悗宸ュ崟" required><Select v-model:value="form.ticketId" :options="tickets" :disabled="!!form.previousId" show-search :filter-option="false" placeholder="杈撳叆宸ュ崟鍙锋悳绱�" @search="searchTickets" /></FormItem>
+ <FormItem label="鍗忓悓绫诲瀷" required><Select v-model:value="form.category" :options="categories" :disabled="!!form.previousId" @change="changeCategory" /></FormItem>
+ <FormItem label="浜嬮」鍚嶇О" required><Input v-model:value="form.title" :maxlength="200" /></FormItem>
+ <FormItem label="寰呭鐞嗗唴瀹�" required><Input.TextArea v-model:value="form.content" :rows="3" :maxlength="2000" /></FormItem>
+ <FormItem label="鎺ユ敹浜�" required><UserSelect v-model="form.assigneeUserId" /></FormItem>
+ <FormItem v-if="allowsAmount" label="娑夊強閲戦锛堝厓锛�" :required="requiresAmount"><InputNumber v-model:value="form.amount" string-mode :min="0.01" :precision="2" class="w-full" /></FormItem>
+ <FormItem v-if="form.amount != null" label="璧勯噾鏂瑰悜" required><Select v-model:value="form.direction" :options="[{label:'搴旀敹',value:'RECEIVABLE'},{label:'搴斾粯',value:'PAYABLE'},{label:'鍐呴儴鎴愭湰',value:'INTERNAL'}]" /></FormItem>
+ <FormItem v-if="form.amount != null && form.category === 'SUPPLIER'" label="渚涘簲鍟�" required><SrmSupplierSelect v-model="form.partyId" :approval-filter="false" :supplier-name="form.partyName" @change="item => form.partyName = item?.name" /></FormItem>
+ <FormItem v-else-if="form.amount != null && form.category === 'WARRANTY'" label="瀹㈡埛">浠庡敭鍚庡伐鍗曞叧鑱旂殑瀹㈡埛鑷姩鑾峰彇</FormItem>
+ <FormItem v-else-if="form.amount != null && form.direction !== 'INTERNAL'" label="寰�鏉ユ柟鍚嶇О" required><Input v-model:value="form.partyName" :maxlength="200" /></FormItem>
+ </Form>
+ </Modal>
+ <Modal v-model:open="finishOpen" title="澶勭悊鍗忓悓浜嬮」" :confirm-loading="saving" @ok="finish">
+ <Input.TextArea v-model:value="finishResult" :rows="4" :maxlength="2000" placeholder="濉啓澶勭悊缁撴灉" />
+ </Modal>
+ <Modal v-model:open="reviewOpen" :title="reviewApproved ? '涓氬姟瀹℃牳閫氳繃' : '涓氬姟瀹℃牳閫�鍥�'" :confirm-loading="saving" @ok="review">
+ <p v-if="reviewApproved" class="mb-2">纭鍚庡皢鐢熸垚璐㈠姟鑽夌锛岀瓑寰呰储鍔″鏍革紝涓嶄細鑷姩浠樻鎴栬璐︺��</p>
+ <Input.TextArea v-model:value="reviewRemark" :rows="3" :maxlength="1000" :placeholder="reviewApproved ? '瀹℃牳鎰忚锛堝彲閫夛級' : '璇峰~鍐欓��鍥炲師鍥�'" />
+ </Modal>
+ </Page>
+</template>
diff --git a/src/views/aftersales/ticket/index.vue b/src/views/aftersales/ticket/index.vue
index edd0d78..7ddd81a 100644
--- a/src/views/aftersales/ticket/index.vue
+++ b/src/views/aftersales/ticket/index.vue
@@ -2,16 +2,16 @@
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { AftersalesTicketApi } from '#/api/aftersales/ticket';
-import { ref } from 'vue';
+import { onMounted, ref } from 'vue';
import { useRouter } from 'vue-router';
import { Page, useVbenModal } from '@vben/common-ui';
import { AftersaleTicketStatusEnum } from '@vben/constants';
-import { Button, message, Tabs, Tag } from 'ant-design-vue';
+import { Button, Card, Col, message, Row, Statistic, Tabs, Tag } from 'ant-design-vue';
import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
-import { deleteTicket, getTicketPage } from '#/api/aftersales/ticket';
+import { deleteTicket, getTicketOverview, getTicketPage } from '#/api/aftersales/ticket';
import { cancelTicket } from '#/api/aftersales/ticket';
import { $t } from '#/locales';
@@ -29,11 +29,32 @@
}
const sceneType = ref('1');
+const overview = ref<Record<string, number>>({});
+const overviewLoading = ref(false);
+let overviewRequest = 0;
+const overviewItems = [
+ { status: '0', label: '鑽夌' }, { status: '10', label: '澶勭悊涓�' },
+ { status: '30', label: '寰呴��璐�' }, { status: '40', label: '寰呴��娆�/鎹㈣揣' },
+ { status: '50', label: '宸插畬缁�' }, { status: '60', label: '宸插叧闂�' },
+ { status: '99', label: '宸插彇娑�' },
+];
+async function loadOverview() {
+ const request = ++overviewRequest;
+ overview.value = {};
+ overviewLoading.value = true;
+ try {
+ const result = await getTicketOverview(Number(sceneType.value));
+ if (request === overviewRequest) overview.value = result;
+ } catch { /* 璇锋眰灞傛樉绀洪敊璇紝閬垮厤鏄剧ず鍏朵粬鍦烘櫙鐨勭粺璁°�� */ }
+ finally { if (request === overviewRequest) overviewLoading.value = false; }
+}
+onMounted(loadOverview);
/** 澶勭悊鍦烘櫙绫诲瀷鐨勫垏鎹� */
function handleChangeSceneType(key: number | string) {
sceneType.value = key.toString();
gridApi.query();
+ void loadOverview();
}
const [FormModal, formModalApi] = useVbenModal({
@@ -44,6 +65,7 @@
/** 鍒锋柊琛ㄦ牸 */
function handleRefresh() {
gridApi.query();
+ void loadOverview();
}
/** 鍒涘缓宸ュ崟 */
@@ -114,6 +136,12 @@
<Page auto-content-height>
<FormModal @success="handleRefresh" />
+ <Row :gutter="12" class="mb-3">
+ <Col v-for="item in overviewItems" :key="item.status" :xs="12" :xl="3">
+ <Card size="small" :loading="overviewLoading"><Statistic :title="item.label" :value="overview[item.status] ?? '鈥�'" /></Card>
+ </Col>
+ </Row>
+
<Grid table-title="鍞悗宸ュ崟鍒楄〃">
<template #toolbar-actions>
<Tabs class="w-full" @change="handleChangeSceneType">
diff --git a/src/views/erp/finance/after-sale-draft/index.vue b/src/views/erp/finance/after-sale-draft/index.vue
new file mode 100644
index 0000000..8269462
--- /dev/null
+++ b/src/views/erp/finance/after-sale-draft/index.vue
@@ -0,0 +1,64 @@
+<script setup lang="ts">
+import type { AfterSaleFinanceDraft } from '#/api/erp/finance/after-sale-draft';
+import { onMounted, ref } from 'vue';
+import { Page } from '@vben/common-ui';
+import { Button, Input, Modal, Select, Space, Table, Tag, message } from 'ant-design-vue';
+import { getAfterSaleFinanceDraftPage, reviewAfterSaleFinanceDraft } from '#/api/erp/finance/after-sale-draft';
+
+const rows = ref<AfterSaleFinanceDraft[]>([]);
+const page = ref(1);
+const total = ref(0);
+const status = ref<number>();
+const loading = ref(false);
+const saving = ref(false);
+const dialogOpen = ref(false);
+const reviewId = ref<number>();
+const approved = ref(true);
+const remark = ref('');
+const categoryLabels: Record<string, string> = { QUALITY: '璐ㄩ噺璐圭敤', FINANCE: '璐㈠姟鍗忓悓', SUPPLIER: '渚涘簲鍟嗙储璧�', WARRANTY: '涓夊寘璧斾粯' };
+const columns = [
+ { title: '鑽夌缂栧彿', dataIndex: 'id' }, { title: '鍞悗宸ュ崟', dataIndex: 'ticketId' },
+ { title: '鍗忓悓浜嬮」', dataIndex: 'collaborationId' }, { title: '璐圭敤绫诲瀷', key: 'category' }, { title: '璧勯噾鏂瑰悜', key: 'direction' },
+ { title: '閲戦锛堝厓锛�', dataIndex: 'amount' }, { title: '寰�鏉ユ柟', dataIndex: 'partyName' },
+ { title: '鐘舵��', key: 'status' }, { title: '鎿嶄綔', key: 'actions', width: 150 },
+];
+async function load() {
+ loading.value = true;
+ try { const result = await getAfterSaleFinanceDraftPage({ pageNo: page.value, pageSize: 20, status: status.value }); rows.value = result.list; total.value = result.total; }
+ catch { /* 璇锋眰灞傛樉绀洪敊璇�� */ } finally { loading.value = false; }
+}
+function openReview(id: number, passed: boolean) { reviewId.value = id; approved.value = passed; remark.value = ''; dialogOpen.value = true; }
+async function review() {
+ if (!reviewId.value || (!approved.value && !remark.value.trim())) { message.warning('閫�鍥炴椂璇峰~鍐欏鏍告剰瑙�'); return; }
+ saving.value = true;
+ try { await reviewAfterSaleFinanceDraft(reviewId.value, approved.value, remark.value || undefined); message.success('瀹℃牳瀹屾垚'); dialogOpen.value = false; await load(); }
+ catch { /* 璇锋眰灞傛樉绀洪敊璇�� */ } finally { saving.value = false; }
+}
+onMounted(load);
+</script>
+
+<template>
+ <Page title="鍞悗璐㈠姟鑽夌">
+ <p class="mb-3 text-gray-500">璐㈠姟瀹℃牳浠呰褰曞鏍哥粨璁猴紝涓嶄細鑷姩鐢熸垚浠樻銆佹敹娆炬垨浼氳鍑瘉銆�</p>
+ <Space class="mb-3"><Select v-model:value="status" allow-clear placeholder="瀹℃牳鐘舵��" style="width: 160px"
+ :options="[{label:'寰呭鏍�',value:0},{label:'瀹℃牳閫氳繃',value:1},{label:'宸查��鍥�',value:2}]" @change="page = 1; load()" /></Space>
+ <Table :columns="columns" :data-source="rows" :loading="loading" row-key="id"
+ :pagination="{ current: page, pageSize: 20, total, showSizeChanger: false, onChange: (p: number) => { page = p; load(); } }">
+ <template #expandedRowRender="{ record }"><p>涓氬姟璇存槑锛歿{ record.description }}</p><p>涓氬姟瀹℃牳浜猴細{{ record.businessApproverId }}</p>
+ <p v-if="record.reviewerId">璐㈠姟瀹℃牳浜猴細{{ record.reviewerId }}锛涙剰瑙侊細{{ record.reviewRemark || '鈥�' }}</p></template>
+ <template #bodyCell="{ column, record }">
+ <template v-if="column.key === 'category'">{{ categoryLabels[record.category] || record.category }}</template>
+ <template v-else-if="column.key === 'direction'">{{ record.direction === 'RECEIVABLE' ? '搴旀敹' : record.direction === 'PAYABLE' ? '搴斾粯' : '鍐呴儴鎴愭湰' }}</template>
+ <template v-else-if="column.key === 'status'"><Tag>{{ record.status === 0 ? '寰呭鏍�' : record.status === 1 ? '瀹℃牳閫氳繃' : '宸查��鍥�' }}</Tag></template>
+ <template v-else-if="column.key === 'actions'"><Space v-if="record.status === 0">
+ <Button v-access:code="['erp:after-sale-finance:review']" type="link" @click="openReview(record.id, true)">閫氳繃</Button>
+ <Button v-access:code="['erp:after-sale-finance:review']" type="link" danger @click="openReview(record.id, false)">閫�鍥�</Button>
+ </Space></template>
+ </template>
+ </Table>
+ <Modal v-model:open="dialogOpen" :title="approved ? '璐㈠姟瀹℃牳閫氳繃' : '璐㈠姟瀹℃牳閫�鍥�'" :confirm-loading="saving" @ok="review">
+ <p v-if="approved" class="mb-2">纭瀹℃牳閫氳繃锛熸鎿嶄綔涓嶄細鑷姩浠樻鎴栬璐︺��</p>
+ <Input.TextArea v-model:value="remark" :rows="3" :maxlength="1000" :placeholder="approved ? '瀹℃牳鎰忚锛堝彲閫夛級' : '璇峰~鍐欓��鍥炲師鍥�'" />
+ </Modal>
+ </Page>
+</template>
diff --git a/src/views/erp/sale/order/index.vue b/src/views/erp/sale/order/index.vue
index bec1872..4bc9efe 100644
--- a/src/views/erp/sale/order/index.vue
+++ b/src/views/erp/sale/order/index.vue
@@ -151,6 +151,8 @@
await cancelSaleOrder(row.id!);
message.success('浣滃簾鎴愬姛');
handleRefresh();
+ } catch {
+ // 璇锋眰灞傚凡鎻愮ず澶辫触鍘熷洜锛屼繚鐣欏垪琛ㄤ緵鐢ㄦ埛澶勭悊鍚庨噸璇曘��
} finally {
hideLoading();
}
diff --git a/src/views/mes/process-design/knowledge/index.vue b/src/views/mes/process-design/knowledge/index.vue
new file mode 100644
index 0000000..eac3c89
--- /dev/null
+++ b/src/views/mes/process-design/knowledge/index.vue
@@ -0,0 +1,208 @@
+<script setup lang="ts">
+import type { Knowledge, KnowledgeReference } from '#/api/mes/pro/processdesign/knowledge';
+import { onMounted, reactive, ref } from 'vue';
+import { Page } from '@vben/common-ui';
+import { Button, Form, FormItem, Input, InputNumber, Modal, Popconfirm, Select, Space, Table, Tag, message } from 'ant-design-vue';
+import { createKnowledge, getKnowledge, getKnowledgePage, matchKnowledge, publishKnowledge, referenceKnowledgeRoute, reviseKnowledge, updateKnowledge } from '#/api/mes/pro/processdesign/knowledge';
+import { getRouteSimpleList } from '#/api/mes/pro/route';
+import { getTemplate, getTemplatePage } from '#/api/mes/pro/processdesign/template';
+import { MdItemSelect, MdProductBomSelect } from '#/views/mes/md/item/components';
+import DvMachinerySelect from '#/views/mes/dv/machinery/components/select.vue';
+import MdWorkstationSelect from '#/views/mes/md/workstation/components/select.vue';
+
+const rows = ref<Knowledge[]>([]);
+const total = ref(0);
+const loading = ref(false);
+const saving = ref(false);
+const dialogOpen = ref(false);
+const readOnly = ref(false);
+const referenceOpen = ref(false);
+const referenceKnowledgeId = ref<number>();
+const referenceRouteId = ref<number>();
+const references = ref<KnowledgeReference[]>([]);
+const name = ref('');
+const page = ref(1);
+const pageSize = 20;
+const standardText = ref('');
+const resources = ref<NonNullable<Knowledge['resources']>>([]);
+const matchStandardText = ref('');
+const matching = ref(false);
+const matchResults = ref<Knowledge[] | null>(null);
+const criteria = reactive<{ productId?: number; bomId?: number; voltage?: number; market?: string }>({});
+const routes = ref<{ label: string; value: number }[]>([]);
+const templates = ref<{ label: string; value: number }[]>([]);
+let templateRequest = 0;
+const form = reactive<Knowledge>({ code: '', name: '', market: 'ALL' });
+const columns = [
+ { title: '缂栫爜', dataIndex: 'code' }, { title: '鍚嶇О', dataIndex: 'name' },
+ { title: '鐗堟湰', dataIndex: 'version' }, { title: '鐘舵��', key: 'status' },
+ { title: '鎿嶄綔', key: 'actions', width: 160 },
+];
+
+async function load() {
+ matchResults.value = null;
+ loading.value = true;
+ try {
+ const result = await getKnowledgePage({ pageNo: page.value, pageSize, name: name.value || undefined });
+ rows.value = result.list;
+ total.value = result.total;
+ } catch { /* 璇锋眰灞傛樉绀洪敊璇�� */ } finally { loading.value = false; }
+}
+async function match() {
+ matching.value = true;
+ try {
+ const standards = matchStandardText.value.split('\n').map(v => v.trim()).filter(Boolean);
+ matchResults.value = await matchKnowledge({ ...criteria, standards: standards.length ? standards : undefined });
+ } catch { /* 璇锋眰灞傛樉绀洪敊璇�� */ } finally { matching.value = false; }
+}
+async function open(id?: number, viewOnly = false) {
+ Object.assign(form, { id: undefined, code: '', name: '', market: 'ALL', productItemId: undefined,
+ bomId: undefined, voltageMin: undefined, voltageMax: undefined, routeId: undefined,
+ templateId: undefined, description: undefined, standards: [] });
+ standardText.value = '';
+ resources.value = [];
+ references.value = [];
+ readOnly.value = viewOnly;
+ if (id) {
+ try {
+ const detail = await getKnowledge(id);
+ if (!detail) { message.warning('鐭ヨ瘑涓嶅瓨鍦�'); return; }
+ Object.assign(form, detail.knowledge);
+ standardText.value = detail.standards.join('\n');
+ resources.value = detail.resources.map(item => ({ processId: item.processId, resourceType: item.resourceType,
+ resourceId: item.resourceId, capabilityDescription: item.capabilityDescription }));
+ references.value = detail.references;
+ if (form.templateId != null && !templates.value.some(item => item.value === form.templateId)) {
+ try {
+ const template = await getTemplate(form.templateId);
+ if (template) templates.value.push({ label: template.templateName || template.templateCode || String(form.templateId), value: form.templateId });
+ } catch { /* 淇濈暀鐭ヨ瘑璇︽儏锛涙ā鏉胯闂潈闄愮敱鍚勮嚜鐨勬潈闄愭帶鍒躲�� */ }
+ }
+ } catch { return; }
+ }
+ dialogOpen.value = true;
+}
+async function save() {
+ if (!form.code.trim() || !form.name.trim()) { message.warning('璇峰~鍐欑煡璇嗙紪鐮佸拰鍚嶇О'); return; }
+ if (form.voltageMin != null && form.voltageMax != null && form.voltageMin > form.voltageMax) {
+ message.warning('鏈�浣庣數鍘嬩笉鑳藉ぇ浜庢渶楂樼數鍘�'); return;
+ }
+ saving.value = true;
+ try {
+ const data = { ...form, standards: standardText.value.split('\n').map(v => v.trim()).filter(Boolean), resources: resources.value };
+ if (form.id) await updateKnowledge(data); else await createKnowledge(data);
+ message.success('淇濆瓨鎴愬姛'); dialogOpen.value = false; await load();
+ } catch { /* 璇锋眰灞傛樉绀洪敊璇紝淇濈暀琛ㄥ崟浠ヤ究閲嶈瘯銆� */ } finally { saving.value = false; }
+}
+async function publish(id: number) {
+ try { await publishKnowledge(id); message.success('鍙戝竷鎴愬姛'); await load(); }
+ catch { /* 璇锋眰灞傛樉绀洪敊璇�� */ }
+}
+async function revise(id: number) {
+ try { const draftId = await reviseKnowledge(id); message.success('宸插垱寤烘柊鐗堟湰鑽夌'); await load(); await open(draftId); }
+ catch { /* 璇锋眰灞傛樉绀洪敊璇�� */ }
+}
+function openReference(id: number) {
+ referenceKnowledgeId.value = id;
+ referenceRouteId.value = undefined;
+ referenceOpen.value = true;
+}
+async function saveReference() {
+ if (referenceKnowledgeId.value == null || referenceRouteId.value == null) { message.warning('璇烽�夋嫨鐩爣宸ヨ壓璺嚎'); return; }
+ saving.value = true;
+ try {
+ await referenceKnowledgeRoute(referenceKnowledgeId.value, referenceRouteId.value);
+ message.success('宸茶褰曞弬鑰冨叧绯�'); referenceOpen.value = false;
+ } catch { /* 璇锋眰灞傛樉绀洪敊璇�� */ } finally { saving.value = false; }
+}
+async function searchTemplates(keyword = '') {
+ const request = ++templateRequest;
+ try {
+ const result = await getTemplatePage({ pageNo: 1, pageSize: 100, templateName: keyword || undefined });
+ if (request === templateRequest) templates.value = result.list.filter(t => t.id != null)
+ .map(t => ({ label: t.templateName || t.templateCode || String(t.id), value: t.id! }));
+ } catch { /* 璇锋眰灞傛樉绀洪敊璇�� */ }
+}
+onMounted(async () => {
+ await load();
+ const [routeResult] = await Promise.allSettled([getRouteSimpleList(), searchTemplates()]);
+ if (routeResult.status === 'fulfilled')
+ routes.value = routeResult.value.filter(r => r.id != null).map(r => ({ label: r.name || r.code || String(r.id), value: r.id! }));
+});
+</script>
+
+<template>
+ <Page title="宸ヨ壓鐭ヨ瘑">
+ <div class="mb-4 rounded bg-white p-4">
+ <div class="mb-3 font-medium">鍖归厤宸插彂甯冪殑宸ヨ壓鐭ヨ瘑</div>
+ <div class="mb-3 text-gray-500">璇峰~鍐欏凡鐭ユ潯浠讹紱鏈~鍐欐爣鍑嗘椂涓嶆牎楠屾爣鍑嗭紝缁撴灉闇�鐢卞伐鑹轰汉鍛樼‘璁ゃ��</div>
+ <Space wrap>
+ <MdItemSelect v-model="criteria.productId" placeholder="閫夋嫨閫傜敤鐗╂枡" style="width: 240px" @change="criteria.bomId = undefined" />
+ <MdProductBomSelect v-model="criteria.bomId" :item-id="criteria.productId" :disabled="criteria.productId == null" placeholder="鎸囧畾 BOM 鐗╂枡锛堝彲閫夛級" style="width: 240px" />
+ <InputNumber v-model:value="criteria.voltage" :min="0" placeholder="鐢靛帇锛坘V锛�" />
+ <Select v-model:value="criteria.market" allow-clear placeholder="鍐呭閿�" style="width: 120px" :options="[{label:'鍐呴攢',value:'DOMESTIC'},{label:'澶栭攢',value:'EXPORT'}]" />
+ <Input v-model:value="matchStandardText" placeholder="鏍囧噯缂栫爜锛堝崟椤癸級" style="width: 180px" />
+ <Button :loading="matching" @click="match">鍖归厤鐭ヨ瘑</Button>
+ <Button v-if="matchResults !== null" @click="load">杩斿洖鍏ㄩ儴鐭ヨ瘑</Button>
+ </Space>
+ </div>
+ <Space class="mb-4">
+ <Input v-model:value="name" placeholder="鐭ヨ瘑鍚嶇О" allow-clear @press-enter="page = 1; load()" />
+ <Button @click="page = 1; load()">鏌ヨ</Button>
+ <Button v-access:code="['mes:pd-knowledge:create']" type="primary" @click="open()">鏂板缓鐭ヨ瘑</Button>
+ </Space>
+ <Table :columns="columns" :data-source="matchResults ?? rows" :loading="loading" row-key="id"
+ :pagination="matchResults !== null ? false : { current: page, pageSize, total, showSizeChanger: false, onChange: (p: number) => { page = p; load(); } }">
+ <template #bodyCell="{ column, record }">
+ <template v-if="column.key === 'status'"><Tag>{{ record.status === 1 ? '宸插彂甯�' : record.status === 2 ? '宸插仠鐢�' : '鑽夌' }}</Tag></template>
+ <template v-else-if="column.key === 'actions'">
+ <Space>
+ <Button type="link" @click="open(record.id, true)">璇︽儏</Button>
+ <Button v-if="record.status === 0" v-access:code="['mes:pd-knowledge:update']" type="link" @click="open(record.id)">缂栬緫</Button>
+ <template v-if="record.status === 0">
+ <Popconfirm title="纭鍙戝竷璇ョ増鏈紵鍙戝竷鍚庝笉鑳界洿鎺ヤ慨鏀广��" @confirm="publish(record.id)">
+ <Button v-access:code="['mes:pd-knowledge:publish']" type="link">鍙戝竷</Button>
+ </Popconfirm>
+ </template>
+ <Button v-if="record.status === 1" v-access:code="['mes:pd-knowledge:create']" type="link" @click="revise(record.id)">鍒涘缓鏂扮増鏈�</Button>
+ <Button v-if="record.status === 1" v-access:code="['mes:pd-knowledge:reference']" type="link" @click="openReference(record.id)">璁板綍鍙傝��</Button>
+ </Space>
+ </template>
+ </template>
+ </Table>
+ <Modal v-model:open="dialogOpen" :title="readOnly ? '宸ヨ壓鐭ヨ瘑璇︽儏' : form.id ? '缂栬緫宸ヨ壓鐭ヨ瘑鑽夌' : '鏂板缓宸ヨ壓鐭ヨ瘑'" :footer="readOnly ? null : undefined" :confirm-loading="saving" @ok="save">
+ <Form layout="vertical" :disabled="readOnly">
+ <FormItem label="鐭ヨ瘑缂栫爜" required><Input v-model:value="form.code" :disabled="!!form.id" :maxlength="64" /></FormItem>
+ <FormItem label="鐭ヨ瘑鍚嶇О" required><Input v-model:value="form.name" :maxlength="200" /></FormItem>
+ <FormItem label="閫傜敤甯傚満"><Select v-model:value="form.market" :options="[{label:'鍏ㄩ儴',value:'ALL'},{label:'鍐呴攢',value:'DOMESTIC'},{label:'澶栭攢',value:'EXPORT'}]" /></FormItem>
+ <FormItem label="閫傜敤鐗╂枡锛堢暀绌鸿〃绀轰笉闄愶級"><MdItemSelect v-model="form.productItemId" :disabled="readOnly" @change="form.bomId = undefined" /></FormItem>
+ <FormItem label="閫傜敤 BOM 鐗╂枡锛堝彲閫夛級"><MdProductBomSelect v-model="form.bomId" :item-id="form.productItemId" :disabled="readOnly || form.productItemId == null" /></FormItem>
+ <FormItem label="鏈�浣庣數鍘嬶紙kV锛�"><InputNumber v-model:value="form.voltageMin" :min="0" class="w-full" /></FormItem>
+ <FormItem label="鏈�楂樼數鍘嬶紙kV锛�"><InputNumber v-model:value="form.voltageMax" :min="0" class="w-full" /></FormItem>
+ <FormItem label="鍙傝�冨伐鑹鸿矾绾�"><Select v-model:value="form.routeId" :options="routes" allow-clear show-search option-filter-prop="label" /></FormItem>
+ <FormItem label="鍙傝�冨弬鏁版ā鏉�"><Select v-model:value="form.templateId" :options="templates" allow-clear show-search :filter-option="false" @search="searchTemplates" /></FormItem>
+ <FormItem label="閫傜敤鏍囧噯缂栫爜锛堟瘡琛屼竴椤癸級"><Input.TextArea v-model:value="standardText" :rows="3" /></FormItem>
+ <FormItem label="鐢熶骇璧勬簮鑳藉姏">
+ <div v-for="(item, index) in resources" :key="index" class="mb-3 rounded border p-3">
+ <Select v-model:value="item.resourceType" class="mb-2 w-full" :disabled="readOnly"
+ :options="[{label:'璁惧',value:'MACHINE'},{label:'宸ヤ綔绔�',value:'WORKSTATION'},{label:'鍏朵粬',value:'OTHER'}]"
+ @change="item.resourceId = undefined" />
+ <DvMachinerySelect v-if="item.resourceType === 'MACHINE'" v-model="item.resourceId" :disabled="readOnly" />
+ <MdWorkstationSelect v-else-if="item.resourceType === 'WORKSTATION'" v-model="item.resourceId" :disabled="readOnly" />
+ <Input.TextArea v-model:value="item.capabilityDescription" class="mt-2" :maxlength="500" :disabled="readOnly" placeholder="鎻忚堪璇ヨ祫婧愮殑鑳藉姏鍜岀害鏉�" />
+ <Button v-if="!readOnly" danger type="link" @click="resources.splice(index, 1)">绉婚櫎璧勬簮</Button>
+ </div>
+ <Button v-if="!readOnly" type="dashed" @click="resources.push({ resourceType: 'OTHER', capabilityDescription: '' })">娣诲姞璧勬簮鑳藉姏</Button>
+ </FormItem>
+ <FormItem v-if="readOnly && references.length" label="鍙傝�冩鐗堟湰鐨勫伐鑹鸿矾绾�">
+ <div v-for="reference in references" :key="reference.id">{{ routes.find(r => r.value === reference.targetId)?.label || `璺嚎 #${reference.targetId}` }}锛堢増鏈� {{ reference.knowledgeVersion }}锛�</div>
+ </FormItem>
+ <FormItem label="閫傜敤璇存槑"><Input.TextArea v-model:value="form.description" :rows="3" /></FormItem>
+ </Form>
+ </Modal>
+ <Modal v-model:open="referenceOpen" title="璁板綍璺嚎鍙傝��" :confirm-loading="saving" @ok="saveReference">
+ <p class="mb-3">姝ゆ搷浣滃彧璁板綍鍙傝�冨叧绯伙紝涓嶄細澶嶅埗鎴栦慨鏀瑰伐鑹鸿矾绾裤��</p>
+ <Select v-model:value="referenceRouteId" class="w-full" :options="routes" show-search option-filter-prop="label" placeholder="閫夋嫨鐩爣宸ヨ壓璺嚎" />
+ </Modal>
+ </Page>
+</template>
--
Gitblit v1.9.3