From 4bca9dd2a51a3564a59e7cf8e0d36ba54ad140ce Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 25 三月 2026 14:31:00 +0800
Subject: [PATCH] feat:1.生产报工增加工序绑定的设备选择展示 2.报工生产参数添加
---
src/views/productionManagement/workOrder/index.vue | 271 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 245 insertions(+), 26 deletions(-)
diff --git a/src/views/productionManagement/workOrder/index.vue b/src/views/productionManagement/workOrder/index.vue
index 162dd91..96e3f27 100644
--- a/src/views/productionManagement/workOrder/index.vue
+++ b/src/views/productionManagement/workOrder/index.vue
@@ -121,7 +121,7 @@
</div>
<div class="info-group">
<div class="info-item">
- <span class="info-label">闇�姹傛暟閲�</span>
+ <span class="info-label">棰勮鐢熶骇鏁伴噺</span>
<span class="info-value">{{ transferCardRowData.planQuantity }}</span>
</div>
<div class="info-item">
@@ -176,6 +176,16 @@
readonly
style="width: 300px" />
</el-form-item>
+ <el-form-item label="鎶曞叆鎬婚噺(kg)"
+ prop="totalInvestment">
+ <el-input v-model.number="reportForm.totalInvestment"
+ type="number"
+ min="1"
+ step="1"
+ style="width: 300px"
+ placeholder="璇疯緭鍏ユ姇鍏ユ�婚噺"
+ @input="handleTotalInvestmentInput" />
+ </el-form-item>
<el-form-item label="鏈鐢熶骇鏁伴噺"
prop="quantity">
<el-input v-model.number="reportForm.quantity"
@@ -196,6 +206,16 @@
placeholder="璇疯緭鍏ユ姤搴熸暟閲�"
@input="handleScrapQtyInput" />
</el-form-item>
+ <el-form-item label="妫�鍝佹暟閲�"
+ prop="inspectedQuantity">
+ <el-input v-model.number="reportForm.inspectedQuantity"
+ type="number"
+ min="0"
+ step="1"
+ style="width: 300px"
+ placeholder="璇疯緭鍏ユ鍝佹暟閲�"
+ @input="handleInspectedQuantity"/>
+ </el-form-item>
<el-form-item label="鐝粍淇℃伅">
<el-select v-model="reportForm.userId"
style="width: 300px"
@@ -209,6 +229,30 @@
:value="user.userId" />
</el-select>
</el-form-item>
+ <el-form-item label="璁惧閫夋嫨">
+ <el-select v-model="reportForm.deviceId"
+ style="width: 300px"
+ placeholder="璇烽�夋嫨璁惧"
+ clearable
+ filterable
+ @change="handleDeviceChange">
+ <el-option v-for="device in deviceOptions"
+ :key="device.id"
+ :label="device.deviceName"
+ :value="device.id" />
+ </el-select>
+ </el-form-item>
+ <el-form-item v-if="currentDevice" label="璁惧缂栧彿">
+ <el-input v-model="currentDevice.deviceCode"
+ disabled
+ style="width: 300px" />
+ </el-form-item>
+ <el-form-item v-if="currentDevice" label="杞暟">
+ <el-input v-model="currentDevice.rpm"
+ disabled
+ style="width: 300px" />
+ </el-form-item>
+ <ProductionRecordForm ref="productionRecordFormRef" :list="processParamList"/>
</el-form>
<template #footer>
<span class="dialog-footer">
@@ -223,7 +267,7 @@
</template>
<script setup>
- import { onMounted, ref, nextTick } from "vue";
+ import { onMounted, ref, nextTick, computed } from "vue";
import { ElMessageBox } from "element-plus";
import dayjs from "dayjs";
import {
@@ -233,10 +277,17 @@
downProductWorkOrder,
} from "@/api/productionManagement/workOrder.js";
import { getUserProfile, userListNoPageByTenantId } from "@/api/system/user.js";
+ import { getBindDevices } from "@/api/productionManagement/productionProcess.js";
import QRCode from "qrcode";
import { getCurrentInstance, reactive, toRefs } from "vue";
import FilesDia from "./components/filesDia.vue";
+ import {
+ listPage as listProcessParamPage,
+ } from "@/api/productionManagement/productProcessParameter.js";
+
const { proxy } = getCurrentInstance();
+
+ const ProductionRecordForm = defineAsyncComponent(() => import("./components/ProductionRecordForm.vue"));
const tableColumn = ref([
{
@@ -272,7 +323,11 @@
prop: "processName",
},
{
- label: "闇�姹傛暟閲�",
+ label: "鎶曞叆鎬婚噺(kg)",
+ prop: "totalInvestment",
+ },
+ {
+ label: "棰勮鐢熶骇鏁伴噺",
prop: "planQuantity",
width: "140",
},
@@ -356,17 +411,50 @@
const workOrderFilesRef = ref(null);
const reportFormRef = ref(null);
const userOptions = ref([]);
+ const deviceOptions = ref([]);
const reportForm = reactive({
planQuantity: 0,
+ totalInvestment: 0,
quantity: null,
scrapQty: null,
+ inspectedQuantity: null,
userName: "",
workOrderId: "",
reportWork: "",
productProcessRouteItemId: "",
userId: "",
productMainId: null,
+ deviceId: null,
+ otherData: {
+ rows: []
+ },
});
+ const productionRecordFormRef = ref();
+
+ const currentDevice = computed(() => {
+ if (!reportForm.deviceId) return null;
+ return deviceOptions.value.find(device => device.id === reportForm.deviceId) || null;
+ });
+
+ // 鎶曞叆鎬婚噺楠岃瘉瑙勫垯
+ const validateTotalInvestment = (rule, value, callback) => {
+ if (value === null || value === undefined || value === "") {
+ callback(new Error("璇疯緭鍏ユ姇鍏ユ�婚噺"));
+ return;
+ }
+ const num = Number(value);
+ if (isNaN(num) || !Number.isInteger(num) || num < 1) {
+ callback(new Error("鎶曞叆鎬婚噺蹇呴』澶т簬绛変簬1"));
+ return;
+ }
+ if (reportForm.quantity !== null && reportForm.quantity !== undefined && reportForm.quantity !== "") {
+ if (num < Number(reportForm.quantity)) {
+ callback(new Error("鎶曞叆鎬婚噺蹇呴』澶т簬鏈鐢熶骇鏁伴噺"));
+ return;
+ }
+ }
+ callback();
+ };
// 鏈鐢熶骇鏁伴噺楠岃瘉瑙勫垯
const validateQuantity = (rule, value, callback) => {
@@ -375,10 +463,15 @@
return;
}
const num = Number(value);
- // 鏁存暟涓斿ぇ浜庣瓑浜�1
if (isNaN(num) || !Number.isInteger(num) || num < 1) {
callback(new Error("鏈鐢熶骇鏁伴噺蹇呴』澶т簬绛変簬1"));
return;
+ }
+ if (reportForm.totalInvestment !== null && reportForm.totalInvestment !== undefined && reportForm.totalInvestment !== "") {
+ if (num > Number(reportForm.totalInvestment)) {
+ callback(new Error("鏈鐢熶骇鏁伴噺蹇呴』灏忎簬鎶曞叆鎬婚噺"));
+ return;
+ }
}
callback();
};
@@ -400,37 +493,87 @@
// 楠岃瘉瑙勫垯
const reportFormRules = {
+ totalInvestment: [{ required: true, validator: validateTotalInvestment, trigger: "blur" }],
quantity: [{ required: true, validator: validateQuantity, trigger: "blur" }],
scrapQty: [{ validator: validateScrapQty, trigger: "blur" }],
};
- // 澶勭悊鏈鐢熶骇鏁伴噺杈撳叆锛岄檺鍒跺繀椤诲ぇ浜庣瓑浜�1
- const handleQuantityInput = value => {
+ // 澶勭悊鎶曞叆鎬婚噺杈撳叆
+ const handleTotalInvestmentInput = value => {
if (value === "" || value === null || value === undefined) {
- reportForm.quantity = null;
+ reportForm.totalInvestment = null;
+ reportForm.scrapQty = null;
return;
}
const num = Number(value);
if (isNaN(num)) {
return;
}
- // 濡傛灉灏忎簬1锛屾竻闄�
if (num < 1) {
- reportForm.quantity = null;
+ reportForm.totalInvestment = null;
+ reportForm.scrapQty = null;
return;
}
- // 濡傛灉鏄皬鏁板彇鏁存暟閮ㄥ垎
if (!Number.isInteger(num)) {
const intValue = Math.floor(num);
- // 濡傛灉鍙栨暣鍚庡皬浜�1锛屾竻闄�
+ if (intValue < 1) {
+ reportForm.totalInvestment = null;
+ reportForm.scrapQty = null;
+ return;
+ }
+ reportForm.totalInvestment = intValue;
+ } else {
+ reportForm.totalInvestment = num;
+ }
+ // 濡傛灉 quantity 鏈夊�硷紝鑷姩璁＄畻 scrapQty = totalInvestment - quantity
+ if (reportForm.quantity !== null && reportForm.quantity !== undefined && reportForm.quantity !== "") {
+ const total = Number(reportForm.totalInvestment);
+ const qty = Number(reportForm.quantity);
+ if (total > qty) {
+ reportForm.scrapQty = total - qty;
+ } else {
+ reportForm.scrapQty = null;
+ }
+ }
+ };
+
+ // 澶勭悊鏈鐢熶骇鏁伴噺杈撳叆锛岄檺鍒跺繀椤诲ぇ浜庣瓑浜�1
+ const handleQuantityInput = value => {
+ if (value === "" || value === null || value === undefined) {
+ reportForm.quantity = null;
+ reportForm.scrapQty = null;
+ return;
+ }
+ const num = Number(value);
+ if (isNaN(num)) {
+ return;
+ }
+ if (num < 1) {
+ reportForm.quantity = null;
+ reportForm.scrapQty = null;
+ return;
+ }
+ if (!Number.isInteger(num)) {
+ const intValue = Math.floor(num);
if (intValue < 1) {
reportForm.quantity = null;
+ reportForm.scrapQty = null;
return;
}
reportForm.quantity = intValue;
- return;
+ } else {
+ reportForm.quantity = num;
}
- reportForm.quantity = num;
+ // 濡傛灉 totalInvestment 鏈夊�硷紝鑷姩璁＄畻 scrapQty = totalInvestment - quantity
+ if (reportForm.totalInvestment !== null && reportForm.totalInvestment !== undefined && reportForm.totalInvestment !== "") {
+ const total = Number(reportForm.totalInvestment);
+ const qty = Number(reportForm.quantity);
+ if (total > qty) {
+ reportForm.scrapQty = total - qty;
+ } else {
+ reportForm.scrapQty = null;
+ }
+ }
};
// 澶勭悊鎶ュ簾鏁伴噺
@@ -440,22 +583,38 @@
return;
}
const num = Number(value);
- // 濡傛灉鏄疦aN锛屼繚鎸佸師鍊�
if (isNaN(num)) {
return;
}
- // 濡傛灉鏄礋鏁帮紝娓呴櫎杈撳叆
if (num < 0) {
reportForm.scrapQty = null;
return;
}
- // 濡傛灉鏄皬鏁帮紝鍙栨暣鏁伴儴鍒�
if (!Number.isInteger(num)) {
reportForm.scrapQty = Math.floor(num);
return;
}
- // 鏈夋晥鐨勯潪璐熸暣鏁帮紙鍖呮嫭0锛�
reportForm.scrapQty = num;
+ };
+
+ const handleInspectedQuantity = value => {
+ if (value === "" || value === null || value === undefined) {
+ reportForm.inspectedQuantity = null;
+ return;
+ }
+ const num = Number(value);
+ if (isNaN(num)) {
+ return;
+ }
+ if (num < 0) {
+ reportForm.inspectedQuantity = null;
+ return;
+ }
+ if (!Number.isInteger(num)) {
+ reportForm.inspectedQuantity = Math.floor(num);
+ return;
+ }
+ reportForm.inspectedQuantity = num;
};
const currentReportRowData = ref(null);
const page = reactive({
@@ -594,17 +753,40 @@
});
};
- const showReportDialog = row => {
+ const processParamPage = reactive({
+ current: 1,
+ size: 9999,
+ total: 0,
+ });
+ const getProcessParamList = async (row) => {
+ const params = {
+ processId: row.processId,
+ ...processParamPage,
+ };
+ const res = await listProcessParamPage(params)
+ return res.data.records
+ };
+
+ const processParamList = ref([])
+ const showReportDialog = async row => {
currentReportRowData.value = row;
+ processParamList.value = await getProcessParamList(row)
reportForm.planQuantity = row.planQuantity;
+ reportForm.totalInvestment = row.totalInvestment;
reportForm.quantity =
row.quantity !== undefined && row.quantity !== null ? row.quantity : null;
reportForm.productProcessRouteItemId = row.productProcessRouteItemId;
reportForm.workOrderId = row.id;
reportForm.reportWork = row.reportWork;
reportForm.productMainId = row.productMainId;
+ reportForm.inspectedQuantity = row.inspectedQuantity;
reportForm.scrapQty =
row.scrapQty !== undefined && row.scrapQty !== null ? row.scrapQty : null;
+ reportForm.deviceId = row.deviceId || null;
+
+ // 鑾峰彇宸ュ簭缁戝畾璁惧鍒楄〃
+ getDeviceList(row.processId);
+
nextTick(() => {
reportFormRef.value?.clearValidate();
});
@@ -627,7 +809,16 @@
workOrderFilesRef.value?.openDialog(row);
};
- const handleReport = () => {
+ const handleReport = async () => {
+ try {
+ const data = await productionRecordFormRef.value.submitData();
+ console.log("鐢熶骇璁板綍琛ㄥ崟鏁版嵁:", data);
+ reportForm.otherData.rows = data || [];
+ } catch (error) {
+ console.error("鑾峰彇鐢熶骇璁板綍琛ㄥ崟鏁版嵁澶辫触", error);
+ return;
+ }
+
reportFormRef.value?.validate(valid => {
if (!valid) {
return false;
@@ -676,20 +867,20 @@
return;
}
- if (quantity > reportForm.planQuantity) {
- ElMessageBox.alert("鏈鐢熶骇鏁伴噺涓嶈兘瓒呰繃寰呯敓浜ф暟閲�", "鎻愮ず", {
- confirmButtonText: "纭畾",
- });
- return;
- }
+ // if (quantity > reportForm.planQuantity) {
+ // ElMessageBox.alert("鏈鐢熶骇鏁伴噺涓嶈兘瓒呰繃寰呯敓浜ф暟閲�", "鎻愮ず", {
+ // confirmButtonText: "纭畾",
+ // });
+ // return;
+ // }
const submitData = {
...reportForm,
quantity: quantity,
scrapQty: scrapQty,
+ otherData: JSON.stringify(reportForm.otherData)
};
- // console.log(submitData);
addProductMain(submitData).then(res => {
if (res.code === 200) {
proxy.$modal.msgSuccess("鎶ュ伐鎴愬姛");
@@ -700,6 +891,11 @@
confirmButtonText: "纭畾",
});
}
+ }).catch(err => {
+ console.error("鎶ュ伐澶辫触", err);
+ ElMessageBox.alert("鎶ュ伐澶辫触", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ });
});
});
};
@@ -717,6 +913,24 @@
});
};
+ // 鑾峰彇璁惧鍒楄〃
+ const getDeviceList = (processId) => {
+ if (!processId) {
+ deviceOptions.value = [];
+ return;
+ }
+ getBindDevices(processId)
+ .then(res => {
+ if (res.code === 200) {
+ deviceOptions.value = res.data || [];
+ }
+ })
+ .catch(err => {
+ console.error("鑾峰彇璁惧鍒楄〃澶辫触", err);
+ deviceOptions.value = [];
+ });
+ };
+
// 鐢ㄦ埛閫夋嫨鍙樺寲鏃舵洿鏂� userName
const handleUserChange = userId => {
if (userId) {
@@ -729,6 +943,11 @@
}
};
+ // 璁惧閫夋嫨鍙樺寲鏃舵洿鏂� deviceId
+ const handleDeviceChange = deviceId => {
+ reportForm.deviceId = deviceId;
+ };
+
onMounted(() => {
getList();
getUserList();
--
Gitblit v1.9.3