From d3230d4bb80fbc7c2adb63c588c580ab94234ee8 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期三, 26 八月 2026 10:12:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/mes/pro/feedback/modules/form.vue | 105 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 92 insertions(+), 13 deletions(-)
diff --git a/src/views/mes/pro/feedback/modules/form.vue b/src/views/mes/pro/feedback/modules/form.vue
index 00ae80a..92bc22f 100644
--- a/src/views/mes/pro/feedback/modules/form.vue
+++ b/src/views/mes/pro/feedback/modules/form.vue
@@ -1,9 +1,11 @@
-锘�<script lang="ts" setup>
+<script lang="ts" setup>
import type { FormType } from '../data';
import type { MesProFeedbackApi } from '#/api/mes/pro/feedback';
import { computed, ref } from 'vue';
+
+import dayjs from 'dayjs';
import { useVbenModal } from '@vben/common-ui';
import { MesAutoCodeRuleCode, MesProFeedbackStatusEnum } from '@vben/constants';
@@ -16,15 +18,18 @@
import {
approveFeedback,
createFeedback,
+ getBatchRequirements,
getFeedback,
rejectFeedback,
submitFeedback,
updateFeedback,
} from '#/api/mes/pro/feedback';
import { getRouteProcessByRouteAndProcess } from '#/api/mes/pro/route/process';
+import { getWorkOrder } from '#/api/mes/pro/workorder';
import { $t } from '#/locales';
import { useFormSchema } from '../data';
+import BatchInputDialog from './batch-input-dialog.vue';
import ItemConsumeList from './item-consume-list.vue';
import ProductProduceList from './product-produce-list.vue';
@@ -138,6 +143,23 @@
}
}
+const batchDialogRef = ref<InstanceType<typeof BatchInputDialog>>();
+const batchActionType = ref<'submit' | 'approve'>('');
+
+/** 鎵ц鎻愪氦锛堝惈鎵规灞炴�э級 */
+async function doSubmit(batchFields?: Record<string, unknown>) {
+ if (!formData.value?.id) return;
+ modalApi.lock();
+ try {
+ await submitFeedback({ id: formData.value.id, ...batchFields });
+ await modalApi.close();
+ emit('success');
+ message.success('鎶ュ伐鍗曞凡鎻愪氦');
+ } finally {
+ modalApi.unlock();
+ }
+}
+
/** 鎻愪氦锛氫粎褰撹〃鍗曡緝蹇収鏈夊彉鏇存椂鎵嶅厛淇濆瓨锛屽啀璋冪敤鎻愪氦鎺ュ彛 */
async function handleSubmit() {
const { valid } = await formApi.validate();
@@ -152,10 +174,55 @@
await updateFeedback(data);
originalSnapshot.value = JSON.stringify(data);
}
- await submitFeedback(formData.value!.id!);
+
+ // 妫�鏌ユ槸鍚﹂渶瑕佸鎵癸紝鑻ラ渶瑕佸鎵癸紝鍒欎笉闇�瑕佸湪姝ら樁娈靛～鍐欐壒娆″睘鎬э紝鐩存帴鎻愪氦
+ let feedbackApprove = false;
+ if (formData.value?.workOrderId) {
+ try {
+ const workOrder = await getWorkOrder(formData.value.workOrderId);
+ feedbackApprove = workOrder?.feedbackApprove ?? false;
+ } catch {
+ // ignore
+ }
+ }
+
+ if (feedbackApprove) {
+ await doSubmit();
+ return;
+ }
+
+ let checkResult;
+ try {
+ checkResult = await getBatchRequirements(formData.value!.id!);
+ } catch {
+ // ignore
+ }
+
+ if (checkResult?.needBatchInput) {
+ batchActionType.value = 'submit';
+ batchDialogRef.value?.open({ checkResult });
+ } else {
+ await doSubmit();
+ }
+ } finally {
+ modalApi.unlock();
+ }
+}
+
+/** 鎵ц瀹℃壒锛堝惈鎵规灞炴�э級 */
+async function doApprove(batchFields?: Record<string, unknown>) {
+ if (!formData.value?.id) return;
+ modalApi.lock();
+ try {
+ const finished = await approveFeedback({
+ id: formData.value.id,
+ ...batchFields,
+ });
await modalApi.close();
emit('success');
- message.success('鎶ヨ鍗曞凡鎻愪氦');
+ message.success(
+ finished ? '鎶ヨ鍗曞凡瀹℃壒瀹屾垚' : '鎶ュ伐鎴愬姛锛岃绛夊緟璐ㄩ噺妫�楠屽畬鎴愶紒',
+ );
} finally {
modalApi.unlock();
}
@@ -166,16 +233,27 @@
if (!formData.value?.id) {
return;
}
- modalApi.lock();
try {
- const finished = await approveFeedback(formData.value.id);
- await modalApi.close();
- emit('success');
- message.success(
- finished ? '鎶ヨ鍗曞凡瀹℃壒瀹屾垚' : '鎶ュ伐鎴愬姛锛岃绛夊緟璐ㄩ噺妫�楠屽畬鎴愶紒',
- );
- } finally {
- modalApi.unlock();
+ const checkResult = await getBatchRequirements(formData.value.id);
+ if (checkResult?.needBatchInput) {
+ // 闇�瑕佸～鍐欐壒娆″睘鎬э紝寮圭獥鏀堕泦
+ batchActionType.value = 'approve';
+ batchDialogRef.value?.open({ checkResult });
+ } else {
+ await doApprove();
+ }
+ } catch {
+ // 妫�鏌ュけ璐ユ椂鐩存帴瀹℃壒锛堝吋瀹规棫閫昏緫锛�
+ await doApprove();
+ }
+}
+
+/** 鎵规寮圭獥纭鍥炶皟 */
+function handleBatchConfirm(batchData: Record<string, unknown>) {
+ if (batchActionType.value === 'submit') {
+ doSubmit(batchData);
+ } else {
+ doApprove(batchData);
}
}
@@ -248,7 +326,7 @@
);
await formApi.setValues({
code,
- feedbackTime: Date.now(),
+ feedbackTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
feedbackUserId: userStore.userInfo?.id,
});
// 璁板綍鍒濆蹇収锛堝惈鏁伴噺瀵归綈缁撴灉锛夛紝submit 鏃剁敤浜庤烦杩囨棤鍙樻洿鐨勪繚瀛樿姹�
@@ -314,5 +392,6 @@
</Popconfirm>
</div>
</template>
+ <BatchInputDialog ref="batchDialogRef" @confirm="handleBatchConfirm" />
</Modal>
</template>
--
Gitblit v1.9.3