From 6c0b0dd81a98a3163e45f1b5b5417e02af165fd8 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 29 八月 2026 10:04:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/mes/pro/feedback/modules/form.vue | 190 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 154 insertions(+), 36 deletions(-)
diff --git a/src/views/mes/pro/feedback/modules/form.vue b/src/views/mes/pro/feedback/modules/form.vue
index 89e8a52..9e5a9a3 100644
--- a/src/views/mes/pro/feedback/modules/form.vue
+++ b/src/views/mes/pro/feedback/modules/form.vue
@@ -5,31 +5,38 @@
import { computed, ref } from 'vue';
-import { useVbenModal } from '..\..\..\..\..\packages\effects\common-ui\src';
-import { MesAutoCodeRuleCode, MesProFeedbackStatusEnum } from '..\..\..\..\..\packages\constants\src';
-import { useUserStore } from '..\..\..\..\..\packages\stores\src';
+import dayjs from 'dayjs';
-import { Button, message, Popconfirm, Tabs } from 'ant-design-vue';
+import { useVbenModal } from '@vben/common-ui';
+import { MesAutoCodeRuleCode, MesProFeedbackStatusEnum } from '@vben/constants';
+import { useUserStore } from '@vben/stores';
+
+import { Button, Input, message, Popconfirm, Tabs } from 'ant-design-vue';
import { useVbenForm } from '#/adapter/form';
import { generateAutoCode } from '#/api/mes/md/autocode/record';
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 { findMissingRequiredParams, loadParamDetails, paramDetails } from '../param-state';
+import BatchInputDialog from './batch-input-dialog.vue';
import ItemConsumeList from './item-consume-list.vue';
import ProductProduceList from './product-produce-list.vue';
const emit = defineEmits(['success']);
const formType = ref<FormType>('create');
+const showSubmitButton = ref(true);
const formData = ref<MesProFeedbackApi.Feedback>();
const userStore = useUserStore();
const subTabsName = ref('itemConsume');
@@ -40,6 +47,7 @@
);
const canSubmit = computed(
() =>
+ showSubmitButton.value &&
isEditable.value &&
formData.value?.status === MesProFeedbackStatusEnum.PREPARE,
);
@@ -79,25 +87,20 @@
wrapperClass: 'grid-cols-3',
});
-/** 鎻愪氦鍓嶅榻愭暟閲忥細鏍规嵁 checkFlag 鍐冲畾 uncheck/鍚堟牸/涓嶈壇褰掗浂绛栫暐 */
+/** 鎻愪氦鍓嶅榻愭暟閲忥細鎶ュ伐鍙～鍐欐姤宸ユ暟閲忥紝鍚堟牸/涓嶈壇/搴熷搧鏁伴噺鐢辫川妫�纭畾锛屾姤宸ョ幆鑺備笉閲囬泦 */
function alignQuantity(data: MesProFeedbackApi.Feedback) {
- if (data.checkFlag) {
- data.uncheckQuantity = data.feedbackQuantity;
- data.qualifiedQuantity = 0;
- data.unqualifiedQuantity = 0;
- data.laborScrapQuantity = 0;
- data.materialScrapQuantity = 0;
- data.otherScrapQuantity = 0;
- } else {
- data.feedbackQuantity =
- (data.qualifiedQuantity || 0) + (data.unqualifiedQuantity || 0);
- data.uncheckQuantity = 0;
- }
+ data.uncheckQuantity = data.checkFlag ? data.feedbackQuantity : 0;
+ delete data.qualifiedQuantity;
+ delete data.unqualifiedQuantity;
+ delete data.laborScrapQuantity;
+ delete data.materialScrapQuantity;
+ delete data.otherScrapQuantity;
}
/** 璇诲彇骞舵寜鎻愪氦瑙勫垯瀵归綈鍚庣殑琛ㄥ崟鏁版嵁锛岀敤浜庡揩鐓у拰淇濆瓨 */
async function getAlignedData(): Promise<MesProFeedbackApi.Feedback> {
const data = (await formApi.getValues()) as MesProFeedbackApi.Feedback;
+ syncParamValues(data);
alignQuantity(data);
return data;
}
@@ -106,6 +109,9 @@
async function handleSave() {
const { valid } = await formApi.validate();
if (!valid) {
+ return;
+ }
+ if (!checkRequiredParams()) {
return;
}
modalApi.lock();
@@ -126,10 +132,45 @@
await updateFeedback(data);
formData.value = { ...formData.value, ...data };
message.success($t('common.updateSuccess'));
+ await modalApi.close();
}
// 鍒锋柊蹇収锛堝凡瀵归綈鏁伴噺骞惰ˉ id锛夛紝鍚庣画 submit 鐢ㄤ簬鍒ゆ柇鏄惁闇�瑕佸啀淇濆瓨
originalSnapshot.value = JSON.stringify(data);
emit('success');
+ } finally {
+ modalApi.unlock();
+ }
+}
+
+const batchDialogRef = ref<InstanceType<typeof BatchInputDialog>>();
+const batchActionType = ref<'' | 'submit' | 'approve'>('');
+
+function syncParamValues(data: MesProFeedbackApi.Feedback) {
+ data.paramValues = paramDetails.value.map((detail) => ({
+ detailId: detail.id,
+ value: detail.paramValue,
+ }));
+}
+
+/** 鏍￠獙蹇呭～鍙傛暟鏄惁濉啓瀹屾暣 */
+function checkRequiredParams(): boolean {
+ const missing = findMissingRequiredParams();
+ if (missing.length > 0) {
+ message.warning(`蹇呭～鍙傛暟鏈～鍐欙細${missing.join('銆�')}`);
+ return false;
+ }
+ return true;
+}
+
+/** 鎵ц鎻愪氦锛堝惈鎵规灞炴�э級 */
+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();
}
@@ -141,6 +182,9 @@
if (!valid) {
return;
}
+ if (!checkRequiredParams()) {
+ return;
+ }
modalApi.lock();
try {
const data = await getAlignedData();
@@ -149,10 +193,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();
}
@@ -163,16 +252,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);
}
}
@@ -186,7 +286,7 @@
await rejectFeedback(formData.value.id);
await modalApi.close();
emit('success');
- message.success('鎶ュ伐鍗曞凡椹冲洖');
+ message.success('鎶ヨ鍗曞凡椹冲洖');
} finally {
modalApi.unlock();
}
@@ -221,11 +321,13 @@
formData.value = undefined;
subTabsName.value = 'itemConsume';
originalSnapshot.value = '';
+ paramDetails.value = [];
return;
}
// 鍔犺浇鏁版嵁
- const data = modalApi.getData<{ formType: FormType; id?: number }>();
+ const data = modalApi.getData<{ formType: FormType; id?: number; showSubmitButton?: boolean }>();
formType.value = data.formType;
+ showSubmitButton.value = data.showSubmitButton !== false;
formApi.setState({ schema: useFormSchema(formType.value, formApi) });
// 瀹℃壒/璇︽儏鏁磋〃绂佺敤锛岄伩鍏嶅鏍镐汉璇敼鏈彁浜ょ殑瀛楁
formApi.setDisabled(
@@ -233,16 +335,18 @@
);
modalApi.setState({
showConfirmButton:
- formType.value !== 'detail' && formType.value !== 'approve',
+ formType.value !== 'detail' &&
+ formType.value !== 'approve' &&
+ formType.value !== 'submit',
});
if (!data?.id) {
- // 鏂板锛氶粯璁ゆ姤宸ヤ汉鍜屾姤宸ユ椂闂达紝骞惰嚜鍔ㄧ敓鎴愭姤宸ュ崟鍙�
+ // 鏂板锛氶粯璁ゆ姤宸ヤ汉鍜屾姤宸ユ椂闂达紝骞惰嚜鍔ㄧ敓鎴愭姤璁㈠崟鍙�
const code = await generateAutoCode(
MesAutoCodeRuleCode.PRO_FEEDBACK_CODE,
);
await formApi.setValues({
code,
- feedbackTime: Date.now(),
+ feedbackTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
feedbackUserId: userStore.userInfo?.id,
});
// 璁板綍鍒濆蹇収锛堝惈鏁伴噺瀵归綈缁撴灉锛夛紝submit 鏃剁敤浜庤烦杩囨棤鍙樻洿鐨勪繚瀛樿姹�
@@ -252,6 +356,7 @@
modalApi.lock();
try {
formData.value = await getFeedback(data.id);
+ await loadParamDetails(formData.value.taskId);
const checkFlag = await resolveCheckFlag(
formData.value.routeId,
formData.value.processId,
@@ -270,6 +375,18 @@
<template>
<Modal :title="getTitle" class="w-3/5">
<Form class="mx-4" />
+ <div v-if="paramDetails.length" class="mx-4 mt-4 rounded border border-gray-200 p-4">
+ <div class="mb-3 font-medium">宸ヨ壓鍙傛暟</div>
+ <div class="grid grid-cols-2 gap-3">
+ <div v-for="detail in paramDetails" :key="detail.id" class="flex items-center gap-2">
+ <span class="w-44 text-right text-sm text-gray-600">
+ <span v-if="detail.required" class="text-red-500">* </span>
+ {{ detail.paramName || detail.paramCode }}{{ detail.unitMeasureName ? `锛�${detail.unitMeasureName}锛塦 : '' }}
+ </span>
+ <Input v-model:value="detail.paramValue" :disabled="!isEditable" placeholder="璇疯緭鍏ュ弬鏁板��" />
+ </div>
+ </div>
+ </div>
<Tabs
v-if="showSubTabs"
v-model:active-key="subTabsName"
@@ -287,26 +404,27 @@
<div class="flex flex-auto items-center justify-end gap-2">
<Popconfirm
v-if="canSubmit"
- title="纭鎻愪氦璇ユ姤宸ュ崟锛熸彁浜ゅ悗灏嗕笉鑳戒慨鏀广��"
+ title="纭鎻愪氦璇ユ姤璁㈠崟锛熸彁浜ゅ悗灏嗕笉鑳戒慨鏀广��"
@confirm="handleSubmit"
>
<Button type="primary">{{ $t('common.submit') }}</Button>
</Popconfirm>
<Popconfirm
v-if="canApprove"
- title="纭瀹℃壒閫氳繃璇ユ姤宸ュ崟锛�"
+ title="纭瀹℃壒閫氳繃璇ユ姤璁㈠崟锛�"
@confirm="handleApprove"
>
<Button type="primary">閫氳繃</Button>
</Popconfirm>
<Popconfirm
v-if="canApprove"
- title="纭椹冲洖璇ユ姤宸ュ崟锛�"
+ title="纭椹冲洖璇ユ姤璁㈠崟锛�"
@confirm="handleReject"
>
<Button danger>涓嶉�氳繃</Button>
</Popconfirm>
</div>
</template>
+ <BatchInputDialog ref="batchDialogRef" @confirm="handleBatchConfirm" />
</Modal>
</template>
--
Gitblit v1.9.3