From 36b909e117c3ccc22dd266a94479e2a02335d261 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 26 三月 2026 18:03:34 +0800
Subject: [PATCH] 军泰伟业 1.生产订单新增编辑逻辑重写
---
src/views/productionManagement/productionOrder/New.vue | 284 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 224 insertions(+), 60 deletions(-)
diff --git a/src/views/productionManagement/productionOrder/New.vue b/src/views/productionManagement/productionOrder/New.vue
index 329473a..51e5404 100644
--- a/src/views/productionManagement/productionOrder/New.vue
+++ b/src/views/productionManagement/productionOrder/New.vue
@@ -28,8 +28,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鍥剧焊缂栧彿" prop="productModelName">
- <el-input v-model="formState.productModelName" disabled />
+ <el-form-item label="鍥剧焊缂栧彿" prop="model">
+ <el-input v-model="formState.model" disabled />
</el-form-item>
</el-col>
</el-row>
@@ -61,18 +61,22 @@
<el-col :span="12">
<el-form-item label="鍥剧焊涓婁紶">
<el-upload
- action="#"
- :auto-upload="false"
- :on-change="handleFileChange"
- :file-list="fileList"
+ v-model:file-list="fileList"
+ :action="upload.url"
+ :headers="upload.headers"
+ :data="upload.data"
+ :on-success="handleDrawingUploadSuccess"
+ :on-remove="handleDrawingRemove"
+ :before-upload="handleDrawingBeforeUpload"
:limit="5"
- class="upload-inline"
+ accept=".pdf,.jpg,.jpeg,.png,.dwg"
+ list-type="picture-card"
>
- <el-button type="primary" plain size="small">
- <el-icon><Upload /></el-icon> 閫夋嫨鏂囦欢
- </el-button>
+ <el-icon class="avatar-uploader-icon"><Plus /></el-icon>
<template #tip>
- <div class="el-upload__tip">鏀寔jpg/png/pdf锛屽崟涓笉瓒呰繃10MB</div>
+ <div class="el-upload__tip">
+ 鏀寔 pdf銆乯pg銆乯peg銆乸ng銆乨wg 鏍煎紡锛屽ぇ灏忎笉瓒呰繃 10MB
+ </div>
</template>
</el-upload>
</el-form-item>
@@ -94,11 +98,26 @@
@confirm="handleMaterialProductSelect"
/>
- <!-- 鐢熶骇浠诲姟 -->
+ <!-- BOM閫夋嫨寮圭獥 -->
+ <el-dialog
+ v-model="showBomDialog"
+ title="閫夋嫨BOM"
+ width="500"
+ append-to-body
+ >
+ <el-table :data="bomList" border size="small" @row-click="handleBomSelect" highlight-current-row style="margin-bottom: 10px;">
+ <el-table-column type="index" label="搴忓彿" width="60" />
+ <el-table-column label="BOM缂栧彿" prop="bomNo" min-width="120" />
+ <el-table-column label="鐗堟湰" prop="version" min-width="80" />
+ <el-table-column label="浜у搧鍚嶇О" prop="productName" min-width="100" />
+ </el-table>
+ </el-dialog>
+
+ <!-- 宸ュ簭 -->
<div class="section-card">
<div class="section-header">
<span class="section-icon">馃敡</span>
- <span class="section-title-text">鐢熶骇浠诲姟</span>
+ <span class="section-title-text">宸ュ簭</span>
<el-button type="primary" size="small" @click="addProductionTask" class="add-btn">
<el-icon><Plus /></el-icon> 娣诲姞浠诲姟
</el-button>
@@ -115,10 +134,10 @@
@change="(val) => handleProcessChange(val, row)"
>
<el-option
- v-for="item in processOptions"
+ v-for="item in processRouteItemsOptions"
:key="item.id"
- :label="item.name"
- :value="item.id"
+ :label="item.processName"
+ :value="item.processId"
/>
</el-select>
</template>
@@ -185,7 +204,7 @@
</el-table-column>
</el-table>
<div v-if="processRouteItems.length === 0" class="empty-tip">
- <el-empty description="鏆傛棤鐢熶骇浠诲姟锛岀偣鍑讳笂鏂规寜閽坊鍔�" :image-size="60" />
+ <el-empty description="鏆傛棤宸ュ簭锛岀偣鍑讳笂鏂规寜閽坊鍔�" :image-size="60" />
</div>
</div>
</div>
@@ -202,6 +221,8 @@
<div class="table-container">
<el-table :data="productStructureRecords" border size="small" class="compact-table">
<el-table-column type="index" label="搴忓彿" width="50" align="center" />
+ <el-table-column label="鍥剧焊缂栧彿" prop="model" min-width="120" />
+ <el-table-column label="浜у搧鍚嶇О" prop="productName" min-width="120" />
<el-table-column label="鍗曚綅浜у嚭闇�瑕佹暟閲�" min-width="140">
<template #default="{ row }">
<el-input-number v-model="row.unitQuantity" :min="0" :precision="2" size="small" style="width: 100%" />
@@ -215,11 +236,6 @@
<el-table-column label="鍗曚綅" min-width="80">
<template #default="{ row }">
<el-input v-model="row.unit" placeholder="璇疯緭鍏�" size="small" />
- </template>
- </el-table-column>
- <el-table-column label="bomId" min-width="100">
- <template #default="{ row }">
- <el-input-number v-model="row.bomId" :min="0" size="small" style="width: 100%" />
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" width="80" fixed="right" align="center">
@@ -247,12 +263,15 @@
</template>
<script setup>
-import {ref, computed, getCurrentInstance} from "vue";
+import {ref, computed, getCurrentInstance, watch} from "vue";
import { Plus, Delete, Upload } from '@element-plus/icons-vue';
import ProductSelectDialog from "@/views/basicData/product/ProductSelectDialog.vue";
-import {addProductOrder, listProcessRoute} from "@/api/productionManagement/productionOrder.js";
-import {list as listProcess} from "@/api/productionManagement/productionProcess.js";
+import {addProductOrder} from "@/api/productionManagement/productionOrder.js";
import {listDeptUserTree} from "@/api/basicData/productProcess.js";
+import {findProcessRouteItemList} from "@/api/productionManagement/processRouteItem.js";
+import {listPage as listProductBom} from "@/api/productionManagement/productBom.js";
+import {listByBomIdIsParent} from "@/api/productionManagement/productStructure.js";
+import { getToken } from "@/utils/auth.js";
const props = defineProps({
visible: {
@@ -275,11 +294,13 @@
productModelId: undefined,
routeId: undefined,
productName: "",
- productModelName: "",
+ model: "",
unit: "",
drawingNumber: "",
quantity: 0,
deliveryDate: "",
+ tempFileIds: [],
+ salesLedgerFiles: [],
});
// 宸ュ簭璺嚎鏄庣粏鍒楄〃
@@ -288,14 +309,17 @@
// 鐗╂枡娓呭崟鍒楄〃
const productStructureRecords = ref([]);
-// 宸ュ簭鍒楄〃
-const processOptions = ref([]);
-
// 鐢ㄦ埛鍒楄〃
const userOptions = ref([]);
// 鏂囦欢鍒楄〃
const fileList = ref([]);
+
+const upload = reactive({
+ url: import.meta.env.VITE_APP_BASE_API + "/file/upload",
+ headers: { Authorization: "Bearer " + getToken() },
+ data: { type: 14 },
+});
const isShow = computed({
get() {
@@ -308,13 +332,6 @@
const showProductSelectDialog = ref(false);
const showMaterialProductDialog = ref(false);
-
-// 鑾峰彇宸ュ簭鍒楄〃
-const fetchProcessOptions = () => {
- listProcess().then(res => {
- processOptions.value = res.data || [];
- });
-};
// 鑾峰彇鐢ㄦ埛鍒楄〃
const fetchUserOptions = () => {
@@ -341,7 +358,6 @@
};
// 缁勪欢鎸傝浇鏃惰幏鍙栨暟鎹�
-fetchProcessOptions();
fetchUserOptions();
let { proxy } = getCurrentInstance()
@@ -354,10 +370,12 @@
routeId: undefined,
productName: "",
drawingNumber: "",
- productModelName: "",
+ model: "",
unit: "",
quantity: 0,
deliveryDate: "",
+ tempFileIds: [],
+ salesLedgerFiles: [],
};
// 閲嶇疆宸ュ簭璺嚎鏄庣粏鍜岀墿鏂欐竻鍗�
processRouteItems.value = [];
@@ -373,35 +391,108 @@
formState.value.productId = product.productId;
formState.value.productName = product.productName;
formState.value.drawingNumber = product.drawingNumber;
- formState.value.productModelName = product.model;
+ formState.value.model = product.model;
formState.value.productModelId = product.id;
formState.value.unit = product.unit;
+ formState.value.routeId = product.routeId;
showProductSelectDialog.value = false;
- fetchRouteOptions( product.id);
+
+ // 1. 閫氳繃浜у搧鑷甫鐨剅outeId鑾峰彇宸ュ簭鍒楄〃
+ if (product.routeId) {
+ fetchProcessRouteItems(product.routeId);
+ }
+
+ // 2. 閫氳繃浜у搧id鏌ヨBOM鍒楄〃
+ fetchBomList(product.id);
+
// 瑙﹀彂琛ㄥ崟楠岃瘉鏇存柊
proxy.$refs["formRef"]?.validateField('productModelId');
}
};
-const routeOptions = ref([]);
-const bindRouteLoading = ref(false);
-const fetchRouteOptions = (productModelId) => {
- formState.value.routeId = undefined;
- routeOptions.value = []
- bindRouteLoading.value = true;
- listProcessRoute({ productModelId: productModelId }).then(res => {
- routeOptions.value = res.data || [];
- }).finally(() => {
- bindRouteLoading.value = false;
- })
-}
+// 宸ヨ壓璺嚎宸ュ簭鍒楄〃
+const processRouteItemsOptions = ref([]);
+
+const fetchProcessRouteItems = (routeId) => {
+ processRouteItemsOptions.value = [];
+ findProcessRouteItemList({ routeId: routeId }).then(res => {
+ const items = res.data || [];
+ processRouteItemsOptions.value = items;
+
+ // 鑷姩娣诲姞宸ュ簭
+ processRouteItems.value = items.map(item => ({
+ processId: item.processId,
+ processName: item.processName,
+ productModelId: item.productModelId,
+ userPower: item.userPower ? item.userPower.split(',') : [],
+ planStartTime: "",
+ planEndTime: "",
+ planNum: 1,
+ isQuality: item.isQuality || false,
+ }));
+ });
+};
+
+// BOM鍒楄〃寮圭獥鐩稿叧
+const showBomDialog = ref(false);
+const bomList = ref([]);
+const currentProductId = ref(null);
+
+const fetchBomList = (productModelId) => {
+ currentProductId.value = productModelId;
+ listProductBom({ productModelId: productModelId }).then(res => {
+ const bomData = res.data?.records || [];
+ if (bomData.length === 1) {
+ // 鍙湁涓�涓狟OM锛岀洿鎺ユ煡璇㈢墿鏂欐竻鍗�
+ fetchMaterialList(bomData[0].id);
+ } else if (bomData.length > 1) {
+ // 澶氫釜BOM锛屽脊鍑洪�夋嫨妗�
+ bomList.value = bomData;
+ showBomDialog.value = true;
+ }
+ });
+};
+
+const handleBomSelect = (bom) => {
+ showBomDialog.value = false;
+ fetchMaterialList(bom.id);
+};
+
+const fetchMaterialList = (bomId) => {
+ listByBomIdIsParent(bomId).then(res => {
+ const materials = res.data || [];
+ const demandQty = formState.value.quantity || 1;
+ productStructureRecords.value = materials.map(item => ({
+ parentId: item.parentId,
+ productModelId: item.productModelId,
+ model: item.model || '',
+ productName: item.productName || '',
+ productOrderId: undefined,
+ processId: undefined,
+ unitQuantity: item.unitQuantity || 1,
+ demandedQuantity: (item.unitQuantity || 1) * demandQty,
+ unit: item.unit || '',
+ bomId: item.bomId,
+ }));
+ });
+};
+
+// 鐩戝惉闇�姹傛暟閲忓彉鍖栵紝閲嶆柊璁＄畻鐗╂枡闇�姹傛暟閲�
+watch(() => formState.value.quantity, (newQty) => {
+ if (productStructureRecords.value.length > 0 && newQty) {
+ productStructureRecords.value = productStructureRecords.value.map(item => ({
+ ...item,
+ demandedQuantity: (item.unitQuantity || 1) * newQty
+ }));
+ }
+});
// 宸ュ簭閫夋嫨鍙樺寲澶勭悊
const handleProcessChange = (processId, row) => {
- const selectedProcess = processOptions.value.find(item => item.id === processId);
+ const selectedProcess = processRouteItemsOptions.value.find(item => item.processId === processId);
if (selectedProcess) {
- row.processName = selectedProcess.name;
- row.processNo = selectedProcess.no;
+ row.processName = selectedProcess.processName;
+ row.productModelId = selectedProcess.productModelId;
row.isQuality = selectedProcess.isQuality || false;
// userPower鏄�楀彿鍒嗛殧鐨勭敤鎴峰悕锛岃浆鎹负鏁扮粍
if (selectedProcess.userPower) {
@@ -412,8 +503,16 @@
}
};
-// 娣诲姞鐢熶骇浠诲姟
+// 娣诲姞宸ュ簭
const addProductionTask = () => {
+ if (!formState.value.productModelId) {
+ proxy.$modal.msgWarning("璇峰厛閫夋嫨浜у搧");
+ return;
+ }
+ if (processRouteItemsOptions.value.length === 0) {
+ proxy.$modal.msgWarning("璇峰厛閫夋嫨浜у搧浠ヨ幏鍙栧伐搴忓垪琛�");
+ return;
+ }
processRouteItems.value.push({
processId: undefined,
processName: "",
@@ -446,6 +545,8 @@
parentId: undefined,
productOrderId: undefined,
processId: undefined,
+ model: product.model || '',
+ productName: product.productName || '',
unitQuantity: 1,
demandedQuantity: 1,
unit: product.unit,
@@ -461,9 +562,47 @@
productStructureRecords.value.splice(index, 1);
};
-// 鏂囦欢涓婁紶鍙樻洿
-const handleFileChange = (file, files) => {
- fileList.value = files;
+const handleDrawingBeforeUpload = (file) => {
+ const isAllowed = [
+ 'application/pdf',
+ 'image/jpeg',
+ 'image/jpg',
+ 'image/png',
+ 'application/dwg'
+ ].includes(file.type) || file.name.endsWith('.dwg');
+ const isLt10M = file.size / 1024 / 1024 < 10;
+
+ if (!isAllowed) {
+ proxy.$modal.msgError("鍙兘涓婁紶 pdf銆乯pg銆乯peg銆乸ng銆乨wg 鏍煎紡鐨勬枃浠讹紒");
+ return false;
+ }
+ if (!isLt10M) {
+ proxy.$modal.msgError("涓婁紶鏂囦欢澶у皬涓嶈兘瓒呰繃 10MB锛�");
+ return false;
+ }
+ return true;
+};
+
+const handleDrawingUploadSuccess = (response, file, fileList) => {
+ console.log('涓婁紶鎴愬姛鍝嶅簲', response);
+ console.log('response.data', response.data);
+ if (response.code === 200) {
+ formState.value.tempFileIds = [response.data?.tempId];
+ formState.value.salesLedgerFiles = [{
+ tempId: response.data?.tempId,
+ originalName: response.data?.originalName || file.name,
+ tempPath: response.data?.tempPath,
+ type: response.data?.type || 14
+ }];
+ proxy.$modal.msgSuccess("涓婁紶鎴愬姛");
+ } else {
+ proxy.$modal.msgError(response.msg || "涓婁紶澶辫触");
+ }
+};
+
+const handleDrawingRemove = (file) => {
+ formState.value.tempFileIds = [];
+ formState.value.salesLedgerFiles = [];
};
const handleSubmit = () => {
@@ -490,7 +629,7 @@
...formState.value,
processRouteItems: processedProcessRouteItems,
productStructureRecords: productStructureRecords.value,
- files: fileList.value,
+ files: formState.value.salesLedgerFiles,
};
addProductOrder(submitData).then(res => {
@@ -583,6 +722,31 @@
padding: 20px 0;
}
+.avatar-uploader-icon {
+ font-size: 28px;
+ color: #8c939d;
+ width: 148px;
+ height: 148px;
+ text-align: center;
+ line-height: 148px;
+}
+
+:deep(.el-upload--picture-card) {
+ width: 148px;
+ height: 148px;
+}
+
+:deep(.el-upload-list__item) {
+ width: 148px;
+ height: 148px;
+}
+
+:deep(.el-upload__tip) {
+ font-size: 12px;
+ color: #909399;
+ margin-top: 8px;
+}
+
.upload-inline :deep(.el-upload) {
display: inline-flex;
}
--
Gitblit v1.9.3