From f3cac4aa2db56d6017c1d1dc035bcfeaec76c3e2 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 18:31:13 +0800
Subject: [PATCH] feat(crm): 投标保证金迁移到销售管理并接入销售台账
---
src/views/mes/pro/feedback/modules/form.vue | 45 +++++++++------------------------------------
1 files changed, 9 insertions(+), 36 deletions(-)
diff --git a/src/views/mes/pro/feedback/modules/form.vue b/src/views/mes/pro/feedback/modules/form.vue
index a295a40..0b5594d 100644
--- a/src/views/mes/pro/feedback/modules/form.vue
+++ b/src/views/mes/pro/feedback/modules/form.vue
@@ -24,7 +24,6 @@
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';
@@ -87,20 +86,14 @@
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.feedbackQuantity;
+ delete data.qualifiedQuantity;
+ delete data.unqualifiedQuantity;
+ delete data.laborScrapQuantity;
+ delete data.materialScrapQuantity;
+ delete data.otherScrapQuantity;
}
/** 璇诲彇骞舵寜鎻愪氦瑙勫垯瀵归綈鍚庣殑琛ㄥ崟鏁版嵁锛岀敤浜庡揩鐓у拰淇濆瓨 */
@@ -149,7 +142,7 @@
}
const batchDialogRef = ref<InstanceType<typeof BatchInputDialog>>();
-const batchActionType = ref<'submit' | 'approve'>('');
+const batchActionType = ref<'' | 'submit' | 'approve'>('');
function syncParamValues(data: MesProFeedbackApi.Feedback) {
data.paramValues = paramDetails.value.map((detail) => ({
@@ -298,22 +291,6 @@
}
}
-/** 鍔犺浇宸ュ簭鐨� checkFlag 鐢ㄤ簬鍥炴樉鏁伴噺鍖哄煙 */
-async function resolveCheckFlag(routeId?: number, processId?: number) {
- if (!routeId || !processId) {
- return true;
- }
- try {
- const routeProcess = await getRouteProcessByRouteAndProcess(
- routeId,
- processId,
- );
- return routeProcess?.checkFlag ?? false;
- } catch {
- return true;
- }
-}
-
const [Modal, modalApi] = useVbenModal({
async onConfirm() {
if (formType.value === 'detail' || formType.value === 'approve') {
@@ -363,12 +340,8 @@
try {
formData.value = await getFeedback(data.id);
await loadParamDetails(formData.value.taskId);
- const checkFlag = await resolveCheckFlag(
- formData.value.routeId,
- formData.value.processId,
- );
// 璁剧疆鍒� values
- await formApi.setValues({ ...formData.value, checkFlag });
+ await formApi.setValues({ ...formData.value });
// 璁板綍鍒濆蹇収锛堝惈鏁伴噺瀵归綈缁撴灉锛夛紝submit 鏃剁敤浜庤烦杩囨棤鍙樻洿鐨勪繚瀛樿姹�
originalSnapshot.value = JSON.stringify(await getAlignedData());
} finally {
--
Gitblit v1.9.3