From 91c82965b2d987452ca276e3a03b48c8dcda2ae9 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 19 八月 2026 11:47:26 +0800
Subject: [PATCH] config(env): 更新生产环境配置和公司名称
---
src/views/mes/pro/feedback/modules/form.vue | 82 ++++++++++++++++++++++++++++++-----------
1 files changed, 60 insertions(+), 22 deletions(-)
diff --git a/src/views/mes/pro/feedback/modules/form.vue b/src/views/mes/pro/feedback/modules/form.vue
index 89e8a52..d0e4edf 100644
--- a/src/views/mes/pro/feedback/modules/form.vue
+++ b/src/views/mes/pro/feedback/modules/form.vue
@@ -1,13 +1,15 @@
-<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 { 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 { useVbenModal } from '@vben/common-ui';
+import { MesAutoCodeRuleCode, MesProFeedbackStatusEnum } from '@vben/constants';
+import { useUserStore } from '@vben/stores';
import { Button, message, Popconfirm, Tabs } from 'ant-design-vue';
@@ -16,6 +18,7 @@
import {
approveFeedback,
createFeedback,
+ getBatchRequirements,
getFeedback,
rejectFeedback,
submitFeedback,
@@ -25,11 +28,13 @@
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';
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 +45,7 @@
);
const canSubmit = computed(
() =>
+ showSubmitButton.value &&
isEditable.value &&
formData.value?.status === MesProFeedbackStatusEnum.PREPARE,
);
@@ -126,6 +132,7 @@
await updateFeedback(data);
formData.value = { ...formData.value, ...data };
message.success($t('common.updateSuccess'));
+ await modalApi.close();
}
// 鍒锋柊蹇収锛堝凡瀵归綈鏁伴噺骞惰ˉ id锛夛紝鍚庣画 submit 鐢ㄤ簬鍒ゆ柇鏄惁闇�瑕佸啀淇濆瓨
originalSnapshot.value = JSON.stringify(data);
@@ -152,7 +159,28 @@
await submitFeedback(formData.value!.id!);
await modalApi.close();
emit('success');
- message.success('鎶ュ伐鍗曞凡鎻愪氦');
+ message.success('鎶ヨ鍗曞凡鎻愪氦');
+ } finally {
+ modalApi.unlock();
+ }
+}
+
+const batchDialogRef = ref<InstanceType<typeof BatchInputDialog>>();
+
+/** 鎵ц瀹℃壒锛堝惈鎵规灞炴�э級 */
+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(
+ finished ? '鎶ヨ鍗曞凡瀹℃壒瀹屾垚' : '鎶ュ伐鎴愬姛锛岃绛夊緟璐ㄩ噺妫�楠屽畬鎴愶紒',
+ );
} finally {
modalApi.unlock();
}
@@ -163,17 +191,23 @@
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) {
+ // 闇�瑕佸～鍐欐壒娆″睘鎬э紝寮圭獥鏀堕泦
+ batchDialogRef.value?.open({ checkResult });
+ } else {
+ await doApprove();
+ }
+ } catch {
+ // 妫�鏌ュけ璐ユ椂鐩存帴瀹℃壒锛堝吋瀹规棫閫昏緫锛�
+ await doApprove();
}
+}
+
+/** 鎵规寮圭獥纭鍥炶皟 */
+function handleBatchConfirm(batchData: Record<string, unknown>) {
+ doApprove(batchData);
}
/** 瀹℃壒涓嶉�氳繃 */
@@ -186,7 +220,7 @@
await rejectFeedback(formData.value.id);
await modalApi.close();
emit('success');
- message.success('鎶ュ伐鍗曞凡椹冲洖');
+ message.success('鎶ヨ鍗曞凡椹冲洖');
} finally {
modalApi.unlock();
}
@@ -224,8 +258,9 @@
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 +268,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 鏃剁敤浜庤烦杩囨棤鍙樻洿鐨勪繚瀛樿姹�
@@ -287,26 +324,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