From 7ce932e6c23bdc01ef973d3158c653be3121b566 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期一, 30 三月 2026 15:07:05 +0800
Subject: [PATCH] fix: 生产报工领原材料修改
---
src/views/productionManagement/productionOrder/MaterialRequisitionDialog.vue | 8
src/views/productionManagement/workOrder/components/ProductionRecordForm.vue | 148 ++++++++++++++++++--
src/views/productionManagement/workOrder/index.vue | 243 ++++++++++++++++++++++++++++------
3 files changed, 333 insertions(+), 66 deletions(-)
diff --git a/src/views/productionManagement/productionOrder/MaterialRequisitionDialog.vue b/src/views/productionManagement/productionOrder/MaterialRequisitionDialog.vue
index 230e15d..4aa002b 100644
--- a/src/views/productionManagement/productionOrder/MaterialRequisitionDialog.vue
+++ b/src/views/productionManagement/productionOrder/MaterialRequisitionDialog.vue
@@ -19,11 +19,11 @@
<el-table-column prop="productName" label="浜у搧鍚嶇О" min-width="150" />
<el-table-column prop="model" label="鍨嬪彿" min-width="150" />
<el-table-column prop="unit" label="鍗曚綅" width="80" align="center" />
- <el-table-column prop="qualitity" label="鍙鐢ㄦ暟閲�" width="100" align="center">
+ <!-- <el-table-column prop="qualitity" label="鍙鐢ㄦ暟閲�" width="100" align="center">
<template #default="{ row }">
{{ row.qualitity || 0 }}
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column prop="requisitionQty" label="棰嗙敤鏁伴噺" width="120" align="center">
<template #default="{ row }">
<el-input-number
@@ -78,11 +78,11 @@
<el-table-column prop="productName" label="浜у搧鍚嶇О" min-width="150" />
<el-table-column prop="model" label="鍨嬪彿" min-width="150" />
<el-table-column prop="unit" label="鍗曚綅" width="80" align="center" />
- <el-table-column prop="qualitity" label="鍙鐢ㄦ暟閲�" width="100" align="center">
+ <!-- <el-table-column prop="qualitity" label="鍙鐢ㄦ暟閲�" width="100" align="center">
<template #default="{ row }">
{{ row.qualitity || 0 }}
</template>
- </el-table-column>
+ </el-table-column> -->
</el-table>
<template #footer>
diff --git a/src/views/productionManagement/workOrder/components/ProductionRecordForm.vue b/src/views/productionManagement/workOrder/components/ProductionRecordForm.vue
index a7c1cc9..2af0633 100644
--- a/src/views/productionManagement/workOrder/components/ProductionRecordForm.vue
+++ b/src/views/productionManagement/workOrder/components/ProductionRecordForm.vue
@@ -1,22 +1,31 @@
<script setup lang="ts">
-import {computed, reactive, ref, watch} from "vue";
+import {computed, reactive, ref, watch, withDefaults} from "vue";
defineOptions({
name: "ProductionRecordForm"
});
-const props = defineProps({
- list: {
- type: Array,
- default() {
- return [];
- }
- },
- labelWidth: {
- type: Number,
- default: 120
+type DeviceOption = {
+ id: string | number;
+ deviceName: string;
+ deviceCode?: string | number | null;
+ rpm?: string | number | null;
+};
+
+const props = withDefaults(
+ defineProps<{
+ list: any[];
+ labelWidth: number;
+ deviceOptions: DeviceOption[];
+ selectedDeviceId: string | number | null;
+ }>(),
+ {
+ list: () => [],
+ labelWidth: 120,
+ deviceOptions: () => [],
+ selectedDeviceId: null,
}
-});
+);
const formRef = ref();
const formData = reactive({
@@ -32,6 +41,76 @@
const getType = (item: any) => item.type || "鏂囨湰鏍煎紡";
+const machineSelectItem = computed(() => {
+ return formData.list.find(item => getType(item) === '鏈哄彴閫夋嫨') || null;
+});
+
+const selectedDevice = computed(() => {
+ const machineValue = machineSelectItem.value?.value;
+ if (machineValue === null || machineValue === undefined || machineValue === '') return null;
+ return props.deviceOptions.find(device => String(device.id) === String(machineValue)) || null;
+});
+
+const AUTO_DEVICE_CODE_ID = "__auto_deviceCode__";
+const AUTO_RPM_ID = "__auto_rpm__";
+
+let isSyncingAutoFields = false;
+
+const syncAutoDeviceFields = () => {
+ if (isSyncingAutoFields) return;
+ isSyncingAutoFields = true;
+
+ try {
+ const machineIndex = formData.list.findIndex(item => getType(item) === "鏈哄彴閫夋嫨");
+ if (machineIndex === -1) return;
+
+ const removeById = (id: string) => {
+ const idx = formData.list.findIndex(x => x?.id === id);
+ if (idx !== -1) formData.list.splice(idx, 1);
+ };
+
+ removeById(AUTO_DEVICE_CODE_ID);
+ removeById(AUTO_RPM_ID);
+
+ const dev = selectedDevice.value as any;
+ let insertPos = machineIndex + 1;
+
+ const hasCode =
+ dev &&
+ dev.deviceCode !== null &&
+ dev.deviceCode !== undefined &&
+ String(dev.deviceCode) !== "";
+
+ const hasRpm = dev && dev.rpm !== null && dev.rpm !== undefined;
+
+ if (hasCode) {
+ formData.list.splice(insertPos, 0, {
+ id: AUTO_DEVICE_CODE_ID,
+ parameterItem: "璁惧缂栧彿",
+ value: dev.deviceCode,
+ // 鍙灞曠ず锛氶伩鍏嶅奖鍝嶅悗绔弬鏁扮粨鏋勶紙submitData 浼氳繃婊わ級
+ readonly: true,
+ isRequired: "0",
+ __autoExtra: true,
+ });
+ insertPos++;
+ }
+
+ if (hasRpm) {
+ formData.list.splice(insertPos, 0, {
+ id: AUTO_RPM_ID,
+ parameterItem: "杞暟",
+ value: dev.rpm,
+ readonly: true,
+ isRequired: "0",
+ __autoExtra: true,
+ });
+ }
+ } finally {
+ isSyncingAutoFields = false;
+ }
+};
+
const rules = computed(() => {
const result: Record<string, any[]> = {};
formData.list.forEach((item, index) => {
@@ -43,10 +122,15 @@
});
const initData = () => {
- formData.list = props.list || [];
+ // 閲嶈锛氫笉瑕佺洿鎺ュ鐢� props.list 鐨勫紩鐢紝鍚﹀垯鍚庣画 splice formData.list 浼氳Е鍙� props watch锛屽鑷撮�掑綊鏇存柊
+ formData.list = (props.list || []).map(item => ({ ...item }));
formData.list.forEach(item => {
if (item.value === undefined) {
item.value = null;
+ }
+ // 濡傛灉鍙傛暟涓瓨鍦ㄢ�滄満鍙伴�夋嫨鈥濓紝鍒欎娇鐢ㄧ埗缁勪欢浼犲叆鐨勯粯璁ゆ満鍙板洖濉�
+ if (getType(item) === '鏈哄彴閫夋嫨' && (item.value === null || item.value === undefined || item.value === '')) {
+ item.value = props.selectedDeviceId ?? item.value;
}
});
};
@@ -55,7 +139,8 @@
const valid = await formRef.value.validate().catch(() => false)
if (valid) {
- return formData.list
+ // 鑷姩鎻掑叆鐨勫彧璇诲瓧娈典笉鍙備笌鎻愪氦锛岄伩鍏嶅悗绔弬鏁扮粨鏋勫彉鍖�
+ return formData.list.filter(item => !item.__autoExtra)
} else {
return null
}
@@ -65,8 +150,18 @@
() => props.list,
() => {
initData();
+ // 鍒濆鍖栧悗鍐嶅悓姝ヨ嚜鍔ㄦ彃鍏ュ瓧娈�
+ syncAutoDeviceFields();
},
{immediate: true, deep: true}
+);
+
+watch(
+ () => selectedDevice.value,
+ () => {
+ syncAutoDeviceFields();
+ },
+ { immediate: true }
);
defineExpose({
@@ -76,9 +171,11 @@
<template>
<el-form ref="formRef" :model="formData" :rules="rules" :label-width="`${labelWidth}px`">
+ <el-row :gutter="30">
+ <el-col :span="12" v-for="(item, index) in formData.list"
+ :key="item.id">
<el-form-item
- v-for="(item, index) in formData.list"
- :key="item.id"
+
:label="fieldLabel(item)"
:prop="`list.${index}.value`"
>
@@ -117,12 +214,29 @@
<el-option label="鏄�" value="鏄�"/>
<el-option label="鍚�" value="鍚�"/>
</el-select>
+ <el-select
+ v-else-if="getType(item) === '鏈哄彴閫夋嫨'"
+ v-model="item.value"
+ placeholder="璇烽�夋嫨"
+ clearable
+ style="width: 100%"
+ >
+ <el-option
+ v-for="device in props.deviceOptions"
+ :key="device.id"
+ :label="device.deviceName"
+ :value="device.id"
+ />
+ </el-select>
<el-input
v-else
v-model="item.value"
placeholder="璇疯緭鍏�"
- clearable
+ :disabled="item.readonly"
+ :clearable="!item.readonly"
/>
</el-form-item>
+ </el-col>
+ </el-row>
</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 b9df112..90003cc 100644
--- a/src/views/productionManagement/workOrder/index.vue
+++ b/src/views/productionManagement/workOrder/index.vue
@@ -166,17 +166,21 @@
</el-dialog>
<el-dialog v-model="reportDialogVisible"
title="鎶ュ伐"
- width="500px">
+ width="1400px">
<el-form ref="reportFormRef"
:model="reportForm"
:rules="reportFormRules"
label-width="120px">
- <el-form-item label="寰呯敓浜ф暟閲�">
- <el-input v-model="reportForm.planQuantity"
- readonly
- style="width: 300px" />
- </el-form-item>
- <el-form-item label="鎶曞叆鎬婚噺(kg)"
+ <el-row :gutter="30">
+ <el-col :span="12">
+ <el-form-item label="寰呯敓浜ф暟閲�">
+ <el-input v-model="reportForm.planQuantity"
+ readonly
+ style="width: 300px" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鎶曞叆鎬婚噺(kg)"
prop="totalInvestment">
<el-input v-model.number="reportForm.totalInvestment"
type="number"
@@ -186,7 +190,8 @@
placeholder="璇疯緭鍏ユ姇鍏ユ�婚噺"
@input="handleTotalInvestmentInput" />
</el-form-item>
- <el-form-item label="鏈鐢熶骇鏁伴噺"
+ </el-col>
+ <el-col :span="12"><el-form-item label="鏈鐢熶骇鏁伴噺"
prop="quantity">
<el-input v-model.number="reportForm.quantity"
type="number"
@@ -195,8 +200,8 @@
style="width: 300px"
placeholder="璇疯緭鍏ユ湰娆＄敓浜ф暟閲�"
@input="handleQuantityInput" />
- </el-form-item>
- <el-form-item label="鎶ュ簾鏁伴噺"
+ </el-form-item></el-col>
+ <el-col :span="12"><el-form-item label="鎶ュ簾鏁伴噺"
prop="scrapQty">
<el-input v-model.number="reportForm.scrapQty"
type="number"
@@ -205,8 +210,9 @@
style="width: 300px"
placeholder="璇疯緭鍏ユ姤搴熸暟閲�"
@input="handleScrapQtyInput" />
- </el-form-item>
- <el-form-item label="妫�鍝佹暟閲�"
+ </el-form-item></el-col>
+ <el-col :span="12">
+ <el-form-item label="妫�鍝佹暟閲�"
prop="inspectedQuantity">
<el-input v-model.number="reportForm.inspectedQuantity"
type="number"
@@ -216,7 +222,9 @@
placeholder="璇疯緭鍏ユ鍝佹暟閲�"
@input="handleInspectedQuantity"/>
</el-form-item>
- <el-form-item label="鐝粍淇℃伅">
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鐝粍淇℃伅">
<el-select v-model="reportForm.userId"
style="width: 300px"
placeholder="璇烽�夋嫨鐝粍淇℃伅"
@@ -229,30 +237,56 @@
: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-col>
+ </el-row>
+ <ProductionRecordForm
+ ref="productionRecordFormRef"
+ :list="processParamList"
+ :device-options="deviceOptions"
+ :selected-device-id="reportForm.deviceId"
+ />
+
+ <div style="margin-top: 20px">
+ <div style="display: flex; justify-content: flex-end; margin-bottom: 10px">
+ <el-button type="primary" @click="openAddMaterialDialog">鏂板鍘熸潗鏂�</el-button>
+ </div>
+
+ <el-table
+ :data="reportForm.drawMaterialList"
+ border
+ style="width: 100%"
+ height="220px"
+ empty-text="鏆傛棤鍘熸潗鏂欓鐢ㄦ槑缁�"
+ >
+ <el-table-column type="index" label="搴忓彿" width="60" align="center" />
+ <el-table-column prop="productName" label="浜у搧鍚嶇О" min-width="160" />
+ <el-table-column prop="model" label="鍨嬪彿" min-width="150" />
+ <el-table-column prop="unit" label="鍗曚綅" width="90" align="center" />
+ <el-table-column prop="reportQty" label="棰嗙敤鏁伴噺" width="160" align="center">
+ <template #default="{ row }">
+ <el-input-number
+ v-model.number="row.reportQty"
+ :min="0"
+ :precision="2"
+ :controls="false"
+ :max="row.qualitity || 0"
+ :disabled="!row.qualitity"
+ style="width: 100%"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column prop="remark" label="澶囨敞" min-width="160">
+ <template #default="{ row }">
+ <el-input v-model="row.remark" placeholder="璇疯緭鍏ュ娉�" clearable />
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" width="80" align="center">
+ <template #default="{ $index }">
+ <el-button type="danger" link @click="removeDrawMaterialRow($index)">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
</el-form>
<template #footer>
<span class="dialog-footer">
@@ -262,12 +296,49 @@
</span>
</template>
</el-dialog>
+
+ <el-dialog
+ v-model="addMaterialDialogVisible"
+ title="閫夋嫨鍘熸潗鏂�"
+ width="1000px"
+ top="5vh"
+ :close-on-click-modal="false"
+ append-to-body
+ destroy-on-close
+ >
+ <div>
+ <el-table
+ :data="availableMaterials"
+ border
+ style="width: 100%"
+ height="45vh"
+ row-key="id"
+ @selection-change="handleAddMaterialSelectionChange"
+ >
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column type="index" label="搴忓彿" width="60" align="center" />
+ <el-table-column prop="productName" label="浜у搧鍚嶇О" min-width="160" />
+ <el-table-column prop="model" label="鍨嬪彿" min-width="150" />
+ <el-table-column prop="unit" label="鍗曚綅" width="90" align="center" />
+ <el-table-column prop="qualitity" label="鍙鐢ㄦ暟閲�" width="140" align="center" />
+ </el-table>
+
+ <!-- 宸查�夋嫨鏄庣粏灞曠ず鏀惧湪鎶ュ伐寮规涓嬫柟鐨� reportForm.drawMaterialList 琛ㄦ牸閲� -->
+ </div>
+
+ <template #footer>
+ <span class="dialog-footer">
+ <el-button @click="addMaterialDialogVisible = false">鍙栨秷</el-button>
+ <el-button type="primary" @click="handleConfirmAddMaterial">纭畾</el-button>
+ </span>
+ </template>
+ </el-dialog>
<FilesDia ref="workOrderFilesRef" />
</div>
</template>
<script setup>
- import { onMounted, ref, nextTick, computed } from "vue";
+ import { onMounted, ref, nextTick } from "vue";
import { ElMessageBox } from "element-plus";
import dayjs from "dayjs";
import {
@@ -429,16 +500,18 @@
userId: "",
productMainId: null,
deviceId: null,
+ // 鎶ュ伐鏃堕�夋嫨鐨勫師鏉愭枡棰嗙敤鏄庣粏
+ drawMaterialList: [],
otherData: {
rows: []
},
});
const productionRecordFormRef = ref();
- const currentDevice = computed(() => {
- if (!reportForm.deviceId) return null;
- return deviceOptions.value.find(device => device.id === reportForm.deviceId) || null;
- });
+ // 鍘熸潗鏂欓鐢紙鏂板/閫夋嫨寮规锛�
+ const availableMaterials = ref([]); // 鏉ヨ嚜褰撳墠琛岀殑 drawMaterials锛坖son瑙ｆ瀽鎴恖ist锛�
+ const addMaterialDialogVisible = ref(false);
+ const selectedAddMaterials = ref([]); // 寮规閲岀敤鎴烽�変腑鐨勬潯鐩紙鍙紪杈� reportQty锛�
// 鎶曞叆鎬婚噺楠岃瘉瑙勫垯
const validateTotalInvestment = (rule, value, callback) => {
@@ -771,6 +844,72 @@
return res.data.records
};
+ // 鍘熸潗鏂欓鐢細drawMaterials锛坖son -> list锛変笌 drawMaterialList锛堟渶缁堟彁浜わ級
+ const parseMaybeJsonList = (val) => {
+ if (!val) return [];
+ if (Array.isArray(val)) return val;
+ if (typeof val === 'string') {
+ try {
+ const parsed = JSON.parse(val);
+ return Array.isArray(parsed) ? parsed : [];
+ } catch (e) {
+ return [];
+ }
+ }
+ return [];
+ };
+
+ const normalizeDrawMaterialItem = (item) => {
+ if (!item) return null;
+ return {
+ ...item,
+ reportQty: item.reportQty ?? item.requisitionQty ?? 0,
+ remark: item.remark ?? '',
+ };
+ };
+
+ const materialKey = (item) => String(item?.id ?? item?.productModelId ?? '');
+
+ const openAddMaterialDialog = () => {
+ if (!availableMaterials.value || availableMaterials.value.length === 0) {
+ proxy.$modal.msgWarning("褰撳墠宸ュ崟娌℃湁鍙鐢ㄧ殑鍘熸潗鏂�");
+ return;
+ }
+ selectedAddMaterials.value = [];
+ addMaterialDialogVisible.value = true;
+ };
+
+ const handleAddMaterialSelectionChange = (selection) => {
+ selectedAddMaterials.value = (selection || []).map((x) => normalizeDrawMaterialItem({ ...x }));
+ };
+
+ const handleConfirmAddMaterial = () => {
+ if (!selectedAddMaterials.value || selectedAddMaterials.value.length === 0) {
+ proxy.$modal.msgWarning("璇峰厛閫夋嫨鍘熸潗鏂�");
+ return;
+ }
+
+ const existingKeys = new Set((reportForm.drawMaterialList || []).map(materialKey));
+ const newItems = selectedAddMaterials.value
+ .filter((it) => !existingKeys.has(materialKey(it)))
+ .map(normalizeDrawMaterialItem)
+ .filter(Boolean);
+
+ if (newItems.length === 0) {
+ proxy.$modal.msgWarning("鎵�閫夊師鏉愭枡宸插瓨鍦紝鏃犻渶閲嶅娣诲姞");
+ addMaterialDialogVisible.value = false;
+ return;
+ }
+
+ reportForm.drawMaterialList = [...(reportForm.drawMaterialList || []), ...newItems];
+ addMaterialDialogVisible.value = false;
+ };
+
+ const removeDrawMaterialRow = (index) => {
+ if (!Array.isArray(reportForm.drawMaterialList)) return;
+ reportForm.drawMaterialList.splice(index, 1);
+ };
+
const processParamList = ref([])
const showReportDialog = async row => {
currentReportRowData.value = row;
@@ -790,6 +929,15 @@
// 鑾峰彇宸ュ簭缁戝畾璁惧鍒楄〃
getDeviceList(row.processId);
+
+ // 鍘熸潗鏂欙細鍙�夐」鏉ヨ嚜褰撳墠琛� drawMaterials锛坖son -> list锛�
+ availableMaterials.value = parseMaybeJsonList(row.drawMaterials);
+
+ // 鏈�缁堥鐢ㄦ竻鍗曪細浼樺厛鍥炴樉 drawMaterialList锛堣嫢鍚庣宸茶繑鍥烇級锛涘惁鍒欎负绌�
+ const existingDrawList = parseMaybeJsonList(row.drawMaterialList);
+ reportForm.drawMaterialList = (existingDrawList || []).map(normalizeDrawMaterialItem).filter(Boolean);
+ selectedAddMaterials.value = [];
+ addMaterialDialogVisible.value = false;
nextTick(() => {
reportFormRef.value?.clearValidate();
@@ -818,6 +966,8 @@
const data = await productionRecordFormRef.value.submitData();
console.log("鐢熶骇璁板綍琛ㄥ崟鏁版嵁:", data);
reportForm.otherData.rows = data || [];
+ // 鏈哄彴閫夋嫨鐢� ProductionRecordForm 鐨勨�滄満鍙伴�夋嫨鈥濆弬鏁板喅瀹�
+ reportForm.deviceId = getDeviceFromRecordParams(data) ?? reportForm.deviceId;
} catch (error) {
console.error("鑾峰彇鐢熶骇璁板綍琛ㄥ崟鏁版嵁澶辫触", error);
return;
@@ -882,6 +1032,8 @@
...reportForm,
quantity: quantity,
scrapQty: scrapQty,
+ // drawMaterialList 鐩存帴浼犳暟缁勶紙涓嶅仛 JSON.stringify锛�
+ drawMaterialList: reportForm.drawMaterialList || [],
otherData: JSON.stringify(reportForm.otherData)
};
@@ -947,9 +1099,10 @@
}
};
- // 璁惧閫夋嫨鍙樺寲鏃舵洿鏂� deviceId
- const handleDeviceChange = deviceId => {
- reportForm.deviceId = deviceId;
+ const getDeviceFromRecordParams = (rows) => {
+ if (!Array.isArray(rows)) return null;
+ const machineRow = rows.find(r => r?.type === '鏈哄彴閫夋嫨');
+ return machineRow?.value ?? null;
};
onMounted(() => {
--
Gitblit v1.9.3