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/components/ProductionRecordForm.vue | 128 ++++++++++++++++++++++++++++++++
src/views/productionManagement/workOrder/index.vue | 108 ++++++++++++++++++++++++++-
2 files changed, 232 insertions(+), 4 deletions(-)
diff --git a/src/views/productionManagement/workOrder/components/ProductionRecordForm.vue b/src/views/productionManagement/workOrder/components/ProductionRecordForm.vue
new file mode 100644
index 0000000..a7c1cc9
--- /dev/null
+++ b/src/views/productionManagement/workOrder/components/ProductionRecordForm.vue
@@ -0,0 +1,128 @@
+<script setup lang="ts">
+import {computed, reactive, ref, watch} from "vue";
+
+defineOptions({
+ name: "ProductionRecordForm"
+});
+
+const props = defineProps({
+ list: {
+ type: Array,
+ default() {
+ return [];
+ }
+ },
+ labelWidth: {
+ type: Number,
+ default: 120
+ }
+});
+
+const formRef = ref();
+const formData = reactive({
+ list: [] as any[],
+});
+
+const fieldLabel = (item: any) => {
+ if (!item.unit || item.unit === "/") {
+ return item.parameterItem;
+ }
+ return `${item.parameterItem}锛�${item.unit}锛塦;
+};
+
+const getType = (item: any) => item.type || "鏂囨湰鏍煎紡";
+
+const rules = computed(() => {
+ const result: Record<string, any[]> = {};
+ formData.list.forEach((item, index) => {
+ if (String(item.isRequired) === "1") {
+ result[`list.${index}.value`] = [{required: true, message: `璇疯緭鍏�${item.parameterItem}`, trigger: "blur"}];
+ }
+ });
+ return result;
+});
+
+const initData = () => {
+ formData.list = props.list || [];
+ formData.list.forEach(item => {
+ if (item.value === undefined) {
+ item.value = null;
+ }
+ });
+};
+
+const submitData = async () => {
+ const valid = await formRef.value.validate().catch(() => false)
+
+ if (valid) {
+ return formData.list
+ } else {
+ return null
+ }
+}
+
+watch(
+ () => props.list,
+ () => {
+ initData();
+ },
+ {immediate: true, deep: true}
+);
+
+defineExpose({
+ submitData
+})
+</script>
+
+<template>
+ <el-form ref="formRef" :model="formData" :rules="rules" :label-width="`${labelWidth}px`">
+ <el-form-item
+ v-for="(item, index) in formData.list"
+ :key="item.id"
+ :label="fieldLabel(item)"
+ :prop="`list.${index}.value`"
+ >
+ <el-input-number
+ v-if="getType(item) === '鏁板�兼牸寮�'"
+ v-model="item.value"
+ :controls="false"
+ style="width: 100%"
+ placeholder="璇疯緭鍏�"
+ />
+ <el-date-picker
+ v-else-if="getType(item) === '鏃堕棿鏍煎紡'"
+ v-model="item.value"
+ type="datetime"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ format="YYYY-MM-DD HH:mm:ss"
+ placeholder="璇烽�夋嫨"
+ style="width: 100%"
+ />
+ <el-date-picker
+ v-else-if="getType(item) === '鏃ユ湡鏍煎紡'"
+ v-model="item.value"
+ type="date"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ placeholder="璇烽�夋嫨"
+ style="width: 100%"
+ />
+ <el-select
+ v-else-if="getType(item) === '鏄�/鍚﹂�夋'"
+ v-model="item.value"
+ placeholder="璇烽�夋嫨"
+ clearable
+ style="width: 100%"
+ >
+ <el-option label="鏄�" value="鏄�"/>
+ <el-option label="鍚�" value="鍚�"/>
+ </el-select>
+ <el-input
+ v-else
+ v-model="item.value"
+ placeholder="璇疯緭鍏�"
+ clearable
+ />
+ </el-form-item>
+ </el-form>
+</template>
\ No newline at end of file
diff --git a/src/views/productionManagement/workOrder/index.vue b/src/views/productionManagement/workOrder/index.vue
index 0e1a793..96e3f27 100644
--- a/src/views/productionManagement/workOrder/index.vue
+++ b/src/views/productionManagement/workOrder/index.vue
@@ -229,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">
@@ -243,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 {
@@ -253,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([
{
@@ -380,6 +411,7 @@
const workOrderFilesRef = ref(null);
const reportFormRef = ref(null);
const userOptions = ref([]);
+ const deviceOptions = ref([]);
const reportForm = reactive({
planQuantity: 0,
totalInvestment: 0,
@@ -392,6 +424,16 @@
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;
});
// 鎶曞叆鎬婚噺楠岃瘉瑙勫垯
@@ -711,8 +753,24 @@
});
};
- 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 =
@@ -724,6 +782,11 @@
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();
});
@@ -746,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;
@@ -806,9 +878,9 @@
...reportForm,
quantity: quantity,
scrapQty: scrapQty,
+ otherData: JSON.stringify(reportForm.otherData)
};
- // console.log(submitData);
addProductMain(submitData).then(res => {
if (res.code === 200) {
proxy.$modal.msgSuccess("鎶ュ伐鎴愬姛");
@@ -819,6 +891,11 @@
confirmButtonText: "纭畾",
});
}
+ }).catch(err => {
+ console.error("鎶ュ伐澶辫触", err);
+ ElMessageBox.alert("鎶ュ伐澶辫触", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ });
});
});
};
@@ -836,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) {
@@ -848,6 +943,11 @@
}
};
+ // 璁惧閫夋嫨鍙樺寲鏃舵洿鏂� deviceId
+ const handleDeviceChange = deviceId => {
+ reportForm.deviceId = deviceId;
+ };
+
onMounted(() => {
getList();
getUserList();
--
Gitblit v1.9.3