From 265d03ef2304f9461ba4926d729cda520c1e959c Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期一, 16 三月 2026 13:28:46 +0800
Subject: [PATCH] 一些修改
---
src/views/productionManagement/processRoute/index.vue | 923 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 675 insertions(+), 248 deletions(-)
diff --git a/src/views/productionManagement/processRoute/index.vue b/src/views/productionManagement/processRoute/index.vue
index afdd542..228ccb2 100644
--- a/src/views/productionManagement/processRoute/index.vue
+++ b/src/views/productionManagement/processRoute/index.vue
@@ -17,12 +17,12 @@
<div class="route-info">
<span class="route-name"><el-icon style="margin-right: 8px;line-height: 30px;">
<ScaleToOriginal />
- </el-icon>{{ route.routeName }}<el-tag style="margin-left: 8px"
- :type="route.status == 1 ? 'warning' : 'success'">{{ route.status == 1 ? '鑽夌' : '鎵瑰噯' }}</el-tag></span>
- <span class="route-code">{{ route.routeCode }}</span>
+ </el-icon>{{route.routeCode }}<el-tag style="margin-left: 8px"
+ :type="!route.status ? 'warning' : 'success'">{{ !route.status ? '鑽夌' : '鎵瑰噯' }}</el-tag></span>
+ <!-- <span class="route-code">{{ route.routeCode }}</span> -->
</div>
<div class="route-actions">
- <el-button v-if="route.status === '1'"
+ <el-button v-if="!route.status"
link
type="success"
@click="handleApproveRoute(route)">
@@ -31,7 +31,7 @@
</el-icon>
鎵瑰噯
</el-button>
- <el-button v-if="route.status === '2'"
+ <el-button v-if="route.status"
link
type="warning"
@click="handleRevokeApproveRoute(route)">
@@ -72,14 +72,14 @@
<Document />
</el-icon>
<span class="meta-label">BOM:</span>
- <span class="meta-value">{{ route.bomId || '-' }}</span>
+ <span class="meta-value">{{ route.bomNo || '-' }}</span>
</span>
<span class="meta-item">
<el-icon>
<Document />
</el-icon>
<span class="meta-label">璺嚎鎻忚堪:</span>
- <span class="meta-value">{{ route.routeDesc || '鏆傛棤鎻忚堪' }}</span>
+ <span class="meta-value">{{ route.description || '鏆傛棤鎻忚堪' }}</span>
</span>
</div>
<div class="expand-btn-wrapper">
@@ -121,9 +121,9 @@
</div>
</div>
<div class="process-node-body">
- <div class="process-code">{{ process.processCode }}</div>
- <div class="process-name">{{ process.processName }}</div>
- <div class="process-desc">{{ process.processDesc || '鏆傛棤鎻忚堪' }}</div>
+ <div class="process-code">{{ process.no }}</div>
+ <div class="process-name">{{ process.name }}</div>
+ <div class="process-desc">{{ process.remark || '鏆傛棤鎻忚堪' }}</div>
</div>
<div class="process-node-footer">
<!-- <el-tag size="small"
@@ -201,9 +201,6 @@
<span>鏂板宸ュ簭</span>
</div>
</div>
- <el-empty v-if="!route.processList || route.processList.length === 0"
- description="鏆傛棤宸ュ簭"
- :image-size="80" />
</div>
</div>
</div>
@@ -240,16 +237,12 @@
<el-form-item label="璺嚎缂栫爜"
prop="routeCode">
<el-input v-model="routeForm.routeCode"
- placeholder="璇疯緭鍏ヨ矾绾跨紪鐮�" />
- </el-form-item>
- <el-form-item label="璺嚎鍚嶇О"
- prop="routeName">
- <el-input v-model="routeForm.routeName"
- placeholder="璇疯緭鍏ヨ矾绾垮悕绉�" />
+ disabled
+ placeholder="鑷姩鐢熸垚" />
</el-form-item>
<el-form-item label="璺嚎鎻忚堪"
- prop="routeDesc">
- <el-input v-model="routeForm.routeDesc"
+ prop="description">
+ <el-input v-model="routeForm.description"
type="textarea"
:rows="3"
placeholder="璇疯緭鍏ヨ矾绾挎弿杩�" />
@@ -283,18 +276,18 @@
ref="processFormRef"
label-width="120px">
<el-form-item label="宸ュ簭缂栫爜"
- prop="processCode">
- <el-input v-model="processForm.processCode"
+ prop="no">
+ <el-input v-model="processForm.no"
placeholder="璇疯緭鍏ュ伐搴忕紪鐮�" />
</el-form-item>
<el-form-item label="宸ュ簭鍚嶇О"
- prop="processName">
- <el-input v-model="processForm.processName"
+ prop="name">
+ <el-input v-model="processForm.name"
placeholder="璇疯緭鍏ュ伐搴忓悕绉�" />
</el-form-item>
<el-form-item label="宸ュ簭鎻忚堪"
- prop="processDesc">
- <el-input v-model="processForm.processDesc"
+ prop="remark">
+ <el-input v-model="processForm.remark"
type="textarea"
:rows="3"
placeholder="璇疯緭鍏ュ伐搴忔弿杩�" />
@@ -302,8 +295,8 @@
<el-form-item label="鐘舵��"
prop="status">
<el-radio-group v-model="processForm.status">
- <el-radio label="1">鍚敤</el-radio>
- <el-radio label="0">鍋滅敤</el-radio>
+ <el-radio :label="true">鍚敤</el-radio>
+ <el-radio :label="false">鍋滅敤</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
@@ -341,20 +334,20 @@
border
highlight-current-row
@current-change="handleProcessSelect">
- <el-table-column prop="processCode"
+ <el-table-column prop="no"
label="宸ュ簭缂栧彿"
width="100" />
- <el-table-column prop="processName"
+ <el-table-column prop="name"
label="宸ュ簭鍚嶇О" />
- <el-table-column prop="processDesc"
+ <el-table-column prop="remark"
label="宸ュ簭鎻忚堪" />
<el-table-column prop="status"
label="鐘舵��"
width="80">
<template #default="scope">
<el-tag size="small"
- :type="scope.row.status === '1' ? 'success' : 'info'">
- {{ scope.row.status === '1' ? '鍚敤' : '鍋滅敤' }}
+ :type="scope.row.status ? 'success' : 'info'">
+ {{ scope.row.status ? '鍚敤' : '鍋滅敤' }}
</el-tag>
</template>
</el-table-column>
@@ -368,23 +361,29 @@
label-width="100px"
class="process-detail-form">
<el-form-item label="宸ュ簭缂栧彿">
- <span class="detail-text">{{ selectedProcessItem.processCode }}</span>
+ <span class="detail-text">{{ selectedProcessItem.no }}</span>
</el-form-item>
<el-form-item label="宸ュ簭鍚嶇О">
- <span class="detail-text">{{ selectedProcessItem.processName }}</span>
+ <span class="detail-text">{{ selectedProcessItem.name }}</span>
</el-form-item>
<el-form-item label="宸ュ簭鎻忚堪">
- <span class="detail-text">{{ selectedProcessItem.processDesc || '-' }}</span>
+ <span class="detail-text">{{ selectedProcessItem.remark || '-' }}</span>
</el-form-item>
<el-form-item label="鐘舵��">
<el-tag size="small"
- :type="selectedProcessItem.status === '1' ? 'success' : 'info'">
- {{ selectedProcessItem.status === '1' ? '鍚敤' : '鍋滅敤' }}
+ :type="selectedProcessItem.status ? 'success' : 'info'">
+ {{ selectedProcessItem.status ? '鍚敤' : '鍋滅敤' }}
</el-tag>
</el-form-item>
- <el-form-item label="鍙傛暟鏁伴噺">
- <span class="detail-text">{{ selectedProcessItem.paramCount || 0 }}涓�</span>
+ <el-form-item label="鏄惁璐ㄦ">
+ <el-tag size="small"
+ :type="selectedProcessItem.isQuality ? 'success' : 'info'">
+ {{ selectedProcessItem.isQuality ? '璐ㄦ' : '闈炶川妫�' }}
+ </el-tag>
</el-form-item>
+ <!-- <el-form-item label="鍙傛暟鏁伴噺">
+ <span class="detail-text">{{ selectedProcessItem.paramCount || 0 }}涓�</span>
+ </el-form-item> -->
</el-form>
<el-empty v-else
description="璇蜂粠宸︿晶閫夋嫨宸ュ簭" />
@@ -489,6 +488,186 @@
</span>
</template>
</el-dialog>
+ <!-- 閫夋嫨鍙傛暟瀵硅瘽妗� -->
+ <el-dialog v-model="selectParamDialogVisible"
+ title="閫夋嫨鍙傛暟"
+ width="1000px">
+ <div class="param-select-container">
+ <!-- 宸︿晶鍙傛暟鍒楄〃 -->
+ <div class="param-list-area">
+ <div class="area-title">鍙�夊弬鏁�</div>
+ <div class="search-box">
+ <el-input v-model="paramSearchKeyword"
+ placeholder="璇疯緭鍏ュ弬鏁板悕绉版悳绱�"
+ clearable
+ size="small"
+ @input="handleParamSearch">
+ <template #prefix>
+ <el-icon>
+ <Search />
+ </el-icon>
+ </template>
+ </el-input>
+ </div>
+ <el-table :data="filteredParamList"
+ height="300"
+ border
+ highlight-current-row
+ @current-change="handleParamSelect">
+ <el-table-column prop="paramName"
+ label="鍙傛暟鍚嶇О" />
+ <el-table-column prop="paramType"
+ label="鍙傛暟绫诲瀷">
+ <template #default="scope">
+ <el-tag size="small"
+ :type="getParamTypeTag(scope.row.paramType)">
+ {{ getParamTypeText(scope.row.paramType) }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ </el-table>
+ <!-- 鍒嗛〉鎺т欢 -->
+ <div class="pagination-container"
+ style="margin-top: 10px;">
+ <el-pagination v-model:current-page="paramPage.current"
+ v-model:page-size="paramPage.size"
+ :page-sizes="[10, 20, 50, 100]"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="paramPage.total"
+ @size-change="handleParamSizeChange"
+ @current-change="handleParamCurrentChange"
+ size="small" />
+ </div>
+ </div>
+ <!-- 鍙充晶鍙傛暟璇︽儏 -->
+ <div class="param-detail-area">
+ <div class="area-title">鍙傛暟璇︽儏</div>
+ <el-form v-if="selectedParam"
+ :model="selectedParam"
+ label-width="100px"
+ class="param-detail-form">
+ <el-form-item label="鍙傛暟鍚嶇О">
+ <span class="detail-text">{{ selectedParam.paramName }}</span>
+ </el-form-item>
+ <el-form-item label="鍙傛暟妯″紡">
+ <el-tag size="small"
+ :type="selectedParam.valueMode == '1' ? 'success' : 'warning'">
+ {{ selectedParam.valueMode == '1' ? '鍗曞��' : '鍖洪棿' }}
+ </el-tag>
+ </el-form-item>
+ <el-form-item label="鍙傛暟绫诲瀷">
+ <el-tag size="small"
+ :type="getParamTypeTag(selectedParam.paramType)">
+ {{ getParamTypeText(selectedParam.paramType) }}
+ </el-tag>
+ </el-form-item>
+ <el-form-item label="鍙傛暟鏍煎紡">
+ <span class="detail-text">{{ selectedParam.paramFormat || '-' }}</span>
+ </el-form-item>
+ <el-form-item label="鍗曚綅">
+ <span class="detail-text">{{ selectedParam.unit || '-' }}</span>
+ </el-form-item>
+ <el-form-item label="鏍囧噯鍊�"
+ v-if="selectedParam.valueMode == '1'">
+ <el-input v-model="selectedParam.standardValue"
+ type="number"
+ placeholder="璇疯緭鍏ラ粯璁ゅ��" />
+ </el-form-item>
+ <el-form-item label="鏈�灏忓��"
+ v-if="selectedParam.valueMode == '2'">
+ <el-input v-model="selectedParam.minValue"
+ type="number"
+ placeholder="璇疯緭鍏ユ渶灏忓��" />
+ </el-form-item>
+ <el-form-item label="鏈�澶у��"
+ v-if="selectedParam.valueMode == '2'">
+ <el-input v-model="selectedParam.maxValue"
+ type="number"
+ placeholder="璇疯緭鍏ユ渶澶у��" />
+ </el-form-item>
+ <el-form-item label="鎺掑簭">
+ <el-input v-model="selectedParam.sort"
+ type="number"
+ placeholder="璇疯緭鍏ユ帓搴�" />
+ </el-form-item>
+ <el-form-item label="鏄惁蹇呭～">
+ <el-switch v-model="selectedParam.isRequired"
+ :active-value="1"
+ :inactive-value="0" />
+ </el-form-item>
+ </el-form>
+ <el-empty v-else
+ description="璇蜂粠宸︿晶閫夋嫨鍙傛暟" />
+ </div>
+ </div>
+ <template #footer>
+ <span class="dialog-footer">
+ <el-button @click="selectParamDialogVisible = false">鍙栨秷</el-button>
+ <el-button type="primary"
+ :disabled="!selectedParam"
+ @click="handleParamSelectSubmit">纭畾</el-button>
+ </span>
+ </template>
+ </el-dialog>
+ <!-- 缂栬緫鍙傛暟瀵硅瘽妗� -->
+ <el-dialog v-model="editParamDialogVisible"
+ title="缂栬緫鍙傛暟"
+ width="600px">
+ <el-form :model="editParamForm"
+ :rules="editParamRules"
+ ref="editParamFormRef"
+ label-width="120px">
+ <el-form-item label="鍙傛暟鍚嶇О">
+ <span class="detail-text">{{ editParamForm.paramName }}</span>
+ </el-form-item>
+ <el-form-item label="鍙傛暟妯″紡">
+ <el-tag size="small"
+ :type="editParamForm.valueMode == '1' ? 'success' : 'warning'">
+ {{ editParamForm.valueMode == '1' ? '鍗曞��' : '鍖洪棿' }}
+ </el-tag>
+ </el-form-item>
+ <el-form-item label="鏍囧噯鍊�"
+ v-if="editParamForm.valueMode == '1'"
+ prop="standardValue">
+ <el-input v-model="editParamForm.standardValue"
+ type="number"
+ placeholder="璇疯緭鍏ユ爣鍑嗗��" />
+ </el-form-item>
+ <el-form-item label="鏈�灏忓��"
+ v-if="editParamForm.valueMode == '2'"
+ prop="minValue">
+ <el-input v-model="editParamForm.minValue"
+ type="number"
+ placeholder="璇疯緭鍏ユ渶灏忓��" />
+ </el-form-item>
+ <el-form-item label="鏈�澶у��"
+ v-if="editParamForm.valueMode == '2'"
+ prop="maxValue">
+ <el-input v-model="editParamForm.maxValue"
+ type="number"
+ placeholder="璇疯緭鍏ユ渶澶у��" />
+ </el-form-item>
+ <el-form-item label="鎺掑簭"
+ prop="sort">
+ <el-input v-model="editParamForm.sort"
+ type="number"
+ placeholder="璇疯緭鍏ユ帓搴�" />
+ </el-form-item>
+ <el-form-item label="鏄惁蹇呭～"
+ prop="isRequired">
+ <el-switch v-model="editParamForm.isRequired"
+ :active-value="1"
+ :inactive-value="0" />
+ </el-form-item>
+ </el-form>
+ <template #footer>
+ <span class="dialog-footer">
+ <el-button @click="editParamDialogVisible = false">鍙栨秷</el-button>
+ <el-button type="primary"
+ @click="handleEditParamSubmit">纭畾</el-button>
+ </span>
+ </template>
+ </el-dialog>
</div>
</template>
@@ -510,6 +689,9 @@
} from "@element-plus/icons-vue";
import { listType } from "@/api/system/dict/type";
import { getByModel } from "@/api/productionManagement/productBom.js";
+ import { add, update, del } from "@/api/productionManagement/processRoute.js";
+ import { list as getProcessListApi } from "@/api/productionManagement/productionProcess.js";
+ import { getBaseParamList } from "@/api/basicData/parameterMaintenance.js";
import ProductSelectDialog from "@/views/basicData/product/ProductSelectDialog.vue";
// 宸ヨ壓璺嚎鍒楄〃
@@ -534,17 +716,14 @@
productModelName: "",
bomId: null,
routeCode: "",
- routeName: "",
- routeDesc: "",
- status: "1",
+ description: "",
+ status: true,
});
const routeRules = {
productModelId: [
{ required: true, message: "璇烽�夋嫨浜у搧", trigger: "change" },
],
bomId: [{ required: true, message: "璇烽�夋嫨BOM", trigger: "change" }],
- routeCode: [{ required: true, message: "璇疯緭鍏ヨ矾绾跨紪鐮�", trigger: "blur" }],
- routeName: [{ required: true, message: "璇疯緭鍏ヨ矾绾垮悕绉�", trigger: "blur" }],
};
// 宸ュ簭瀵硅瘽妗�
@@ -554,14 +733,14 @@
const currentRouteId = ref(null);
const processForm = reactive({
id: null,
- processCode: "",
- processName: "",
- processDesc: "",
- status: "1",
+ no: "",
+ name: "",
+ remark: "",
+ status: true,
});
const processRules = {
- processCode: [{ required: true, message: "璇疯緭鍏ュ伐搴忕紪鐮�", trigger: "blur" }],
- processName: [{ required: true, message: "璇疯緭鍏ュ伐搴忓悕绉�", trigger: "blur" }],
+ no: [{ required: true, message: "璇疯緭鍏ュ伐搴忕紪鐮�", trigger: "blur" }],
+ name: [{ required: true, message: "璇疯緭鍏ュ伐搴忓悕绉�", trigger: "blur" }],
};
// 閫夋嫨宸ュ簭瀵硅瘽妗�
@@ -599,121 +778,126 @@
],
};
+ // 閫夋嫨鍙傛暟瀵硅瘽妗�
+ const selectParamDialogVisible = ref(false);
+ const availableParamList = ref([]);
+ const filteredParamList = ref([]);
+ const selectedParam = ref(null);
+ const paramSearchKeyword = ref("");
+
+ // 鍙�夊弬鏁板垎椤�
+ const paramPage = reactive({
+ current: 1,
+ size: 10,
+ total: 0,
+ });
+
+ // 缂栬緫鍙傛暟瀵硅瘽妗�
+ const editParamDialogVisible = ref(false);
+ const editParamFormRef = ref(null);
+ const editParamForm = reactive({
+ id: null,
+ processId: null,
+ paramId: null,
+ paramName: "",
+ valueMode: "1",
+ standardValue: null,
+ minValue: null,
+ maxValue: null,
+ sort: 1,
+ isRequired: 0,
+ });
+ const editParamRules = reactive({
+ standardValue: [
+ {
+ required: true,
+ message: "璇疯緭鍏ユ爣鍑嗗��",
+ trigger: "blur",
+ validator: (rule, value, callback) => {
+ if (value === null || value === undefined || value === "") {
+ callback(new Error("璇疯緭鍏ユ爣鍑嗗��"));
+ } else {
+ callback();
+ }
+ },
+ },
+ ],
+ minValue: [
+ {
+ required: true,
+ message: "璇疯緭鍏ユ渶灏忓��",
+ trigger: "blur",
+ validator: (rule, value, callback) => {
+ if (value === null || value === undefined || value === "") {
+ callback(new Error("璇疯緭鍏ユ渶灏忓��"));
+ } else {
+ callback();
+ }
+ },
+ },
+ ],
+ maxValue: [
+ {
+ required: true,
+ message: "璇疯緭鍏ユ渶澶у��",
+ trigger: "blur",
+ validator: (rule, value, callback) => {
+ if (value === null || value === undefined || value === "") {
+ callback(new Error("璇疯緭鍏ユ渶澶у��"));
+ } else {
+ callback();
+ }
+ },
+ },
+ ],
+ sort: [
+ {
+ required: true,
+ message: "璇疯緭鍏ユ帓搴�",
+ trigger: "blur",
+ validator: (rule, value, callback) => {
+ if (value === null || value === undefined || value === "") {
+ callback(new Error("璇疯緭鍏ユ帓搴�"));
+ } else if (isNaN(value) || value < 1) {
+ callback(new Error("鎺掑簭蹇呴』鏄ぇ浜�0鐨勬暣鏁�"));
+ } else {
+ callback();
+ }
+ },
+ },
+ ],
+ });
+
// 鎷栨嫿鐩稿叧
const draggedItem = ref(null);
const draggedRouteId = ref(null);
// 鑾峰彇宸ヨ壓璺嚎鍒楄〃
const getRouteList = () => {
- routeList.value = [
- {
- id: 1,
- productModelId: 1,
- productName: "鏍囧噯鐮屽潡",
- productModelName: "3.5鍨�",
- bomId: 1,
- routeCode: "ROUTE001",
- routeName: "鏍囧噯鐮屽潡鐢熶骇绾�",
- routeDesc: "鏍囧噯鐮屽潡鐢熶骇娴佺▼",
- status: "1",
- expanded: false,
- processList: [
- {
- id: 1,
- processCode: "PROC001",
- processName: "鍘熸枡閰嶆瘮",
- processDesc: "鍘熸潗鏂欓厤姣斿伐搴�",
- status: "1",
+ // 瀵煎叆 listPage 鏂规硶
+ import("@/api/productionManagement/processRoute.js").then(({ listPage }) => {
+ listPage({ pageNum: 1, pageSize: 100 })
+ .then(res => {
+ // 澶勭悊杩斿洖鐨勬暟鎹紝鏄犲皠鍒伴〉闈㈤渶瑕佺殑鏍煎紡
+ routeList.value = (res.data?.records || []).map(item => ({
+ id: item.id,
+ productModelId: item.productModelId,
+ productName: item.productName,
+ productModelName: item.model || item.productModelName,
+ bomId: item.bomId,
+ bomNo: item.bomNo,
+ routeCode: item.processRouteCode || item.routeCode,
+ description: item.description || item.description,
+ status: item.status,
expanded: false,
- paramList: [
- {
- id: 1,
- parameterCode: "P001",
- parameterName: "姘存偿姣斾緥",
- parameterType2: "1",
- parameterType: "鏁板�兼牸寮�",
- parameterFormat: "",
- standardValue: "30",
- unit: "%",
- },
- {
- id: 2,
- parameterCode: "P002",
- parameterName: "鐮傛瘮渚�",
- parameterType2: "1",
- parameterType: "鏁板�兼牸寮�",
- parameterFormat: "",
- standardValue: "60",
- unit: "%",
- },
- ],
- },
- {
- id: 2,
- processCode: "PROC002",
- processName: "鎼呮媽娣峰悎",
- processDesc: "鎼呮媽娣峰悎宸ュ簭",
- status: "1",
- expanded: false,
- paramList: [
- {
- id: 3,
- parameterCode: "P003",
- parameterName: "鎼呮媽鏃堕棿",
- parameterType2: "1",
- parameterType: "鏁板�兼牸寮�",
- parameterFormat: "",
- standardValue: "5",
- unit: "鍒嗛挓",
- },
- ],
- },
- {
- id: 3,
- processCode: "PROC003",
- processName: "娴囩瓚鎴愬瀷",
- processDesc: "娴囩瓚鎴愬瀷宸ュ簭",
- status: "1",
- expanded: false,
- paramList: [],
- },
- ],
- },
- {
- id: 2,
- productModelId: 2,
- productName: "鏉挎潗",
- productModelName: "5.0鍨�",
- bomId: 2,
- routeCode: "ROUTE002",
- routeName: "鏉挎潗鐢熶骇绾�",
- routeDesc: "鏉挎潗鐢熶骇娴佺▼",
- status: "1",
- expanded: false,
- processList: [
- {
- id: 4,
- processCode: "PROC004",
- processName: "鍒囧壊鍔犲伐",
- processDesc: "鍒囧壊鍔犲伐宸ュ簭",
- status: "1",
- expanded: false,
- paramList: [
- {
- id: 4,
- parameterCode: "P004",
- parameterName: "鍒囧壊灏哄",
- parameterType2: "1",
- parameterType: "鏂囨湰鏍煎紡",
- parameterFormat: "",
- standardValue: "600x200x100",
- unit: "mm",
- },
- ],
- },
- ],
- },
- ];
+ processList: item.processList || [],
+ }));
+ })
+ .catch(err => {
+ console.error("鑾峰彇宸ヨ壓璺嚎鍒楄〃澶辫触锛�", err);
+ routeList.value = [];
+ });
+ });
};
// 灞曞紑/鏀惰捣宸ヨ壓璺嚎
@@ -735,9 +919,8 @@
routeForm.productModelName = "";
routeForm.bomId = null;
routeForm.routeCode = "";
- routeForm.routeName = "";
- routeForm.routeDesc = "";
- routeForm.status = "1";
+ routeForm.description = "";
+ routeForm.status = false;
bomOptions.value = [];
routeDialogVisible.value = true;
};
@@ -750,8 +933,7 @@
routeForm.productModelName = route.productModelName;
routeForm.bomId = route.bomId;
routeForm.routeCode = route.routeCode;
- routeForm.routeName = route.routeName;
- routeForm.routeDesc = route.routeDesc;
+ routeForm.description = route.description;
routeForm.status = route.status;
routeDialogVisible.value = true;
};
@@ -762,17 +944,52 @@
cancelButtonText: "鍙栨秷",
type: "warning",
}).then(() => {
- ElMessage.success("鍒犻櫎鎴愬姛");
- getRouteList();
+ del(route.id)
+ .then(res => {
+ ElMessage.success("鍒犻櫎鎴愬姛");
+ getRouteList();
+ })
+ .catch(err => {
+ ElMessage.error("鍒犻櫎澶辫触");
+ });
});
};
const handleRouteSubmit = () => {
routeFormRef.value.validate(valid => {
if (valid) {
- ElMessage.success(isRouteEdit.value ? "缂栬緫鎴愬姛" : "鏂板鎴愬姛");
- routeDialogVisible.value = false;
- getRouteList();
+ // 鏋勫缓鎻愪氦鏁版嵁
+ const submitData = {
+ ...routeForm,
+ // 娉ㄦ剰锛欰PI 鏈熸湜鐨勫瓧娈靛悕鍙兘涓庤〃鍗曞瓧娈靛悕涓嶅悓
+ productId: routeForm.productModelId,
+ productModelId: routeForm.productModelId,
+ description: routeForm.description,
+ };
+
+ if (isRouteEdit.value) {
+ // 缂栬緫鎿嶄綔
+ update(submitData)
+ .then(res => {
+ ElMessage.success("缂栬緫鎴愬姛");
+ routeDialogVisible.value = false;
+ getRouteList();
+ })
+ .catch(err => {
+ ElMessage.error("缂栬緫澶辫触");
+ });
+ } else {
+ // 鏂板鎿嶄綔
+ add(submitData)
+ .then(res => {
+ ElMessage.success("鏂板鎴愬姛");
+ routeDialogVisible.value = false;
+ getRouteList();
+ })
+ .catch(err => {
+ ElMessage.error("鏂板澶辫触");
+ });
+ }
}
});
};
@@ -819,8 +1036,15 @@
cancelButtonText: "鍙栨秷",
type: "info",
}).then(() => {
- route.status = "2";
- ElMessage.success("鎵瑰噯鎴愬姛");
+ // 璋冪敤淇敼鎺ュ彛锛屽彧淇敼status瀛楁涓烘壒鍑嗙姸鎬�
+ update({ id: route.id, status: true })
+ .then(res => {
+ ElMessage.success("鎵瑰噯鎴愬姛");
+ getRouteList();
+ })
+ .catch(err => {
+ ElMessage.error("鎵瑰噯澶辫触");
+ });
});
};
@@ -830,8 +1054,15 @@
cancelButtonText: "鍙栨秷",
type: "warning",
}).then(() => {
- route.status = "1";
- ElMessage.success("鎾ら攢鎵瑰噯鎴愬姛");
+ // 璋冪敤淇敼鎺ュ彛锛屽彧淇敼status瀛楁涓鸿崏绋跨姸鎬�
+ update({ id: route.id, status: false })
+ .then(res => {
+ ElMessage.success("鎾ら攢鎵瑰噯鎴愬姛");
+ getRouteList();
+ })
+ .catch(err => {
+ ElMessage.error("鎾ら攢鎵瑰噯澶辫触");
+ });
});
};
@@ -839,62 +1070,35 @@
const handleSelectProcess = (route, index) => {
currentRouteId.value = route.id;
currentRouteIndex.value = index;
- // 鑾峰彇鍙�夊伐搴忓垪琛紙鍋囨暟鎹級
- availableProcessList.value = [
- {
- id: 1,
- processCode: "PROC001",
- processName: "鍘熸枡閰嶆瘮",
- processDesc: "鍘熸潗鏂欓厤姣斿伐搴�",
- status: "1",
- paramCount: 3,
- },
- {
- id: 2,
- processCode: "PROC002",
- processName: "鎼呮媽娣峰悎",
- processDesc: "鎼呮媽娣峰悎宸ュ簭",
- status: "1",
- paramCount: 2,
- },
- {
- id: 3,
- processCode: "PROC003",
- processName: "娴囩瓚鎴愬瀷",
- processDesc: "娴囩瓚鎴愬瀷宸ュ簭",
- status: "1",
- paramCount: 4,
- },
- {
- id: 4,
- processCode: "PROC004",
- processName: "钂稿帇鍏绘姢",
- processDesc: "钂稿帇鍏绘姢宸ュ簭",
- status: "0",
- paramCount: 2,
- },
- {
- id: 5,
- processCode: "PROC005",
- processName: "鍒囧壊鍔犲伐",
- processDesc: "鍒囧壊鍔犲伐宸ュ簭",
- status: "1",
- paramCount: 3,
- },
- ];
- filteredProcessList.value = availableProcessList.value;
- processSearchKeyword.value = "";
- selectedProcessItem.value = null;
- selectProcessDialogVisible.value = true;
+ // 鑾峰彇鍙�夊伐搴忓垪琛�
+ getProcessListApi()
+ .then(res => {
+ // 澶勭悊杩斿洖鐨勬暟鎹紝鏄犲皠鍒伴〉闈㈤渶瑕佺殑鏍煎紡
+ availableProcessList.value = (res.data || []).map(item => ({
+ id: item.id,
+ no: item.no || item.no,
+ name: item.name || item.name,
+ remark: item.remark || item.remark,
+ status: item.status,
+ isQuality: item.isQuality,
+ }));
+ filteredProcessList.value = availableProcessList.value;
+ processSearchKeyword.value = "";
+ selectedProcessItem.value = null;
+ selectProcessDialogVisible.value = true;
+ })
+ .catch(() => {
+ ElMessage.error("鑾峰彇宸ュ簭鍒楄〃澶辫触");
+ });
};
const handleEditProcess = (routeId, process) => {
currentRouteId.value = routeId;
isProcessEdit.value = true;
processForm.id = process.id;
- processForm.processCode = process.processCode;
- processForm.processName = process.processName;
- processForm.processDesc = process.processDesc;
+ processForm.no = process.no;
+ processForm.name = process.name;
+ processForm.remark = process.remark;
processForm.status = process.status;
processDialogVisible.value = true;
};
@@ -927,7 +1131,7 @@
filteredProcessList.value = availableProcessList.value;
} else {
filteredProcessList.value = availableProcessList.value.filter(item =>
- item.processName.toLowerCase().includes(keyword)
+ item.name.toLowerCase().includes(keyword)
);
}
};
@@ -955,9 +1159,9 @@
// 娣诲姞宸ュ簭鍒板伐鑹鸿矾绾�
const newProcess = {
id: Date.now(),
- processCode: selectedProcessItem.value.processCode,
- processName: selectedProcessItem.value.processName,
- processDesc: selectedProcessItem.value.processDesc,
+ no: selectedProcessItem.value.no,
+ name: selectedProcessItem.value.name,
+ remark: selectedProcessItem.value.remark,
status: selectedProcessItem.value.status,
paramList: [],
expanded: false,
@@ -972,31 +1176,39 @@
const handleAddParam = (routeId, process) => {
currentRouteId.value = routeId;
currentProcessId.value = process.id;
- isParamEdit.value = false;
- paramForm.id = null;
- paramForm.parameterCode = "";
- paramForm.parameterName = "";
- paramForm.parameterType2 = "1";
- paramForm.parameterType = "";
- paramForm.parameterFormat = "";
- paramForm.standardValue = "";
- paramForm.unit = "";
- paramDialogVisible.value = true;
+ selectedParam.value = null;
+ paramSearchKeyword.value = "";
+ paramPage.current = 1;
+ // 鑾峰彇鍙�夊弬鏁板垪琛�
+ getBaseParamList({
+ paramName: paramSearchKeyword.value,
+ current: paramPage.current,
+ size: paramPage.size,
+ }).then(res => {
+ if (res.code === 200) {
+ filteredParamList.value = res.data?.records || [];
+ paramPage.total = res.data?.total || 0;
+ } else {
+ ElMessage.error(res.msg || "鏌ヨ澶辫触");
+ }
+ });
+ selectParamDialogVisible.value = true;
};
const handleEditParam = (routeId, process, param) => {
currentRouteId.value = routeId;
currentProcessId.value = process.id;
- isParamEdit.value = true;
- paramForm.id = param.id;
- paramForm.parameterCode = param.parameterCode;
- paramForm.parameterName = param.parameterName;
- paramForm.parameterType2 = param.parameterType2 || "1";
- paramForm.parameterType = param.parameterType;
- paramForm.parameterFormat = param.parameterFormat;
- paramForm.standardValue = param.standardValue;
- paramForm.unit = param.unit;
- paramDialogVisible.value = true;
+ editParamForm.id = param.id;
+ editParamForm.processId = process.id;
+ editParamForm.paramId = param.paramId;
+ editParamForm.paramName = param.parameterName || param.paramName;
+ editParamForm.valueMode = param.parameterType2 || param.valueMode || "1";
+ editParamForm.standardValue = param.standardValue;
+ editParamForm.minValue = param.minValue;
+ editParamForm.maxValue = param.maxValue;
+ editParamForm.sort = param.sort || 1;
+ editParamForm.isRequired = param.isRequired || 0;
+ editParamDialogVisible.value = true;
};
const handleDeleteParam = (routeId, process, param) => {
@@ -1032,12 +1244,161 @@
const getParamTypeTag = type => {
const typeMap = {
+ 1: "primary",
+ 2: "info",
+ 3: "warning",
+ 4: "success",
鏁板�兼牸寮�: "primary",
鏂囨湰鏍煎紡: "info",
涓嬫媺閫夐」: "warning",
鏃堕棿鏍煎紡: "success",
};
return typeMap[type] || "default";
+ };
+
+ const getParamTypeText = type => {
+ const typeMap = {
+ 1: "鏁板�兼牸寮�",
+ 2: "鏂囨湰鏍煎紡",
+ 3: "涓嬫媺閫夐」",
+ 4: "鏃堕棿鏍煎紡",
+ 鏁板�兼牸寮�: "鏁板�兼牸寮�",
+ 鏂囨湰鏍煎紡: "鏂囨湰鏍煎紡",
+ 涓嬫媺閫夐」: "涓嬫媺閫夐」",
+ 鏃堕棿鏍煎紡: "鏃堕棿鏍煎紡",
+ };
+ return typeMap[type] || "鏈煡鍙傛暟绫诲瀷";
+ };
+
+ // 閫夋嫨鍙傛暟鐩稿叧鏂规硶
+ const handleParamSearch = () => {
+ // 閲嶇疆鍒嗛〉
+ paramPage.current = 1;
+ // 閲嶆柊鍔犺浇鏁版嵁
+ getBaseParamList({
+ paramName: paramSearchKeyword.value,
+ current: paramPage.current,
+ size: paramPage.size,
+ }).then(res => {
+ if (res.code === 200) {
+ filteredParamList.value = res.data?.records || [];
+ paramPage.total = res.data?.total || 0;
+ } else {
+ ElMessage.error(res.msg || "鏌ヨ澶辫触");
+ }
+ });
+ };
+
+ const handleParamSelect = row => {
+ selectedParam.value = row;
+ };
+
+ // 澶勭悊鍒嗛〉澶у皬鍙樺寲
+ const handleParamSizeChange = size => {
+ paramPage.size = size;
+ getBaseParamList({
+ paramName: paramSearchKeyword.value,
+ current: paramPage.current,
+ size: paramPage.size,
+ }).then(res => {
+ if (res.code === 200) {
+ filteredParamList.value = res.data?.records || [];
+ paramPage.total = res.data?.total || 0;
+ } else {
+ ElMessage.error(res.msg || "鏌ヨ澶辫触");
+ }
+ });
+ };
+
+ // 澶勭悊褰撳墠椤电爜鍙樺寲
+ const handleParamCurrentChange = current => {
+ paramPage.current = current;
+ getBaseParamList({
+ paramName: paramSearchKeyword.value,
+ current: paramPage.current,
+ size: paramPage.size,
+ }).then(res => {
+ if (res.code === 200) {
+ filteredParamList.value = res.data?.records || [];
+ paramPage.total = res.data?.total || 0;
+ } else {
+ ElMessage.error(res.msg || "鏌ヨ澶辫触");
+ }
+ });
+ };
+
+ const handleParamSelectSubmit = () => {
+ if (!selectedParam.value) {
+ ElMessage.warning("璇峰厛閫夋嫨涓�涓弬鏁�");
+ return;
+ }
+
+ // 鎵惧埌瀵瑰簲鐨勫伐鑹鸿矾绾垮拰宸ュ簭
+ const route = routeList.value.find(r => r.id === currentRouteId.value);
+ const process = route?.processList.find(p => p.id === currentProcessId.value);
+
+ if (route && process) {
+ // 妫�鏌ュ弬鏁版槸鍚﹀凡瀛樺湪
+ const exists = process.paramList?.some(
+ p =>
+ p.paramId === selectedParam.value.id ||
+ p.parameterCode === selectedParam.value.paramCode
+ );
+ if (exists) {
+ ElMessage.warning("璇ュ弬鏁板凡瀛樺湪浜庡伐搴忎腑");
+ return;
+ }
+
+ // 娣诲姞宸ュ簭鍒板伐鑹鸿矾绾�
+ const newParam = {
+ id: Date.now(),
+ paramId: selectedParam.value.id,
+ parameterCode: selectedParam.value.paramCode,
+ parameterName: selectedParam.value.paramName,
+ parameterType2: selectedParam.value.valueMode || "1",
+ parameterType: selectedParam.value.paramType,
+ parameterFormat: selectedParam.value.paramFormat,
+ standardValue: selectedParam.value.standardValue,
+ minValue: selectedParam.value.minValue,
+ maxValue: selectedParam.value.maxValue,
+ unit: selectedParam.value.unit,
+ sort: selectedParam.value.sort || 1,
+ isRequired: selectedParam.value.isRequired || 0,
+ };
+
+ if (!process.paramList) {
+ process.paramList = [];
+ }
+
+ process.paramList.push(newParam);
+ ElMessage.success("娣诲姞鍙傛暟鎴愬姛");
+ selectParamDialogVisible.value = false;
+ }
+ };
+
+ const handleEditParamSubmit = () => {
+ editParamFormRef.value.validate(valid => {
+ if (valid) {
+ // 鎵惧埌瀵瑰簲鐨勫伐鑹鸿矾绾裤�佸伐搴忓拰鍙傛暟
+ const route = routeList.value.find(r => r.id === currentRouteId.value);
+ const process = route?.processList.find(
+ p => p.id === currentProcessId.value
+ );
+ const param = process?.paramList.find(p => p.id === editParamForm.id);
+
+ if (param) {
+ // 鏇存柊鍙傛暟淇℃伅
+ param.standardValue = editParamForm.standardValue;
+ param.minValue = editParamForm.minValue;
+ param.maxValue = editParamForm.maxValue;
+ param.sort = editParamForm.sort;
+ param.isRequired = editParamForm.isRequired;
+
+ ElMessage.success("缂栬緫鎴愬姛");
+ editParamDialogVisible.value = false;
+ }
+ }
+ });
};
// 鎷栨嫿鎺掑簭
@@ -1570,4 +1931,70 @@
}
}
}
+
+ // 閫夋嫨鍙傛暟瀵硅瘽妗嗘牱寮�
+ .param-select-container {
+ display: flex;
+ gap: 20px;
+ height: 450px;
+
+ .param-list-area {
+ // flex: 1;
+ width: 380px;
+ display: flex;
+ flex-direction: column;
+
+ .area-title {
+ font-size: 14px;
+ font-weight: 600;
+ color: #303133;
+ margin-bottom: 12px;
+ padding-bottom: 8px;
+ border-bottom: 1px solid #ebeef5;
+ }
+
+ .search-box {
+ margin-bottom: 12px;
+
+ .el-input {
+ width: 100%;
+ }
+ }
+ }
+
+ .param-detail-area {
+ // width: 380px;
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+ background: #f5f7fa;
+ border-radius: 8px;
+ padding: 16px;
+
+ .area-title {
+ font-size: 14px;
+ font-weight: 600;
+ color: #303133;
+ margin-bottom: 16px;
+ padding-bottom: 8px;
+ border-bottom: 1px solid #ebeef5;
+ }
+
+ .param-detail-form {
+ .el-form-item {
+ margin-bottom: 12px;
+
+ .el-form-item__label {
+ color: #606266;
+ font-weight: 500;
+ }
+ }
+
+ .detail-text {
+ color: #303133;
+ font-weight: 500;
+ }
+ }
+ }
+ }
</style>
--
Gitblit v1.9.3