From 2d9fa4f40833ec76c481720cdb3329407657b4a5 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期二, 21 四月 2026 17:20:06 +0800
Subject: [PATCH] 工艺路线一些对接(部分接口有问题)
---
src/views/productionManagement/processRoute/processRouteItem/index.vue | 556 +++++--------------------------------------------------
1 files changed, 51 insertions(+), 505 deletions(-)
diff --git a/src/views/productionManagement/processRoute/processRouteItem/index.vue b/src/views/productionManagement/processRoute/processRouteItem/index.vue
index be7138d..c310b45 100644
--- a/src/views/productionManagement/processRoute/processRouteItem/index.vue
+++ b/src/views/productionManagement/processRoute/processRouteItem/index.vue
@@ -77,10 +77,10 @@
width="60"
type="index" />
<el-table-column label="宸ュ簭鍚嶇О"
- prop="processId"
+ prop="technologyOperationId"
width="200">
<template #default="scope">
- {{ getProcessName(scope.row.processId) || '-' }}
+ {{ getProcessName(scope.row.technologyOperationId) || '-' }}
</template>
</el-table-column>
<el-table-column label="鍙傛暟鍒楄〃"
@@ -151,7 +151,7 @@
<!-- 搴忓彿鍦嗗湀 -->
<div class="card-header">
<div class="card-number">{{ index + 1 }}</div>
- <div class="card-process-name">{{ getProcessName(item.processId) || '-' }}</div>
+ <div class="card-process-name">{{ getProcessName(item.technologyOperationId) || '-' }}</div>
</div>
<!-- 浜у搧淇℃伅 -->
<div class="card-content">
@@ -191,168 +191,6 @@
</div>
</div>
</template>
- <div class="section-BOM">
- <div class="section-header">
- <div class="section-title">BOM</div>
- <div class="section-actions">
- <el-button type="primary"
- @click="toggleBomEdit">
- {{ bomDataValue.isEdit ? '鍙栨秷' : '缂栬緫' }}
- </el-button>
- <el-button v-if=" bomDataValue.isEdit"
- type="success"
- @click="saveBomChanges">淇濆瓨</el-button>
- </div>
- </div>
- <div>
- <!-- BOM琛ㄦ牸 -->
- <el-table :data="bomTableData"
- border
- :preserve-expanded-content="false"
- :default-expand-all="true"
- style="width: 100%">
- <el-table-column type="expand">
- <template #default="props">
- <el-form ref="bomFormRef"
- :model="bomDataValue">
- <el-table :data="props.row.bomList"
- row-key="tempId"
- default-expand-all
- :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
- style="width: 100%">
- <el-table-column prop="productName"
- label="浜у搧" />
- <el-table-column prop="model"
- label="瑙勬牸">
- <template #default="{ row }">
- <el-form-item v-if="bomDataValue.isEdit"
- :rules="[{ required: true, message: '璇烽�夋嫨瑙勬牸', trigger: ['blur','change'] }]"
- style="margin: 0">
- <el-select v-model="row.model"
- placeholder="璇烽�夋嫨瑙勬牸"
- clearable
- :disabled="!bomDataValue.isEdit"
- style="width: 100%"
- @visible-change="(v) => { if (v) openBomProductDialog(row.tempId) }">
- <el-option v-if="row.model"
- :label="row.model"
- :value="row.model" />
- </el-select>
- </el-form-item>
- <span v-else>{{ row.model }}</span>
- </template>
- </el-table-column>
- <el-table-column prop="processName"
- label="娑堣�楀伐搴�">
- <template #default="{ row }">
- <el-form-item v-if="bomDataValue.isEdit"
- :rules="[{ required: true, message: '璇烽�夋嫨娑堣�楀伐搴�', trigger: 'change' }]"
- style="margin: 0">
- <el-select v-model="row.processId"
- placeholder="璇烽�夋嫨"
- filterable
- clearable
- :disabled="!bomDataValue.isEdit"
- style="width: 100%">
- <el-option v-for="process in processOptions"
- :key="process.id"
- :label="process.name"
- :value="process.id" />
- </el-select>
- </el-form-item>
- <span v-else>{{ row.processName }}</span>
- </template>
- </el-table-column>
- <el-table-column prop="unitQuantity"
- label="鍗曚綅浜у嚭鎵�闇�鏁伴噺">
- <template #default="{ row }">
- <el-form-item v-if="bomDataValue.isEdit"
- :rules="[{ required: true, message: '璇疯緭鍏ュ崟浣嶄骇鍑烘墍闇�鏁伴噺', trigger: ['blur','change'] }]"
- style="margin: 0">
- <el-input-number v-model="row.unitQuantity"
- :min="0"
- :precision="2"
- :step="1"
- controls-position="right"
- style="width: 100%"
- :disabled="!bomDataValue.isEdit" />
- </el-form-item>
- <span v-else>{{ row.unitQuantity }}</span>
- </template>
- </el-table-column>
- <el-table-column v-if="pageType === 'order'"
- prop="demandedQuantity"
- label="闇�姹傛�婚噺">
- <template #default="{ row }">
- <el-form-item v-if="bomDataValue.isEdit"
- :rules="[{ required: true, message: '璇疯緭鍏ラ渶姹傛�婚噺', trigger: ['blur','change'] }]"
- style="margin: 0">
- <el-input-number v-model="row.demandedQuantity"
- :min="0"
- :precision="2"
- :step="1"
- controls-position="right"
- style="width: 100%"
- :disabled="!bomDataValue.isEdit" />
- </el-form-item>
- <span v-else>{{ row.demandedQuantity }}</span>
- </template>
- </el-table-column>
- <el-table-column prop="unit"
- label="鍗曚綅">
- <template #default="{ row }">
- <el-form-item v-if="bomDataValue.isEdit"
- :rules="[{ required: true, message: '璇疯緭鍏ュ崟浣�', trigger: ['blur','change'] }]"
- style="margin: 0">
- <el-input v-model="row.unit"
- placeholder="璇疯緭鍏ュ崟浣�"
- clearable
- :disabled="!bomDataValue.isEdit" />
- </el-form-item>
- <span v-else>{{ row.unit }}</span>
- </template>
- </el-table-column>
- <el-table-column label="鎿嶄綔"
- fixed="right"
- width="180">
- <template #default="{ row }">
- <el-button v-if="bomDataValue.isEdit"
- type="danger"
- text
- size="small"
- @click="removeBomItem(row.tempId)">鍒犻櫎</el-button>
- <el-button v-if="bomDataValue.isEdit"
- type="primary"
- text
- size="small"
- @click="addBomItem2(row.tempId)">娣诲姞瀛愰」</el-button>
- </template>
- </el-table-column>
- </el-table>
- </el-form>
- </template>
- </el-table-column>
- <el-table-column label="BOM缂栧彿"
- prop="bomNo" />
- <el-table-column label="浜у搧鍚嶇О"
- prop="productName" />
- <el-table-column label="瑙勬牸鍨嬪彿"
- prop="model" />
- </el-table>
- <!-- <div v-if="bomDataValue.isEdit"
- style="text-align: center;border: 1px solid #e4e7ed;padding: 10px;transition: all 0.3s ease;cursor: pointer;"
- :class="{'hover-effect': bomDataValue.isEdit}">
- <el-button type="primary"
- text
- @click="addBomItem">
- <el-icon style="vertical-align: middle;margin-right: 5px;">
- <Plus />
- </el-icon>
- 娣诲姞
- </el-button>
- </div> -->
- </div>
- </div>
<!-- 鏂板/缂栬緫寮圭獥 -->
<el-dialog v-model="dialogVisible"
:title="operationType === 'add' ? '鏂板宸ヨ壓璺嚎椤圭洰' : '缂栬緫宸ヨ壓璺嚎椤圭洰'"
@@ -363,8 +201,8 @@
:rules="rules"
label-width="120px">
<el-form-item label="宸ュ簭"
- prop="processId">
- <el-select v-model="form.processId"
+ prop="technologyOperationId">
+ <el-select v-model="form.technologyOperationId"
placeholder="璇烽�夋嫨宸ュ簭"
clearable
style="width: 100%">
@@ -408,19 +246,16 @@
<ProductSelectDialog v-model="showProductSelectDialog"
@confirm="handleProductSelect"
single />
- <!-- BOM浜у搧閫夋嫨瀵硅瘽妗� -->
- <ProductSelectDialog v-model="bomDataValue.showProductDialog"
- @confirm="handleBomProductSelect"
- single />
<!-- 鍙傛暟鍒楄〃瀵硅瘽妗� -->
<!-- :editable="!routeInfo.status" -->
<ProcessParamListDialog v-model="showParamListDialog"
- :title="`${currentProcess ? (currentProcess.processName || getProcessName(currentProcess.processId)) : ''} - 鍙傛暟鍒楄〃`"
+ :title="`${currentProcess ? (currentProcess.processName || getProcessName(currentProcess.technologyOperationId)) : ''} - 鍙傛暟鍒楄〃`"
:route-id="routeId"
:order-id="orderId"
:process="currentProcess"
:page-type="pageType"
:param-list="paramList"
+ @getsyncProcessParamItem="getsyncProcessParamItem"
@refresh="refreshParamList" />
</div>
</template>
@@ -439,10 +274,12 @@
import {
findProcessRouteItemList,
addOrUpdateProcessRouteItem,
+ addOrUpdateProcessRouteItem1,
sortProcessRouteItem,
batchDeleteProcessRouteItem,
getProcessParamList,
} from "@/api/productionManagement/processRouteItem.js";
+ import { syncProcessParamItem } from "@/api/productionManagement/processRouteItem.js";
import {
findProductProcessRouteItemList,
deleteRouteItem,
@@ -452,11 +289,6 @@
sortRouteItem,
} from "@/api/productionManagement/productProcessRoute.js";
import { processList } from "@/api/productionManagement/productionProcess.js";
- import {
- queryList2,
- queryList,
- add2,
- } from "@/api/productionManagement/productStructure.js";
import { useRoute } from "vue-router";
import { ElMessageBox, ElMessage } from "element-plus";
import Sortable from "sortablejs";
@@ -490,15 +322,6 @@
const showParamListDialog = ref(false);
const currentProcess = ref(null);
const paramList = ref([]);
- const bomTableData = ref([]);
- const bomFormRef = ref(null);
- const bomDataValue = ref({
- dataList: [],
- showProductDialog: false,
- currentRowName: null,
- loading: false,
- isEdit: false,
- });
let tableSortable = null;
let cardSortable = null;
@@ -514,7 +337,7 @@
const form = ref({
id: undefined,
routeId: routeId.value,
- processId: undefined,
+ technologyOperationId: undefined,
productModelId: undefined,
productName: "",
model: "",
@@ -523,16 +346,42 @@
});
const rules = {
- processId: [{ required: true, message: "璇烽�夋嫨宸ュ簭", trigger: "change" }],
+ technologyOperationId: [
+ { required: true, message: "璇烽�夋嫨宸ュ簭", trigger: "change" },
+ ],
productModelId: [
{ required: true, message: "璇烽�夋嫨浜у搧", trigger: "change" },
],
};
+ const getsyncProcessParamItem = () => {
+ ElMessageBox.confirm("鏄惁瑕嗙洊褰撳墠宸ュ簭宸插瓨鍦ㄥ弬鏁帮紵", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(() => {
+ syncProcessParamItem({
+ replaceExisting: true,
+ technologyRoutingOperationId: currentProcess.value.id,
+ }).then(res => {
+ if (res.code === 200) {
+ ElMessage.success("鍚屾鎴愬姛");
+ refreshParamList();
+ } else {
+ ElMessage.error(res.msg || "鍚屾澶辫触");
+ }
+ });
+ })
+ .catch(() => {});
+ };
+
// 鏍规嵁宸ュ簭ID鑾峰彇宸ュ簭鍚嶇О
- const getProcessName = processId => {
- if (!processId) return "";
- const process = processOptions.value.find(p => p.id === processId);
+ const getProcessName = technologyOperationId => {
+ if (!technologyOperationId) return "";
+ const process = processOptions.value.find(
+ p => p.id === technologyOperationId
+ );
return process ? process.name : "";
};
@@ -562,9 +411,9 @@
// 鑾峰彇宸ュ簭鍒楄〃
const getProcessList = () => {
- processList({})
+ processList({ size: -1, current: -1 })
.then(res => {
- processOptions.value = res.data || [];
+ processOptions.value = res.data.records || [];
})
.catch(err => {
console.error("鑾峰彇宸ュ簭澶辫触锛�", err);
@@ -581,73 +430,6 @@
description: route.query.description || "",
status: !(route.query.status == 1 || route.query.status === "false"),
};
- if (pageType.value === "order") {
- queryList2(route.query.orderId)
- .then(res => {
- if (res.data) {
- // 涓築OM鏁版嵁璁剧疆tempId
- const setTempIdRecursively = items => {
- items.forEach(item => {
- item.tempId = item.id || new Date().getTime();
- if (item.children && item.children.length > 0) {
- setTempIdRecursively(item.children);
- }
- });
- };
- setTempIdRecursively(res.data);
-
- bomTableData.value = [
- {
- bomNo: routeInfo.value.bomNo,
- dictLabel: routeInfo.value.dictLabel,
- productCode: "",
- productName: routeInfo.value.productName,
- model: routeInfo.value.model,
- bomList: res.data,
- },
- ];
-
- // 淇濆瓨鍘熷BOM鏁版嵁
- bomDataValue.value.dataList = res.data;
- }
- })
- .catch(err => {
- console.error("鑾峰彇BOM鏁版嵁澶辫触锛�", err);
- });
- } else {
- queryList(Number(route.query.bomId))
- .then(res => {
- if (res.data) {
- // 涓築OM鏁版嵁璁剧疆tempId
- const setTempIdRecursively = items => {
- items.forEach(item => {
- item.tempId = item.id || new Date().getTime();
- if (item.children && item.children.length > 0) {
- setTempIdRecursively(item.children);
- }
- });
- };
- setTempIdRecursively(res.data);
-
- bomTableData.value = [
- {
- bomNo: routeInfo.value.bomNo,
- dictLabel: routeInfo.value.dictLabel,
- productCode: "",
- productName: routeInfo.value.productName,
- model: routeInfo.value.model,
- bomList: res.data,
- },
- ];
-
- // 淇濆瓨鍘熷BOM鏁版嵁
- bomDataValue.value.dataList = res.data;
- }
- })
- .catch(err => {
- console.error("鑾峰彇BOM鏁版嵁澶辫触锛�", err);
- });
- }
};
// 鏂板
@@ -663,7 +445,7 @@
form.value = {
id: row.id,
routeId: routeId.value,
- processId: row.processId,
+ technologyOperationId: row.technologyOperationId,
productModelId: row.productModelId,
productName: row.productName || "",
model: row.model || "",
@@ -729,14 +511,14 @@
? addRouteItem({
productOrderId: orderId.value,
productRouteId: routeId.value,
- processId: form.value.processId,
+ technologyOperationId: form.value.technologyOperationId,
productModelId: form.value.productModelId,
isQuality: form.value.isQuality,
dragSort,
})
: addOrUpdateProcessRouteItem({
- routeId: routeId.value,
- processId: form.value.processId,
+ technologyRoutingId: Number(routeId.value),
+ technologyOperationId: form.value.technologyOperationId,
productModelId: form.value.productModelId,
isQuality: form.value.isQuality,
dragSort,
@@ -761,13 +543,13 @@
const updatePromise = isOrderPage
? addOrUpdateProductProcessRouteItem({
id: form.value.id,
- processId: form.value.processId,
+ technologyOperationId: form.value.technologyOperationId,
productModelId: form.value.productModelId,
isQuality: form.value.isQuality,
})
- : addOrUpdateProcessRouteItem({
- routeId: routeId.value,
- processId: form.value.processId,
+ : addOrUpdateProcessRouteItem1({
+ technologyRoutingId: Number(routeId.value),
+ technologyOperationId: form.value.technologyOperationId,
productModelId: form.value.productModelId,
id: form.value.id,
isQuality: form.value.isQuality,
@@ -795,7 +577,7 @@
form.value = {
id: undefined,
routeId: routeId.value,
- processId: undefined,
+ technologyOperationId: undefined,
productModelId: undefined,
productName: "",
model: "",
@@ -839,231 +621,6 @@
if (currentProcess.value) {
handleViewParams(currentProcess.value);
}
- };
-
- // BOM鐩稿叧鏂规硶
- // 鍒囨崲BOM缂栬緫妯″紡
- const toggleBomEdit = () => {
- bomDataValue.value.isEdit = !bomDataValue.value.isEdit;
- if (!bomDataValue.value.isEdit) {
- // 鍙栨秷缂栬緫鏃堕噸鏂板姞杞芥暟鎹�
- getRouteInfo();
- }
- };
-
- // 娣诲姞BOM椤�
- const addBomItem = () => {
- if (bomTableData.value.length > 0) {
- const newItem = {
- parentId: "",
- parentTempId: "",
- productName: "",
- productId: "",
- model: undefined,
- productModelId: undefined,
- processId: "",
- processName: "",
- unitQuantity: 0,
- demandedQuantity: 0,
- unit: "",
- children: [],
- tempId: new Date().getTime(),
- };
- bomTableData.value[0].bomList.push(newItem);
- }
- };
-
- // 娣诲姞BOM瀛愰」
- const addBomItem2 = tempId => {
- const addChildItem = (items, tempId) => {
- for (let i = 0; i < items.length; i++) {
- const item = items[i];
- if (item.tempId === tempId) {
- if (!item.children) {
- item.children = [];
- }
- item.children.push({
- parentId: item.id || "",
- parentTempId: item.tempId || "",
- productName: "",
- productId: "",
- model: undefined,
- productModelId: undefined,
- processId: "",
- processName: "",
- unitQuantity: 0,
- demandedQuantity: 0,
- unit: "",
- children: [],
- tempId: new Date().getTime(),
- });
- return true;
- }
- if (item.children && item.children.length > 0) {
- if (addChildItem(item.children, tempId)) {
- return true;
- }
- }
- }
- return false;
- };
-
- if (bomTableData.value.length > 0) {
- addChildItem(bomTableData.value[0].bomList, tempId);
- }
- };
-
- // 鍒犻櫎BOM椤�
- const removeBomItem = tempId => {
- if (bomTableData.value.length > 0) {
- const removeFromList = (items, tempId) => {
- for (let i = 0; i < items.length; i++) {
- const item = items[i];
- if (item.tempId === tempId) {
- items.splice(i, 1);
- return true;
- }
- if (item.children && item.children.length > 0) {
- if (removeFromList(item.children, tempId)) {
- return true;
- }
- }
- }
- return false;
- };
- removeFromList(bomTableData.value[0].bomList, tempId);
- }
- };
-
- // 鎵撳紑BOM浜у搧閫夋嫨瀵硅瘽妗�
- const openBomProductDialog = tempId => {
- bomDataValue.value.currentRowName = tempId;
- bomDataValue.value.showProductDialog = true;
- };
-
- // 澶勭悊BOM浜у搧閫夋嫨
- const handleBomProductSelect = products => {
- if (products && products.length > 0) {
- const product = products[0];
- const updateProductInfo = (items, tempId, productData) => {
- for (let i = 0; i < items.length; i++) {
- const item = items[i];
- if (item.tempId === tempId) {
- item.productName = productData.productName;
- item.model = productData.model;
- item.productModelId = productData.id;
- item.unit = productData.unit || "";
- return true;
- }
- if (item.children && item.children.length > 0) {
- if (updateProductInfo(item.children, tempId, productData)) {
- return true;
- }
- }
- }
- return false;
- };
-
- if (bomTableData.value.length > 0) {
- updateProductInfo(
- bomTableData.value[0].bomList,
- bomDataValue.value.currentRowName,
- product
- );
- }
- bomDataValue.value.showProductDialog = false;
- }
- };
-
- // 淇濆瓨BOM鏇存敼
- const saveBomChanges = () => {
- const validateBomData = (items, isTopLevel = false) => {
- for (let i = 0; i < items.length; i++) {
- const item = items[i];
- if (!item.productModelId) {
- ElMessage.error("璇烽�夋嫨浜у搧");
- return false;
- }
- if (!isTopLevel && !item.processId) {
- ElMessage.error("璇烽�夋嫨娑堣�楀伐搴�");
- return false;
- }
- if (
- item.unitQuantity === undefined ||
- item.unitQuantity === null ||
- item.unitQuantity === 0
- ) {
- ElMessage.error("璇峰～鍐欏崟浣嶄骇鍑烘墍闇�鏁伴噺");
- return false;
- }
- if (
- pageType.value === "order" &&
- (item.demandedQuantity === undefined ||
- item.demandedQuantity === null ||
- item.demandedQuantity === 0)
- ) {
- ElMessage.error("璇疯緭鍏ラ渶姹傛�婚噺");
- return false;
- }
- if (item.children && item.children.length > 0) {
- if (!validateBomData(item.children, false)) {
- return false;
- }
- }
- }
- return true;
- };
-
- if (bomTableData.value.length > 0) {
- if (!validateBomData(bomTableData.value[0].bomList, true)) {
- return;
- }
- }
-
- const processBomItem = (item, parentId = null, parentTempId = null) => {
- const cleanItem = {
- id: item.id || null,
- orderId: Number(orderId.value) || null,
- parentId: parentId,
- parentTempId: parentTempId || null,
- productModelId: item.productModelId || null,
- processId: item.processId || null,
- unitQuantity: item.unitQuantity || 0,
- demandedQuantity: item.demandedQuantity || 0,
- unit: item.unit || "",
- tempId: item.tempId || new Date().getTime(),
- bomId: Number(route.query.bomId) || null,
- children: [],
- };
-
- if (item.children && item.children.length > 0) {
- cleanItem.children = item.children.map(child =>
- processBomItem(child, item.id, item.tempId)
- );
- }
-
- return cleanItem;
- };
-
- const saveData = {
- orderId: Number(orderId.value),
- bomId: Number(route.query.bomId),
- children: bomTableData.value[0].bomList.map(item => processBomItem(item)),
- };
-
- const savePromise =
- pageType.value === "order" ? add2(saveData) : add(saveData);
-
- savePromise
- .then(() => {
- proxy?.$modal?.msgSuccess("淇濆瓨鎴愬姛");
- bomDataValue.value.isEdit = false;
- getRouteInfo();
- })
- .catch(err => {
- console.error("淇濆瓨BOM澶辫触锛�", err);
- proxy?.$modal?.msgError("淇濆瓨澶辫触");
- });
};
// 鍒濆鍖栨嫋鎷芥帓搴�
@@ -1470,16 +1027,5 @@
font-weight: 500;
line-height: 1.5;
word-break: break-all;
- }
-
- .section-BOM {
- margin-top: 20px;
- }
-
- .hover-effect:hover {
- border-color: #409eff;
- background-color: #ecf5ff;
- transform: translateY(-2px);
- box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
}
</style>
--
Gitblit v1.9.3