From 173855b299e89930b5ea2ff9a9295fde9d0f55b5 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 07 十一月 2026 08:51:43 +0800
Subject: [PATCH] feat: 同步质检、生产、销售、财务与人事前端功能
---
src/views/mes/pro/workorder-center/modules/quick-feedback.vue | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 50 insertions(+), 1 deletions(-)
diff --git a/src/views/mes/pro/workorder-center/modules/quick-feedback.vue b/src/views/mes/pro/workorder-center/modules/quick-feedback.vue
index a8662dd..356d809 100644
--- a/src/views/mes/pro/workorder-center/modules/quick-feedback.vue
+++ b/src/views/mes/pro/workorder-center/modules/quick-feedback.vue
@@ -10,6 +10,8 @@
import dayjs from 'dayjs';
import { quickCreateFeedback } from '#/api/mes/pro/feedback';
+import { getProcess } from '#/api/mes/pro/process';
+import { getTask } from '#/api/mes/pro/task';
import {
loadParamDetails,
paramDetails,
@@ -40,14 +42,18 @@
selectedTask.value = undefined;
formData.value = {
feedbackQuantity: undefined,
+ workHours: undefined,
feedbackTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
remark: '',
};
- // 棰勮浠诲姟鏃跺姞杞藉叾宸ヨ壓鍙傛暟锛涘惁鍒欑瓑寰呴�夋嫨浠诲姟鍚庡啀鍔犺浇
+ // 棰勮浠诲姟鏃跺姞杞藉叾宸ヨ壓鍙傛暟涓庡伐搴忚璐规柟寮忥紱鍚﹀垯绛夊緟閫夋嫨浠诲姟鍚庡啀鍔犺浇
if (props.taskId) {
loadParamDetails(props.taskId);
+ loadProcessByTask(props.taskId);
} else {
paramDetails.value = [];
+ billingType.value = undefined;
+ wageRate.value = 0;
}
}
},
@@ -58,10 +64,34 @@
const selectedTask = ref<MesProTaskApi.Task>();
const formData = ref({
feedbackQuantity: undefined as number | undefined,
+ workHours: undefined as number | undefined,
feedbackTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
remark: '',
});
const submitting = ref(false);
+/** 宸ュ簭璁¤垂绫诲瀷锛�1-璁℃椂锛堥渶褰曞伐鏃讹級 2-璁′欢 */
+const billingType = ref<number>();
+const wageRate = ref(0);
+
+/** 鏍规嵁浠诲姟甯﹀嚭宸ュ簭鐨勮璐规柟寮忥細璁℃椂宸ュ簭闇�瑕佺敤鎴疯ˉ褰曞伐鏃� */
+async function loadProcessByTask(taskId?: number) {
+ billingType.value = undefined;
+ wageRate.value = 0;
+ if (!taskId) {
+ return;
+ }
+ try {
+ const task = await getTask(taskId);
+ if (!task?.processId) {
+ return;
+ }
+ const process = await getProcess(task.processId);
+ billingType.value = process?.billingType ?? 2;
+ wageRate.value = process?.wageRate ?? 0;
+ } catch {
+ // 宸ュ簭淇℃伅鍔犺浇澶辫触涓嶉樆鏂姤宸ワ紝淇濆瓨鏃跺悗绔細鍐嶆鏍¢獙骞剁粰鍑烘槑纭彁绀�
+ }
+}
const hasPredefinedTask = computed(() => !!props.taskId);
@@ -80,6 +110,7 @@
selectedTask.value = task;
selectedTaskId.value = task?.id;
loadParamDetails(task?.id);
+ loadProcessByTask(task?.id);
}
async function handleSubmit() {
@@ -92,11 +123,16 @@
message.warning('璇疯緭鍏ユ姤宸ユ暟閲�');
return;
}
+ if (billingType.value === 1 && wageRate.value > 0 && !formData.value.workHours) {
+ message.warning('褰撳墠宸ュ簭鎸夎鏃惰钖紝璇疯緭鍏ユ湰娆℃姤宸ュ伐鏃讹紙灏忔椂锛�');
+ return;
+ }
submitting.value = true;
try {
await quickCreateFeedback({
taskId,
feedbackQuantity: formData.value.feedbackQuantity,
+ workHours: formData.value.workHours,
feedbackTime: formData.value.feedbackTime || undefined,
paramValues: paramDetails.value.map((detail) => ({
detailId: detail.id,
@@ -140,6 +176,19 @@
class="!w-full"
/>
</a-form-item>
+ <a-form-item
+ v-if="billingType === 1"
+ label="鎶ュ伐宸ユ椂(h)"
+ :required="wageRate > 0"
+ >
+ <a-input-number
+ v-model:value="formData.workHours"
+ :min="0.01"
+ :precision="2"
+ placeholder="璇疯緭鍏ユ湰娆℃姤宸ュ伐鏃讹紙灏忔椂锛�"
+ class="!w-full"
+ />
+ </a-form-item>
<a-form-item label="鎶ュ伐鏃堕棿">
<a-date-picker
v-model:value="formData.feedbackTime"
--
Gitblit v1.9.3