From 46d5fc2f692b19538f2f7224f04096faececd38b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 26 三月 2026 14:13:36 +0800
Subject: [PATCH] 军泰伟业 1.生产订单新增时展示工序和物料清单并可以修改
---
src/views/productionManagement/productionOrder/New.vue | 518 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 458 insertions(+), 60 deletions(-)
diff --git a/src/views/productionManagement/productionOrder/New.vue b/src/views/productionManagement/productionOrder/New.vue
index baa2578..329473a 100644
--- a/src/views/productionManagement/productionOrder/New.vue
+++ b/src/views/productionManagement/productionOrder/New.vue
@@ -3,66 +3,83 @@
<el-dialog
v-model="isShow"
title="鏂板鐢熶骇璁㈠崟"
- width="800"
+ width="1500"
+ :close-on-click-modal="false"
@close="closeModal"
+ class="production-order-dialog"
>
- <el-form label-width="140px" :model="formState" label-position="top" ref="formRef">
- <el-form-item
- label="浜у搧鍚嶇О"
- prop="productModelId"
- :rules="[
- {
- required: true,
- message: '璇烽�夋嫨浜у搧',
- trigger: 'change',
- }
- ]"
- >
- <el-button type="primary" @click="showProductSelectDialog = true">
- {{ formState.productName ? formState.productName : '閫夋嫨浜у搧' }}
- </el-button>
- </el-form-item>
-
- <el-form-item
- label="鍥剧焊缂栧彿"
- prop="drawingNumber"
- >
- <el-input v-model="formState.drawingNumber" disabled />
- </el-form-item>
-
- <el-form-item
- label="瑙勬牸"
- prop="productModelName"
- >
- <el-input v-model="formState.productModelName" disabled />
- </el-form-item>
-
- <el-form-item
- label="鍗曚綅"
- prop="unit"
- >
- <el-input v-model="formState.unit" disabled />
- </el-form-item>
-
- <el-form-item label="宸ヨ壓璺嚎">
- <el-select v-model="formState.routeId"
- placeholder="璇烽�夋嫨宸ヨ壓璺嚎"
- style="width: 100%;"
- :loading="bindRouteLoading">
- <el-option v-for="item in routeOptions"
- :key="item.id"
- :label="`${item.processRouteCode || ''}`"
- :value="item.id" />
- </el-select>
- </el-form-item>
-
- <el-form-item
- label="闇�姹傛暟閲�"
- prop="quantity"
- >
- <el-input-number v-model="formState.quantity" :step="1" :min="1" style="width: 100%" />
- </el-form-item>
- </el-form>
+ <!-- 鍩烘湰淇℃伅 -->
+ <div class="section-card">
+ <div class="section-header">
+ <span class="section-icon">馃搵</span>
+ <span class="section-title-text">鍩烘湰淇℃伅</span>
+ </div>
+ <el-form label-width="100px" :model="formState" label-position="right" ref="formRef" class="compact-form">
+ <el-row :gutter="20">
+ <el-col :span="12">
+ <el-form-item
+ label="浜у搧鍚嶇О"
+ prop="productModelId"
+ :rules="[{ required: true, message: '璇烽�夋嫨浜у搧', trigger: 'change' }]"
+ >
+ <el-button type="primary" @click="showProductSelectDialog = true" class="select-btn">
+ {{ formState.productName ? formState.productName : '閫夋嫨浜у搧' }}
+ </el-button>
+ </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>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="12">
+ <el-form-item label="鍗曚綅" prop="unit">
+ <el-input v-model="formState.unit" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="闇�姹傛暟閲�" prop="quantity">
+ <el-input-number v-model="formState.quantity" :step="1" :min="1" style="width: 100%" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="12">
+ <el-form-item label="浜や粯鏃ユ湡" prop="deliveryDate">
+ <el-date-picker
+ v-model="formState.deliveryDate"
+ type="date"
+ placeholder="閫夋嫨浜や粯鏃ユ湡"
+ style="width: 100%"
+ format="YYYY-MM-DD"
+ value-format="YYYY-MM-DD"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍥剧焊涓婁紶">
+ <el-upload
+ action="#"
+ :auto-upload="false"
+ :on-change="handleFileChange"
+ :file-list="fileList"
+ :limit="5"
+ class="upload-inline"
+ >
+ <el-button type="primary" plain size="small">
+ <el-icon><Upload /></el-icon> 閫夋嫨鏂囦欢
+ </el-button>
+ <template #tip>
+ <div class="el-upload__tip">鏀寔jpg/png/pdf锛屽崟涓笉瓒呰繃10MB</div>
+ </template>
+ </el-upload>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </div>
<!-- 浜у搧閫夋嫨寮圭獥 -->
<ProductSelectDialog
@@ -70,6 +87,155 @@
@confirm="handleProductSelect"
single
/>
+
+ <!-- 鐢ㄦ枡浜у搧閫夋嫨寮圭獥 -->
+ <ProductSelectDialog
+ v-model="showMaterialProductDialog"
+ @confirm="handleMaterialProductSelect"
+ />
+
+ <!-- 鐢熶骇浠诲姟 -->
+ <div class="section-card">
+ <div class="section-header">
+ <span class="section-icon">馃敡</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>
+ </div>
+ <div class="table-container">
+ <el-table :data="processRouteItems" border size="small" class="compact-table">
+ <el-table-column type="index" label="搴忓彿" width="60" />
+ <el-table-column label="宸ュ簭鍚嶇О" min-width="150">
+ <template #default="{ row }">
+ <el-select
+ v-model="row.processId"
+ placeholder="璇烽�夋嫨宸ュ簭"
+ style="width: 100%"
+ @change="(val) => handleProcessChange(val, row)"
+ >
+ <el-option
+ v-for="item in processOptions"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+ />
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎶ュ伐鏉冮檺" min-width="180">
+ <template #default="{ row }">
+ <el-select
+ v-model="row.userPower"
+ multiple
+ collapse-tags
+ collapse-tags-tooltip
+ placeholder="璇烽�夋嫨鎶ュ伐鏉冮檺"
+ style="width: 100%"
+ >
+ <el-option
+ v-for="item in userOptions"
+ :key="item.userId"
+ :label="item.nickName"
+ :value="item.nickName"
+ />
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column label="璁″垝鏁�" min-width="100">
+ <template #default="{ row }">
+ <el-input-number v-model="row.planNum" :min="1" size="small" style="width: 100%" />
+ </template>
+ </el-table-column>
+ <el-table-column label="鏄惁璐ㄦ" min-width="100">
+ <template #default="{ row }">
+ <el-switch v-model="row.isQuality" :active-value="true" :inactive-value="false" size="small" />
+ </template>
+ </el-table-column>
+ <el-table-column label="璁″垝寮�濮嬫椂闂�" min-width="180">
+ <template #default="{ row }">
+ <el-date-picker
+ v-model="row.planStartTime"
+ type="date"
+ placeholder="閫夋嫨寮�濮嬫椂闂�"
+ style="width: 100%"
+ format="YYYY-MM-DD"
+ value-format="YYYY-MM-DD"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column label="璁″垝缁撴潫鏃堕棿" min-width="180">
+ <template #default="{ row }">
+ <el-date-picker
+ v-model="row.planEndTime"
+ type="date"
+ placeholder="閫夋嫨缁撴潫鏃堕棿"
+ style="width: 100%"
+ format="YYYY-MM-DD"
+ value-format="YYYY-MM-DD"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" width="80" fixed="right" align="center">
+ <template #default="{ $index }">
+ <el-button type="danger" link size="small" @click="removeProcessRouteItem($index)">
+ <el-icon><Delete /></el-icon>
+ </el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <div v-if="processRouteItems.length === 0" class="empty-tip">
+ <el-empty description="鏆傛棤鐢熶骇浠诲姟锛岀偣鍑讳笂鏂规寜閽坊鍔�" :image-size="60" />
+ </div>
+ </div>
+ </div>
+
+ <!-- 鐢ㄦ枡娓呭崟 -->
+ <div class="section-card">
+ <div class="section-header">
+ <span class="section-icon">馃摝</span>
+ <span class="section-title-text">鐢ㄦ枡娓呭崟</span>
+ <el-button type="primary" size="small" @click="addMaterialItem" class="add-btn">
+ <el-icon><Plus /></el-icon> 娣诲姞鐢ㄦ枡
+ </el-button>
+ </div>
+ <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="鍗曚綅浜у嚭闇�瑕佹暟閲�" min-width="140">
+ <template #default="{ row }">
+ <el-input-number v-model="row.unitQuantity" :min="0" :precision="2" size="small" style="width: 100%" />
+ </template>
+ </el-table-column>
+ <el-table-column label="闇�姹傛暟閲�" min-width="120">
+ <template #default="{ row }">
+ <el-input-number v-model="row.demandedQuantity" :min="0" :precision="2" size="small" style="width: 100%" />
+ </template>
+ </el-table-column>
+ <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">
+ <template #default="{ $index }">
+ <el-button type="danger" link size="small" @click="removeProductStructureRecord($index)">
+ <el-icon><Delete /></el-icon>
+ </el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <div v-if="productStructureRecords.length === 0" class="empty-tip">
+ <el-empty description="鏆傛棤鐢ㄦ枡娓呭崟锛岀偣鍑讳笂鏂规寜閽坊鍔�" :image-size="60" />
+ </div>
+ </div>
+ </div>
+
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="handleSubmit">纭</el-button>
@@ -82,8 +248,11 @@
<script setup>
import {ref, computed, getCurrentInstance} 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 {listDeptUserTree} from "@/api/basicData/productProcess.js";
const props = defineProps({
visible: {
@@ -110,7 +279,23 @@
unit: "",
drawingNumber: "",
quantity: 0,
+ deliveryDate: "",
});
+
+// 宸ュ簭璺嚎鏄庣粏鍒楄〃
+ const processRouteItems = ref([]);
+
+ // 鐗╂枡娓呭崟鍒楄〃
+ const productStructureRecords = ref([]);
+
+// 宸ュ簭鍒楄〃
+const processOptions = ref([]);
+
+// 鐢ㄦ埛鍒楄〃
+const userOptions = ref([]);
+
+// 鏂囦欢鍒楄〃
+const fileList = ref([]);
const isShow = computed({
get() {
@@ -122,6 +307,42 @@
});
const showProductSelectDialog = ref(false);
+const showMaterialProductDialog = ref(false);
+
+// 鑾峰彇宸ュ簭鍒楄〃
+const fetchProcessOptions = () => {
+ listProcess().then(res => {
+ processOptions.value = res.data || [];
+ });
+};
+
+// 鑾峰彇鐢ㄦ埛鍒楄〃
+const fetchUserOptions = () => {
+ listDeptUserTree().then(res => {
+ const users = [];
+ const extractUsers = (nodes) => {
+ nodes.forEach(node => {
+ if (node.userList && node.userList.length > 0) {
+ node.userList.forEach(user => {
+ users.push({
+ userId: user.userId,
+ nickName: user.nickName || user.userName
+ });
+ });
+ }
+ if (node.childrenList && node.childrenList.length > 0) {
+ extractUsers(node.childrenList);
+ }
+ });
+ };
+ extractUsers(res.data || []);
+ userOptions.value = users;
+ });
+};
+
+// 缁勪欢鎸傝浇鏃惰幏鍙栨暟鎹�
+fetchProcessOptions();
+fetchUserOptions();
let { proxy } = getCurrentInstance()
@@ -134,8 +355,14 @@
productName: "",
drawingNumber: "",
productModelName: "",
- quantity: '',
+ unit: "",
+ quantity: 0,
+ deliveryDate: "",
};
+ // 閲嶇疆宸ュ簭璺嚎鏄庣粏鍜岀墿鏂欐竻鍗�
+ processRouteItems.value = [];
+ productStructureRecords.value = [];
+ fileList.value = [];
isShow.value = false;
};
@@ -169,6 +396,76 @@
})
}
+// 宸ュ簭閫夋嫨鍙樺寲澶勭悊
+const handleProcessChange = (processId, row) => {
+ const selectedProcess = processOptions.value.find(item => item.id === processId);
+ if (selectedProcess) {
+ row.processName = selectedProcess.name;
+ row.processNo = selectedProcess.no;
+ row.isQuality = selectedProcess.isQuality || false;
+ // userPower鏄�楀彿鍒嗛殧鐨勭敤鎴峰悕锛岃浆鎹负鏁扮粍
+ if (selectedProcess.userPower) {
+ row.userPower = selectedProcess.userPower.split(',');
+ } else {
+ row.userPower = [];
+ }
+ }
+};
+
+// 娣诲姞鐢熶骇浠诲姟
+const addProductionTask = () => {
+ processRouteItems.value.push({
+ processId: undefined,
+ processName: "",
+ processNo: "",
+ productModelId: undefined,
+ userPower: [],
+ planStartTime: "",
+ planEndTime: "",
+ planNum: 1,
+ isQuality: false,
+ });
+};
+
+// 鍒犻櫎宸ュ簭璺嚎鏄庣粏
+const removeProcessRouteItem = (index) => {
+ processRouteItems.value.splice(index, 1);
+};
+
+// 娣诲姞鐢ㄦ枡 - 寮瑰嚭浜у搧閫夋嫨妗�
+const addMaterialItem = () => {
+ showMaterialProductDialog.value = true;
+};
+
+// 澶勭悊鐢ㄦ枡浜у搧閫夋嫨
+const handleMaterialProductSelect = (products) => {
+ if (products && products.length > 0) {
+ products.forEach(product => {
+ productStructureRecords.value.push({
+ productModelId: product.id,
+ parentId: undefined,
+ productOrderId: undefined,
+ processId: undefined,
+ unitQuantity: 1,
+ demandedQuantity: 1,
+ unit: product.unit,
+ bomId: undefined,
+ });
+ });
+ }
+ showMaterialProductDialog.value = false;
+};
+
+// 鍒犻櫎鐗╂枡娓呭崟
+const removeProductStructureRecord = (index) => {
+ productStructureRecords.value.splice(index, 1);
+};
+
+// 鏂囦欢涓婁紶鍙樻洿
+const handleFileChange = (file, files) => {
+ fileList.value = files;
+};
+
const handleSubmit = () => {
proxy.$refs["formRef"].validate(valid => {
if (valid) {
@@ -182,7 +479,21 @@
return;
}
- addProductOrder(formState.value).then(res => {
+ // 澶勭悊鎻愪氦鏁版嵁 - 灏唘serPower鏁扮粍杞崲涓洪�楀彿鍒嗛殧鐨勫瓧绗︿覆
+ const processedProcessRouteItems = processRouteItems.value.map(item => ({
+ ...item,
+ userPower: Array.isArray(item.userPower) ? item.userPower.join(',') : item.userPower
+ }));
+
+ // 缁勮鎻愪氦鏁版嵁
+ const submitData = {
+ ...formState.value,
+ processRouteItems: processedProcessRouteItems,
+ productStructureRecords: productStructureRecords.value,
+ files: fileList.value,
+ };
+
+ addProductOrder(submitData).then(res => {
// 鍏抽棴妯℃�佹
isShow.value = false;
// 鍛婄煡鐖剁粍浠跺凡瀹屾垚
@@ -200,3 +511,90 @@
isShow,
});
</script>
+
+<style scoped>
+.production-order-dialog :deep(.el-dialog__body) {
+ padding: 15px 20px;
+ max-height: 70vh;
+ overflow-y: auto;
+}
+
+.section-card {
+ background: #f8f9fa;
+ border-radius: 8px;
+ padding: 15px;
+ margin-bottom: 15px;
+}
+
+.section-header {
+ display: flex;
+ align-items: center;
+ margin-bottom: 15px;
+ padding-bottom: 10px;
+ border-bottom: 1px solid #e4e7ed;
+}
+
+.section-icon {
+ font-size: 18px;
+ margin-right: 8px;
+}
+
+.section-title-text {
+ font-size: 15px;
+ font-weight: 600;
+ color: #303133;
+ flex: 1;
+}
+
+.add-btn {
+ margin-left: auto;
+}
+
+.compact-form :deep(.el-form-item) {
+ margin-bottom: 12px;
+}
+
+.compact-form :deep(.el-form-item__label) {
+ font-size: 13px;
+ color: #606266;
+}
+
+.select-btn {
+ width: 100%;
+ justify-content: flex-start;
+}
+
+.table-container {
+ background: #fff;
+ border-radius: 4px;
+ padding: 10px;
+}
+
+.compact-table :deep(.el-table__cell) {
+ padding: 4px 0;
+}
+
+.compact-table :deep(.el-input__wrapper),
+.compact-table :deep(.el-input-number) {
+ width: 100%;
+}
+
+.empty-tip {
+ padding: 20px 0;
+}
+
+.upload-inline :deep(.el-upload) {
+ display: inline-flex;
+}
+
+.upload-inline :deep(.el-upload__tip) {
+ margin-top: 4px;
+ font-size: 12px;
+}
+
+.dialog-footer {
+ display: flex;
+ justify-content: center;
+ gap: 10px;
+}
+</style>
--
Gitblit v1.9.3