From cec91d13116154243b444fd950e59f628b355981 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期二, 18 八月 2026 11:30:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/mes/qc/rqc/modules/form.vue | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/views/mes/qc/rqc/modules/form.vue b/src/views/mes/qc/rqc/modules/form.vue
index 0f39d57..b931684 100644
--- a/src/views/mes/qc/rqc/modules/form.vue
+++ b/src/views/mes/qc/rqc/modules/form.vue
@@ -5,8 +5,8 @@
import { computed, ref } from 'vue';
-import { confirm, useVbenModal } from '..\..\..\..\..\packages\effects\common-ui\src';
-import { MesQcStatusEnum, MesQcTypeEnum } from '..\..\..\..\..\packages\constants\src';
+import { confirm, useVbenModal } from '@vben/common-ui';
+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 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,6 +114,13 @@
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;
@@ -228,6 +244,12 @@
<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>
--
Gitblit v1.9.3