From 1c20a331d9fc1be029fadbd3d0f7619fe6a83cd0 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期二, 17 三月 2026 13:32:32 +0800
Subject: [PATCH] 决策分析页面
---
src/views/productionManagement/processRoute/index.vue | 1472 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 1,158 insertions(+), 314 deletions(-)
diff --git a/src/views/productionManagement/processRoute/index.vue b/src/views/productionManagement/processRoute/index.vue
index afdd542..40ab129 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-label">澶囨敞:</span>
+ <span class="meta-value">{{ route.description || '鏆傛棤鎻忚堪' }}</span>
</span>
</div>
<div class="expand-btn-wrapper">
@@ -112,6 +112,13 @@
<div class="process-number">{{ index + 1 }}</div>
<div class="process-actions">
<el-button link
+ type="primary"
+ @click="handleEditProcessSelect(route, index, process)">
+ <el-icon>
+ <Edit />
+ </el-icon>
+ </el-button>
+ <el-button link
type="danger"
@click="handleDeleteProcess(route.id, process)">
<el-icon>
@@ -121,9 +128,9 @@
</div>
</div>
<div class="process-node-body">
- <div class="process-code">{{ process.processCode }}</div>
+ <!-- <div class="process-code">{{ process.processId }}</div> -->
<div class="process-name">{{ process.processName }}</div>
- <div class="process-desc">{{ process.processDesc || '鏆傛棤鎻忚堪' }}</div>
+ <!-- <div class="process-desc">{{ process.remark || '鏆傛棤鎻忚堪' }}</div> -->
</div>
<div class="process-node-footer">
<!-- <el-tag size="small"
@@ -135,7 +142,7 @@
size="small"
@click="toggleProcessParams(process)">
{{ process.expanded ? '鏀惰捣鍙傛暟' : '灞曞紑鍙傛暟' }}
- ({{ process.paramList?.length || 0 }})
+ ({{ process.paramCount }})
</el-button>
</div>
<div v-if="process.expanded"
@@ -156,14 +163,17 @@
:key="param.id"
class="param-item">
<div class="param-info">
- <span class="param-code">{{ param.parameterCode }}</span>
- <span class="param-name">{{ param.parameterName }}</span>
+ <span class="param-code">{{ param.paramName }}</span>
+ <!-- <span class="param-name">{{ param.paramName }}</span> -->
<!-- <el-tag size="small"
style="margin-right: 20px;"
:type="getParamTypeTag(param.parameterType)">
{{ param.parameterType }}
</el-tag> -->
- <span class="param-value">鏍囧噯鍊硷細{{ param.standardValue }} {{ param.unit }}</span>
+ <span v-if="param.valueMode==1"
+ class="param-value">鏍囧噯鍊硷細{{ param.standardValue || "-" }} {{ param.unit }}</span>
+ <span v-else
+ class="param-value">鏍囧噯鍊硷細{{ param.minValue || "-" }}-{{ param.maxValue || "-" }} {{ param.unit }}</span>
</div>
<div class="param-actions">
<el-button link
@@ -201,11 +211,18 @@
<span>鏂板宸ュ簭</span>
</div>
</div>
- <el-empty v-if="!route.processList || route.processList.length === 0"
- description="鏆傛棤宸ュ簭"
- :image-size="80" />
</div>
</div>
+ </div>
+ <!-- 鍒嗛〉鎺т欢 -->
+ <div class="pagination-container">
+ <el-pagination v-model:current-page="routePage.current"
+ v-model:page-size="routePage.size"
+ :page-sizes="[10, 20, 50, 100]"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="routePage.total"
+ @size-change="handleRouteSizeChange"
+ @current-change="handleRouteCurrentChange" />
</div>
<!-- 宸ヨ壓璺嚎鏂板/缂栬緫瀵硅瘽妗� -->
<el-dialog v-model="routeDialogVisible"
@@ -218,7 +235,7 @@
<el-form-item label="浜у搧鍚嶇О"
prop="productModelId">
<el-button type="primary"
- @click="showProductSelectDialog = true">
+ @click="handleProcessProductSelectClick2">
{{ routeForm.productName && routeForm.productModelName
? `${routeForm.productName} - ${routeForm.productModelName}`
: '閫夋嫨浜у搧' }}
@@ -240,16 +257,12 @@
<el-form-item label="璺嚎缂栫爜"
prop="routeCode">
<el-input v-model="routeForm.routeCode"
- placeholder="璇疯緭鍏ヨ矾绾跨紪鐮�" />
+ disabled
+ placeholder="鑷姩鐢熸垚" />
</el-form-item>
- <el-form-item label="璺嚎鍚嶇О"
- prop="routeName">
- <el-input v-model="routeForm.routeName"
- placeholder="璇疯緭鍏ヨ矾绾垮悕绉�" />
- </el-form-item>
- <el-form-item label="璺嚎鎻忚堪"
- prop="routeDesc">
- <el-input v-model="routeForm.routeDesc"
+ <el-form-item label="澶囨敞"
+ prop="description">
+ <el-input v-model="routeForm.description"
type="textarea"
:rows="3"
placeholder="璇疯緭鍏ヨ矾绾挎弿杩�" />
@@ -283,18 +296,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 +315,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 +354,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>
@@ -364,26 +377,51 @@
<div class="process-detail-area">
<div class="area-title">宸ュ簭璇︽儏</div>
<el-form v-if="selectedProcessItem"
- :model="selectedProcessItem"
+ :model="processForm"
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="浜у搧鍚嶇О"
+ prop="productModelId">
+ <el-button type="primary"
+ @click="handleProcessProductSelectClick">
+ {{ processForm.productName && processForm.model
+ ? `${processForm.productName} - ${processForm.model}`
+ : '閫夋嫨浜у搧' }}
+ </el-button>
+ </el-form-item>
+ <el-form-item label="鍗曚綅"
+ prop="unit">
+ <el-input v-model="processForm.unit"
+ :placeholder="processForm.productModelId ? '鏍规嵁閫夋嫨鐨勪骇鍝佽嚜鍔ㄥ甫鍑�' : '璇峰厛閫夋嫨浜у搧' "
+ clearable
+ :disabled="true" />
+ </el-form-item>
+ <el-form-item label="鏄惁璐ㄦ"
+ prop="isQuality">
+ <el-switch v-model="processForm.isQuality"
+ :active-value="true"
+ inactive-value="false" />
</el-form-item>
</el-form>
<el-empty v-else
@@ -394,7 +432,7 @@
<span class="dialog-footer">
<el-button @click="selectProcessDialogVisible = false">鍙栨秷</el-button>
<el-button type="primary"
- :disabled="!selectedProcessItem"
+ :disabled="!selectedProcessItem || !processForm.productModelId"
@click="handleProcessSelectSubmit">纭畾</el-button>
</span>
</template>
@@ -489,11 +527,203 @@
</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' && selectedParam.paramType == '1'">
+ <el-input v-model="selectedParam.standardValue"
+ type="number"
+ placeholder="璇疯緭鍏ラ粯璁ゅ��" />
+ </el-form-item>
+ <el-form-item label="鏈�灏忓��"
+ v-if="selectedParam.valueMode == '2' && selectedParam.paramType == '1'">
+ <el-input v-model="selectedParam.minValue"
+ type="number"
+ placeholder="璇疯緭鍏ユ渶灏忓��" />
+ </el-form-item>
+ <el-form-item label="鏈�澶у��"
+ v-if="selectedParam.valueMode == '2' && selectedParam.paramType == '1'">
+ <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="鍙傛暟绫诲瀷">
+ <el-tag size="small"
+ :type="getParamTypeTag(editParamForm.paramType)">
+ {{ getParamTypeText(editParamForm.paramType) }}
+ </el-tag>
+ </el-form-item>
+ <el-form-item label="鍙傛暟鏍煎紡">
+ <span class="detail-text">{{ editParamForm.paramFormat || '-' }}</span>
+ </el-form-item>
+ <el-form-item label="鍗曚綅">
+ <span class="detail-text">{{ editParamForm.unit || '-' }}</span>
+ </el-form-item>
+ <el-form-item label="鏍囧噯鍊�"
+ v-if="editParamForm.valueMode == '1' && editParamForm.paramType == '1'"
+ prop="standardValue">
+ <el-input v-model="editParamForm.standardValue"
+ type="number"
+ placeholder="璇疯緭鍏ユ爣鍑嗗��" />
+ </el-form-item>
+ <el-form-item label="鏈�灏忓��"
+ v-if="editParamForm.valueMode == '2' && editParamForm.paramType == '1'"
+ prop="minValue">
+ <el-input v-model="editParamForm.minValue"
+ type="number"
+ placeholder="璇疯緭鍏ユ渶灏忓��" />
+ </el-form-item>
+ <el-form-item label="鏈�澶у��"
+ v-if="editParamForm.valueMode == '2' && editParamForm.paramType == '1'"
+ 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>
<script setup>
- import { ref, reactive, getCurrentInstance } from "vue";
+ import { ref, reactive, getCurrentInstance, onMounted } from "vue";
import { ElMessage, ElMessageBox } from "element-plus";
import {
Plus,
@@ -510,11 +740,31 @@
} 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 {
+ addOrUpdateProcessRouteItem,
+ batchDeleteProcessRouteItem,
+ sortProcessRouteItem,
+ findProcessRouteItemList,
+ getProcessParamList,
+ addProcessRouteItemParam,
+ editProcessRouteItemParam,
+ delProcessRouteItemParam,
+ } from "@/api/productionManagement/processRouteItem.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";
// 宸ヨ壓璺嚎鍒楄〃
const routeList = ref([]);
const dictTypes = ref([]);
+
+ // 宸ヨ壓璺嚎鍒嗛〉
+ const routePage = reactive({
+ current: 1,
+ size: 10,
+ total: 0,
+ });
// 鑾峰彇鍏ㄥ眬瀹炰緥
const { proxy } = getCurrentInstance();
@@ -534,17 +784,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 +801,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,133 +846,209 @@
],
};
+ // 閫夋嫨鍙傛暟瀵硅瘽妗�
+ 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: routePage.current, pageSize: routePage.size })
+ .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 || []).map(process => ({
+ ...process,
+ processId: process.processId || process.id,
+ expanded: false,
+ })),
+ }));
+ // 鏇存柊鍒嗛〉鎬绘暟
+ routePage.total = res.data?.total || 0;
+ })
+ .catch(err => {
+ console.error("鑾峰彇宸ヨ壓璺嚎鍒楄〃澶辫触锛�", err);
+ routeList.value = [];
+ routePage.total = 0;
+ });
+ });
};
// 灞曞紑/鏀惰捣宸ヨ壓璺嚎
const toggleExpand = route => {
route.expanded = !route.expanded;
+ if (route.expanded) {
+ // 璋冪敤鎺ュ彛鑾峰彇宸ュ簭鍒楄〃
+ findProcessRouteItemList({ routeId: route.id })
+ .then(res => {
+ route.processList = (res.data || []).map(process => ({
+ ...process,
+ processId: process.processId || process.id,
+ expanded: false,
+ }));
+ })
+ .catch(err => {
+ console.error("鑾峰彇宸ュ簭鍒楄〃澶辫触锛�", err);
+ route.processList = [];
+ });
+ }
};
// 灞曞紑/鏀惰捣宸ュ簭鍙傛暟
const toggleProcessParams = process => {
process.expanded = !process.expanded;
+ if (process.expanded && process.id) {
+ // 璋冪敤鎺ュ彛鑾峰彇鍙傛暟鍒楄〃
+ getProcessParamList({
+ routeItemId: process.id,
+ pageNum: 1,
+ pageSize: 1000,
+ })
+ .then(res => {
+ if (res.code === 200) {
+ process.paramList = res.data?.records || [];
+ process.paramCount = process.paramList.length;
+ } else {
+ ElMessage.error(res.msg || "鑾峰彇鍙傛暟鍒楄〃澶辫触");
+ process.paramList = [];
+ process.paramCount = 0;
+ }
+ })
+ .catch(err => {
+ console.error("鑾峰彇鍙傛暟鍒楄〃澶辫触锛�", err);
+ ElMessage.error("鑾峰彇鍙傛暟鍒楄〃澶辫触");
+ process.paramList = [];
+ process.paramCount = 0;
+ });
+ }
};
-
+ const toggleProcessParams2 = process => {
+ if (process.expanded && process.id) {
+ // 璋冪敤鎺ュ彛鑾峰彇鍙傛暟鍒楄〃
+ getProcessParamList({
+ routeItemId: process.id,
+ pageNum: 1,
+ pageSize: 1000,
+ })
+ .then(res => {
+ if (res.code === 200) {
+ process.paramList = res.data?.records || [];
+ process.paramCount = process.paramList.length;
+ } else {
+ ElMessage.error(res.msg || "鑾峰彇鍙傛暟鍒楄〃澶辫触");
+ process.paramList = [];
+ process.paramCount = 0;
+ }
+ })
+ .catch(err => {
+ console.error("鑾峰彇鍙傛暟鍒楄〃澶辫触锛�", err);
+ ElMessage.error("鑾峰彇鍙傛暟鍒楄〃澶辫触");
+ process.paramList = [];
+ process.paramCount = 0;
+ });
+ }
+ };
// 宸ヨ壓璺嚎鎿嶄綔
const handleAddRoute = () => {
isRouteEdit.value = false;
@@ -735,9 +1058,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 +1072,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,53 +1083,115 @@
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("鏂板澶辫触");
+ });
+ }
}
});
+ };
+ const isform2 = ref(null);
+ const handleProcessProductSelectClick = () => {
+ isform2.value = true;
+ showProductSelectDialog.value = true;
+ };
+ const handleProcessProductSelectClick2 = () => {
+ isform2.value = false;
+ showProductSelectDialog.value = true;
};
// 浜у搧閫夋嫨澶勭悊
const handleProductSelect = async products => {
- if (products && products.length > 0) {
- const product = products[0];
- // 鍏堟煡璇OM鍒楄〃锛堝繀閫夛級
- try {
- const res = await getByModel(product.id);
- // 澶勭悊杩斿洖鐨凚OM鏁版嵁锛氬彲鑳芥槸鏁扮粍銆佸璞℃垨鍖呭惈data瀛楁
- let bomList = [];
- if (Array.isArray(res)) {
- bomList = res;
- } else if (res && res.data) {
- bomList = Array.isArray(res.data) ? res.data : [res.data];
- } else if (res && typeof res === "object") {
- bomList = [res];
- }
+ if (isform2.value) {
+ // 甯垜鍐欏伐搴忎腑鐨勯�夋嫨浜у搧鐨勫洖璋�,骞朵笖鎶婂瓧娈靛姞杩沺rocessForm
+ if (products && products.length > 0) {
+ const product = products[0];
+ console.log("product:", product);
+ // 鎶妏roduct涓殑瀛楁娣诲姞鍒皃rocessForm涓�
+ // Object.assign(processForm, product);
+ processForm.productModelId = product.id;
+ processForm.productName = product.productName;
+ processForm.model = product.model;
+ processForm.unit = product.unit || "";
+ console.log("processForm:", processForm);
- if (bomList.length > 0) {
- routeForm.productModelId = product.id;
- routeForm.productName = product.productName;
- routeForm.productModelName = product.model;
- routeForm.bomId = undefined; // 閲嶇疆BOM閫夋嫨
- bomOptions.value = bomList;
- showProductSelectDialog.value = false;
- // 瑙﹀彂琛ㄥ崟楠岃瘉鏇存柊
- proxy.$refs["routeFormRef"]?.validateField("productModelId");
- } else {
+ // 瑙﹀彂琛ㄥ崟楠岃瘉鏇存柊
+ proxy.$refs["processFormRef"]?.validateField("productModelId");
+ }
+ } else {
+ if (products && products.length > 0) {
+ const product = products[0];
+ // 鍏堟煡璇OM鍒楄〃锛堝繀閫夛級
+ try {
+ const res = await getByModel(product.id);
+ // 澶勭悊杩斿洖鐨凚OM鏁版嵁锛氬彲鑳芥槸鏁扮粍銆佸璞℃垨鍖呭惈data瀛楁
+ let bomList = [];
+ if (Array.isArray(res)) {
+ bomList = res;
+ } else if (res && res.data) {
+ bomList = Array.isArray(res.data) ? res.data : [res.data];
+ } else if (res && typeof res === "object") {
+ bomList = [res];
+ }
+ console.log("bomList:", bomList);
+ if (bomList.length > 0) {
+ routeForm.productModelId = product.id;
+ routeForm.productName = product.productName;
+ routeForm.productModelName = product.model;
+ routeForm.bomId = undefined; // 閲嶇疆BOM閫夋嫨
+ bomOptions.value = bomList;
+ showProductSelectDialog.value = false;
+ // 瑙﹀彂琛ㄥ崟楠岃瘉鏇存柊
+ proxy.$refs["routeFormRef"]?.validateField("productModelId");
+ } else {
+ proxy.$modal.msgError("璇ヤ骇鍝佹病鏈塀OM锛岃鍏堝垱寤築OM");
+ }
+ } catch (error) {
+ // 濡傛灉鎺ュ彛杩斿洖404鎴栧叾浠栭敊璇紝璇存槑娌℃湁BOM
proxy.$modal.msgError("璇ヤ骇鍝佹病鏈塀OM锛岃鍏堝垱寤築OM");
}
- } catch (error) {
- // 濡傛灉鎺ュ彛杩斿洖404鎴栧叾浠栭敊璇紝璇存槑娌℃湁BOM
- proxy.$modal.msgError("璇ヤ骇鍝佹病鏈塀OM锛岃鍏堝垱寤築OM");
}
}
};
@@ -819,8 +1202,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,61 +1220,56 @@
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("鎾ら攢鎵瑰噯澶辫触");
+ });
});
};
-
// 宸ュ簭鎿嶄綔
const handleSelectProcess = (route, index) => {
+ console.log("route:", route);
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;
+ };
+ const dragSort = ref(0);
+ const currentId = ref(null);
+ // 淇敼宸ュ簭
+ const handleEditProcessSelect = (route, index, process) => {
+ console.log("route:", route);
+ console.log("process:", process);
+ currentId.value = process.id;
+ currentRouteId.value = route.id;
+ currentRouteIndex.value = index;
+ // 閲嶇疆鎼滅储鍜岄�夋嫨鐘舵��
+ filteredProcessList.value = availableProcessList.value;
+ processSearchKeyword.value = "";
+ // 璁剧疆閫変腑鐨勫伐搴�
+ filteredProcessList.value.map(item => {
+ if (item.id === process.processId) {
+ selectedProcessItem.value = item;
+ }
+ });
+ dragSort.value = process.dragSort;
+ // selectedProcessItem.value = process;
+ // 濉厖浜у搧閫夋嫨琛ㄥ崟
+ processForm.productModelId = process.productModelId;
+ processForm.productName = process.productName;
+ processForm.model = process.model;
+ processForm.processId = process.no;
+ // processForm.name = process.name;
+ processForm.unit = process.unit || "";
+ processForm.isQuality = process.isQuality || false;
selectProcessDialogVisible.value = true;
};
@@ -892,9 +1277,9 @@
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;
};
@@ -905,8 +1290,30 @@
cancelButtonText: "鍙栨秷",
type: "warning",
}).then(() => {
- ElMessage.success("鍒犻櫎鎴愬姛");
- getRouteList();
+ // 璋冪敤API鍒犻櫎宸ュ簭
+ batchDeleteProcessRouteItem([process.id])
+ .then(res => {
+ ElMessage.success("鍒犻櫎鎴愬姛");
+ // 璋冪敤鎺ュ彛鏇存柊宸ュ簭鍒楄〃
+ findProcessRouteItemList({ routeId: routeId })
+ .then(res => {
+ const route = routeList.value.find(r => r.id === routeId);
+ if (route) {
+ route.processList = (res.data || []).map(process => ({
+ ...process,
+ processId: process.processId || process.id,
+ expanded: false,
+ }));
+ }
+ })
+ .catch(err => {
+ console.error("鑾峰彇宸ュ簭鍒楄〃澶辫触锛�", err);
+ });
+ })
+ .catch(err => {
+ ElMessage.error("鍒犻櫎澶辫触");
+ console.error("鍒犻櫎宸ュ簭澶辫触锛�", err);
+ });
});
};
@@ -915,7 +1322,25 @@
if (valid) {
ElMessage.success(isProcessEdit.value ? "缂栬緫鎴愬姛" : "鏂板鎴愬姛");
processDialogVisible.value = false;
- getRouteList();
+ // 璋冪敤鎺ュ彛鏇存柊宸ュ簭鍒楄〃
+ if (currentRouteId.value) {
+ findProcessRouteItemList({ routeId: currentRouteId.value })
+ .then(res => {
+ const route = routeList.value.find(
+ r => r.id === currentRouteId.value
+ );
+ if (route) {
+ route.processList = (res.data || []).map(process => ({
+ ...process,
+ processId: process.processId || process.id,
+ expanded: false,
+ }));
+ }
+ })
+ .catch(err => {
+ console.error("鑾峰彇宸ュ簭鍒楄〃澶辫触锛�", err);
+ });
+ }
}
});
};
@@ -926,14 +1351,34 @@
if (!keyword) {
filteredProcessList.value = availableProcessList.value;
} else {
- filteredProcessList.value = availableProcessList.value.filter(item =>
- item.processName.toLowerCase().includes(keyword)
+ filteredProcessList.value = availableProcessList.value.filter(
+ item =>
+ (item.name && item.name.toLowerCase().includes(keyword)) ||
+ (item.no && item.no.toLowerCase().includes(keyword))
);
}
};
const handleProcessSelect = row => {
selectedProcessItem.value = row;
+ // 閲嶇疆浜у搧閫夋嫨琛ㄥ崟
+ processForm.productModelId = undefined;
+ processForm.productName = "";
+ processForm.productModelName = "";
+ processForm.unit = "";
+ processForm.isQuality = row.isQuality || false;
+ };
+
+ // 澶勭悊宸ュ簭閫夋嫨鏃剁殑浜у搧閫夋嫨
+ const handleProcessProductSelect = async products => {
+ if (products && products.length > 0) {
+ const product = products[0];
+ processForm.productModelId = product.id;
+ processForm.productName = product.productName;
+ processForm.productModelName = product.model;
+ processForm.unit = product.unit || "";
+ showProductSelectDialog.value = false;
+ }
};
const handleProcessSelectSubmit = () => {
@@ -942,61 +1387,101 @@
return;
}
- // 妫�鏌ュ伐搴忔槸鍚﹀凡瀛樺湪
- const route = routeList.value[currentRouteIndex.value];
- const exists = route.processList.some(
- p => p.id === selectedProcessItem.value.id
- );
- if (exists) {
- ElMessage.warning("璇ュ伐搴忓凡瀛樺湪浜庡伐鑹鸿矾绾夸腑");
+ if (!processForm.productModelId) {
+ ElMessage.warning("璇烽�夋嫨浜у搧");
return;
}
- // 娣诲姞宸ュ簭鍒板伐鑹鸿矾绾�
- const newProcess = {
- id: Date.now(),
- processCode: selectedProcessItem.value.processCode,
- processName: selectedProcessItem.value.processName,
- processDesc: selectedProcessItem.value.processDesc,
- status: selectedProcessItem.value.status,
- paramList: [],
- expanded: false,
+ // 鏋勫缓璇锋眰鍙傛暟
+ const params = {
+ routeId: currentRouteId.value,
+ processId: selectedProcessItem.value.id,
+ dragSort: routePage.total + 1,
+ ...processForm,
};
- route.processList.push(newProcess);
- ElMessage.success("娣诲姞宸ュ簭鎴愬姛");
- selectProcessDialogVisible.value = false;
+ // 濡傛灉鏄慨鏀规搷浣滐紝娣诲姞id鍙傛暟
+ if (selectedProcessItem.value.id) {
+ params.id = currentId.value;
+ params.dragSort = dragSort.value;
+ }
+
+ // 璋冪敤API娣诲姞宸ュ簭鎴栦慨鏀瑰伐搴�
+ addOrUpdateProcessRouteItem(params)
+ .then(res => {
+ ElMessage.success(
+ selectedProcessItem.value.id ? "淇敼宸ュ簭鎴愬姛" : "娣诲姞宸ュ簭鎴愬姛"
+ );
+ selectProcessDialogVisible.value = false;
+ // 璋冪敤鎺ュ彛鏇存柊宸ュ簭鍒楄〃
+ findProcessRouteItemList({ routeId: currentRouteId.value })
+ .then(res => {
+ const route = routeList.value.find(
+ r => r.id === currentRouteId.value
+ );
+ if (route) {
+ route.processList = (res.data || []).map(process => ({
+ ...process,
+ processId: process.processId || process.id,
+ expanded: false,
+ }));
+ }
+ })
+ .catch(err => {
+ console.error("鑾峰彇宸ュ簭鍒楄〃澶辫触锛�", err);
+ });
+ })
+ .catch(err => {
+ ElMessage.error(
+ selectedProcessItem.value.id ? "淇敼宸ュ簭澶辫触" : "娣诲姞宸ュ簭澶辫触"
+ );
+ console.error(
+ selectedProcessItem.value.id ? "淇敼宸ュ簭澶辫触锛�" : "娣诲姞宸ュ簭澶辫触锛�",
+ err
+ );
+ });
};
// 鍙傛暟鎿嶄綔
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;
+ editParamForm.paramType = param.parameterType || param.paramType;
+ editParamForm.paramFormat = param.parameterFormat || param.paramFormat;
+ editParamForm.unit = param.unit || param.unit;
+ editParamDialogVisible.value = true;
};
const handleDeleteParam = (routeId, process, param) => {
@@ -1005,8 +1490,17 @@
cancelButtonText: "鍙栨秷",
type: "warning",
}).then(() => {
- ElMessage.success("鍒犻櫎鎴愬姛");
- getRouteList();
+ // 璋冪敤API鍒犻櫎鍙傛暟
+ delProcessRouteItemParam(param.id)
+ .then(res => {
+ ElMessage.success("鍒犻櫎鎴愬姛");
+ // 鍒锋柊鍙傛暟鍒楄〃
+ toggleProcessParams2(process);
+ })
+ .catch(err => {
+ ElMessage.error("鍒犻櫎鍙傛暟澶辫触");
+ console.error("鍒犻櫎鍙傛暟澶辫触锛�", err);
+ });
});
};
@@ -1032,12 +1526,178 @@
const getParamTypeTag = type => {
const typeMap = {
- 鏁板�兼牸寮�: "primary",
- 鏂囨湰鏍煎紡: "info",
- 涓嬫媺閫夐」: "warning",
- 鏃堕棿鏍煎紡: "success",
+ 1: "primary",
+ 2: "info",
+ 3: "warning",
+ 4: "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 handleRouteSizeChange = size => {
+ routePage.size = size;
+ getRouteList();
+ };
+
+ const handleRouteCurrentChange = current => {
+ routePage.current = current;
+ getRouteList();
+ };
+
+ 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 isNumericMode = selectedParam.value.valueMode === 1;
+
+ // 璋冪敤API鏂板鍙傛暟
+ addProcessRouteItemParam({
+ routeItemId: process.id,
+ paramId: selectedParam.value.id,
+ standardValue: isNumericMode
+ ? selectedParam.value.standardValue || ""
+ : "",
+ minValue: isNumericMode ? selectedParam.value.minValue || 0 : null,
+ maxValue: isNumericMode ? selectedParam.value.maxValue || 0 : null,
+ isRequired: selectedParam.value.isRequired || 0,
+ })
+ .then(res => {
+ ElMessage.success("娣诲姞鍙傛暟鎴愬姛");
+ selectParamDialogVisible.value = false;
+ // 鍒锋柊鍙傛暟鍒楄〃
+ toggleProcessParams2(process);
+ })
+ .catch(err => {
+ ElMessage.error("娣诲姞鍙傛暟澶辫触");
+ console.error("娣诲姞鍙傛暟澶辫触锛�", err);
+ });
+ }
+ };
+
+ const handleEditParamSubmit = () => {
+ editParamFormRef.value.validate(valid => {
+ if (valid) {
+ // 鍒ゆ柇鍙傛暟绫诲瀷锛屽彧鏈夋暟鍊肩被鍨嬫墠浼犳爣鍑嗗�笺�佹渶澶у�煎拰鏈�灏忓��
+ const isNumericMode = editParamForm.valueMode == 1;
+
+ // 璋冪敤API淇敼鍙傛暟
+ editProcessRouteItemParam({
+ id: editParamForm.id,
+ routeItemId: currentProcessId.value,
+ paramId: editParamForm.paramId,
+ standardValue: isNumericMode ? editParamForm.standardValue || "" : "",
+ minValue: isNumericMode ? editParamForm.minValue || 0 : null,
+ maxValue: isNumericMode ? editParamForm.maxValue || 0 : null,
+ isRequired: editParamForm.isRequired || 0,
+ })
+ .then(res => {
+ ElMessage.success("缂栬緫鎴愬姛");
+ editParamDialogVisible.value = false;
+ // 鎵惧埌瀵瑰簲鐨勫伐鑹鸿矾绾垮拰宸ュ簭
+ const route = routeList.value.find(
+ r => r.id === currentRouteId.value
+ );
+ const process = route?.processList.find(
+ p => p.id === currentProcessId.value
+ );
+ // 鍒锋柊鍙傛暟鍒楄〃
+ if (process) {
+ toggleProcessParams2(process);
+ }
+ })
+ .catch(err => {
+ ElMessage.error("缂栬緫鍙傛暟澶辫触");
+ console.error("缂栬緫鍙傛暟澶辫触锛�", err);
+ });
+ }
+ });
};
// 鎷栨嫿鎺掑簭
@@ -1059,9 +1719,37 @@
const route = routeList.value.find(r => r.id === routeId);
if (route && route.processList) {
const draggedProcess = route.processList[draggedItem.value];
- route.processList.splice(draggedItem.value, 1);
- route.processList.splice(dropIndex, 0, draggedProcess);
- ElMessage.success("鎺掑簭鎴愬姛");
+
+ // 璁＄畻鏂扮殑鎺掑簭鍊�
+ const newDragSort = dropIndex + 1;
+
+ // 璋冪敤API鎺掑簭宸ュ簭
+ sortProcessRouteItem({
+ id: draggedProcess.id,
+ dragSort: newDragSort,
+ })
+ .then(res => {
+ // 璋冪敤鎺ュ彛鑾峰彇鏈�鏂扮殑宸ュ簭鍒楄〃
+ findProcessRouteItemList({ routeId: routeId })
+ .then(res => {
+ if (route) {
+ route.processList = (res.data || []).map(process => ({
+ ...process,
+ processId: process.processId || process.id,
+ expanded: false,
+ }));
+ }
+ ElMessage.success("鎺掑簭鎴愬姛");
+ })
+ .catch(err => {
+ console.error("鑾峰彇宸ュ簭鍒楄〃澶辫触锛�", err);
+ ElMessage.success("鎺掑簭鎴愬姛");
+ });
+ })
+ .catch(err => {
+ ElMessage.error("鎺掑簭澶辫触");
+ console.error("鎺掑簭宸ュ簭澶辫触锛�", err);
+ });
}
};
@@ -1079,13 +1767,35 @@
getRouteList();
getDictTypes();
+
+ // 椤甸潰鍔犺浇鏃惰幏鍙栧伐搴忓垪琛�
+ onMounted(() => {
+ 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;
+ })
+ .catch(() => {
+ ElMessage.error("鑾峰彇宸ュ簭鍒楄〃澶辫触");
+ });
+ });
</script>
<style scoped lang="scss">
.app-container {
padding: 20px;
+ padding-bottom: 80px;
background-color: #f0f2f5;
min-height: calc(100vh - 84px);
+ overflow: hidden;
}
.route-header {
@@ -1125,9 +1835,31 @@
}
.route-card-list {
- display: flex;
- flex-direction: column;
+ display: grid;
+ grid-template-columns: repeat(1, 1fr);
gap: 20px;
+ max-height: calc(100vh - 240px);
+ overflow-y: auto;
+ padding-right: 10px;
+ }
+
+ /* 鑷畾涔夋粴鍔ㄦ潯鏍峰紡 */
+ .route-card-list::-webkit-scrollbar {
+ width: 8px;
+ }
+
+ .route-card-list::-webkit-scrollbar-track {
+ background: #f1f1f1;
+ border-radius: 4px;
+ }
+
+ .route-card-list::-webkit-scrollbar-thumb {
+ background: #c1c1c1;
+ border-radius: 4px;
+ }
+
+ .route-card-list::-webkit-scrollbar-thumb:hover {
+ background: #a8a8a8;
}
.route-card {
@@ -1473,7 +2205,7 @@
align-items: center;
justify-content: center;
min-width: 100px;
- height: 175px;
+ height: 137px;
border: 2px dashed #dcdfe6;
border-radius: 12px;
background: #fafafa;
@@ -1570,4 +2302,116 @@
}
}
}
+
+ // 閫夋嫨鍙傛暟瀵硅瘽妗嗘牱寮�
+ .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;
+ }
+ }
+ }
+ }
+
+ // 鍒嗛〉鎺т欢鏍峰紡
+ .pagination-container {
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ display: flex;
+ justify-content: flex-end;
+ padding: 16px 20px;
+ background-color: #fff !important;
+ border-top: 1px solid #ebeef5;
+ box-shadow: 0 -2px 12px 0 rgba(0, 0, 0, 0.1);
+ z-index: 100;
+
+ .el-pagination {
+ .el-pagination__sizes {
+ margin-right: 16px;
+ }
+
+ .el-pagination__jump {
+ margin-left: 16px;
+ }
+
+ .el-pagination__total {
+ color: #606266;
+ font-size: 14px;
+ }
+
+ .el-pagination__button {
+ border-radius: 4px;
+ transition: all 0.3s ease;
+
+ &:hover:not(:disabled) {
+ color: #409eff;
+ border-color: #409eff;
+ }
+ }
+
+ .el-pagination__button--active {
+ background-color: #409eff;
+ border-color: #409eff;
+ color: #fff;
+ }
+ }
+ }
</style>
--
Gitblit v1.9.3