From f3f855be1fd86d28485fceb02c30b6c6b2853aef Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 04 十一月 2026 18:15:40 +0800
Subject: [PATCH] feat(mes): 质检附件与来源关联界面,新增工单技术文件、废料登记与领料单打印
---
src/views/mes/qc/components/qc-source-link.vue | 116 ++++++
src/views/mes/qc/iqc/modules/form.vue | 81 ---
src/api/mes/pro/task/index.ts | 7
src/views/mes/qc/ipqc/data.ts | 44 --
src/views/mes/qc/iqc/data.ts | 38 --
src/views/wls/productsales/modules/form.vue | 2
src/views/mes/pro/mps/modules/form.vue | 11
src/views/mes/qc/oqc/modules/form.vue | 105 +---
src/views/mes/qc/components/qc-attachments.vue | 64 +++
src/views/mes/pro/workorder/modules/technical-files.vue | 51 ++
src/api/mes/wm/productissue/line/index.ts | 8
src/views/crm/contract/index.vue | 4
src/components/upload/file-upload.vue | 2
src/api/mdm/item/index.ts | 5
src/views/crm/contract/detail/index.vue | 4
src/components/upload/typing.ts | 4
src/views/erp/sale/order/modules/item-form.vue | 7
src/views/mes/qc/ipqc/modules/form.vue | 105 +---
src/views/basicData/mdm/modules/form.vue | 35 +
src/views/erp/sale/order/data.ts | 7
src/views/mes/workbench/components/tabs/ProductIssueTab.vue | 52 ++
src/views/mes/qc/oqc/data.ts | 38 --
src/views/mes/qc/rqc/modules/form.vue | 81 ---
src/views/mes/pro/workorder/modules/scrap-modal.vue | 77 ++++
src/views/mes/pro/workorder/modules/form.vue | 5
src/api/mes/wm/productsales/line/index.ts | 4
src/views/mes/pro/workorder/index.vue | 10
src/views/wls/productsales/data.ts | 17
src/views/mes/qc/rqc/data.ts | 38 --
src/views/mes/workbench/components/WorkstationSelectDialog.vue | 20
src/api/mes/qc/source-link/index.ts | 39 ++
31 files changed, 593 insertions(+), 488 deletions(-)
diff --git a/src/api/mdm/item/index.ts b/src/api/mdm/item/index.ts
index 1f3ffa8..71fabdf 100644
--- a/src/api/mdm/item/index.ts
+++ b/src/api/mdm/item/index.ts
@@ -151,3 +151,8 @@
params: { itemId },
});
}
+
+/** 浠庣墿鏂欑Щ闄ゆ妧鏈枃浠讹紱宸茬敓鎴愬伐鍗曚粛淇濈暀鏂囦欢蹇収銆� */
+export function deleteTechnicalFile(itemId: number, id: number) {
+ return requestClient.delete('/mdm/item/technical-file/delete', { params: { itemId, id } });
+}
diff --git a/src/api/mes/pro/task/index.ts b/src/api/mes/pro/task/index.ts
index 6ec30d3..34baaa6 100644
--- a/src/api/mes/pro/task/index.ts
+++ b/src/api/mes/pro/task/index.ts
@@ -234,6 +234,13 @@
);
}
+/** 鎸夊伐浣滅珯缁熻褰撳墠鐢ㄦ埛鍙鐨勬湭瀹屾垚浠诲姟銆� */
+export function getUnfinishedWorkstationCounts() {
+ return requestClient.get<Array<{ workstationId: number; pendingCount: number }>>(
+ '/mes/pro/task/unfinished-workstation-counts',
+ );
+}
+
/** 鏍规嵁宸ヤ綔绔欏拰鏁伴噺璁$畻鐢熶骇鏃堕暱 */
export function calculateTaskDuration(workstationId: number, quantity: number) {
return requestClient.get<{ duration: number }>(
diff --git a/src/api/mes/qc/source-link/index.ts b/src/api/mes/qc/source-link/index.ts
new file mode 100644
index 0000000..b8ec52c
--- /dev/null
+++ b/src/api/mes/qc/source-link/index.ts
@@ -0,0 +1,39 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesQcSourceLinkApi {
+ /** 鍏宠仈绫诲瀷锛歠eedback = 鐢熶骇鎶ュ伐锛宻ales = 閿�鍞嚭搴� */
+ export type LinkType = 'feedback' | 'sales';
+
+ /** 鍙叧鑱旂殑寰呮鏉ユ簮鏄庣粏鍊欓�� */
+ export interface Candidate {
+ lineId: number; // 寰呮鏄庣粏 ID锛屾彁浜ゅ叧鑱旀椂鍥炰紶
+ documentId: number; // 鏉ユ簮鍗曟嵁 ID
+ documentCode: string; // 鏉ユ簮鍗曟嵁缂栧彿
+ reelNo: string; // 鐩樺彿
+ quantity: number; // 寰呮鏁伴噺
+ }
+}
+
+/** 鏌ヨ鍙叧鑱旂殑寰呮鏉ユ簮鍊欓�� */
+export function getSourceLinkCandidates(
+ type: MesQcSourceLinkApi.LinkType,
+ qcId: number,
+) {
+ return requestClient.get<MesQcSourceLinkApi.Candidate[]>(
+ `/mes/qc/source-link/${type}-candidates`,
+ { params: { qcId } },
+ );
+}
+
+/** 灏嗚川妫�鍗曞叧鑱斿埌鎸囧畾鏉ユ簮鏄庣粏 */
+export function linkSource(
+ type: MesQcSourceLinkApi.LinkType,
+ qcId: number,
+ lineId: number,
+) {
+ return requestClient.post<boolean>(
+ `/mes/qc/source-link/${type}`,
+ null,
+ { params: { lineId, qcId } },
+ );
+}
diff --git a/src/api/mes/wm/productissue/line/index.ts b/src/api/mes/wm/productissue/line/index.ts
index 9b79b2f..6fa4ac8 100644
--- a/src/api/mes/wm/productissue/line/index.ts
+++ b/src/api/mes/wm/productissue/line/index.ts
@@ -36,6 +36,14 @@
>('/mes/wm/product-issue-line/page', { params });
}
+/** 鏌ヨ棰嗘枡鍗曞叏閮ㄦ槑缁嗭紝鐢ㄤ簬鎵撳嵃銆� */
+export function getProductIssueLinesByIssue(issueId: number) {
+ return requestClient.get<MesWmProductIssueLineApi.ProductIssueLine[]>(
+ '/mes/wm/product-issue-line/list-by-issue',
+ { params: { issueId } },
+ );
+}
+
/** 鏌ヨ棰嗘枡鍑哄簱鍗曡璇︽儏 */
export function getProductIssueLine(id: number) {
return requestClient.get<MesWmProductIssueLineApi.ProductIssueLine>(
diff --git a/src/api/mes/wm/productsales/line/index.ts b/src/api/mes/wm/productsales/line/index.ts
index 53f17b4..5ba1f43 100644
--- a/src/api/mes/wm/productsales/line/index.ts
+++ b/src/api/mes/wm/productsales/line/index.ts
@@ -19,7 +19,9 @@
batchId?: number; // 鎵规缂栧彿
batchCode?: string; // 鎵规鍙�
reelNo?: string; // 閿�鍞槑缁嗙洏鍙�
- oqcCheckFlag?: boolean; // 鏄惁妫�楠�
+ oqcCheckFlag?: boolean; // 鏄惁闇�瑕佸嚭璐ф楠�
+ oqcId?: number; // 鍏宠仈鐨勫嚭璐ф楠屽崟 ID
+ qualityStatus?: number; // 璐ㄩ噺鐘舵�侊紙瀛楀吀 mes_wm_quality_status锛�
remark?: string; // 澶囨敞
}
}
diff --git a/src/components/upload/file-upload.vue b/src/components/upload/file-upload.vue
index 8920f4d..be1ece9 100644
--- a/src/components/upload/file-upload.vue
+++ b/src/components/upload/file-upload.vue
@@ -77,7 +77,7 @@
isInnerOperate.value = false;
return;
}
- let value: string[] = [];
+ let value: Array<number | string> = [];
if (v) {
if (Array.isArray(v)) {
value = v;
diff --git a/src/components/upload/typing.ts b/src/components/upload/typing.ts
index fa2a0e9..b973c32 100644
--- a/src/components/upload/typing.ts
+++ b/src/components/upload/typing.ts
@@ -23,14 +23,14 @@
helpText?: string;
listType?: UploadListType;
maxNumber?: number; // 鏈�澶ф暟閲忕殑鏂囦欢锛孖nfinity涓嶉檺鍒�
- modelValue?: string | string[] | number[]; // v-model 鏀寔
+ modelValue?: string | number | string[] | number[]; // v-model 鏀寔
maxSize?: number; // 鏂囦欢鏈�澶у灏慚B
multiple?: boolean; // 鏄惁鏀寔澶氶��
resultField?: string; // support xxx.xxx.xx
returnText?: boolean; // 鏄惁杩斿洖鏂囦欢鏂囨湰鍐呭
showDescription?: boolean; // 鏄惁鏄剧ず涓嬮潰鐨勬弿杩�
showDownloadIcon?: boolean; // 鏄惁鏄剧ず涓嬭浇鎸夐挳
- value?: string | string[] | number[];
+ value?: string | number | string[] | number[];
valueKey?: string; // 杩斿洖鍊肩殑瀛楁鍚嶏紝榛樿 'url'锛岃涓� 'id' 鏃惰繑鍥� blobId
valuePrefix?: string; // valueKey 杩斿洖鍊肩殑鍓嶇紑
}
diff --git a/src/views/basicData/mdm/modules/form.vue b/src/views/basicData/mdm/modules/form.vue
index e9948c7..e96e7f8 100644
--- a/src/views/basicData/mdm/modules/form.vue
+++ b/src/views/basicData/mdm/modules/form.vue
@@ -3,12 +3,13 @@
import { useVbenModal } from "#/packages/effects/common-ui/src";
-import { message } from "ant-design-vue";
+import { message, Popconfirm } from "ant-design-vue";
import { useVbenForm } from '#/adapter/form';
import {
createItem,
createTechnicalFile,
+ deleteTechnicalFile,
getItem,
getTechnicalFileList,
updateItem,
@@ -25,7 +26,7 @@
const emit = defineEmits(['success']);
const formData = ref<MdmItemApi.Item>();
const technicalFiles = ref<MdmItemApi.TechnicalFile[]>([]);
-const technicalUploadValue = ref<number[]>([]);
+const technicalUploadValue = ref<number | number[] | string>([]);
const [Form, formApi] = useVbenForm({
commonConfig: {
@@ -95,20 +96,31 @@
});
async function handleTechnicalFileChange(value: unknown) {
- if (!formData.value?.id || !Array.isArray(value)) {
+ if (!formData.value?.id) {
return;
}
- const blobId = value.find((item): item is number => typeof item === 'number');
- if (!blobId) {
+ // 鍗曟枃浠朵笂浼犵粍浠惰繑鍥炲崟涓� ID锛涘吋瀹规暟缁勫拰鏁板瓧瀛楃涓层��
+ const rawId = Array.isArray(value) ? value[0] : value;
+ const blobId = typeof rawId === 'number' ? rawId :
+ typeof rawId === 'string' && /^\d+$/.test(rawId) ? Number(rawId) : 0;
+ if (!Number.isSafeInteger(blobId) || blobId <= 0) {
return;
}
try {
await createTechnicalFile(formData.value.id, blobId);
technicalFiles.value = await getTechnicalFileList(formData.value.id);
- message.success('鎶�鏈枃浠跺凡淇濆瓨锛屽巻鍙茬増鏈凡淇濈暀');
+ message.success('鎶�鏈枃浠跺凡娣诲姞');
} finally {
technicalUploadValue.value = [];
}
+}
+
+async function handleDeleteTechnicalFile(id: number) {
+ const itemId = formData.value?.id;
+ if (!itemId) return;
+ await deleteTechnicalFile(itemId, id);
+ technicalFiles.value = await getTechnicalFileList(itemId);
+ message.success('鎶�鏈枃浠跺凡绉婚櫎');
}
</script>
@@ -116,14 +128,14 @@
<Modal class="w-[1000px]" :title="formData?.id ? $t('ui.actionTitle.edit', ['鐗╂枡']) : $t('ui.actionTitle.create', ['鐗╂枡'])">
<Form class="mx-4" />
<div v-if="formData?.id" class="mx-4 mb-4 rounded border p-4">
- <div class="mb-3 text-base font-medium">鎶�鏈枃浠跺巻鍙�</div>
+ <div class="mb-3 text-base font-medium">鎶�鏈枃浠�</div>
<FileUpload
v-model:value="technicalUploadValue"
value-key="id"
:max-number="1"
:multiple="false"
- :accept="['.pdf', '.doc', '.docx', '.xls', '.xlsx', '.dwg', '.png', '.jpg', '.jpeg']"
- help-text="涓婁紶鏂版枃浠朵細鐢熸垚鏂扮殑鐗堟湰锛屽巻鍙叉枃浠朵粛鍙煡鐪�"
+ :accept="['pdf', 'doc', 'docx', 'xls', 'xlsx', 'dwg', 'png', 'jpg', 'jpeg']"
+ help-text="姣忔涓婁紶浼氳拷鍔犱竴浠芥妧鏈枃浠讹紝鍘熸枃浠剁户缁繚鐣�"
@change="handleTechnicalFileChange"
/>
<a-table
@@ -133,12 +145,15 @@
:pagination="false"
row-key="id"
>
- <a-table-column key="versionNo" title="鐗堟湰" data-index="versionNo" />
+ <a-table-column key="versionNo" title="涓婁紶搴忓彿" data-index="versionNo" />
<a-table-column key="fileName" title="鏂囦欢鍚�" data-index="fileName" />
<a-table-column key="createTime" title="涓婁紶鏃堕棿" data-index="createTime" />
<a-table-column key="action" title="鎿嶄綔">
<template #default="{ record }">
<a :href="record.downloadURL || record.previewURL" target="_blank">鏌ョ湅鏂囦欢</a>
+ <Popconfirm title="绉婚櫎璇ユ妧鏈枃浠讹紵宸叉湁宸ュ崟浠嶄繚鐣欏師鏂囦欢锛屾柊宸ュ崟灏嗕笉鍐嶅甫鍏ャ��" ok-text="绉婚櫎" cancel-text="鍙栨秷" @confirm="handleDeleteTechnicalFile(record.id)">
+ <a class="ml-3 text-red-500">鍒犻櫎</a>
+ </Popconfirm>
</template>
</a-table-column>
</a-table>
diff --git a/src/views/crm/contract/detail/index.vue b/src/views/crm/contract/detail/index.vue
index 3aac028..3bc6eeb 100644
--- a/src/views/crm/contract/detail/index.vue
+++ b/src/views/crm/contract/detail/index.vue
@@ -6,6 +6,7 @@
import { useRoute, useRouter } from 'vue-router';
import { Page, useVbenModal } from '@vben/common-ui';
+import { useAccess } from '@vben/access';
import { useTabs } from '@vben/hooks';
import { Card, Tabs } from 'ant-design-vue';
@@ -29,6 +30,7 @@
import ContractDetailsInfo from './modules/info.vue';
const props = defineProps<{ id?: number }>();
+const { hasAccessByRoles } = useAccess();
const route = useRoute();
const router = useRouter();
@@ -123,7 +125,7 @@
label: '瀵煎嚭 Word',
type: 'primary',
icon: 'lucide:download',
- auth: ['crm:contract:query'],
+ auth: hasAccessByRoles(['super_admin']) ? [] : ['crm:contract:query'],
onClick: () => downloadContractWord(contractId, contract.no),
},
{
diff --git a/src/views/crm/contract/index.vue b/src/views/crm/contract/index.vue
index 10e2b45..64dff45 100644
--- a/src/views/crm/contract/index.vue
+++ b/src/views/crm/contract/index.vue
@@ -6,6 +6,7 @@
import { useRouter } from 'vue-router';
import { Page, useVbenModal } from '@vben/common-ui';
+import { useAccess } from '@vben/access';
import { downloadFileFromBlobPart } from '@vben/utils';
import { Button, message, Modal, Select, Tabs, Tag, Tooltip } from 'ant-design-vue';
@@ -28,6 +29,7 @@
import ImportForm from './modules/import-form.vue';
const { push } = useRouter();
+const { hasAccessByRoles } = useAccess();
const sceneType = ref('1');
const [FormModal, formModalApi] = useVbenModal({
@@ -336,7 +338,7 @@
label: '瀵煎嚭 Word',
type: 'link',
icon: 'lucide:download',
- auth: ['crm:contract:query'],
+ auth: hasAccessByRoles(['super_admin']) ? [] : ['crm:contract:query'],
onClick: () => downloadContractWord(row.id, row.no),
},
{
diff --git a/src/views/erp/sale/order/data.ts b/src/views/erp/sale/order/data.ts
index 2322850..13ba1e5 100644
--- a/src/views/erp/sale/order/data.ts
+++ b/src/views/erp/sale/order/data.ts
@@ -303,13 +303,6 @@
formatter: 'formatAmount2',
},
{
- field: 'totalPrice',
- title: '绋庨鍚堣',
- minWidth: 120,
- fixed: 'right',
- formatter: 'formatAmount2',
- },
- {
title: '鎿嶄綔',
width: 80,
fixed: 'right',
diff --git a/src/views/erp/sale/order/modules/item-form.vue b/src/views/erp/sale/order/modules/item-form.vue
index 9fd0ce2..c555326 100644
--- a/src/views/erp/sale/order/modules/item-form.vue
+++ b/src/views/erp/sale/order/modules/item-form.vue
@@ -48,10 +48,6 @@
(sum, item) => sum + (item.taxPrice || 0),
0,
),
- totalPrice: tableData.value.reduce(
- (sum, item) => sum + (item.totalPrice || 0),
- 0,
- ),
};
});
@@ -325,9 +321,6 @@
閲戦锛歿{ erpPriceInputFormatter(summaries.totalProductPrice) }}
</span>
<span>绋庨锛歿{ erpPriceInputFormatter(summaries.taxPrice) }}</span>
- <span>
- 绋庨鍚堣锛歿{ erpPriceInputFormatter(summaries.totalPrice) }}
- </span>
</div>
</div>
</div>
diff --git a/src/views/mes/pro/mps/modules/form.vue b/src/views/mes/pro/mps/modules/form.vue
index 6a758ed..aaadd38 100644
--- a/src/views/mes/pro/mps/modules/form.vue
+++ b/src/views/mes/pro/mps/modules/form.vue
@@ -12,6 +12,7 @@
import { useVbenForm } from '#/adapter/form';
import { createMps, getMps, updateMps } from '#/api/mes/pro/mps';
import { $t } from '#/locales';
+import TechnicalFiles from '../../workorder/modules/technical-files.vue';
import PredictDelivery from '../../workorder/modules/ai/predict-delivery.vue';
import PredictDuration from '../../workorder/modules/ai/predict-duration.vue';
@@ -22,6 +23,7 @@
const emit = defineEmits(['success']);
const formData = ref<MesProMpsApi.Mps>();
const formType = ref<FormType>('detail');
+const selectedProductId = ref<number>();
const isEditable = computed(() => ['create', 'edit'].includes(formType.value));
@@ -50,6 +52,9 @@
schema: [],
showDefaultActions: false,
wrapperClass: 'grid-cols-3',
+ handleValuesChange: (values, changedFields) => {
+ if (changedFields.includes('productId')) selectedProductId.value = values.productId;
+ },
});
/** 閲嶆柊鎸傝浇 schema 骞舵寜琛ㄥ崟鎬佹帶鍒跺簳閮ㄧ‘璁ゆ寜閽� */
@@ -86,6 +91,7 @@
async onOpenChange(isOpen: boolean) {
if (!isOpen) {
formData.value = undefined;
+ selectedProductId.value = undefined;
return;
}
// 鍔犺浇鏁版嵁
@@ -96,6 +102,7 @@
modalApi.lock();
try {
formData.value = await getMps(data.id);
+ selectedProductId.value = formData.value.productId;
await formApi.setValues(formData.value);
} finally {
modalApi.unlock();
@@ -108,6 +115,10 @@
<template>
<Modal :title="getTitle" class="w-3/5">
<Form class="mx-4" />
+ <div class="mx-4 mb-4 rounded border p-4">
+ <div class="mb-3 font-medium">鎶�鏈枃浠�</div>
+ <TechnicalFiles :work-order-id="formData?.workOrderId" :item-id="selectedProductId" />
+ </div>
<!-- 璇︽儏妯″紡棰濆灞曠ず鍙淇℃伅 -->
<div v-if="formType === 'detail' && formData" class="mx-4">
<Descriptions bordered :column="2">
diff --git a/src/views/mes/pro/workorder/index.vue b/src/views/mes/pro/workorder/index.vue
index 1547165..7b360b0 100644
--- a/src/views/mes/pro/workorder/index.vue
+++ b/src/views/mes/pro/workorder/index.vue
@@ -26,6 +26,7 @@
import { useGridColumns, useGridFormSchema } from "./data";
import Form from "./modules/form.vue";
+ import ScrapModal from "./modules/scrap-modal.vue";
const [FormModal, formModalApi] = useVbenModal({
connectedComponent: Form,
@@ -34,6 +35,7 @@
const archiveVisible = ref(false);
const archiveProductCode = ref('');
+ const scrapModalRef = ref<InstanceType<typeof ScrapModal>>();
// const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 鏉$爜璇︽儏寮圭獥
/** 鍒锋柊琛ㄦ牸 */
@@ -279,6 +281,13 @@
// onClick: handleBarcode.bind(null, row),
// },
{
+ label: '搴熸枡',
+ type: 'link',
+ auth: ['mes:wm-scrap-receipt:create'],
+ ifShow: row.status === MesProWorkOrderStatusEnum.FINISHED,
+ onClick: () => scrapModalRef?.open(row.id, row.code),
+ },
+ {
label: '褰掓。',
type: 'link',
onClick: handleArchive.bind(null, row),
@@ -288,6 +297,7 @@
</Grid>
<!-- <BarcodeDetail ref="barcodeDetailRef" /> -->
<ArchiveDetail :visible="archiveVisible" :product-code="archiveProductCode" @update:visible="archiveVisible = $event" />
+ <ScrapModal ref="scrapModalRef" @success="handleRefresh" />
</Page>
</template>
diff --git a/src/views/mes/pro/workorder/modules/form.vue b/src/views/mes/pro/workorder/modules/form.vue
index 180e00f..cda001d 100644
--- a/src/views/mes/pro/workorder/modules/form.vue
+++ b/src/views/mes/pro/workorder/modules/form.vue
@@ -33,6 +33,7 @@
import PredictRisk from "./ai/predict-risk.vue";
import ItemList from "./item-list.vue";
import ProcessList from "./process-list.vue";
+ import TechnicalFiles from "./technical-files.vue";
const emit = defineEmits(["success"]);
const formType = ref<FormType>("create");
@@ -367,6 +368,10 @@
@process-list-change="handleProcessListChange"
/>
</Tabs.TabPane>
+ <Tabs.TabPane key="technical-files" tab="鎶�鏈枃浠�">
+ <TechnicalFiles v-if="formData?.id" :work-order-id="formData.id" :key="formData.id" />
+ <div v-else class="text-gray-400 text-center py-8">淇濆瓨宸ュ崟鏃跺皢鐣欏瓨鎵�閫変骇鍝佺殑鎶�鏈枃浠�</div>
+ </Tabs.TabPane>
<Tabs.TabPane key="item"
tab="鐗╂枡闇�姹�">
<p class="mb-3 text-xs text-gray-400 leading-relaxed">
diff --git a/src/views/mes/pro/workorder/modules/scrap-modal.vue b/src/views/mes/pro/workorder/modules/scrap-modal.vue
new file mode 100644
index 0000000..86764f2
--- /dev/null
+++ b/src/views/mes/pro/workorder/modules/scrap-modal.vue
@@ -0,0 +1,77 @@
+<script setup lang="ts">
+import { computed, ref } from 'vue';
+import { Button, Form, FormItem, Input, InputNumber, Modal, Select, message } from 'ant-design-vue';
+import { requestClient } from '#/api/request';
+import { getWarehouseSimpleList } from '#/api/mes/wm/warehouse';
+import { WmWarehouseAreaSelect, WmWarehouseLocationSelect } from '#/views/wls/warehouse/components';
+
+const emit = defineEmits<{ success: [] }>();
+const visible = ref(false);
+const busy = ref(false);
+const orderId = ref<number>();
+const orderCode = ref('');
+const requestId = ref('');
+const outputs = ref<Array<{ itemId: number; itemCode?: string; itemName?: string; quantity: number; batchId?: number; batchCode?: string }>>([]);
+const warehouses = ref<Array<{ id?: number; name?: string; warehouseType?: string; frozen?: boolean }>>([]);
+const itemId = ref<number>();
+const selectedOutput = ref<number>();
+const batchId = ref<number>();
+const quantity = ref<number>();
+const warehouseId = ref<number>();
+const locationId = ref<number>();
+const areaId = ref<number>();
+const batchCode = ref('');
+const options = computed(() => outputs.value.map((item, index) => ({ value: index, label: `${item.itemName || item.itemCode || item.itemId}${item.batchCode ? ` 路 鎵规 ${item.batchCode}` : ''}锛堜骇鍑� ${item.quantity}锛塦 })));
+function selectOutput(index: number) {
+ const output = outputs.value[index];
+ itemId.value = output?.itemId; batchId.value = output?.batchId; batchCode.value = output?.batchCode || '';
+}
+
+async function open(id: number, code?: string) {
+ orderId.value = id; orderCode.value = code || ''; itemId.value = undefined; selectedOutput.value = undefined; batchId.value = undefined; quantity.value = undefined;
+ warehouseId.value = undefined; locationId.value = undefined; areaId.value = undefined; batchCode.value = '';
+ requestId.value = globalThis.crypto?.randomUUID?.() ?? `${Date.now()}-${Math.random().toString(36).slice(2)}`;
+ outputs.value = []; visible.value = true; busy.value = true;
+ try {
+ const [items, list] = await Promise.all([
+ requestClient.get<typeof outputs.value>('/mes/wm/scrap-receipt/order-outputs', { params: { workOrderId: id } }),
+ getWarehouseSimpleList(),
+ ]);
+ outputs.value = items || [];
+ warehouses.value = (list || []).filter(w => ['搴熸枡浠�', '搴熸枡'].includes(w.warehouseType || '') && !w.frozen);
+ if (!outputs.value.length) message.warning('璇ヨ鍗曟病鏈夊凡瀹屾垚鐨勪骇鍑虹墿鏂�');
+ if (!warehouses.value.length) message.warning('璇峰厛鍦ㄤ粨搴撹缃腑灏嗗簾鏂欎粨鐨勪粨搴撶被鍨嬭涓衡�滃簾鏂欎粨鈥�');
+ } finally { busy.value = false; }
+}
+
+async function submit() {
+ if (!orderId.value || !itemId.value || !quantity.value || quantity.value <= 0 || !warehouseId.value || !locationId.value || !areaId.value) {
+ message.warning('璇烽�夋嫨浜у嚭鐗╂枡銆佹暟閲忎互鍙婂簾鏂欎粨搴撳拰搴撲綅'); return;
+ }
+ busy.value = true;
+ try {
+ await requestClient.post('/mes/wm/scrap-receipt/create-from-output', {
+ requestId: requestId.value, workOrderId: orderId.value, itemId: itemId.value,
+ quantity: quantity.value, warehouseId: warehouseId.value, locationId: locationId.value,
+ areaId: areaId.value, batchId: batchId.value, batchCode: batchCode.value || undefined,
+ });
+ message.success('搴熸枡宸插叆搴�'); visible.value = false; emit('success');
+ } finally { busy.value = false; }
+}
+defineExpose({ open });
+</script>
+
+<template>
+ <Modal v-model:open="visible" title="搴熸枡鍏ュ簱" :confirm-loading="busy" :mask-closable="false" @ok="submit">
+ <Form layout="vertical">
+ <FormItem label="鐢熶骇璁㈠崟"><Input :value="orderCode" disabled /></FormItem>
+ <FormItem label="浜у嚭鐗╂枡" required><Select v-model:value="selectedOutput" :options="options" placeholder="璇烽�夋嫨璁㈠崟浜у嚭鐗╂枡" @change="selectOutput" /></FormItem>
+ <FormItem label="搴熸枡鏁伴噺" required><InputNumber v-model:value="quantity" :min="0.0001" :precision="4" class="w-full" /></FormItem>
+ <FormItem label="搴熸枡浠撳簱" required><Select v-model:value="warehouseId" :options="warehouses.map(w => ({value: w.id, label: w.name}))" placeholder="璇烽�夋嫨搴熸枡浠撳簱" @change="locationId = undefined; areaId = undefined" /></FormItem>
+ <FormItem label="搴撳尯" required><WmWarehouseLocationSelect v-model="locationId" :warehouse-id="warehouseId" @change="areaId = undefined" /></FormItem>
+ <FormItem label="搴撲綅" required><WmWarehouseAreaSelect v-model="areaId" :location-id="locationId" /></FormItem>
+ <FormItem label="鎵规鍙�"><Input :value="batchCode || '鏃�'" disabled /></FormItem>
+ </Form>
+ <template #footer><Button @click="visible = false">鍙栨秷</Button><Button type="primary" :loading="busy" :disabled="busy" @click="submit">纭鍏ュ簱</Button></template>
+ </Modal>
+</template>
diff --git a/src/views/mes/pro/workorder/modules/technical-files.vue b/src/views/mes/pro/workorder/modules/technical-files.vue
new file mode 100644
index 0000000..3bda8a1
--- /dev/null
+++ b/src/views/mes/pro/workorder/modules/technical-files.vue
@@ -0,0 +1,51 @@
+<script setup lang="ts">
+import { ref, watch } from 'vue';
+import { Button, Empty, Space, Table } from 'ant-design-vue';
+import { requestClient } from '#/api/request';
+
+const props = defineProps<{ workOrderId?: number; itemId?: number }>();
+interface TechnicalFile {
+ id: number;
+ fileName?: string;
+ versionNo?: number;
+ previewURL?: string;
+ downloadURL?: string;
+}
+const files = ref<TechnicalFile[]>([]);
+const loading = ref(false);
+watch(() => [props.workOrderId, props.itemId] as const, async ([workOrderId, itemId], _old, onCleanup) => {
+ let active = true;
+ onCleanup(() => { active = false; });
+ files.value = [];
+ if (!workOrderId && !itemId) {
+ loading.value = false;
+ return;
+ }
+ loading.value = true;
+ try {
+ const data: TechnicalFile[] = workOrderId
+ ? await requestClient.get('/mes/pro/work-order/technical-files', { params: { id: workOrderId } })
+ : await requestClient.get('/mdm/item/technical-file/list', { params: { itemId } });
+ if (active) files.value = data || [];
+ } finally {
+ if (active) loading.value = false;
+ }
+}, { immediate: true });
+</script>
+
+<template>
+ <p class="mb-3 text-xs text-gray-500">{{ workOrderId ? '鏄剧ず鐢熶骇璁㈠崟鍒涘缓鏃剁暀瀛樼殑鎶�鏈枃浠躲��' : '鏄剧ず鐗╂枡褰撳墠鎶�鏈枃浠讹紝涓嬪彂鏃朵繚瀛樺埌鐢熶骇璁㈠崟銆�' }}棰勮鍚庡彲浣跨敤娴忚鍣ㄦ墦鍗帮紝鍏朵粬鏍煎紡鍙笅杞藉悗鎵撳嵃銆�</p>
+ <Table v-if="files.length || loading" :data-source="files" :loading="loading" :pagination="false" row-key="id" size="small">
+ <Table.Column title="鏂囦欢鍚嶇О" data-index="fileName" />
+ <Table.Column title="鏂囦欢鐗堟湰" data-index="versionNo" />
+ <Table.Column title="鎿嶄綔" key="actions">
+ <template #default="{ record }">
+ <Space>
+ <Button v-if="record.previewURL" type="link" :href="record.previewURL" target="_blank" rel="noopener noreferrer">棰勮 / 鎵撳嵃</Button>
+ <Button v-if="record.downloadURL" type="link" :href="record.downloadURL" target="_blank" rel="noopener noreferrer">涓嬭浇</Button>
+ </Space>
+ </template>
+ </Table.Column>
+ </Table>
+ <Empty v-else :description="workOrderId ? '璇ュ伐鍗曟病鏈夌暀瀛樻妧鏈枃浠�' : '褰撳墠鐗╂枡娌℃湁鎶�鏈枃浠�'" />
+</template>
diff --git a/src/views/mes/qc/components/qc-attachments.vue b/src/views/mes/qc/components/qc-attachments.vue
new file mode 100644
index 0000000..7530eb8
--- /dev/null
+++ b/src/views/mes/qc/components/qc-attachments.vue
@@ -0,0 +1,64 @@
+<script setup lang="ts">
+import { computed, onMounted, ref } from 'vue';
+import { useAccess } from '@vben/access';
+import { Button, Empty, message, Popconfirm, Space, Table, Upload } from 'ant-design-vue';
+import { requestClient } from '#/api/request';
+import { uploadFile, type SystemStorageApi } from '#/api/system/storage';
+
+const props = defineProps<{ qcType: 'iqc' | 'ipqc' | 'oqc' | 'rqc'; qcId: number; readonly?: boolean }>();
+const { hasAccessByCodes, hasAccessByRoles } = useAccess();
+const canEdit = computed(() => !props.readonly && (hasAccessByRoles(['super_admin']) || hasAccessByCodes([`mes:qc-${props.qcType}:update`])));
+const files = ref<SystemStorageApi.StorageBlob[]>([]);
+const loading = ref(false);
+async function refresh() {
+ files.value = await requestClient.get('/mes/qc/attachment/list', { params: { type: props.qcType, id: props.qcId } });
+}
+onMounted(refresh);
+async function beforeUpload(file: File) {
+ if (loading.value) return Upload.LIST_IGNORE;
+ loading.value = true;
+ try {
+ const uploaded = await uploadFile([file]);
+ const blobId = uploaded?.[0]?.id;
+ if (!blobId) throw new Error('涓婁紶缁撴灉缂哄皯鏂囦欢缂栧彿');
+ await requestClient.post('/mes/qc/attachment/append', {
+ type: props.qcType, id: props.qcId, blobId,
+ });
+ await refresh();
+ message.success('闄勪欢宸蹭笂浼�');
+ } finally {
+ loading.value = false;
+ }
+ return Upload.LIST_IGNORE;
+}
+async function removeFile(blobId: number) {
+ loading.value = true;
+ try {
+ await requestClient.delete('/mes/qc/attachment/remove', { params: { type: props.qcType, id: props.qcId, blobId } });
+ await refresh();
+ message.success('闄勪欢宸茬Щ闄�');
+ } finally {
+ loading.value = false;
+ }
+}
+</script>
+
+<template>
+ <Space direction="vertical" class="w-full">
+ <Upload v-if="canEdit" :show-upload-list="false" :before-upload="beforeUpload" :disabled="loading">
+ <Button :loading="loading">涓婁紶妫�楠岄檮浠�</Button>
+ </Upload>
+ <Table v-if="files.length" :data-source="files" :pagination="false" row-key="id" size="small">
+ <Table.Column title="鏂囦欢鍚嶇О" data-index="name" />
+ <Table.Column title="鎿嶄綔" key="actions">
+ <template #default="{ record }">
+ <a v-if="record.previewURL || record.downloadURL" :href="record.previewURL || record.downloadURL" target="_blank" rel="noopener noreferrer">鏌ョ湅 / 涓嬭浇</a>
+ <Popconfirm v-if="canEdit" title="纭浠庤川妫�鍗曠Щ闄ゆ闄勪欢锛�" ok-text="绉婚櫎" cancel-text="鍙栨秷" @confirm="removeFile(record.id)">
+ <a class="ml-3 text-red-500">绉婚櫎</a>
+ </Popconfirm>
+ </template>
+ </Table.Column>
+ </Table>
+ <Empty v-else description="鏆傛棤妫�楠岄檮浠�" />
+ </Space>
+</template>
diff --git a/src/views/mes/qc/components/qc-source-link.vue b/src/views/mes/qc/components/qc-source-link.vue
new file mode 100644
index 0000000..350c137
--- /dev/null
+++ b/src/views/mes/qc/components/qc-source-link.vue
@@ -0,0 +1,116 @@
+<script lang="ts" setup>
+import type { MesQcSourceLinkApi } from '#/api/mes/qc/source-link';
+
+import { computed, ref } from 'vue';
+
+import { useAccess } from '@vben/access';
+
+import { Button, message, Modal, Table } from 'ant-design-vue';
+
+import {
+ getSourceLinkCandidates,
+ linkSource,
+} from '#/api/mes/qc/source-link';
+
+const props = defineProps<{
+ type: MesQcSourceLinkApi.LinkType;
+ qcId: number;
+ reelNo?: string;
+}>();
+
+const emit = defineEmits<{ linked: [] }>();
+
+const { hasAccessByCodes, hasAccessByRoles } = useAccess();
+
+const allowed = computed(
+ () =>
+ hasAccessByRoles(['super_admin']) ||
+ hasAccessByCodes([
+ `mes:qc-${props.type === 'feedback' ? 'ipqc' : 'oqc'}:update`,
+ ]),
+);
+const title = computed(() =>
+ props.type === 'feedback' ? '鍏宠仈鐢熶骇鎶ュ伐' : '鍏宠仈閿�鍞嚭搴�',
+);
+const targetName = computed(() =>
+ props.type === 'feedback' ? '寰呮鎶ュ伐浜у嚭琛�' : '寰呮鍑哄簱鏄庣粏',
+);
+
+const open = ref(false);
+const loading = ref(false);
+const linkingLineId = ref<number>();
+
+const rows = ref<MesQcSourceLinkApi.Candidate[]>([]);
+
+const columns = [
+ { title: '鏉ユ簮鍗曟嵁缂栧彿', dataIndex: 'documentCode', key: 'documentCode' },
+ { title: '鐩樺彿', dataIndex: 'reelNo', key: 'reelNo' },
+ { title: '寰呮鏁伴噺', dataIndex: 'quantity', key: 'quantity' },
+ { title: '鎿嶄綔', key: 'action', width: 100 },
+];
+
+async function show() {
+ if (!props.reelNo?.trim()) {
+ message.warning('璇ヨ川妫�鍗曠己灏戠洏鍙凤紝璇峰厛琛ュ厖鐩樺彿鍚庡啀鍏宠仈');
+ return;
+ }
+ open.value = true;
+ loading.value = true;
+ try {
+ rows.value = await getSourceLinkCandidates(props.type, props.qcId);
+ } finally {
+ loading.value = false;
+ }
+}
+
+async function link(row: MesQcSourceLinkApi.Candidate) {
+ linkingLineId.value = row.lineId;
+ try {
+ await linkSource(props.type, props.qcId, row.lineId);
+ message.success('鍏宠仈鎴愬姛锛岃川妫�鏁伴噺宸插洖鍐欐潵婧愬崟鎹�');
+ open.value = false;
+ emit('linked');
+ } catch {
+ // 鍚庣閿欒鎻愮ず宸茬敱璇锋眰鎷︽埅鍣ㄥ睍绀猴紝淇濈暀寮圭獥渚夸簬閲嶆柊閫夋嫨鍊欓��
+ } finally {
+ linkingLineId.value = undefined;
+ }
+}
+</script>
+
+<template>
+ <Button v-if="allowed" @click="show">{{ title }}</Button>
+ <Modal v-model:open="open" :title="title" :footer="null" :width="760">
+ <p class="mb-3">
+ 褰撳墠璐ㄦ鍗曠洏鍙凤細{{ reelNo || '鏈~鍐�' }}銆備粎鏄剧ず鐗╂枡銆佺洏鍙峰拰鏁伴噺鍧囦竴鑷翠笖浠嶅浜庡緟妫�鐘舵�佺殑{{
+ targetName
+ }}銆�
+ </p>
+ <Table
+ :columns="columns"
+ :data-source="rows"
+ :loading="loading"
+ :pagination="{ pageSize: 10 }"
+ row-key="lineId"
+ size="small"
+ >
+ <template #emptyText>
+ <div class="py-4 text-gray-500">
+ 鏆傛棤鍙叧鑱旂殑{{ targetName }}锛岃鏍稿鐩樺彿銆佹娴嬫暟閲忓強鏉ユ簮鍗曟嵁鐘舵�佸悗閲嶈瘯銆�
+ </div>
+ </template>
+ <template #bodyCell="{ column, record }">
+ <template v-if="column.key === 'action'">
+ <Button
+ type="link"
+ :disabled="!!linkingLineId"
+ :loading="linkingLineId === record.lineId"
+ @click="link(record as MesQcSourceLinkApi.Candidate)"
+ >
+ 鍏宠仈
+ </Button>
+ </template>
+ </template>
+ </Table>
+ </Modal>
+</template>
diff --git a/src/views/mes/qc/ipqc/data.ts b/src/views/mes/qc/ipqc/data.ts
index ca997ca..443272b 100644
--- a/src/views/mes/qc/ipqc/data.ts
+++ b/src/views/mes/qc/ipqc/data.ts
@@ -14,7 +14,6 @@
import { Button } from 'ant-design-vue';
import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import { getTemplateItemOptionList } from '#/api/mes/qc/template/item';
import { getSimpleUserList } from '#/api/system/user';
import { getDateRangePickerDefaultProps } from '#/utils';
import { MdItemSelect } from '#/views/mes/md/item/components';
@@ -202,39 +201,6 @@
},
},
{
- fieldName: 'templateId',
- label: '璐ㄦ鏂规',
- component: 'ApiSelect',
- componentProps: {
- api: getTemplateItemOptionList,
- autoSelect: 'first',
- labelField: 'templateName',
- valueField: 'templateId',
- placeholder: '璇烽�夋嫨璐ㄦ鏂规',
- },
- rules: 'selectRequired',
- dependencies: {
- triggerFields: ['workOrderId', 'taskId'],
- componentProps: (values) => ({
- api: getTemplateItemOptionList,
- autoSelect: 'first',
- labelField: 'templateName',
- valueField: 'templateId',
- disabled: formType !== 'create' || !values.workOrderId,
- params: values.workOrderId
- ? {
- qcType: 2,
- workOrderId: values.workOrderId,
- taskId: values.taskId,
- }
- : {},
- placeholder: values.workOrderId
- ? '璇烽�夋嫨璐ㄦ鏂规'
- : '璇峰厛閫夋嫨鐢熶骇璁㈠崟',
- }),
- },
- },
- {
fieldName: 'checkQuantity',
label: '妫�娴嬫暟閲�',
component: 'InputNumber',
@@ -361,16 +327,6 @@
valueFormat: 'YYYY-MM-DD',
},
rules: 'required',
- },
- {
- fieldName: 'checkResult',
- label: '妫�娴嬬粨鏋�',
- component: 'Select',
- componentProps: {
- allowClear: true,
- options: getDictOptions(DICT_TYPE.MES_QC_CHECK_RESULT, 'number'),
- placeholder: '璇烽�夋嫨妫�娴嬬粨鏋�',
- },
},
{
fieldName: 'remark',
diff --git a/src/views/mes/qc/ipqc/modules/form.vue b/src/views/mes/qc/ipqc/modules/form.vue
index 0969fc7..5752a47 100644
--- a/src/views/mes/qc/ipqc/modules/form.vue
+++ b/src/views/mes/qc/ipqc/modules/form.vue
@@ -6,24 +6,22 @@
import { computed, ref } from 'vue';
import { confirm, useVbenModal } from '@vben/common-ui';
-import { MesQcCheckResultEnum, MesQcStatusEnum, MesQcTypeEnum } from '@vben/constants';
+import { MesQcStatusEnum } from '@vben/constants';
-import { Button, Descriptions, message, Tabs } from 'ant-design-vue';
+import { Button, message, Tabs } from 'ant-design-vue';
import { useVbenForm } from '#/adapter/form';
import { createIpqc, finishIpqc, getIpqc, updateIpqc } from '#/api/mes/qc/ipqc';
import { $t } from '#/locales';
-import { QcIndicatorResultList } from '../../indicatorresult/components';
-import MesQcAiSuggest from '../../components/ai-suggest.vue';
-import MesQcAiAssistant from '../../components/ai-assistant.vue';
+import QcAttachments from '../../components/qc-attachments.vue';
+import QcSourceLink from '../../components/qc-source-link.vue';
import { useFormSchema } from '../data';
-import LineList from './line-list.vue';
const emit = defineEmits(['success']);
const formType = ref<FormType>('create');
const formData = ref<MesQcIpqcApi.Ipqc>();
-const subTabsName = ref('line');
+const subTabsName = ref('attachments');
const originalSnapshot = ref(''); // 琛ㄥ崟鍘熷鏁版嵁蹇収锛岀敤浜� finish 鏃惰烦杩囨湭鍙樻洿鐨勪繚瀛樿姹�
const isDetail = computed(() => formType.value === 'detail');
const canFinish = computed(
@@ -54,14 +52,6 @@
showDefaultActions: false,
});
-/** 瀛愯〃鍙樻洿鍚庡埛鏂颁富琛ㄥご鏁版嵁锛堢己闄风粺璁$瓑锛� */
-async function handleRefresh() {
- if (!formData.value?.id) {
- return;
- }
- formData.value = await getIpqc(formData.value.id);
-}
-
/** 鎻愪氦琛ㄥ崟 */
async function handleSubmit(): Promise<boolean> {
const { valid } = await formApi.validate();
@@ -69,13 +59,6 @@
return false;
}
const data = (await formApi.getValues()) as MesQcIpqcApi.Ipqc;
- if (
- (data.unqualifiedQuantity == null || data.unqualifiedQuantity === 0) &&
- data.checkResult === MesQcCheckResultEnum.FAIL
- ) {
- message.warning('涓嶅悎鏍煎搧鏁伴噺涓�0鏃讹紝妫�娴嬬粨鏋滀笉鑳戒负"鏍¢獙涓嶉�氳繃"');
- return false;
- }
if (formData.value?.id) {
await updateIpqc({ ...data, id: formData.value.id });
formData.value = { ...formData.value, ...data };
@@ -95,6 +78,18 @@
return true;
}
+/** 鍏宠仈鏉ユ簮鍗曟嵁鍚庡埛鏂拌鎯呫�佽〃鍗曟樉绀轰笌蹇収 */
+async function handleLinked() {
+ const id = formData.value?.id;
+ if (!id) {
+ return;
+ }
+ formData.value = await getIpqc(id);
+ await formApi.setValues(formData.value);
+ originalSnapshot.value = JSON.stringify(await formApi.getValues());
+ emit('success');
+}
+
/** 瀹屾垚妫�楠屽崟锛氳〃鍗曟湁淇敼鏃跺厛淇濆瓨锛屽啀璋冪敤瀹屾垚鎺ュ彛 */
async function handleFinish() {
const id = formData.value?.id;
@@ -106,7 +101,7 @@
return;
}
try {
- await confirm('鏄惁瀹屾垚杩囩▼妫�楠屽崟缂栧埗锛熴�愬畬鎴愬悗灏嗕笉鑳芥洿鏀广��');
+ await confirm('鏄惁瀹屾垚杩囩▼妫�楠屽崟缂栧埗锛熴�愬畬鎴愬悗浠呭彲淇敼妫�楠岄檮浠躲��');
} catch {
return;
}
@@ -115,13 +110,6 @@
const current = JSON.stringify(await formApi.getValues());
if (current !== originalSnapshot.value) {
const data = (await formApi.getValues()) as MesQcIpqcApi.Ipqc;
- if (
- (data.unqualifiedQuantity == null || data.unqualifiedQuantity === 0) &&
- data.checkResult === MesQcCheckResultEnum.FAIL
- ) {
- message.warning('涓嶅悎鏍煎搧鏁伴噺涓�0鏃讹紝妫�娴嬬粨鏋滀笉鑳戒负"鏍¢獙涓嶉�氳繃"');
- return;
- }
await updateIpqc({ ...data, id });
formData.value = { ...formData.value, ...data };
originalSnapshot.value = current;
@@ -162,7 +150,7 @@
originalSnapshot.value = '';
return;
}
- subTabsName.value = 'line';
+ subTabsName.value = 'attachments';
// 鍔犺浇鏁版嵁
const data = modalApi.getData<{
formType: FormType;
@@ -196,60 +184,31 @@
<template>
<Modal :title="getTitle" class="w-4/5">
<Form class="mx-4" />
- <!-- 缂洪櫡缁熻锛堝彧璇伙級 -->
- <div v-if="formData?.id" class="mx-4 mt-4">
- <Descriptions title="缂洪櫡鎯呭喌" :column="3" bordered size="small">
- <Descriptions.Item label="鑷村懡缂洪櫡鏁�">
- {{ formData.criticalQuantity ?? 0 }}
- </Descriptions.Item>
- <Descriptions.Item label="涓ラ噸缂洪櫡鏁�">
- {{ formData.majorQuantity ?? 0 }}
- </Descriptions.Item>
- <Descriptions.Item label="杞诲井缂洪櫡鏁�">
- {{ formData.minorQuantity ?? 0 }}
- </Descriptions.Item>
- <Descriptions.Item label="鑷村懡缂洪櫡鐜�">
- {{ formData.criticalRate ?? 0 }}%
- </Descriptions.Item>
- <Descriptions.Item label="涓ラ噸缂洪櫡鐜�">
- {{ formData.majorRate ?? 0 }}%
- </Descriptions.Item>
- <Descriptions.Item label="杞诲井缂洪櫡鐜�">
- {{ formData.minorRate ?? 0 }}%
- </Descriptions.Item>
- </Descriptions>
- </div>
<Tabs
v-if="formData?.id"
v-model:active-key="subTabsName"
class="mx-4 mt-4"
>
- <Tabs.TabPane key="line" tab="妫�楠岄」">
- <LineList
- :form-type="formType"
- :ipqc-id="formData.id"
- @refresh="handleRefresh"
- />
- </Tabs.TabPane>
- <Tabs.TabPane key="result" tab="妫�娴嬬粨鏋�">
- <QcIndicatorResultList
- :qc-id="formData.id"
- :qc-type="MesQcTypeEnum.IPQC"
- :readonly="isDetail"
- />
+ <Tabs.TabPane key="attachments" tab="妫�楠岄檮浠�">
+ <QcAttachments qc-type="ipqc" :qc-id="formData!.id!" />
</Tabs.TabPane>
</Tabs>
<template #prepend-footer>
<div class="flex flex-auto items-center gap-2">
+ <QcSourceLink
+ v-if="
+ formData?.id &&
+ formData.status === MesQcStatusEnum.FINISHED &&
+ !formData.sourceDocId
+ "
+ :qc-id="formData.id"
+ :reel-no="formData.reelNo"
+ type="feedback"
+ @linked="handleLinked"
+ />
<Button v-if="canFinish" type="primary" @click="handleFinish">
瀹屾垚
</Button>
- <MesQcAiSuggest
- v-if="canFinish && formData?.id"
- :qc-id="formData.id"
- :qc-type="MesQcTypeEnum.IPQC"
- />
- <MesQcAiAssistant />
</div>
</template>
</Modal>
diff --git a/src/views/mes/qc/iqc/data.ts b/src/views/mes/qc/iqc/data.ts
index 3ad70e6..f89ad3f 100644
--- a/src/views/mes/qc/iqc/data.ts
+++ b/src/views/mes/qc/iqc/data.ts
@@ -11,7 +11,6 @@
import { Button } from 'ant-design-vue';
import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import { getTemplateItemOptionList } from '#/api/mes/qc/template/item';
import { getSimpleUserList } from '#/api/system/user';
import { getDateRangePickerDefaultProps } from '#/utils';
import { MdmItemSelect } from '#/views/basicData/mdm/components';
@@ -135,33 +134,6 @@
},
},
{
- fieldName: 'templateId',
- label: '璐ㄦ鏂规',
- component: 'ApiSelect',
- componentProps: {
- api: getTemplateItemOptionList,
- autoSelect: 'first',
- labelField: 'templateName',
- valueField: 'templateId',
- placeholder: '璇烽�夋嫨璐ㄦ鏂规',
- },
- rules: 'selectRequired',
- dependencies: {
- triggerFields: ['itemId'],
- componentProps: (values) => ({
- api: getTemplateItemOptionList,
- autoSelect: 'first',
- labelField: 'templateName',
- valueField: 'templateId',
- disabled: formType !== 'create' || !values.itemId,
- params: values.itemId
- ? { itemId: values.itemId, qcType: 1 }
- : {},
- placeholder: values.itemId ? '璇烽�夋嫨璐ㄦ鏂规' : '璇峰厛閫夋嫨浜у搧鐗╂枡',
- }),
- },
- },
- {
fieldName: 'vendorName',
label: '渚涘簲鍟�',
component: 'Input',
@@ -273,16 +245,6 @@
valueFormat: 'YYYY-MM-DD',
},
rules: 'required',
- },
- {
- fieldName: 'checkResult',
- label: '妫�娴嬬粨鏋�',
- component: 'Select',
- componentProps: {
- allowClear: true,
- options: getDictOptions(DICT_TYPE.MES_QC_CHECK_RESULT, 'number'),
- placeholder: '璇烽�夋嫨妫�娴嬬粨鏋�',
- },
},
{
fieldName: 'remark',
diff --git a/src/views/mes/qc/iqc/modules/form.vue b/src/views/mes/qc/iqc/modules/form.vue
index 45c1c35..749fff1 100644
--- a/src/views/mes/qc/iqc/modules/form.vue
+++ b/src/views/mes/qc/iqc/modules/form.vue
@@ -6,24 +6,21 @@
import { computed, ref } from 'vue';
import { confirm, useVbenModal } from '@vben/common-ui';
-import { MesQcCheckResultEnum, MesQcStatusEnum, MesQcTypeEnum } from '@vben/constants';
+import { MesQcStatusEnum } from '@vben/constants';
-import { Button, Descriptions, message, Tabs } from 'ant-design-vue';
+import { Button, message, Tabs } from 'ant-design-vue';
import { useVbenForm } from '#/adapter/form';
import { createIqc, finishIqc, getIqc, updateIqc } from '#/api/mes/qc/iqc';
import { $t } from '#/locales';
-import { QcIndicatorResultList } from '../../indicatorresult/components';
-import MesQcAiSuggest from '../../components/ai-suggest.vue';
-import MesQcAiAssistant from '../../components/ai-assistant.vue';
+import QcAttachments from '../../components/qc-attachments.vue';
import { useFormSchema } from '../data';
-import LineList from './line-list.vue';
const emit = defineEmits(['success']);
const formType = ref<FormType>('create');
const formData = ref<MesQcIqcApi.Iqc>();
-const subTabsName = ref('line');
+const subTabsName = ref('attachments');
const originalSnapshot = ref(''); // 琛ㄥ崟鍘熷鏁版嵁蹇収锛岀敤浜� finish 鏃惰烦杩囨湭鍙樻洿鐨勪繚瀛樿姹�
const isDetail = computed(() => formType.value === 'detail');
const canFinish = computed(
@@ -54,14 +51,6 @@
showDefaultActions: false,
});
-/** 瀛愯〃鍙樻洿鍚庡埛鏂颁富琛ㄥご鏁版嵁锛堢己闄风粺璁$瓑锛� */
-async function handleRefresh() {
- if (!formData.value?.id) {
- return;
- }
- formData.value = await getIqc(formData.value.id);
-}
-
/** 鎻愪氦琛ㄥ崟 */
async function handleSubmit(): Promise<boolean> {
const { valid } = await formApi.validate();
@@ -69,13 +58,6 @@
return false;
}
const data = (await formApi.getValues()) as MesQcIqcApi.Iqc;
- if (
- (data.unqualifiedQuantity == null || data.unqualifiedQuantity === 0) &&
- data.checkResult === MesQcCheckResultEnum.FAIL
- ) {
- message.warning('涓嶅悎鏍煎搧鏁伴噺涓�0鏃讹紝妫�娴嬬粨鏋滀笉鑳戒负"鏍¢獙涓嶉�氳繃"');
- return false;
- }
if (formData.value?.id) {
await updateIqc({ ...data, id: formData.value.id });
formData.value = { ...formData.value, ...data };
@@ -106,7 +88,7 @@
return;
}
try {
- await confirm('鏄惁瀹屾垚鏉ユ枡妫�楠屽崟缂栧埗锛熴�愬畬鎴愬悗灏嗕笉鑳芥洿鏀广��');
+ await confirm('鏄惁瀹屾垚鏉ユ枡妫�楠屽崟缂栧埗锛熴�愬畬鎴愬悗浠呭彲淇敼妫�楠岄檮浠躲��');
} catch {
return;
}
@@ -115,13 +97,6 @@
const current = JSON.stringify(await formApi.getValues());
if (current !== originalSnapshot.value) {
const data = (await formApi.getValues()) as MesQcIqcApi.Iqc;
- if (
- (data.unqualifiedQuantity == null || data.unqualifiedQuantity === 0) &&
- data.checkResult === MesQcCheckResultEnum.FAIL
- ) {
- message.warning('涓嶅悎鏍煎搧鏁伴噺涓�0鏃讹紝妫�娴嬬粨鏋滀笉鑳戒负"鏍¢獙涓嶉�氳繃"');
- return;
- }
await updateIqc({ ...data, id });
formData.value = { ...formData.value, ...data };
originalSnapshot.value = current;
@@ -162,7 +137,7 @@
originalSnapshot.value = '';
return;
}
- subTabsName.value = 'line';
+ subTabsName.value = 'attachments';
// 鍔犺浇鏁版嵁
const data = modalApi.getData<{
formType: FormType;
@@ -197,47 +172,13 @@
<template>
<Modal :title="getTitle" class="w-4/5">
<Form class="mx-4" />
- <!-- 缂洪櫡缁熻锛堝彧璇伙級 -->
- <div v-if="formData?.id" class="mx-4 mt-4">
- <Descriptions title="缂洪櫡鎯呭喌" :column="3" bordered size="small">
- <Descriptions.Item label="鑷村懡缂洪櫡鏁�">
- {{ formData.criticalQuantity ?? 0 }}
- </Descriptions.Item>
- <Descriptions.Item label="涓ラ噸缂洪櫡鏁�">
- {{ formData.majorQuantity ?? 0 }}
- </Descriptions.Item>
- <Descriptions.Item label="杞诲井缂洪櫡鏁�">
- {{ formData.minorQuantity ?? 0 }}
- </Descriptions.Item>
- <Descriptions.Item label="鑷村懡缂洪櫡鐜�">
- {{ formData.criticalRate ?? 0 }}%
- </Descriptions.Item>
- <Descriptions.Item label="涓ラ噸缂洪櫡鐜�">
- {{ formData.majorRate ?? 0 }}%
- </Descriptions.Item>
- <Descriptions.Item label="杞诲井缂洪櫡鐜�">
- {{ formData.minorRate ?? 0 }}%
- </Descriptions.Item>
- </Descriptions>
- </div>
<Tabs
v-if="formData?.id"
v-model:active-key="subTabsName"
class="mx-4 mt-4"
>
- <Tabs.TabPane key="line" tab="妫�楠岄」">
- <LineList
- :form-type="formType"
- :iqc-id="formData.id"
- @refresh="handleRefresh"
- />
- </Tabs.TabPane>
- <Tabs.TabPane key="result" tab="妫�娴嬬粨鏋�">
- <QcIndicatorResultList
- :qc-id="formData.id"
- :qc-type="MesQcTypeEnum.IQC"
- :readonly="isDetail"
- />
+ <Tabs.TabPane key="attachments" tab="妫�楠岄檮浠�">
+ <QcAttachments qc-type="iqc" :qc-id="formData!.id!" />
</Tabs.TabPane>
</Tabs>
<template #prepend-footer>
@@ -245,12 +186,6 @@
<Button v-if="canFinish" type="primary" @click="handleFinish">
瀹屾垚
</Button>
- <MesQcAiSuggest
- v-if="canFinish && formData?.id"
- :qc-id="formData.id"
- :qc-type="MesQcTypeEnum.IQC"
- />
- <MesQcAiAssistant />
</div>
</template>
</Modal>
diff --git a/src/views/mes/qc/oqc/data.ts b/src/views/mes/qc/oqc/data.ts
index 643af30..23c8508 100644
--- a/src/views/mes/qc/oqc/data.ts
+++ b/src/views/mes/qc/oqc/data.ts
@@ -11,7 +11,6 @@
import { Button } from 'ant-design-vue';
import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import { getTemplateItemOptionList } from '#/api/mes/qc/template/item';
import { getSimpleUserList } from '#/api/system/user';
import { getDateRangePickerDefaultProps } from '#/utils';
import CrmCustomerSelect from '#/components/crm-customer-select.vue';
@@ -132,33 +131,6 @@
allCustomers: true,
disabled: !!values.sourceDocId,
placeholder: '璇烽�夋嫨浜у搧鐗╂枡',
- }),
- },
- },
- {
- fieldName: 'templateId',
- label: '璐ㄦ鏂规',
- component: 'ApiSelect',
- componentProps: {
- api: getTemplateItemOptionList,
- autoSelect: 'first',
- labelField: 'templateName',
- valueField: 'templateId',
- placeholder: '璇烽�夋嫨璐ㄦ鏂规',
- },
- rules: 'selectRequired',
- dependencies: {
- triggerFields: ['itemId'],
- componentProps: (values) => ({
- api: getTemplateItemOptionList,
- autoSelect: 'first',
- labelField: 'templateName',
- valueField: 'templateId',
- disabled: formType !== 'create' || !values.itemId,
- params: values.itemId
- ? { itemId: values.itemId, qcType: 3 }
- : {},
- placeholder: values.itemId ? '璇烽�夋嫨璐ㄦ鏂规' : '璇峰厛閫夋嫨浜у搧鐗╂枡',
}),
},
},
@@ -315,16 +287,6 @@
valueFormat: 'YYYY-MM-DD',
},
rules: 'required',
- },
- {
- fieldName: 'checkResult',
- label: '妫�娴嬬粨鏋�',
- component: 'Select',
- componentProps: {
- allowClear: true,
- options: getDictOptions(DICT_TYPE.MES_QC_CHECK_RESULT, 'number'),
- placeholder: '璇烽�夋嫨妫�娴嬬粨鏋�',
- },
},
{
fieldName: 'remark',
diff --git a/src/views/mes/qc/oqc/modules/form.vue b/src/views/mes/qc/oqc/modules/form.vue
index e9e7258..73028bc 100644
--- a/src/views/mes/qc/oqc/modules/form.vue
+++ b/src/views/mes/qc/oqc/modules/form.vue
@@ -6,24 +6,22 @@
import { computed, ref } from 'vue';
import { confirm, useVbenModal } from '@vben/common-ui';
-import { MesQcCheckResultEnum, MesQcStatusEnum, MesQcTypeEnum } from '@vben/constants';
+import { MesQcStatusEnum } from '@vben/constants';
-import { Button, Descriptions, message, Tabs } from 'ant-design-vue';
+import { Button, message, Tabs } from 'ant-design-vue';
import { useVbenForm } from '#/adapter/form';
import { createOqc, finishOqc, getOqc, updateOqc } from '#/api/mes/qc/oqc';
import { $t } from '#/locales';
-import { QcIndicatorResultList } from '../../indicatorresult/components';
-import MesQcAiSuggest from '../../components/ai-suggest.vue';
-import MesQcAiAssistant from '../../components/ai-assistant.vue';
+import QcAttachments from '../../components/qc-attachments.vue';
+import QcSourceLink from '../../components/qc-source-link.vue';
import { useFormSchema } from '../data';
-import LineList from './line-list.vue';
const emit = defineEmits(['success']);
const formType = ref<FormType>('create');
const formData = ref<MesQcOqcApi.Oqc>();
-const subTabsName = ref('line');
+const subTabsName = ref('attachments');
const originalSnapshot = ref(''); // 琛ㄥ崟鍘熷鏁版嵁蹇収锛岀敤浜� finish 鏃惰烦杩囨湭鍙樻洿鐨勪繚瀛樿姹�
const isDetail = computed(() => formType.value === 'detail');
const canFinish = computed(
@@ -54,14 +52,6 @@
showDefaultActions: false,
});
-/** 瀛愯〃鍙樻洿鍚庡埛鏂颁富琛ㄥご鏁版嵁锛堢己闄风粺璁$瓑锛� */
-async function handleRefresh() {
- if (!formData.value?.id) {
- return;
- }
- formData.value = await getOqc(formData.value.id);
-}
-
/** 鎻愪氦琛ㄥ崟 */
async function handleSubmit(): Promise<boolean> {
const { valid } = await formApi.validate();
@@ -69,13 +59,6 @@
return false;
}
const data = (await formApi.getValues()) as MesQcOqcApi.Oqc;
- if (
- (data.unqualifiedQuantity == null || data.unqualifiedQuantity === 0) &&
- data.checkResult === MesQcCheckResultEnum.FAIL
- ) {
- message.warning('涓嶅悎鏍煎搧鏁伴噺涓�0鏃讹紝妫�娴嬬粨鏋滀笉鑳戒负"鏍¢獙涓嶉�氳繃"');
- return false;
- }
if (formData.value?.id) {
await updateOqc({ ...data, id: formData.value.id });
formData.value = { ...formData.value, ...data };
@@ -94,6 +77,18 @@
return true;
}
+/** 鍏宠仈鏉ユ簮鍗曟嵁鍚庡埛鏂拌鎯呫�佽〃鍗曟樉绀轰笌蹇収 */
+async function handleLinked() {
+ const id = formData.value?.id;
+ if (!id) {
+ return;
+ }
+ formData.value = await getOqc(id);
+ await formApi.setValues(formData.value);
+ originalSnapshot.value = JSON.stringify(await formApi.getValues());
+ emit('success');
+}
+
/** 瀹屾垚妫�楠屽崟锛氳〃鍗曟湁淇敼鏃跺厛淇濆瓨锛屽啀璋冪敤瀹屾垚鎺ュ彛 */
async function handleFinish() {
const id = formData.value?.id;
@@ -105,7 +100,7 @@
return;
}
try {
- await confirm('鏄惁瀹屾垚鍑鸿揣妫�楠屽崟缂栧埗锛熴�愬畬鎴愬悗灏嗕笉鑳芥洿鏀广��');
+ await confirm('鏄惁瀹屾垚鍑鸿揣妫�楠屽崟缂栧埗锛熴�愬畬鎴愬悗浠呭彲淇敼妫�楠岄檮浠躲��');
} catch {
return;
}
@@ -114,13 +109,6 @@
const current = JSON.stringify(await formApi.getValues());
if (current !== originalSnapshot.value) {
const data = (await formApi.getValues()) as MesQcOqcApi.Oqc;
- if (
- (data.unqualifiedQuantity == null || data.unqualifiedQuantity === 0) &&
- data.checkResult === MesQcCheckResultEnum.FAIL
- ) {
- message.warning('涓嶅悎鏍煎搧鏁伴噺涓�0鏃讹紝妫�娴嬬粨鏋滀笉鑳戒负"鏍¢獙涓嶉�氳繃"');
- return;
- }
await updateOqc({ ...data, id });
formData.value = { ...formData.value, ...data };
originalSnapshot.value = current;
@@ -161,7 +149,7 @@
originalSnapshot.value = '';
return;
}
- subTabsName.value = 'line';
+ subTabsName.value = 'attachments';
// 鍔犺浇鏁版嵁
const data = modalApi.getData<{
formType: FormType;
@@ -200,60 +188,31 @@
<template>
<Modal :title="getTitle" class="w-4/5">
<Form class="mx-4" />
- <!-- 缂洪櫡缁熻锛堝彧璇伙級 -->
- <div v-if="formData?.id" class="mx-4 mt-4">
- <Descriptions title="缂洪櫡鎯呭喌" :column="3" bordered size="small">
- <Descriptions.Item label="鑷村懡缂洪櫡鏁�">
- {{ formData.criticalQuantity ?? 0 }}
- </Descriptions.Item>
- <Descriptions.Item label="涓ラ噸缂洪櫡鏁�">
- {{ formData.majorQuantity ?? 0 }}
- </Descriptions.Item>
- <Descriptions.Item label="杞诲井缂洪櫡鏁�">
- {{ formData.minorQuantity ?? 0 }}
- </Descriptions.Item>
- <Descriptions.Item label="鑷村懡缂洪櫡鐜�">
- {{ formData.criticalRate ?? 0 }}%
- </Descriptions.Item>
- <Descriptions.Item label="涓ラ噸缂洪櫡鐜�">
- {{ formData.majorRate ?? 0 }}%
- </Descriptions.Item>
- <Descriptions.Item label="杞诲井缂洪櫡鐜�">
- {{ formData.minorRate ?? 0 }}%
- </Descriptions.Item>
- </Descriptions>
- </div>
<Tabs
v-if="formData?.id"
v-model:active-key="subTabsName"
class="mx-4 mt-4"
>
- <Tabs.TabPane key="line" tab="妫�楠岄」">
- <LineList
- :form-type="formType"
- :oqc-id="formData.id"
- @refresh="handleRefresh"
- />
- </Tabs.TabPane>
- <Tabs.TabPane key="result" tab="妫�娴嬬粨鏋�">
- <QcIndicatorResultList
- :qc-id="formData.id"
- :qc-type="MesQcTypeEnum.OQC"
- :readonly="isDetail"
- />
+ <Tabs.TabPane key="attachments" tab="妫�楠岄檮浠�">
+ <QcAttachments qc-type="oqc" :qc-id="formData!.id!" />
</Tabs.TabPane>
</Tabs>
<template #prepend-footer>
<div class="flex flex-auto items-center gap-2">
+ <QcSourceLink
+ v-if="
+ formData?.id &&
+ formData.status === MesQcStatusEnum.FINISHED &&
+ !formData.sourceDocId
+ "
+ :qc-id="formData.id"
+ :reel-no="formData.reelNo"
+ type="sales"
+ @linked="handleLinked"
+ />
<Button v-if="canFinish" type="primary" @click="handleFinish">
瀹屾垚
</Button>
- <MesQcAiSuggest
- v-if="canFinish && formData?.id"
- :qc-id="formData.id"
- :qc-type="MesQcTypeEnum.OQC"
- />
- <MesQcAiAssistant />
</div>
</template>
</Modal>
diff --git a/src/views/mes/qc/rqc/data.ts b/src/views/mes/qc/rqc/data.ts
index 8bb1f3b..e5d9726 100644
--- a/src/views/mes/qc/rqc/data.ts
+++ b/src/views/mes/qc/rqc/data.ts
@@ -15,7 +15,6 @@
import { Button } from 'ant-design-vue';
import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import { getTemplateItemOptionList } from '#/api/mes/qc/template/item';
import { getSimpleUserList } from '#/api/system/user';
import { getDateRangePickerDefaultProps } from '#/utils';
import { MdmItemSelect } from '#/views/basicData/mdm/components';
@@ -160,33 +159,6 @@
},
},
{
- fieldName: 'templateId',
- label: '璐ㄦ鏂规',
- component: 'ApiSelect',
- componentProps: {
- api: getTemplateItemOptionList,
- autoSelect: 'first',
- labelField: 'templateName',
- valueField: 'templateId',
- placeholder: '璇烽�夋嫨璐ㄦ鏂规',
- },
- rules: 'selectRequired',
- dependencies: {
- triggerFields: ['itemId'],
- componentProps: (values) => ({
- api: getTemplateItemOptionList,
- autoSelect: 'first',
- labelField: 'templateName',
- valueField: 'templateId',
- disabled: formType !== 'create' || !values.itemId,
- params: values.itemId
- ? { itemId: values.itemId, qcType: 4 }
- : {},
- placeholder: values.itemId ? '璇烽�夋嫨璐ㄦ鏂规' : '璇峰厛閫夋嫨浜у搧鐗╂枡',
- }),
- },
- },
- {
fieldName: 'batchCode',
label: '鎵规鍙�',
component: 'Input',
@@ -265,16 +237,6 @@
valueField: 'id',
},
rules: 'selectRequired',
- },
- {
- fieldName: 'checkResult',
- label: '妫�娴嬬粨鏋�',
- component: 'Select',
- componentProps: {
- allowClear: true,
- options: getDictOptions(DICT_TYPE.MES_QC_CHECK_RESULT, 'number'),
- placeholder: '璇烽�夋嫨妫�娴嬬粨鏋�',
- },
},
{
fieldName: 'remark',
diff --git a/src/views/mes/qc/rqc/modules/form.vue b/src/views/mes/qc/rqc/modules/form.vue
index b931684..db58a72 100644
--- a/src/views/mes/qc/rqc/modules/form.vue
+++ b/src/views/mes/qc/rqc/modules/form.vue
@@ -6,24 +6,21 @@
import { computed, ref } from 'vue';
import { confirm, useVbenModal } from '@vben/common-ui';
-import { MesQcCheckResultEnum, MesQcStatusEnum, MesQcTypeEnum } from '@vben/constants';
+import { MesQcStatusEnum } from '@vben/constants';
-import { Button, Descriptions, message, Tabs } from 'ant-design-vue';
+import { Button, message, Tabs } from 'ant-design-vue';
import { useVbenForm } from '#/adapter/form';
import { createRqc, finishRqc, getRqc, updateRqc } from '#/api/mes/qc/rqc';
import { $t } from '#/locales';
-import { QcIndicatorResultList } from '../../indicatorresult/components';
-import MesQcAiSuggest from '../../components/ai-suggest.vue';
-import MesQcAiAssistant from '../../components/ai-assistant.vue';
+import QcAttachments from '../../components/qc-attachments.vue';
import { useFormSchema } from '../data';
-import LineList from './line-list.vue';
const emit = defineEmits(['success']);
const formType = ref<FormType>('create');
const formData = ref<MesQcRqcApi.Rqc>();
-const subTabsName = ref('line');
+const subTabsName = ref('attachments');
const originalSnapshot = ref(''); // 琛ㄥ崟鍘熷鏁版嵁蹇収锛岀敤浜� finish 鏃惰烦杩囨湭鍙樻洿鐨勪繚瀛樿姹�
const isDetail = computed(() => formType.value === 'detail');
const canFinish = computed(
@@ -54,14 +51,6 @@
showDefaultActions: false,
});
-/** 瀛愯〃鍙樻洿鍚庡埛鏂颁富琛ㄥご鏁版嵁锛堢己闄风粺璁$瓑锛� */
-async function handleRefresh() {
- if (!formData.value?.id) {
- return;
- }
- formData.value = await getRqc(formData.value.id);
-}
-
/** 鎻愪氦琛ㄥ崟 */
async function handleSubmit(): Promise<boolean> {
const { valid } = await formApi.validate();
@@ -69,13 +58,6 @@
return false;
}
const data = (await formApi.getValues()) as MesQcRqcApi.Rqc;
- if (
- (data.unqualifiedQuantity == null || data.unqualifiedQuantity === 0) &&
- data.checkResult === MesQcCheckResultEnum.FAIL
- ) {
- message.warning('涓嶅悎鏍煎搧鏁伴噺涓�0鏃讹紝妫�娴嬬粨鏋滀笉鑳戒负"鏍¢獙涓嶉�氳繃"');
- return false;
- }
if (formData.value?.id) {
await updateRqc({ ...data, id: formData.value.id });
formData.value = { ...formData.value, ...data };
@@ -105,7 +87,7 @@
return;
}
try {
- await confirm('鏄惁瀹屾垚閫�璐ф楠屽崟缂栧埗锛熴�愬畬鎴愬悗灏嗕笉鑳芥洿鏀广��');
+ await confirm('鏄惁瀹屾垚閫�璐ф楠屽崟缂栧埗锛熴�愬畬鎴愬悗浠呭彲淇敼妫�楠岄檮浠躲��');
} catch {
return;
}
@@ -114,13 +96,6 @@
const current = JSON.stringify(await formApi.getValues());
if (current !== originalSnapshot.value) {
const data = (await formApi.getValues()) as MesQcRqcApi.Rqc;
- if (
- (data.unqualifiedQuantity == null || data.unqualifiedQuantity === 0) &&
- data.checkResult === MesQcCheckResultEnum.FAIL
- ) {
- message.warning('涓嶅悎鏍煎搧鏁伴噺涓�0鏃讹紝妫�娴嬬粨鏋滀笉鑳戒负"鏍¢獙涓嶉�氳繃"');
- return;
- }
await updateRqc({ ...data, id });
formData.value = { ...formData.value, ...data };
originalSnapshot.value = current;
@@ -159,7 +134,7 @@
originalSnapshot.value = '';
return;
}
- subTabsName.value = 'line';
+ subTabsName.value = 'attachments';
// 鍔犺浇鏁版嵁
const data = modalApi.getData<{
formType: FormType;
@@ -196,47 +171,13 @@
<template>
<Modal :title="getTitle" class="w-4/5">
<Form class="mx-4" />
- <!-- 缂洪櫡缁熻锛堝彧璇伙級 -->
- <div v-if="formData?.id" class="mx-4 mt-4">
- <Descriptions title="缂洪櫡鎯呭喌" :column="3" bordered size="small">
- <Descriptions.Item label="鑷村懡缂洪櫡鏁�">
- {{ formData.criticalQuantity ?? 0 }}
- </Descriptions.Item>
- <Descriptions.Item label="涓ラ噸缂洪櫡鏁�">
- {{ formData.majorQuantity ?? 0 }}
- </Descriptions.Item>
- <Descriptions.Item label="杞诲井缂洪櫡鏁�">
- {{ formData.minorQuantity ?? 0 }}
- </Descriptions.Item>
- <Descriptions.Item label="鑷村懡缂洪櫡鐜�">
- {{ formData.criticalRate ?? 0 }}%
- </Descriptions.Item>
- <Descriptions.Item label="涓ラ噸缂洪櫡鐜�">
- {{ formData.majorRate ?? 0 }}%
- </Descriptions.Item>
- <Descriptions.Item label="杞诲井缂洪櫡鐜�">
- {{ formData.minorRate ?? 0 }}%
- </Descriptions.Item>
- </Descriptions>
- </div>
<Tabs
v-if="formData?.id"
v-model:active-key="subTabsName"
class="mx-4 mt-4"
>
- <Tabs.TabPane key="line" tab="妫�楠岄」">
- <LineList
- :form-type="formType"
- :rqc-id="formData.id"
- @refresh="handleRefresh"
- />
- </Tabs.TabPane>
- <Tabs.TabPane key="result" tab="妫�娴嬬粨鏋�">
- <QcIndicatorResultList
- :qc-id="formData.id"
- :qc-type="MesQcTypeEnum.RQC"
- :readonly="isDetail"
- />
+ <Tabs.TabPane key="attachments" tab="妫�楠岄檮浠�">
+ <QcAttachments qc-type="rqc" :qc-id="formData!.id!" />
</Tabs.TabPane>
</Tabs>
<template #prepend-footer>
@@ -244,12 +185,6 @@
<Button v-if="canFinish" type="primary" @click="handleFinish">
瀹屾垚
</Button>
- <MesQcAiSuggest
- v-if="canFinish && formData?.id"
- :qc-id="formData.id"
- :qc-type="MesQcTypeEnum.RQC"
- />
- <MesQcAiAssistant />
</div>
</template>
</Modal>
diff --git a/src/views/mes/workbench/components/WorkstationSelectDialog.vue b/src/views/mes/workbench/components/WorkstationSelectDialog.vue
index 6d5e41d..a3b9c42 100644
--- a/src/views/mes/workbench/components/WorkstationSelectDialog.vue
+++ b/src/views/mes/workbench/components/WorkstationSelectDialog.vue
@@ -5,9 +5,10 @@
import { IconifyIcon } from '@vben/icons';
-import { Input, Modal, Spin } from 'ant-design-vue';
+import { Input, message, Modal, Spin } from 'ant-design-vue';
import { getWorkstationPage } from '#/api/mes/md/workstation';
+import { getUnfinishedWorkstationCounts } from '#/api/mes/pro/task';
defineOptions({ name: 'WorkbenchWorkstationSelectDialog' });
@@ -19,6 +20,8 @@
const loading = ref(false);
const workstations = ref<MesMdWorkstationApi.Workstation[]>([]);
const searchKeyword = ref('');
+const pendingCounts = ref<Record<number, number>>({});
+const countsAvailable = ref(false);
/** 鎵撳紑寮圭獥 */
async function open() {
@@ -31,8 +34,20 @@
async function loadWorkstations() {
loading.value = true;
try {
- const result = await getWorkstationPage({ pageNo: 1, pageSize: 200 });
+ pendingCounts.value = {};
+ countsAvailable.value = false;
+ const [result, counts] = await Promise.all([
+ getWorkstationPage({ pageNo: 1, pageSize: 200 }),
+ getUnfinishedWorkstationCounts().catch(() => {
+ message.warning('鏈兘鑾峰彇宸ヤ綔绔欎换鍔℃暟閲�');
+ return null;
+ }),
+ ]);
workstations.value = result.list ?? [];
+ if (counts) {
+ pendingCounts.value = Object.fromEntries(counts.map((item) => [item.workstationId, item.pendingCount]));
+ countsAvailable.value = true;
+ }
} finally {
loading.value = false;
}
@@ -103,6 +118,7 @@
</span>
</div>
<div class="ws-card__name">{{ ws.name }}</div>
+ <div class="ws-card__info-row">鏈畬鎴愪换鍔★細{{ countsAvailable ? (pendingCounts[ws.id!] ?? 0) : '鈥�' }} 鏉�</div>
<div class="ws-card__info">
<div v-if="ws.workshopName" class="ws-card__info-row">
<IconifyIcon icon="lucide:building-2" class="ws-card__info-icon" />
diff --git a/src/views/mes/workbench/components/tabs/ProductIssueTab.vue b/src/views/mes/workbench/components/tabs/ProductIssueTab.vue
index 27f62be..52c91e7 100644
--- a/src/views/mes/workbench/components/tabs/ProductIssueTab.vue
+++ b/src/views/mes/workbench/components/tabs/ProductIssueTab.vue
@@ -22,10 +22,13 @@
cancelProductIssue,
createProductIssue,
deleteProductIssue,
+ getProductIssue,
getProductIssuePage,
submitProductIssue,
updateProductIssue,
} from '#/api/mes/wm/productissue';
+import { getProductIssueLinesByIssue } from '#/api/mes/wm/productissue/line';
+import dayjs from 'dayjs';
import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
@@ -240,7 +243,7 @@
props: { type: DICT_TYPE.MES_WM_PRODUCT_ISSUE_STATUS },
},
},
- { title: '鎿嶄綔', width: 260, fixed: 'right', slots: { default: 'actions' } },
+ { title: '鎿嶄綔', width: 360, fixed: 'right', slots: { default: 'actions' } },
];
const gridHeight = ref(300);
@@ -304,6 +307,52 @@
/** 鏄惁宸查�変腑宸ヤ綔绔欏拰浠诲姟锛屾湭閫変腑鏃朵笉灞曠ず琛ㄦ牸 */
const isReady = computed(() => !!props.taskId && !!props.workstationId);
+/** 鍗曟嵁鍐呭鍏ㄩ儴鎸夋枃鏈浆涔夛紝閬垮厤鐗╂枡鍚嶇О鎴栧娉ㄥ奖鍝嶆墦鍗伴〉闈㈢粨鏋勩�� */
+function escapePrintText(value: unknown) {
+ return String(value ?? '').replace(/[&<>"']/g, (char) => ({
+ '&': '&', '<': '<', '>': '>', '"': '"', "'": ''',
+ })[char] || char);
+}
+
+async function handlePrintIssue(row: MesWmProductIssueApi.ProductIssue) {
+ if (!row.id) return;
+ // 鍏堟墦寮�绐楀彛锛岄伩鍏嶅紓姝ヨ姹傜粨鏉熷悗琚祻瑙堝櫒浣滀负寮圭獥鎷︽埅銆�
+ const popup = window.open('', '_blank');
+ if (!popup) { message.warning('娴忚鍣ㄦ嫤鎴簡鎵撳嵃绐楀彛锛岃鍏佽寮圭獥鍚庨噸璇�'); return; }
+ popup.document.title = '姝e湪鍑嗗棰嗘枡鍗�';
+ popup.document.body.textContent = '姝e湪鍑嗗棰嗘枡鍗曗��';
+ try {
+ const [issue, lines] = await Promise.all([getProductIssue(row.id), getProductIssueLinesByIssue(row.id)]);
+ if (!issue) throw new Error('棰嗘枡鍗曚笉瀛樺湪');
+ const safe = escapePrintText;
+ const date = (value: unknown) => value && dayjs(value as string | number | Date).isValid()
+ ? dayjs(value as string | number | Date).format('YYYY-MM-DD HH:mm') : '';
+ const statusNames: Record<number, string> = {
+ [MesWmProductIssueStatusEnum.PREPARE]: '鑽夌',
+ [MesWmProductIssueStatusEnum.APPROVING]: '寰呮嫞璐�',
+ [MesWmProductIssueStatusEnum.APPROVED]: '寰呴鍑�',
+ [MesWmProductIssueStatusEnum.FINISHED]: '宸插畬鎴�',
+ [MesWmProductIssueStatusEnum.CANCELED]: '宸插彇娑�',
+ };
+ const rows = lines.map((item, index) => `<tr><td>${index + 1}</td><td>${safe(item.itemCode)}</td><td>${safe(item.itemName)}</td><td>${safe(item.specification)}</td><td>${safe(item.unitMeasureName)}</td><td>${safe(item.quantity)}</td><td>${safe(item.remark)}</td></tr>`).join('');
+ popup.document.open();
+ popup.document.write(`<!doctype html><html lang="zh-CN"><head><meta charset="UTF-8"><title>棰嗘枡鍗� ${safe(issue.code)}</title><style>
+ @page { size: A4; margin: 15mm; } body { color: #111; font: 13px 'Microsoft YaHei', sans-serif; margin: 0 auto; max-width: 180mm; }
+ h1 { text-align: center; font-size: 22px; margin: 12px 0 20px; } .meta { display: grid; grid-template-columns: 1fr 1fr; gap: 9px 16px; margin-bottom: 16px; overflow-wrap: anywhere; }
+ table { border-collapse: collapse; width: 100%; table-layout: fixed; } th,td { border: 1px solid #555; padding: 7px 4px; word-break: break-word; text-align: left; } th:first-child,td:first-child { width: 32px; text-align: center; } th:nth-child(5),td:nth-child(5) { width: 42px; } th:nth-child(6),td:nth-child(6) { width: 56px; } thead { display: table-header-group; } tr { break-inside: avoid; }
+ .sign { display: flex; justify-content: space-between; gap: 18px; margin-top: 32px; } .toolbar { text-align: right; padding: 12px 0; } button { padding: 7px 14px; cursor: pointer; } @media print { .toolbar { display: none; } }
+ </style></head><body><div class="toolbar"><button onclick="window.print()">鎵撳嵃 / 淇濆瓨涓� PDF</button></div><h1>棰嗘枡鍗�</h1>
+ <div class="meta"><div>棰嗘枡鍗曞彿锛�${safe(issue.code)}</div><div>棰嗘枡鍗曞悕绉帮細${safe(issue.name)}</div><div>鐢熶骇浠诲姟锛�${safe(issue.taskCode)}</div><div>鐢熶骇璁㈠崟锛�${safe(issue.workOrderCode)}</div><div>宸ヤ綔绔欙細${safe(issue.workstationName || issue.workstationCode)}</div><div>闇�姹傛椂闂达細${safe(date(issue.requiredTime))}</div><div>鐘舵�侊細${safe(statusNames[issue.status ?? -1] ?? '鏈煡')}</div><div>澶囨敞锛�${safe(issue.remark)}</div></div>
+ <table><thead><tr><th>搴忓彿</th><th>鐗╂枡缂栫爜</th><th>鐗╂枡鍚嶇О</th><th>瑙勬牸鍨嬪彿</th><th>鍗曚綅</th><th>鐢宠鏁伴噺</th><th>澶囨敞</th></tr></thead><tbody>${rows || '<tr><td colspan="7">鏆傛棤棰嗘枡鏄庣粏</td></tr>'}</tbody></table>
+ <div class="sign"><span>鐢宠浜猴細____________</span><span>鍙戞枡浜猴細____________</span><span>棰嗘枡浜猴細____________</span><span>鏃ユ湡锛歘___________</span></div></body></html>`);
+ popup.document.close();
+ } catch (error) {
+ popup.close();
+ message.error('鏃犳硶鐢熸垚棰嗘枡鍗曪紝璇风◢鍚庨噸璇�');
+ console.error(error);
+ }
+}
+
/** 缂栬緫寮圭獥 */
const [EditFormModal, editFormModalApi] = useVbenModal({
connectedComponent: ProductIssueFormModal,
@@ -361,6 +410,7 @@
<div ref="listRef" class="issue-tab__list">
<Grid table-title="棰嗘枡璁板綍">
<template #actions="{ row }">
+ <Button type="link" size="small" @click="handlePrintIssue(row)">鎵撳嵃 / 瀵煎嚭 PDF</Button>
<Button
v-if="row.status === MesWmProductIssueStatusEnum.PREPARE"
type="link"
diff --git a/src/views/wls/productsales/data.ts b/src/views/wls/productsales/data.ts
index 6b96d22..e325943 100644
--- a/src/views/wls/productsales/data.ts
+++ b/src/views/wls/productsales/data.ts
@@ -132,7 +132,7 @@
contactAddress: notice?.recipientAddress,
contactName: notice?.recipientName,
contactTelephone: notice?.recipientTelephone,
- salesOrderCode: notice?.salesOrderCode,
+ salesOrderCode: notice?.saleOrderCode,
});
},
status: MesWmSalesNoticeStatusEnum.APPROVED,
@@ -444,11 +444,20 @@
},
{
field: 'oqcCheckFlag',
- title: '鏄惁鏍¢獙',
- width: 100,
+ title: '闇�瑕佸嚭璐ф楠�',
+ width: 120,
cellRender: {
name: 'CellDict',
props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+ },
+ },
+ {
+ field: 'qualityStatus',
+ title: '璐ㄩ噺鐘舵��',
+ width: 100,
+ cellRender: {
+ name: 'CellDict',
+ props: { type: DICT_TYPE.MES_WM_QUALITY_STATUS },
},
},
{
@@ -563,7 +572,7 @@
},
{
fieldName: 'oqcCheckFlag',
- label: '鏄惁鏍¢獙',
+ label: '闇�瑕佸嚭璐ф楠�',
component: 'RadioGroup',
componentProps: {
buttonStyle: 'solid',
diff --git a/src/views/wls/productsales/modules/form.vue b/src/views/wls/productsales/modules/form.vue
index f6ba967..c3d058f 100644
--- a/src/views/wls/productsales/modules/form.vue
+++ b/src/views/wls/productsales/modules/form.vue
@@ -242,7 +242,7 @@
<div class="flex flex-auto items-center gap-2">
<Popconfirm
v-if="canSubmit"
- title="纭鎻愪氦璇ラ攢鍞嚭搴撳崟锛熴�愭彁浜ゅ悗灏嗕笉鑳戒慨鏀广��"
+ title="纭鎻愪氦璇ラ攢鍞嚭搴撳崟锛熴�愭彁浜ゅ悗灏嗕笉鑳戒慨鏀癸紱闇�瑕佸嚭璐ф楠岀殑鏄庣粏灏嗚繘鍏ュ緟妫�娴嬶紝闇�璐ㄦ鍛樺垱寤哄苟鍏宠仈鍑鸿揣妫�楠屽崟銆�"
@confirm="handleSubmit"
>
<Button type="primary">鎻愪氦</Button>
--
Gitblit v1.9.3