From 78caa769e452f63288743b8997f7b4c21bb06ce5 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 06 十一月 2026 19:00:38 +0800
Subject: [PATCH] feat(crm,mes): 扩展客户字段与重构批次号生成逻辑
---
src/views/mes/qc/seedQuality/record.vue | 606 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 435 insertions(+), 171 deletions(-)
diff --git a/src/views/mes/qc/seedQuality/record.vue b/src/views/mes/qc/seedQuality/record.vue
index 70f832d..ee0cda4 100644
--- a/src/views/mes/qc/seedQuality/record.vue
+++ b/src/views/mes/qc/seedQuality/record.vue
@@ -1,5 +1,6 @@
<script setup lang="ts">
import { computed, onMounted, ref } from 'vue';
+import { useRouter } from 'vue-router';
import type { TablePaginationConfig } from 'ant-design-vue';
import { IconifyIcon } from '@vben/icons';
@@ -10,36 +11,65 @@
import { getWarehouseSimpleList } from '#/api/mes/wm/warehouse';
import {
+ getSeedQualityBatchPage,
getSeedQualityPage,
getSeedQualityIndicators,
getSeedQualityActions,
- getSeedIndicatorRanges,
retestSeedQuality,
retestSeedQualityBatch,
resolveSeedRetestScope,
submitSeedRetestScope,
approveSeedQuality,
approveSeedQualityBatch,
+ retrySeedQualityBpm,
resolveSeedQuality,
submitSeedQualityGroup,
+ type SeedQualityBatchGroup,
type SeedQualityRecord,
type SeedQualityScan,
type SeedQualityIndicator,
type SeedQualityAction,
type SeedRetestScope,
+ type EffectiveIndicator,
} from '#/api/mes/qc/seedQuality';
-const records = ref<SeedQualityRecord[]>([]);
-const loading = ref(false);
-const page = ref(1);
-const pageSize = ref(10);
+interface BatchBucket {
+ list: SeedQualityRecord[];
+ total: number;
+ page: number;
+ pageSize: number;
+ loading: boolean;
+}
+
+const groups = ref<SeedQualityBatchGroup[]>([]);
+const groupLoading = ref(false);
+const groupTotal = ref(0);
+const batchPage = ref(1);
+const batchPageSize = ref(10);
+const expandedKeys = ref<string[]>([]);
+const buckets = ref<Record<string, BatchBucket>>({});
+const batchSelections = ref<Record<string, number[]>>({});
+const loading = computed(() =>
+ groupLoading.value || Object.values(buckets.value).some((bucket) => bucket.loading),
+);
+
+/** 鍥哄畾璐ㄦ绾匡細1-鍔犲伐閮紝2-閿�鍞儴锛涗笉浼犺〃绀哄叏閮� */
+const props = withDefaults(defineProps<{ initialQcLine?: number }>(), {
+ initialQcLine: undefined,
+});
const code = ref('');
const batchCode = ref('');
const result = ref<number>();
const workflowStatus = ref<number>();
+const qcLine = ref<number | undefined>(props.initialQcLine);
-const total = ref(0);
+const pageTitle = computed(() => {
+ if (props.initialQcLine === 1) return '鍔犲伐閮ㄨ川妫�';
+ if (props.initialQcLine === 2) return '閿�鍞儴璐ㄦ';
+ return '璐ㄦ璁板綍';
+});
+
const statsTotal = ref(0);
const passTotal = ref(0);
const failTotal = ref(0);
@@ -48,14 +78,52 @@
Math.max(statsTotal.value - passTotal.value - failTotal.value, 0),
);
const { hasAccessByCodes } = useAccess();
+const router = useRouter();
+function openProcess(processInstanceId?: string) {
+ if (!processInstanceId) {
+ message.warning('瀹℃壒娴佺▼灏氭湭鐢熸垚锛岃鑱旂郴绠$悊鍛樻鏌� BPM 娴佺▼閰嶇疆');
+ return;
+ }
+ void router.push({ name: 'BpmProcessInstanceDetail', query: { id: processInstanceId } });
+}
+async function retryProcess(id: number) {
+ try {
+ await retrySeedQualityBpm(id);
+ message.success('宸查噸鏂板彂璧� BPM 瀹℃壒');
+ refreshAll();
+ } catch (error) {
+ message.error(scopeErrorText(error));
+ }
+}
const canScopeAction = computed(() => [
'mes:qc-seed-quality:submit', 'mes:qc-seed-quality:retest',
- 'mes:qc-seed-quality:process-approve', 'mes:qc-seed-quality:company-approve',
].some((code) => hasAccessByCodes([code])));
const workflowLabels: Record<number, string> = {
- 10: '寰呭妫�', 20: '寰呭垵妫�瀹℃牳', 25: '寰呭垵妫�涓嶅悎鏍煎鐞�', 30: '寰呭妫�瀹℃牳',
- 40: '宸叉斁琛�', 50: '鍒濇椹冲洖寰呴噸妫�', 60: '寰呭妫�涓嶅悎鏍煎鐞�', 70: '宸叉姤搴�',
+ 10: '寰呭妫�', 20: '寰呴儴闂ㄥ鎵�', 25: '寰呴儴闂ㄤ笉鍚堟牸瀹℃壒', 30: '寰呭叕鍙歌川妫�瀹℃壒',
+ 40: '宸叉斁琛�', 50: '鍒濇椹冲洖寰呴噸妫�', 60: '寰呭叕鍙歌川妫�涓嶅悎鏍煎鐞�', 70: '宸叉姤搴�',
};
+/** 鍙岀嚎璐ㄦ锛氬悓涓�琚嬬爜鐢卞姞宸ラ儴銆侀攢鍞儴鍚勭敓鎴愪竴鏉¤川妫�璁板綍 */
+const qcLineLabels: Record<number, string> = { 0: '鏈尯鍒�', 1: '鍔犲伐閮�', 2: '閿�鍞儴' };
+const qcLineColors: Record<number, string> = { 0: 'default', 1: 'blue', 2: 'purple' };
+function qcLineLabel(value?: number) {
+ return qcLineLabels[value ?? 0] || '鏈尯鍒�';
+}
+/** 缁忛攢鍟嗛��璐ц川妫�澶嶇敤鍚屼竴娴佺▼鐘舵�侊紝鎸変笟鍔$被鍨嬪睍绀烘洿鍑嗙‘鐨勮妭鐐瑰悕绉� */
+function statusLabel(record: SeedQualityRecord) {
+ if (record.bizType === 2) {
+ if (record.workflowStatus === 10) return '寰呭妫�';
+ if (record.workflowStatus === 20) return '寰呴攢鍞儴棰嗗瀹℃壒';
+ if (record.workflowStatus === 40) return '閫�璐ц川妫�閫氳繃';
+ if (record.workflowStatus === 70) return '閫�璐ц川妫�涓嶉�氳繃';
+ }
+ return workflowLabels[record.workflowStatus] || '鏈煡鐘舵��';
+}
+function statusColor(record: SeedQualityRecord) {
+ if (record.workflowStatus === 40) return 'green';
+ if (record.workflowStatus === 70) return 'red';
+ if (record.workflowStatus === 60) return 'orange';
+ return 'blue';
+}
const actionLabels: Record<string, string> = {
INITIAL: '鍒濇', INITIAL_RECHECK: '閲嶆柊鍒濇', RETEST: '澶嶆', PROCESS_APPROVE: '鍒濇瀹℃牳閫氳繃',
PROCESS_REJECT: '鍒濇瀹℃牳椹冲洖', COMPANY_APPROVE: '澶嶆瀹℃牳閫氳繃',
@@ -64,6 +132,19 @@
const indicatorLabels: Record<string, string> = {
purity: '绾害', cleanliness: '鍑�搴�', germination_rate: '鍙戣娊鐜�', moisture: '姘村垎',
};
+function indicatorLabel(code: string, name?: string) {
+ return name || indicatorLabels[code] || code;
+}
+function buildIndicators(list?: EffectiveIndicator[]): SeedQualityIndicator[] {
+ return (list || []).map((item) => ({
+ indicatorCode: item.code,
+ indicatorName: item.name || indicatorLabels[item.code] || item.code,
+ unit: item.unit,
+ value: undefined,
+ minValue: Number(item.minValue),
+ maxValue: Number(item.maxValue),
+ }));
+}
function actionColor(action: string) {
if (action.includes('REJECT')) return 'red';
if (action.includes('APPROVE')) return 'green';
@@ -119,21 +200,13 @@
label: warehouse.code ? `${warehouse.name}锛�${warehouse.code}锛塦 : warehouse.name || '',
value: warehouse.id ?? 0,
})).filter((item) => item.value));
-const scopeReviewGroups = computed(() => {
- const scope = retestScope.value;
- if (!scope) return [];
- return [
- { status: 20, stage: 'process' as const, ids: scope.pendingProcessIds || [] },
- { status: 25, stage: 'process' as const, ids: scope.pendingInitialFailIds || [] },
- { status: 30, stage: 'company' as const, ids: scope.pendingCompanyIds || [] },
- { status: 60, stage: 'company' as const, ids: scope.pendingCompanyFailIds || [] },
- ].filter((group) => group.ids.length && hasAccessByCodes([`mes:qc-seed-quality:${group.stage === 'process' ? 'process-approve' : 'company-approve'}`]));
-});
-const scopeHasReviewPermission = computed(() => {
- const scope = retestScope.value;
- if (!scope) return false;
- return (scope.pendingProcessCount > 0 && hasAccessByCodes(['mes:qc-seed-quality:process-approve']))
- || (scope.pendingCompanyCount > 0 && hasAccessByCodes(['mes:qc-seed-quality:company-approve']));
+const scopeReviewGroups = computed(() => [] as Array<{ status: number; stage: 'process' | 'company'; ids: number[] }>);
+const scopeHasReviewPermission = computed(() => false);
+const retestTargetLabel = computed(() => {
+ const record = activeRecord.value;
+ if (!record) return '';
+ if (record.bizType === 2) return `缁忛攢鍟嗛��璐у崟 ${record.returnSalesCode || record.code}`;
+ return `琚嬬爜锛�${record.code} 路 ${qcLineLabel(record.qcLine)}璐ㄦ绾縛;
});
const reviewOpen = ref(false);
const reviewBusy = ref(false);
@@ -145,37 +218,77 @@
const selectedIds = ref<number[]>([]);
const selectedRecordMap = ref(new Map<number, SeedQualityRecord>());
const selectedRows = computed(() => selectedIds.value.map((id) => selectedRecordMap.value.get(id)).filter((row): row is SeedQualityRecord => !!row));
+const reviewTitle = computed(() => {
+ const record = activeRecord.value;
+ if (record?.bizType === 2) return record.workflowStatus === 20 ? '閿�鍞儴棰嗗瀹℃壒' : '閫�璐у妫�涓嶅悎鏍煎鐞�';
+ if ([25, 60].includes(record?.workflowStatus ?? 0)) return '涓嶅悎鏍煎鐞�';
+ return reviewStage.value === 'process' ? '鍒濇瀹℃牳' : '鍏徃璐ㄦ瀹℃壒';
+});
const reviewGroups = computed(() => [20, 25, 30, 60].map((status) => ({
status,
rows: selectedRows.value.filter((row) => row.workflowStatus === status),
stage: status === 20 || status === 25 ? 'process' as const : 'company' as const,
-})).filter((group) => group.rows.length && hasAccessByCodes([`mes:qc-seed-quality:${group.stage === 'process' ? 'process-approve' : 'company-approve'}`])));
+})).filter((group) => group.rows.length && group.rows.every((row) => row.qcLine === 0)
+ && hasAccessByCodes([`mes:qc-seed-quality:${group.stage === 'process' ? 'process-approve' : 'company-approve'}`])));
const retestGroups = computed(() => {
if (!hasAccessByCodes(['mes:qc-seed-quality:retest'])) return [];
const groups = new Map<string, { status: 10 | 50; batchCode: string; rows: SeedQualityRecord[] }>();
for (const row of selectedRows.value) {
if (row.workflowStatus !== 10 && row.workflowStatus !== 50) continue;
if (!row.batchCode) continue;
- const key = `${row.workflowStatus}:${row.batchCode}`;
+ const key = `${row.workflowStatus}:${row.batchCode}:${row.qcLine ?? 0}`;
if (!groups.has(key)) groups.set(key, { status: row.workflowStatus, batchCode: row.batchCode, rows: [] });
groups.get(key)!.rows.push(row);
}
return [...groups.values()];
});
-function changeSelection(keys: (string | number)[]) {
- const nextIds = keys.map(Number);
- const nextMap = new Map(selectedRecordMap.value);
- for (const row of records.value) if (nextIds.includes(row.id)) nextMap.set(row.id, row);
- for (const id of nextMap.keys()) if (!nextIds.includes(id)) nextMap.delete(id);
+function groupKey(group: SeedQualityBatchGroup) {
+ return group.batchCode || '__unbound__';
+}
+function isExpanded(group: SeedQualityBatchGroup) {
+ return expandedKeys.value.includes(groupKey(group));
+}
+function bucketOf(group: SeedQualityBatchGroup) {
+ const key = groupKey(group);
+ buckets.value[key] ??= { list: [], total: 0, page: 1, pageSize: 10, loading: false };
+ return buckets.value[key]!;
+}
+function syncSelection() {
+ const ids = new Set(Object.values(batchSelections.value).flat());
+ const nextMap = new Map<number, SeedQualityRecord>();
+ for (const bucket of Object.values(buckets.value)) {
+ for (const row of bucket.list) if (ids.has(row.id)) nextMap.set(row.id, row);
+ }
+ for (const [id, row] of selectedRecordMap.value) {
+ if (ids.has(id) && !nextMap.has(id)) nextMap.set(id, row);
+ }
+ selectedIds.value = [...ids];
selectedRecordMap.value = nextMap;
- selectedIds.value = nextIds;
+}
+function changeGroupSelection(group: SeedQualityBatchGroup, keys: (number | string)[]) {
+ batchSelections.value = { ...batchSelections.value, [groupKey(group)]: keys.map(Number) };
+ syncSelection();
+}
+function selectionConfig(group: SeedQualityBatchGroup) {
+ return {
+ selectedRowKeys: batchSelections.value[groupKey(group)] || [],
+ preserveSelectedRowKeys: true,
+ onChange: (keys: (number | string)[]) => changeGroupSelection(group, keys),
+ };
}
function clearSelection() {
selectedIds.value = [];
selectedRecordMap.value = new Map();
+ batchSelections.value = {};
}
function removeSelection(ids: number[]) {
const processed = new Set(ids);
+ const next: Record<string, number[]> = {};
+ for (const [key, value] of Object.entries(batchSelections.value)) {
+ const remain = value.filter((id) => !processed.has(id));
+ if (remain.length) next[key] = remain;
+ }
+ batchSelections.value = next;
selectedIds.value = selectedIds.value.filter((id) => !processed.has(id));
selectedRecordMap.value = new Map([...selectedRecordMap.value].filter(([id]) => !processed.has(id)));
}
@@ -185,13 +298,12 @@
activeRecord.value = record;
try {
const previous = await getSeedQualityIndicators(record.id);
- const ranges = await getSeedIndicatorRanges().catch(() => []);
- retestIndicators.value = previous.map((item) => {
- const range = ranges.find((row) => row.indicatorCode === item.indicatorCode);
- return { ...item, minValue: range ? Number(range.minValue) : Number(item.minValue), maxValue: range ? Number(range.maxValue) : Number(item.maxValue) };
- });
- if (retestIndicators.value.length !== 4) throw new Error('璐ㄦ鎸囨爣涓嶅畬鏁�');
- retestIndicators.value = retestIndicators.value.map((item) => ({ ...item, value: undefined }));
+ retestIndicators.value = previous.map((item) => ({
+ ...item,
+ indicatorName: indicatorLabel(item.indicatorCode, item.indicatorName),
+ value: undefined,
+ }));
+ if (!retestIndicators.value.length) throw new Error('璐ㄦ鎸囨爣璁板綍缂哄け');
retestReason.value = '';
retestOpen.value = true;
} catch (error) {
@@ -249,12 +361,12 @@
const scannedCode = scopeCode.value.trim();
let data: SeedRetestScope;
try {
- data = await resolveSeedRetestScope(scannedCode, scopeType.value);
+ data = await resolveSeedRetestScope(scannedCode, scopeType.value, qcLine.value === 2 ? 2 : 1);
} catch (error) {
if (!scopeErrorText(error).startsWith('鏈壘鍒�')) throw error;
const otherType = scopeType.value === 'PALLET' ? 'BATCH' : 'PALLET';
try {
- data = await resolveSeedRetestScope(scannedCode, otherType);
+ data = await resolveSeedRetestScope(scannedCode, otherType, qcLine.value === 2 ? 2 : 1);
scopeType.value = otherType;
} catch (otherError) {
if (scopeErrorText(otherError).startsWith('鏈壘鍒�')) {
@@ -265,15 +377,9 @@
}
await hydrateScopeReviewIds(data, scannedCode);
retestScope.value = data; scopeStatus.value = data.retestIds.length ? 10 : 50;
- initialScope.value = await resolveSeedQuality(scannedCode, data.scanType);
- const ranges = await getSeedIndicatorRanges().catch(() => []);
- const emptyIndicators = () => Object.entries(indicatorLabels).map(([indicatorCode]) => {
- const range = ranges.find((row) => row.indicatorCode === indicatorCode);
- return { indicatorCode, value: undefined, minValue: range ? Number(range.minValue) : undefined as unknown as number,
- maxValue: range ? Number(range.maxValue) : undefined as unknown as number };
- });
- retestIndicators.value = emptyIndicators();
- initialIndicators.value = emptyIndicators();
+ initialScope.value = await resolveSeedQuality(scannedCode, data.scanType, qcLine.value === 2 ? 2 : 1);
+ retestIndicators.value = buildIndicators(data.indicators);
+ initialIndicators.value = buildIndicators(initialScope.value?.indicators);
retestReason.value = '';
initialReason.value = '';
} catch (error) { scopeError.value = scopeErrorText(error); }
@@ -283,10 +389,10 @@
const target = initialScope.value;
if (!target || !target.inbound || !initialSubmitIds.value.length) return;
if (!qualifiedWarehouseId.value) { scopeError.value = '璇烽�夋嫨妫�楠屽悎鏍煎悗鍏ュ簱鐨勫悎鏍煎簱'; return; }
- if (initialIndicators.value.some((item) => item.value === undefined || item.minValue === undefined || item.maxValue === undefined
- || Number(item.value) < 0 || Number(item.value) > 100 || Number(item.minValue) < 0 || Number(item.maxValue) > 100
+ if (initialIndicators.value.length === 0 || initialIndicators.value.some((item) => item.value === undefined || item.minValue === undefined || item.maxValue === undefined
+ || Number(item.value) < 0 || Number(item.minValue) < 0 || Number(item.maxValue) < 0
|| Number(item.minValue) > Number(item.maxValue))) {
- scopeError.value = '璇峰~鍐欏洓椤规寚鏍囩殑瀹炴祴鍊煎拰 0鈥�100 鑼冨洿鍐呯殑鍚堟牸涓婁笅闄�'; return;
+ scopeError.value = '璇峰~鍐欏叏閮ㄨ川妫�椤圭殑瀹炴祴鍊煎拰闈炶礋鐨勫悎鏍间笂涓嬮檺'; return;
}
if (!initialPassed.value && !initialReason.value.trim()) { scopeError.value = '鍒濇涓嶅悎鏍兼椂璇峰~鍐欏師鍥�'; return; }
scopeError.value = '';
@@ -300,7 +406,8 @@
scopeBusy.value = true;
try {
const submitted = await submitSeedQualityGroup({
- code: target.code, batchCode: target.batchCode, scanType: target.scanType || scopeType.value,
+ code: target.code, qcLine: qcLine.value === 2 ? 2 : 1,
+ batchCode: target.batchCode, scanType: target.scanType || scopeType.value,
bagIds: initialSubmitIds.value, qualifiedWarehouseId: qualifiedWarehouseId.value,
reason: initialReason.value.trim() || undefined,
indicators: initialIndicators.value.map((item) => ({ code: item.indicatorCode, value: Number(item.value),
@@ -314,15 +421,16 @@
}
async function saveScopeRetest() {
if (!retestScope.value || !scopeSubmitIds.value.length) return;
- if (retestIndicators.value.some(item => item.value === undefined || item.value === null || item.minValue === undefined || item.maxValue === undefined
- || Number(item.minValue) < 0 || Number(item.maxValue) > 100 || Number(item.minValue) > Number(item.maxValue))) {
- message.warning('璇峰~鍐欏洓椤规寚鏍囩殑瀹炴祴鍊间笌鏈鍚堟牸鑼冨洿'); return;
+ if (retestIndicators.value.length === 0 || retestIndicators.value.some(item => item.value === undefined || item.value === null || item.minValue === undefined || item.maxValue === undefined
+ || Number(item.minValue) < 0 || Number(item.maxValue) < 0 || Number(item.minValue) > Number(item.maxValue))) {
+ message.warning('璇峰~鍐欏叏閮ㄨ川妫�椤圭殑瀹炴祴鍊间笌鏈鍚堟牸鑼冨洿'); return;
}
const passed = retestIndicators.value.every(item => Number(item.value) >= Number(item.minValue) && Number(item.value) <= Number(item.maxValue));
if (!passed && !retestReason.value.trim()) { message.warning('涓嶅悎鏍艰濉啓鍘熷洜'); return; }
scopeBusy.value = true;
try {
- const result = await submitSeedRetestScope({ code: retestScope.value.code, scanType: retestScope.value.scanType, workflowStatus: scopeStatus.value,
+ const result = await submitSeedRetestScope({ code: retestScope.value.code, scanType: retestScope.value.scanType,
+ qcLine: qcLine.value === 2 ? 2 : 1, workflowStatus: scopeStatus.value,
qualityIds: scopeSubmitIds.value, reason: retestReason.value.trim(), indicators: retestIndicators.value.map(item => ({
code: item.indicatorCode, value: Number(item.value), minValue: Number(item.minValue), maxValue: Number(item.maxValue),
})) });
@@ -441,31 +549,90 @@
value === 1 ? '#ecfdf3' : value === 2 ? '#fef2f2' : '#fffbeb';
const formatDateTime = (value?: string) =>
value ? new Date(value).toLocaleString() : '鈥�';
+const formatDate = (value?: string) => (value ? value.slice(0, 10) : '鈥�');
+const showGroupTotal = (count: number) => `鍏� ${count} 涓壒娆;
-async function loadRecords() {
- loading.value = true;
+function batchQuery() {
+ return {
+ code: code.value.trim() || undefined,
+ batchCode: batchCode.value.trim() || undefined,
+ result: result.value,
+ workflowStatus: workflowStatus.value,
+ qcLine: qcLine.value,
+ };
+}
+
+async function loadGroups() {
+ groupLoading.value = true;
+ try {
+ const data = await getSeedQualityBatchPage({
+ pageNo: batchPage.value,
+ pageSize: batchPageSize.value,
+ ...batchQuery(),
+ });
+ groups.value = data.list;
+ groupTotal.value = data.total;
+ const keys = groups.value.map((group) => groupKey(group));
+ expandedKeys.value = expandedKeys.value.filter((key) => keys.includes(key));
+ if (!expandedKeys.value.length && groups.value[0] && Object.keys(buckets.value).length === 0) {
+ expandedKeys.value = [groupKey(groups.value[0])];
+ }
+ await Promise.all(groups.value.filter((group) => isExpanded(group)).map((group) => loadBucket(group)));
+ } finally {
+ groupLoading.value = false;
+ }
+}
+
+async function loadBucket(group: SeedQualityBatchGroup, page?: number, pageSize?: number) {
+ const bucket = bucketOf(group);
+ if (page) bucket.page = page;
+ if (pageSize) bucket.pageSize = pageSize;
+ bucket.loading = true;
try {
const data = await getSeedQualityPage({
- pageNo: page.value,
- pageSize: pageSize.value,
- code: code.value.trim() || undefined,
- batchCode: batchCode.value.trim() || undefined,
- result: result.value,
- workflowStatus: workflowStatus.value,
+ pageNo: bucket.page,
+ pageSize: bucket.pageSize,
+ ...batchQuery(),
+ batchCode: undefined,
+ exactBatchCode: group.batchCode || undefined,
+ unbound: !group.batchCode,
});
- records.value = data.list;
- total.value = data.total;
+ bucket.list = data.list;
+ bucket.total = data.total;
} finally {
- loading.value = false;
+ bucket.loading = false;
}
+}
+
+async function toggleGroup(group: SeedQualityBatchGroup) {
+ const key = groupKey(group);
+ if (isExpanded(group)) {
+ expandedKeys.value = expandedKeys.value.filter((item) => item !== key);
+ return;
+ }
+ expandedKeys.value = [...expandedKeys.value, key];
+ await loadBucket(group);
+}
+
+function tablePagination(group: SeedQualityBatchGroup): TablePaginationConfig {
+ const bucket = buckets.value[groupKey(group)];
+ return {
+ current: bucket?.page ?? 1,
+ pageSize: bucket?.pageSize ?? 10,
+ total: bucket?.total ?? 0,
+ showSizeChanger: true,
+ showTotal: (count: number) => `鍏� ${count} 鏉,
+ onChange: (nextPage: number, nextPageSize: number) =>
+ void loadBucket(group, nextPage, nextPageSize),
+ };
}
async function loadStats() {
try {
const [all, pass, fail] = await Promise.all([
- getSeedQualityPage({ pageNo: 1, pageSize: 1 }),
- getSeedQualityPage({ pageNo: 1, pageSize: 1, workflowStatus: 40 }),
- getSeedQualityPage({ pageNo: 1, pageSize: 1, workflowStatus: 70 }),
+ getSeedQualityPage({ pageNo: 1, pageSize: 1, qcLine: qcLine.value }),
+ getSeedQualityPage({ pageNo: 1, pageSize: 1, qcLine: qcLine.value, workflowStatus: 40 }),
+ getSeedQualityPage({ pageNo: 1, pageSize: 1, qcLine: qcLine.value, workflowStatus: 70 }),
]);
statsTotal.value = all.total;
passTotal.value = pass.total;
@@ -476,9 +643,11 @@
}
function searchRecords() {
- page.value = 1;
+ batchPage.value = 1;
clearSelection();
- void loadRecords();
+ buckets.value = {};
+ expandedKeys.value = [];
+ void loadGroups();
}
function resetFilters() {
@@ -486,21 +655,28 @@
batchCode.value = '';
result.value = undefined;
workflowStatus.value = undefined;
+ // 鍥哄畾璐ㄦ绾跨殑鑿滃崟椤甸噸缃椂淇濈暀褰撳墠璐ㄦ绾�
+ if (props.initialQcLine === undefined) {
+ qcLine.value = undefined;
+ }
searchRecords();
+ void loadStats();
}
function refreshAll() {
- void Promise.all([loadRecords(), loadStats()]);
+ void Promise.all([loadGroups(), loadStats()]);
}
function refreshAndClearSelection() {
clearSelection();
refreshAll();
}
-function handleTableChange(pagination: TablePaginationConfig) {
- page.value = pagination.current || 1;
- pageSize.value = pagination.pageSize || 10;
- void loadRecords();
+function handleGroupPageChange(nextPage: number, nextSize: number) {
+ batchPage.value = nextPage;
+ batchPageSize.value = nextSize;
+ clearSelection();
+ buckets.value = {};
+ void loadGroups();
}
onMounted(refreshAll);
@@ -512,8 +688,8 @@
<header class="page-header">
<div class="header-copy">
<div class="eyebrow">MES / 璐ㄩ噺绠$悊</div>
- <h1>璐ㄦ璁板綍</h1>
- <p>鍒濇瀹℃牳閫氳繃鍚庤繘琛屽妫�锛屽妫�瀹℃牳閫氳繃鍚庢墠鏀捐鍏ュ簱鎴栧缃笉鍚堟牸鍝�</p>
+ <h1>{{ pageTitle }}</h1>
+ <p>姣忚淇濈暀鍔犲伐閮ㄣ�侀攢鍞儴涓ゆ潯璐ㄦ绾匡紱鍒濇涓嶅悎鏍煎厛澶嶆锛屽弻绾块儴闂ㄥ鎵瑰畬鎴愬悗杩涘叆鍏徃璐ㄦ瀹℃壒</p>
</div>
<div class="header-badge">
<span class="badge-pulse" />
@@ -525,7 +701,7 @@
<section class="stat-grid" aria-label="璐ㄦ缁撴灉姹囨��">
<div class="stat-card total">
<div class="stat-icon"><IconifyIcon icon="ep:document" /></div>
- <div class="stat-main"><span>璁板綍鎬绘暟</span><strong>{{ statsTotal.toLocaleString() }}</strong><small>鎸夎鐮佽</small></div>
+ <div class="stat-main"><span>璁板綍鎬绘暟</span><strong>{{ statsTotal.toLocaleString() }}</strong><small>鎸夎川妫�璁板綍璁�</small></div>
</div>
<div class="stat-card pass">
<div class="stat-icon"><IconifyIcon icon="ep:success-filled" /></div>
@@ -560,8 +736,8 @@
<div class="card-toolbar">
<div class="card-title">
<IconifyIcon icon="ep:list" />
- 鏄庣粏鍒楄〃
- <span class="count-chip">{{ total.toLocaleString() }} 鏉�</span>
+ 鎸夌敓浜ф壒娆℃煡鐪�
+ <span class="count-chip">{{ groupTotal.toLocaleString() }} 涓壒娆�</span>
</div>
<div class="filters">
<a-button v-if="canScopeAction" class="desktop-scope-action" type="primary" @click="openScopeRetest">鎸夋墭鐩� / 鎵规鎵归噺澶勭悊</a-button>
@@ -610,87 +786,146 @@
v-for="group in retestGroups"
:key="`retest-${group.status}-${group.batchCode}`"
@click="openBatchRetest(group)"
- >{{ group.status === 50 ? '閲嶆柊鍒濇' : '澶嶆' }} 路 {{ group.batchCode }} 路 {{ group.rows.length }} 琚�</a-button>
+ >{{ group.status === 50 ? '閲嶆柊鍒濇' : '澶嶆' }} 路 {{ group.batchCode }} 路 {{ group.rows.length }} 鏉¤褰�</a-button>
<span v-if="!reviewGroups.length && !retestGroups.length" class="muted">鎵�閫夎褰曞綋鍓嶆病鏈夊彲鎵归噺澶勭悊鐨勬搷浣滐紝璇锋煡鐪嬫祦绋嬬姸鎬佹垨鍗曟潯鎿嶄綔銆�</span>
</div>
</div>
- <a-table
- :data-source="records"
- :row-selection="{ selectedRowKeys: selectedIds, preserveSelectedRowKeys: true, onChange: changeSelection }"
- :loading="loading"
- :scroll="{ x: 1900 }"
- :pagination="{
- current: page,
- pageSize,
- total,
- showSizeChanger: true,
- showTotal: (t: number) => `鍏� ${t} 鏉,
- }"
- row-key="id"
- size="middle"
- @change="handleTableChange"
- >
- <template #emptyText>
- <div class="empty-state">
- <IconifyIcon icon="ep:data-board" />
- <p>鏆傛棤璐ㄦ璁板綍</p>
- </div>
- </template>
- <a-table-column key="id" title="璐ㄦ缂栧彿" data-index="id" width="100" align="right">
- <template #default="{ record }"><span class="mono muted">{{ record.id }}</span></template>
- </a-table-column>
- <a-table-column key="code" title="琚嬬爜" data-index="code" min-width="220">
- <template #default="{ record }"><span class="mono strong">{{ record.code }}</span></template>
- </a-table-column>
- <a-table-column key="palletCode" title="鎵樼洏鐮�" data-index="palletCode" min-width="190">
- <template #default="{ record }"><span class="mono">{{ record.palletCode || '鈥�' }}</span></template>
- </a-table-column>
- <a-table-column key="batchCode" title="鐢熶骇鎵规" data-index="batchCode" min-width="190">
- <template #default="{ record }">{{ record.batchCode || '鈥�' }}</template>
- </a-table-column>
- <a-table-column key="result" title="妫�楠岀粨鏋�" width="130">
- <template #default="{ record }">
- <span class="result-tag" :style="{ color: resultColor(record.result), background: resultBg(record.result) }">
- <i class="result-dot" :style="{ background: resultColor(record.result) }" />
- {{ resultLabel(record.result) }}
+ <a-spin :spinning="groupLoading">
+ <div v-if="!groups.length && !groupLoading" class="empty-state">
+ <IconifyIcon icon="ep:data-board" />
+ <p>鏆傛棤璐ㄦ璁板綍</p>
+ </div>
+ <div
+ v-for="group in groups"
+ :key="groupKey(group)"
+ class="batch-group"
+ :class="{ expanded: isExpanded(group) }"
+ >
+ <div
+ class="batch-head"
+ role="button"
+ tabindex="0"
+ @click="toggleGroup(group)"
+ @keydown.enter="toggleGroup(group)"
+ @keydown.space.prevent="toggleGroup(group)"
+ >
+ <span class="batch-chevron">
+ <IconifyIcon :icon="isExpanded(group) ? 'ep:arrow-down' : 'ep:arrow-right'" />
</span>
- </template>
- </a-table-column>
- <a-table-column key="workflowStatus" title="娴佺▼鐘舵��" width="190">
- <template #default="{ record }"><a-tag color="blue">{{ workflowLabels[record.workflowStatus] || '鏈煡鐘舵��' }}</a-tag></template>
- </a-table-column>
- <a-table-column key="reason" title="涓嶅悎鏍煎師鍥�" data-index="reason" min-width="220" ellipsis>
- <template #default="{ record }">
- <span v-if="record.reason" class="reason-text">{{ record.reason }}</span>
- <span v-else class="muted">鈥�</span>
- </template>
- </a-table-column>
- <a-table-column key="inspectedAt" title="妫�楠屾椂闂�" width="190">
- <template #default="{ record }"><span class="mono muted">{{ formatDateTime(record.inspectedAt) }}</span></template>
- </a-table-column>
- <a-table-column key="createTime" title="鎻愪氦鏃堕棿" width="190">
- <template #default="{ record }"><span class="mono muted">{{ formatDateTime(record.createTime) }}</span></template>
- </a-table-column>
- <a-table-column key="actions" title="鎿嶄綔" width="260" fixed="right">
- <template #default="{ record }">
- <a-space>
- <a-button v-if="[10, 50].includes(record.workflowStatus) && hasAccessByCodes(['mes:qc-seed-quality:retest'])" type="link" @click="openRetest(record)">{{ record.workflowStatus === 50 ? '閲嶆柊鍒濇' : '澶嶆' }}</a-button>
- <a-button v-if="[20, 25].includes(record.workflowStatus) && hasAccessByCodes(['mes:qc-seed-quality:process-approve'])" type="link" @click="openReview(record, 'process')">{{ record.workflowStatus === 25 ? '涓嶅悎鏍煎鐞�' : '鍒濇瀹℃牳' }}</a-button>
- <a-button v-if="[30, 60].includes(record.workflowStatus) && hasAccessByCodes(['mes:qc-seed-quality:company-approve'])" type="link" @click="openReview(record, 'company')">{{ record.workflowStatus === 60 ? '涓嶅悎鏍煎鐞�' : '澶嶆瀹℃牳' }}</a-button>
- <a-button v-if="hasAccessByCodes(['mes:qc-seed-quality:query'])" type="link" @click="openHistory(record)">娴佺▼璁板綍</a-button>
- </a-space>
- </template>
- </a-table-column>
- </a-table>
+ <span class="batch-code">{{ group.batchLabel }}</span>
+ <span class="batch-meta">
+ <span v-if="group.itemName">鍝佺 {{ group.itemName }}</span>
+ <span v-if="group.lineName">{{ group.lineName }}</span>
+ <span v-if="group.produceDate">鐢熶骇 {{ formatDate(group.produceDate) }}</span>
+ <span v-if="group.lastInspectedAt">鏈�杩戞楠� {{ formatDateTime(group.lastInspectedAt) }}</span>
+ </span>
+ <span class="batch-counts">
+ <span class="count-pill total">鍏� {{ group.totalCount }} 琚�</span>
+ <span class="count-pill pass">鍚堟牸 {{ group.passCount }}</span>
+ <span class="count-pill fail">涓嶅悎鏍� {{ group.failCount }}</span>
+ <span class="count-pill pending">澶勭悊涓� {{ group.processingCount }}</span>
+ </span>
+ <span class="batch-flags">
+ <a-tag v-if="group.pendingProcessReviewCount" color="orange">寰呭垵妫�瀹℃牳 {{ group.pendingProcessReviewCount }}</a-tag>
+ <a-tag v-if="group.pendingCompanyReviewCount" color="gold">寰呭叕鍙歌川妫�瀹℃壒 {{ group.pendingCompanyReviewCount }}</a-tag>
+ <a-tag v-if="group.pendingRetestCount" color="blue">寰呮楠� {{ group.pendingRetestCount }}</a-tag>
+ <a-tag v-if="group.releasedCount" color="green">宸叉斁琛� {{ group.releasedCount }}</a-tag>
+ <a-tag v-if="group.scrappedCount" color="red">宸叉姤搴� {{ group.scrappedCount }}</a-tag>
+ </span>
+ </div>
+ <div v-if="isExpanded(group)" class="batch-body">
+ <a-table
+ :data-source="buckets[groupKey(group)]?.list || []"
+ :loading="buckets[groupKey(group)]?.loading"
+ :pagination="tablePagination(group)"
+ :row-selection="selectionConfig(group)"
+ :scroll="{ x: 1500 }"
+ row-key="id"
+ size="middle"
+ >
+ <template #emptyText>
+ <div class="empty-state">
+ <IconifyIcon icon="ep:data-board" />
+ <p>璇ユ壒娆′笅鏆傛棤鍖归厤鐨勮川妫�璁板綍</p>
+ </div>
+ </template>
+ <a-table-column key="id" title="璐ㄦ缂栧彿" data-index="id" width="100" align="right">
+ <template #default="{ record }"><span class="mono muted">{{ record.id }}</span></template>
+ </a-table-column>
+ <a-table-column key="code" title="琚嬬爜" data-index="code" min-width="220">
+ <template #default="{ record }"><span class="mono strong">{{ record.code }}</span></template>
+ </a-table-column>
+ <a-table-column key="palletCode" title="鎵樼洏鐮�" data-index="palletCode" min-width="190">
+ <template #default="{ record }"><span class="mono">{{ record.palletCode || '鈥�' }}</span></template>
+ </a-table-column>
+ <a-table-column key="qcLine" title="璐ㄦ绾�" width="150">
+ <template #default="{ record }">
+ <a-space>
+ <a-tag :color="qcLineColors[record.qcLine ?? 0]">{{ qcLineLabel(record.qcLine) }}</a-tag>
+ <a-tooltip v-if="record.bizType === 2" :title="`缁忛攢鍟嗛��璐у崟 ${record.returnSalesCode || record.code}`">
+ <a-tag color="magenta">閫�璐�</a-tag>
+ </a-tooltip>
+ </a-space>
+ </template>
+ </a-table-column>
+ <a-table-column key="result" title="妫�楠岀粨鏋�" width="130">
+ <template #default="{ record }">
+ <span class="result-tag" :style="{ color: resultColor(record.result), background: resultBg(record.result) }">
+ <i class="result-dot" :style="{ background: resultColor(record.result) }" />
+ {{ resultLabel(record.result) }}
+ </span>
+ </template>
+ </a-table-column>
+ <a-table-column key="workflowStatus" title="娴佺▼鐘舵��" width="190">
+ <template #default="{ record }"><a-tag :color="statusColor(record)">{{ statusLabel(record) }}</a-tag></template>
+ </a-table-column>
+ <a-table-column key="reason" title="涓嶅悎鏍煎師鍥�" data-index="reason" min-width="220" ellipsis>
+ <template #default="{ record }">
+ <span v-if="record.reason" class="reason-text">{{ record.reason }}</span>
+ <span v-else class="muted">鈥�</span>
+ </template>
+ </a-table-column>
+ <a-table-column key="inspectedAt" title="妫�楠屾椂闂�" width="190">
+ <template #default="{ record }"><span class="mono muted">{{ formatDateTime(record.inspectedAt) }}</span></template>
+ </a-table-column>
+ <a-table-column key="createTime" title="鎻愪氦鏃堕棿" width="190">
+ <template #default="{ record }"><span class="mono muted">{{ formatDateTime(record.createTime) }}</span></template>
+ </a-table-column>
+ <a-table-column key="actions" title="鎿嶄綔" width="260" fixed="right">
+ <template #default="{ record }">
+ <a-space>
+ <a-button v-if="[10, 50].includes(record.workflowStatus) && hasAccessByCodes(['mes:qc-seed-quality:retest'])" type="link" @click="openRetest(record)">{{ record.workflowStatus === 50 ? '閲嶆柊鍒濇' : '澶嶆' }}</a-button>
+ <a-button v-if="[20, 25].includes(record.workflowStatus)" type="link" @click="openProcess(record.processInstanceId)">鏌ョ湅閮ㄩ棬瀹℃壒</a-button>
+ <a-button v-if="[30, 60].includes(record.workflowStatus)" type="link" @click="openProcess(record.companyProcessInstanceId)">鏌ョ湅鍏徃瀹℃壒</a-button>
+ <a-button v-if="[20, 25, 30, 60].includes(record.workflowStatus) && !(record.workflowStatus === 20 || record.workflowStatus === 25 ? record.processInstanceId : record.companyProcessInstanceId) && hasAccessByCodes(['mes:qc-seed-quality:process-approve'])" type="link" @click="retryProcess(record.id)">閲嶆柊鍙戣捣瀹℃壒</a-button>
+ <a-button v-if="hasAccessByCodes(['mes:qc-seed-quality:query'])" type="link" @click="openHistory(record)">娴佺▼璁板綍</a-button>
+ </a-space>
+ </template>
+ </a-table-column>
+ </a-table>
+ </div>
+ </div>
+ </a-spin>
+ <div v-if="groupTotal > 0" class="group-pagination">
+ <a-pagination
+ :current="batchPage"
+ :page-size="batchPageSize"
+ :total="groupTotal"
+ show-size-changer
+ :page-size-options="['10', '20', '50']"
+ :show-total="showGroupTotal"
+ @change="handleGroupPageChange"
+ />
+ </div>
</section>
- <a-modal v-model:open="retestOpen" wrap-class-name="seed-quality-modal" :title="activeRecord?.workflowStatus === 50 ? '閲嶆柊鍒濇' : '绉嶅瓙璐ㄦ澶嶆'" :confirm-loading="retestBusy" :ok-text="activeRecord?.workflowStatus === 50 ? '鎻愪氦鍒濇' : '鎻愪氦澶嶆'" @ok="saveRetest">
- <p class="muted">{{ retestBatchIds.length ? `鏈澶勭悊 ${retestBatchIds.length} 琚嬶紝鍚屼竴缁勬寚鏍囦笌缁撹浼氬簲鐢ㄤ簬鍏ㄩ儴鎵�閫夎鐮併�俙 : `琚嬬爜锛�${activeRecord?.code}銆俙 }}璇峰綍鍏ユ湰娆″疄娴嬪�煎苟鏍稿鍚堟牸鑼冨洿銆�</p>
+ <a-modal v-model:open="retestOpen" wrap-class-name="seed-quality-modal" :title="activeRecord?.workflowStatus === 50 ? '閲嶆柊鍒濇' : activeRecord?.bizType === 2 ? '缁忛攢鍟嗛��璐у妫�' : '绉嶅瓙璐ㄦ澶嶆'" :confirm-loading="retestBusy" :ok-text="activeRecord?.workflowStatus === 50 ? '鎻愪氦鍒濇' : '鎻愪氦澶嶆'" @ok="saveRetest">
+ <p class="muted">{{ retestBatchIds.length ? `鏈澶勭悊 ${retestBatchIds.length} 鏉¤褰曪紝鍚屼竴缁勬寚鏍囦笌缁撹浼氬簲鐢ㄤ簬鍏ㄩ儴鎵�閫夎褰曘�俙 : `${retestTargetLabel}銆俙 }}璇峰綍鍏ユ湰娆″疄娴嬪�煎苟鏍稿鍚堟牸鑼冨洿銆�</p>
<div v-for="item in retestIndicators" :key="item.indicatorCode" class="retest-row">
- <strong>{{ indicatorLabels[item.indicatorCode] || item.indicatorCode }}</strong>
+ <strong>{{ item.indicatorName || indicatorLabel(item.indicatorCode) }}</strong>
<a-input-number v-model:value="item.value" :min="0" :precision="3" placeholder="鏈瀹炴祴鍊�" />
- <a-input-number v-model:value="item.minValue" :min="0" :max="100" :precision="3" placeholder="涓嬮檺" />
- <a-input-number v-model:value="item.maxValue" :min="0" :max="100" :precision="3" placeholder="涓婇檺" />
+ <a-input-number v-model:value="item.minValue" :min="0" :precision="3" placeholder="涓嬮檺" />
+ <a-input-number v-model:value="item.maxValue" :min="0" :precision="3" placeholder="涓婇檺" />
</div>
<a-textarea v-model:value="retestReason" :rows="3" :maxlength="500" placeholder="鏈妫�楠屼笉鍚堟牸鏃跺~鍐欏師鍥�" />
</a-modal>
@@ -707,16 +942,16 @@
<template v-if="initialIds.length">
<a-alert v-if="!initialScope?.inbound" type="warning" show-icon message="璇ヨ寖鍥寸殑鏈夋晥琚嬬爜灏氭湭鍏ㄩ儴鍏ュ簱锛屾殏涓嶈兘鎻愪氦鍒濇" />
<template v-else-if="hasAccessByCodes(['mes:qc-seed-quality:submit'])">
- <p class="muted">鍥涢」鎸囨爣鍜岀粨璁轰細搴旂敤浜庢湰娆� {{ initialSubmitIds.length }} 琚嬶紱瓒呰繃 500 琚嬫椂绯荤粺浼氬垎鎵瑰鐞嗗苟鑷姩鍔犺浇鍓╀綑璁板綍銆�</p>
+ <p class="muted">鍏ㄩ儴璐ㄦ椤瑰拰缁撹浼氬簲鐢ㄤ簬鏈 {{ initialSubmitIds.length }} 琚嬶紱瓒呰繃 500 琚嬫椂绯荤粺浼氬垎鎵瑰鐞嗗苟鑷姩鍔犺浇鍓╀綑璁板綍銆�</p>
<a-form-item label="妫�楠屽悎鏍煎悗鍏ュ簱鐨勫悎鏍煎簱" required>
<a-select v-model:value="qualifiedWarehouseId" :options="qualifiedWarehouseOptions" placeholder="璇烽�夋嫨鍚堟牸搴�" style="width: 100%" />
</a-form-item>
<a-alert v-if="!qualifiedWarehouseOptions.length" type="warning" show-icon message="鏆傛棤鍙敤鍚堟牸搴擄紝璇疯仈绯荤鐞嗗憳閰嶇疆" />
<div v-for="item in initialIndicators" :key="`initial-${item.indicatorCode}`" class="retest-row">
- <strong>{{ indicatorLabels[item.indicatorCode] }}</strong>
- <a-input-number v-model:value="item.value" :min="0" :max="100" :precision="3" placeholder="瀹炴祴鍊�" />
- <a-input-number v-model:value="item.minValue" :min="0" :max="100" :precision="3" placeholder="涓嬮檺" />
- <a-input-number v-model:value="item.maxValue" :min="0" :max="100" :precision="3" placeholder="涓婇檺" />
+ <strong>{{ item.indicatorName || indicatorLabels[item.indicatorCode] }}</strong>
+ <a-input-number v-model:value="item.value" :min="0" :precision="3" placeholder="瀹炴祴鍊�" />
+ <a-input-number v-model:value="item.minValue" :min="0" :precision="3" placeholder="涓嬮檺" />
+ <a-input-number v-model:value="item.maxValue" :min="0" :precision="3" placeholder="涓婇檺" />
</div>
<a-textarea v-model:value="initialReason" :rows="2" :maxlength="500" :placeholder="initialPassed ? '鍚堟牸缁撴灉鏃犻渶濉啓鍘熷洜' : '鍒濇涓嶅悎鏍兼椂濉啓鍘熷洜'" />
<div class="scope-actions"><a-button type="primary" :loading="scopeBusy" @click="saveScopeInitial">鎻愪氦鏈 {{ initialSubmitIds.length }} 琚嬪垵妫�</a-button></div>
@@ -745,10 +980,10 @@
</a-radio-group>
<p class="muted">鍚屼竴缁勬寚鏍囧皢搴旂敤浜庢湰娆� {{ scopeSubmitIds.length }} 琚嬶紱瓒呰繃 500 琚嬫椂瀹屾垚鍚庣户缁鐞嗗墿浣欒褰曘�傛ā鏉胯寖鍥村彲浠ヤ慨鏀广��</p>
<div v-for="item in retestIndicators" :key="item.indicatorCode" class="retest-row">
- <strong>{{ indicatorLabels[item.indicatorCode] }}</strong>
- <a-input-number v-model:value="item.value" :min="0" :max="100" :precision="3" placeholder="瀹炴祴鍊�" />
- <a-input-number v-model:value="item.minValue" :min="0" :max="100" :precision="3" placeholder="涓嬮檺" />
- <a-input-number v-model:value="item.maxValue" :min="0" :max="100" :precision="3" placeholder="涓婇檺" />
+ <strong>{{ item.indicatorName || indicatorLabels[item.indicatorCode] }}</strong>
+ <a-input-number v-model:value="item.value" :min="0" :precision="3" placeholder="瀹炴祴鍊�" />
+ <a-input-number v-model:value="item.minValue" :min="0" :precision="3" placeholder="涓嬮檺" />
+ <a-input-number v-model:value="item.maxValue" :min="0" :precision="3" placeholder="涓婇檺" />
</div>
<a-textarea v-model:value="retestReason" :rows="2" :maxlength="500" placeholder="涓嶅悎鏍兼椂濉啓鍘熷洜" />
<div class="scope-actions"><a-button type="primary" :loading="scopeBusy" @click="saveScopeRetest">鎻愪氦鏈 {{ scopeSubmitIds.length }} 琚嬫楠�</a-button></div>
@@ -758,13 +993,20 @@
<a-alert v-if="!initialIds.length && !scopePendingCount && !retestScope.retestIds.length && !retestScope.initialRecheckIds.length" type="success" show-icon message="褰撳墠鑼冨洿娌℃湁寰呭鐞嗙殑璐ㄦ璁板綍" />
</template>
</a-modal>
- <a-modal v-model:open="reviewOpen" wrap-class-name="seed-quality-modal" :title="[25, 60].includes(activeRecord?.workflowStatus ?? 0) ? '涓嶅悎鏍煎鐞�' : reviewStage === 'process' ? '鍒濇瀹℃牳' : '澶嶆瀹℃牳'" :confirm-loading="reviewBusy" :ok-text="reviewApproved ? '纭澶勭悊' : '纭椹冲洖'" @ok="saveReview">
- <p>{{ reviewFromScope || reviewIds.length > 1 ? `鍏� ${reviewIds.length} 鏉¤褰昤 : activeRecord?.code }} 路 {{ workflowLabels[activeRecord?.workflowStatus ?? 0] }}</p>
+ <a-modal v-model:open="reviewOpen" wrap-class-name="seed-quality-modal" :title="reviewTitle" :confirm-loading="reviewBusy" :ok-text="reviewApproved ? '纭澶勭悊' : '纭椹冲洖'" @ok="saveReview">
+ <p>{{ reviewFromScope || reviewIds.length > 1 ? `鍏� ${reviewIds.length} 鏉¤褰昤 : activeRecord?.code }} 路 {{ activeRecord ? statusLabel(activeRecord) : '' }}</p>
<a-radio-group v-model:value="reviewApproved" class="review-choice">
- <a-radio :value="true">{{ reviewStage === 'process' ? activeRecord?.workflowStatus === 25 ? '纭涓嶅悎鏍硷紝瀹夋帓澶嶆' : '閫氳繃锛岃繘鍏ュ妫�' : activeRecord?.workflowStatus === 30 ? '閫氳繃锛屾斁琛屽叆搴�' : '纭涓嶅悎鏍硷紝鎶ュ簾澶勭疆' }}</a-radio>
- <a-radio :value="false">{{ reviewStage === 'process' ? '椹冲洖锛岄噸鏂板垵妫�' : '椹冲洖锛岄噸鏂板妫�' }}</a-radio>
+ <a-radio :value="true">{{ activeRecord?.bizType === 2 ? '纭鍚堟牸锛岃繘鍏ュ妫�' : reviewStage === 'process' ? activeRecord?.workflowStatus === 25 ? '纭涓嶅悎鏍硷紝瀹夋帓澶嶆' : '閫氳繃锛岃繘鍏ュ妫�' : activeRecord?.workflowStatus === 30 ? '閫氳繃锛屾斁琛屽叆搴�' : '纭涓嶅悎鏍硷紝鎶ュ簾澶勭疆' }}</a-radio>
+ <a-radio :value="false">{{ activeRecord?.bizType === 2 ? '纭涓嶅悎鏍硷紝涓嶄簣閫�璐у苟浣滃簾' : reviewStage === 'process' ? '椹冲洖锛岄噸鏂板垵妫�' : '椹冲洖锛屼袱鏉$嚎涓�璧烽��鍥炲緟澶嶆' }}</a-radio>
</a-radio-group>
- <a-alert v-if="reviewIds.length > 1" type="info" show-icon :message="reviewApproved ? reviewStage === 'company' ? activeRecord?.workflowStatus === 60 ? `纭鍚� ${reviewIds.length} 琚嬪皢鎶ュ簾` : `纭鍚� ${reviewIds.length} 琚嬪皢鏀捐鍏ュ簱` : `纭鍚� ${reviewIds.length} 琚嬪皢杩涘叆澶嶆` : `椹冲洖鍚� ${reviewIds.length} 琚嬪皢杩斿洖妫�楠宍" />
+ <a-alert
+ v-if="reviewStage === 'company' && activeRecord?.bizType !== 2"
+ type="info" show-icon message="鍏徃璐ㄦ瀹℃壒鎸夎澶勭悊"
+ description="纭鍚庤琚嬪姞宸ラ儴銆侀攢鍞儴涓ゆ潯璐ㄦ绾垮悓鏃舵洿鏂帮細涓ゆ潯绾垮妫�閮藉悎鏍兼墠鏀捐鍏ュ簱锛屼换涓�鏉′笉鍚堟牸鍒欐暣琚嬫姤搴燂紱椹冲洖鏃朵袱鏉$嚎涓�璧烽��鍥炲緟澶嶆銆�"
+ />
+ <a-alert v-else-if="activeRecord?.bizType === 2" type="info" show-icon message="缁忛攢鍟嗛��璐ц川妫�"
+ description="瀹℃壒閫氳繃鍚庨��璐у崟杩涘叆寰呮墽琛岋紱瀹℃壒涓嶉�氳繃鍒欓��璐у崟鑷姩鍙栨秷骞剁暀瀛樿揣妫�璁板綍銆�" />
+ <a-alert v-if="reviewIds.length > 1" type="info" show-icon :message="reviewApproved ? reviewStage === 'company' ? activeRecord?.workflowStatus === 60 ? `纭鍚� ${reviewIds.length} 鏉¤褰曪紙鎸夎鍚堝苟锛夊皢鎶ュ簾` : `纭鍚� ${reviewIds.length} 鏉¤褰曪紙鎸夎鍚堝苟锛夊皢鏀捐鍏ュ簱` : `纭鍚� ${reviewIds.length} 鏉¤褰曞皢杩涘叆澶嶆` : `椹冲洖鍚� ${reviewIds.length} 鏉¤褰曞皢杩斿洖妫�楠宍" />
<a-textarea v-model:value="reviewOpinion" :rows="3" :maxlength="500" :placeholder="reviewApproved ? '瀹℃壒鎰忚锛堥�夊~锛�' : '璇峰~鍐欓┏鍥炴剰瑙�'" />
</a-modal>
<a-modal v-model:open="historyOpen" wrap-class-name="seed-quality-modal seed-quality-history-modal"
@@ -834,6 +1076,24 @@
.filters .ant-select { width: 128px; }
.filters .ant-btn { display: inline-flex; align-items: center; gap: 5px; }
.filters :deep(.ant-btn .iconify) { font-size: 14px; }
+/* ===== 鎸夌敓浜ф壒娆℃姌鍙� ===== */
+.batch-group { margin-bottom: 12px; border: 1px solid #e8edf5; border-radius: 10px; overflow: hidden; background: #fff; transition: box-shadow .2s ease; }
+.batch-group.expanded { box-shadow: 0 4px 16px #243b5314; }
+.batch-head { display: flex; align-items: center; flex-wrap: wrap; gap: 10px 14px; padding: 13px 16px; border-left: 3px solid #1677ff; background: linear-gradient(90deg, #f8fbff 0%, #fff 70%); cursor: pointer; }
+.batch-head:hover { background: #f5f9ff; }
+.batch-chevron { display: inline-flex; color: #1677ff; font-size: 16px; }
+.batch-code { color: #172033; font-size: 15px; font-weight: 700; font-variant-numeric: tabular-nums; }
+.batch-meta { display: inline-flex; flex-wrap: wrap; gap: 4px 12px; color: #718096; font-size: 12px; }
+.batch-counts { display: inline-flex; flex-wrap: wrap; gap: 6px; margin-left: auto; }
+.count-pill { padding: 1px 9px; border-radius: 999px; font-size: 12px; font-weight: 600; line-height: 20px; font-variant-numeric: tabular-nums; }
+.count-pill.total { color: #334155; background: #eef2f7; }
+.count-pill.pass { color: #16a34a; background: #ecfdf3; }
+.count-pill.fail { color: #dc2626; background: #fef2f2; }
+.count-pill.pending { color: #d97706; background: #fffbeb; }
+.batch-flags { display: inline-flex; flex-wrap: wrap; gap: 4px; }
+.batch-flags :deep(.ant-tag) { margin: 0; }
+.batch-body { padding: 0 12px 12px; border-top: 1px dashed #eef1f6; background: #fff; }
+.group-pagination { display: flex; justify-content: flex-end; padding: 14px 0 2px; }
.selection-bar { padding: 12px 0; border-bottom: 1px solid #eef1f6; }
.selection-summary, .selection-actions { display: flex; align-items: center; flex-wrap: wrap; gap: 8px; }
.selection-summary { margin-bottom: 8px; color: #59677b; }
@@ -891,6 +1151,10 @@
.mobile-batch-copy p { margin: 0; color: #718096; font-size: 13px; line-height: 1.55; }
.mobile-batch-icon { display: flex; flex: 0 0 38px; width: 38px; height: 38px; align-items: center; justify-content: center; border-radius: 10px; color: #1677ff; background: #eaf3ff; font-size: 20px; }
.desktop-scope-action { display: none !important; }
+ .batch-head { align-items: flex-start; padding: 12px; }
+ .batch-counts { width: 100%; margin-left: 0; }
+ .batch-body { padding: 0 4px 8px; }
+ .group-pagination { justify-content: center; }
.record-card { padding: 4px 12px 12px; }
.card-toolbar { align-items: flex-start; flex-direction: column; }
.filters { display: grid; width: 100%; grid-template-columns: repeat(2, minmax(0, 1fr)); }
--
Gitblit v1.9.3