From 4f894ae17a8c2d9c8f5d1a7161415a728c5170b5 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 09:13:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_南通_苏珩' into dev_南通_苏珩
---
src/views/mes/qc/oqc/modules/form.vue | 105 ++++++++++++++++------------------------------------
1 files changed, 32 insertions(+), 73 deletions(-)
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>
--
Gitblit v1.9.3