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/workbench/components/tabs/FeedbackTab.vue | 124 ++++++++++++++++++++++++++++++++++------
1 files changed, 104 insertions(+), 20 deletions(-)
diff --git a/src/views/mes/workbench/components/tabs/FeedbackTab.vue b/src/views/mes/workbench/components/tabs/FeedbackTab.vue
index f867d68..86b6e25 100644
--- a/src/views/mes/workbench/components/tabs/FeedbackTab.vue
+++ b/src/views/mes/workbench/components/tabs/FeedbackTab.vue
@@ -1,5 +1,5 @@
<script lang="ts" setup>
-import type { PendingTask } from '../../../types';
+import type { PendingTask } from '../../types';
import type { FormType } from '../../../pro/feedback/data';
import { computed, ref, watch } from 'vue';
@@ -12,7 +12,7 @@
} from '@vben/constants';
import { useUserStore } from '@vben/stores';
-import { Button, message, Modal, Popconfirm } from 'ant-design-vue';
+import { Button, Input, message, Modal, Popconfirm } from 'ant-design-vue';
import { useVbenForm } from '#/adapter/form';
import { generateAutoCode } from '#/api/mes/md/autocode/record';
@@ -29,9 +29,13 @@
import { $t } from '#/locales';
import { useFormSchema } from '../../../pro/feedback/data';
+import {
+ loadParamDetails,
+ paramDetails,
+} from '../../../pro/feedback/param-state';
import BatchInputDialog from '../../../pro/feedback/modules/batch-input-dialog.vue';
const batchDialogRef = ref<InstanceType<typeof BatchInputDialog>>();
-const batchActionType = ref<'submit' | 'approve'>('');
+const batchActionType = ref<'' | 'submit' | 'approve'>('');
const pendingSubmitMode = ref<'saveAndSubmit' | 'submit'>('submit');
defineOptions({ name: 'WorkbenchFeedbackTab' });
@@ -73,26 +77,29 @@
wrapperClass: 'grid-cols-3',
});
-/** 鏍规嵁 checkFlag 瀵归綈鏁伴噺 */
+/** 鎻愪氦鍓嶅榻愭暟閲忥細鎶ュ伐鍙～鍐欐姤宸ユ暟閲忥紝鍚堟牸/涓嶈壇/搴熷搧鏁伴噺鐢辫川妫�纭畾锛屾姤宸ョ幆鑺備笉閲囬泦 */
function alignQuantity(data: any) {
- 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() {
const data = (await formApi.getValues()) as any;
+ syncParamValues(data);
alignQuantity(data);
return data;
+}
+
+/** 鍚屾宸ヨ壓鍙傛暟鍊煎埌鎶ュ伐鏁版嵁锛堜笌鎻愪氦鏁版嵁涓�鍚屽彂閫佺粰鍚庣锛� */
+function syncParamValues(data: any) {
+ data.paramValues = paramDetails.value.map((detail) => ({
+ detailId: detail.id,
+ value: detail.paramValue,
+ }));
}
/** 鍔犺浇 checkFlag */
@@ -117,6 +124,8 @@
const code = await generateAutoCode(MesAutoCodeRuleCode.PRO_FEEDBACK_CODE);
const checkFlag = await resolveCheckFlag(task.routeId, task.processId);
+ // 鍔犺浇浠诲姟缁戝畾鐨勫伐鑹哄弬鏁帮紙蹇呭～鍙傛暟鏍￠獙 + 鍙傛暟鍊煎洖鏄撅級
+ await loadParamDetails(task.id);
await formApi.setValues({
code,
@@ -133,6 +142,7 @@
itemName: task.itemName,
itemSpecification: task.itemSpecification,
unitMeasureName: task.unitMeasureName,
+ reportableQuantity: task.reportableQuantity,
scheduledQuantity: task.quantity,
feedbackApprove: task.feedbackApprove,
checkFlag,
@@ -210,7 +220,7 @@
pendingSubmitMode.value = 'saveAndSubmit';
// 4. 璋冪敤鎻愪氦鎺ュ彛
- const isDone = await handleOnSubmit(feedbackId.value!,props.task.feedbackApprove);
+ const isDone = await handleOnSubmit(feedbackId.value!,props.task?.feedbackApprove);
if (!isDone) return;
feedbackId.value = record.id;
@@ -242,7 +252,7 @@
}
pendingSubmitMode.value = 'submit';
- const isDone = await handleOnSubmit(feedbackId.value!,props.task.feedbackApprove);
+ const isDone = await handleOnSubmit(feedbackId.value!,props.task?.feedbackApprove);
if (!isDone) return;
message.success('鎶ュ伐鍗曞凡鎻愪氦');
@@ -328,13 +338,15 @@
formType.value = 'update';
formApi.setState({ schema: useFormSchema(formType.value, formApi) });
const checkFlag = await resolveCheckFlag(data.routeId, data.processId);
+ await loadParamDetails(data.taskId);
await formApi.setValues({ ...data, checkFlag });
originalSnapshot.value = JSON.stringify(await getAlignedData());
}
-// 鐩戝惉浠诲姟鍙樻洿锛堜粎褰撲换鍔� ID 鐪熸鍙樺寲鏃舵墠閲嶇疆琛ㄥ崟锛�
+// 鐩戝惉浠诲姟鍙樻洿锛氫换鍔″璞″彉鍖栵紙閫夋嫨浠诲姟 / 鍒楄〃鍒锋柊鍚庡悓姝ョ殑鏈�鏂版暟鎹級鏃堕噸缃〃鍗曪紝
+// 纭繚"鍙姤宸ユ暟閲�"绛変换鍔℃淳鐢熷瓧娈靛缁堝睍绀烘渶鏂板��
watch(
- () => props.task?.id,
+ () => props.task,
() => {
if (props.task) {
resetForTask(props.task);
@@ -364,6 +376,34 @@
</div>
<Form class="feedback-tab__form" />
+
+ <!-- 宸ヨ壓鍙傛暟锛堜换鍔＄粦瀹氬弬鏁版椂灞曠ず锛屽繀濉弬鏁版湭濉細琚悗绔嫤鎴級 -->
+ <div v-if="paramDetails.length" class="feedback-tab__params">
+ <div class="feedback-tab__params-title">宸ヨ壓鍙傛暟</div>
+ <div class="feedback-tab__params-grid">
+ <div
+ v-for="detail in paramDetails"
+ :key="detail.id"
+ class="feedback-tab__params-item"
+ >
+ <span class="feedback-tab__params-label">
+ <span v-if="detail.required" class="feedback-tab__params-required"
+ >* </span
+ >
+ {{ detail.paramName || detail.paramCode
+ }}{{
+ detail.unitMeasureName ? `锛�${detail.unitMeasureName}锛塦 : ''
+ }}
+ </span>
+ <Input
+ v-model:value="detail.paramValue"
+ :disabled="!isEditable"
+ placeholder="璇疯緭鍏ュ弬鏁板��"
+ class="feedback-tab__params-input"
+ />
+ </div>
+ </div>
+ </div>
<div class="feedback-tab__actions">
<Button
@@ -456,4 +496,48 @@
border-top: 1px solid #f0f0f0;
margin-top: 16px;
}
+
+.feedback-tab__params {
+ margin-top: 16px;
+ padding: 14px 16px;
+ border: 1px solid #f0f0f0;
+ border-radius: 8px;
+ background: #fafbfc;
+}
+
+.feedback-tab__params-title {
+ margin-bottom: 12px;
+ font-size: 15px;
+ font-weight: 600;
+ color: #1a1a1a;
+}
+
+.feedback-tab__params-grid {
+ display: grid;
+ grid-template-columns: repeat(2, minmax(0, 1fr));
+ gap: 12px 20px;
+}
+
+.feedback-tab__params-item {
+ display: flex;
+ align-items: center;
+ gap: 10px;
+}
+
+.feedback-tab__params-label {
+ flex-shrink: 0;
+ width: 176px;
+ text-align: right;
+ font-size: 14px;
+ color: #595959;
+}
+
+.feedback-tab__params-required {
+ color: #ff4d4f;
+}
+
+.feedback-tab__params-input {
+ flex: 1;
+ min-width: 0;
+}
</style>
--
Gitblit v1.9.3