From 302e8457c8d34a35d7eabbd474d98ebc16120ed2 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 12 八月 2026 17:23:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fix/hsy/20260812' into dev_pro2.0
---
src/views/mes/qc/oqc/modules/form.vue | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/src/views/mes/qc/oqc/modules/form.vue b/src/views/mes/qc/oqc/modules/form.vue
index 7fc5a64..e9e7258 100644
--- a/src/views/mes/qc/oqc/modules/form.vue
+++ b/src/views/mes/qc/oqc/modules/form.vue
@@ -6,7 +6,7 @@
import { computed, ref } from 'vue';
import { confirm, useVbenModal } from '@vben/common-ui';
-import { MesQcStatusEnum, MesQcTypeEnum } from '@vben/constants';
+import { MesQcCheckResultEnum, MesQcStatusEnum, MesQcTypeEnum } from '@vben/constants';
import { Button, Descriptions, message, Tabs } from 'ant-design-vue';
@@ -15,6 +15,8 @@
import { $t } from '#/locales';
import { QcIndicatorResultList } from '../../indicatorresult/components';
+import MesQcAiSuggest from '../../components/ai-suggest.vue';
+import MesQcAiAssistant from '../../components/ai-assistant.vue';
import { useFormSchema } from '../data';
import LineList from './line-list.vue';
@@ -67,6 +69,13 @@
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 };
@@ -105,6 +114,13 @@
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;
@@ -232,6 +248,12 @@
<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>
--
Gitblit v1.9.3