From 4069e8544bb2e4ec8022d3f23a7ba60a5fef05c5 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期一, 30 三月 2026 16:12:45 +0800
Subject: [PATCH] fix: 可领用数量字段修改
---
src/views/productionManagement/workOrder/index.vue | 428 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 390 insertions(+), 38 deletions(-)
diff --git a/src/views/productionManagement/workOrder/index.vue b/src/views/productionManagement/workOrder/index.vue
index d1cec4d..fbb3f4f 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">
@@ -166,17 +166,32 @@
</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-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"
+ min="1"
+ step="1"
+ style="width: 300px"
+ 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"
@@ -185,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"
@@ -195,17 +210,21 @@
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-number v-model.number="reportForm.inspectedQuantity"
- :min="0"
- :step="1"
+ <el-input v-model.number="reportForm.inspectedQuantity"
+ type="number"
+ min="0"
+ step="1"
style="width: 300px"
- controls-position="right"
- placeholder="璇疯緭鍏ユ鍝佹暟閲�"/>
+ 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="璇烽�夋嫨鐝粍淇℃伅"
@@ -218,12 +237,99 @@
:value="user.userId" />
</el-select>
</el-form-item>
+ </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.requisitionQty || 0"
+ :disabled="!row.requisitionQty"
+ 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">
<el-button type="primary"
@click="handleReport">纭畾</el-button>
<el-button @click="reportDialogVisible = false">鍙栨秷</el-button>
+ </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="requisitionQty" 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>
@@ -242,10 +348,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([
{
@@ -273,6 +386,10 @@
prop: "model",
},
{
+ label: "UID鐮�",
+ prop: "uidNo",
+ },
+ {
label: "鍗曚綅",
prop: "unit",
},
@@ -281,7 +398,11 @@
prop: "processName",
},
{
- label: "闇�姹傛暟閲�",
+ label: "鎶曞叆鎬婚噺(kg)",
+ prop: "totalInvestment",
+ },
+ {
+ label: "棰勮鐢熶骇鏁伴噺",
prop: "planQuantity",
width: "140",
},
@@ -347,7 +468,7 @@
clickFun: row => {
showReportDialog(row);
},
- disabled: row => row.planQuantity <= 0,
+ disabled: row => row.planQuantity <= 0 || row.productOrderIsEnd,
},
],
},
@@ -365,8 +486,10 @@
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,
@@ -376,7 +499,39 @@
productProcessRouteItemId: "",
userId: "",
productMainId: null,
+ deviceId: null,
+ // 鎶ュ伐鏃堕�夋嫨鐨勫師鏉愭枡棰嗙敤鏄庣粏
+ drawMaterialList: [],
+ otherData: {
+ rows: []
+ },
});
+ const productionRecordFormRef = ref();
+
+ // 鍘熸潗鏂欓鐢紙鏂板/閫夋嫨寮规锛�
+ const availableMaterials = ref([]); // 鏉ヨ嚜褰撳墠琛岀殑 drawMaterials锛坖son瑙ｆ瀽鎴恖ist锛�
+ const addMaterialDialogVisible = ref(false);
+ const selectedAddMaterials = ref([]); // 寮规閲岀敤鎴烽�変腑鐨勬潯鐩紙鍙紪杈� reportQty锛�
+
+ // 鎶曞叆鎬婚噺楠岃瘉瑙勫垯
+ 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) => {
@@ -385,10 +540,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();
};
@@ -410,8 +570,48 @@
// 楠岃瘉瑙勫垯
const reportFormRules = {
+ totalInvestment: [{ required: true, validator: validateTotalInvestment, trigger: "blur" }],
quantity: [{ required: true, validator: validateQuantity, trigger: "blur" }],
scrapQty: [{ validator: validateScrapQty, trigger: "blur" }],
+ };
+
+ // 澶勭悊鎶曞叆鎬婚噺杈撳叆
+ const handleTotalInvestmentInput = value => {
+ if (value === "" || value === null || value === undefined) {
+ reportForm.totalInvestment = null;
+ reportForm.scrapQty = null;
+ return;
+ }
+ const num = Number(value);
+ if (isNaN(num)) {
+ return;
+ }
+ if (num < 1) {
+ reportForm.totalInvestment = null;
+ reportForm.scrapQty = null;
+ return;
+ }
+ if (!Number.isInteger(num)) {
+ const intValue = Math.floor(num);
+ 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
@@ -424,23 +624,20 @@
if (isNaN(num)) {
return;
}
- // 濡傛灉灏忎簬1锛屾竻闄�
if (num < 1) {
reportForm.quantity = null;
return;
}
- // 濡傛灉鏄皬鏁板彇鏁存暟閮ㄥ垎
if (!Number.isInteger(num)) {
const intValue = Math.floor(num);
- // 濡傛灉鍙栨暣鍚庡皬浜�1锛屾竻闄�
if (intValue < 1) {
reportForm.quantity = null;
return;
}
reportForm.quantity = intValue;
- return;
+ } else {
+ reportForm.quantity = num;
}
- reportForm.quantity = num;
};
// 澶勭悊鎶ュ簾鏁伴噺
@@ -450,22 +647,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({
@@ -604,9 +817,92 @@
});
};
- 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
+ };
+
+ // 鍘熸潗鏂欓鐢細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;
+ 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;
@@ -616,6 +912,20 @@
reportForm.inspectedQuantity = row.inspectedQuantity;
reportForm.scrapQty =
row.scrapQty !== undefined && row.scrapQty !== null ? row.scrapQty : null;
+ reportForm.deviceId = row.deviceId || null;
+
+ // 鑾峰彇宸ュ簭缁戝畾璁惧鍒楄〃
+ 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();
});
@@ -638,7 +948,18 @@
workOrderFilesRef.value?.openDialog(row);
};
- const handleReport = () => {
+ const handleReport = async () => {
+ try {
+ 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;
+ }
+
reportFormRef.value?.validate(valid => {
if (!valid) {
return false;
@@ -687,20 +1008,22 @@
return;
}
- if (quantity > reportForm.planQuantity) {
- ElMessageBox.alert("鏈鐢熶骇鏁伴噺涓嶈兘瓒呰繃寰呯敓浜ф暟閲�", "鎻愮ず", {
- confirmButtonText: "纭畾",
- });
- return;
- }
+ // if (quantity > reportForm.planQuantity) {
+ // ElMessageBox.alert("鏈鐢熶骇鏁伴噺涓嶈兘瓒呰繃寰呯敓浜ф暟閲�", "鎻愮ず", {
+ // confirmButtonText: "纭畾",
+ // });
+ // return;
+ // }
const submitData = {
...reportForm,
quantity: quantity,
scrapQty: scrapQty,
+ // drawMaterialList 鐩存帴浼犳暟缁勶紙涓嶅仛 JSON.stringify锛�
+ drawMaterialList: reportForm.drawMaterialList || [],
+ otherData: JSON.stringify(reportForm.otherData)
};
- // console.log(submitData);
addProductMain(submitData).then(res => {
if (res.code === 200) {
proxy.$modal.msgSuccess("鎶ュ伐鎴愬姛");
@@ -711,6 +1034,11 @@
confirmButtonText: "纭畾",
});
}
+ }).catch(err => {
+ console.error("鎶ュ伐澶辫触", err);
+ ElMessageBox.alert("鎶ュ伐澶辫触", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ });
});
});
};
@@ -728,6 +1056,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) {
@@ -740,6 +1086,12 @@
}
};
+ const getDeviceFromRecordParams = (rows) => {
+ if (!Array.isArray(rows)) return null;
+ const machineRow = rows.find(r => r?.type === '鏈哄彴閫夋嫨');
+ return machineRow?.value ?? null;
+ };
+
onMounted(() => {
getList();
getUserList();
--
Gitblit v1.9.3