From cd9ee0b4268c6b0ccdaf75115aea4680ce40cb83 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 27 五月 2026 13:38:20 +0800
Subject: [PATCH] Merge branch 'dev_天津_君歌化工' of http://114.132.189.42:9002/r/product-inventory-management into dev_天津_君歌化工
---
src/views/productionManagement/processRoute/processRouteItem/index.vue | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/views/productionManagement/processRoute/processRouteItem/index.vue b/src/views/productionManagement/processRoute/processRouteItem/index.vue
index c2c24b4..398403a 100644
--- a/src/views/productionManagement/processRoute/processRouteItem/index.vue
+++ b/src/views/productionManagement/processRoute/processRouteItem/index.vue
@@ -50,7 +50,7 @@
<!-- 琛ㄦ牸瑙嗗浘 -->
<div v-if="viewMode === 'table'" class="section-header">
- <div class="section-title">浜у搧閮ㄤ欢鍒楄〃</div>
+ <div class="section-title">宸ュ簭鍒楄〃</div>
<div class="section-actions">
<el-button
icon="Grid"
@@ -74,14 +74,9 @@
class="lims-table"
>
<el-table-column align="center" label="搴忓彿" width="60" type="index" />
- <el-table-column label="浜у搧鍚嶇О" prop="name" min-width="140" show-overflow-tooltip>
+ <el-table-column label="閮ㄤ欢鍚嶇О" prop="name" min-width="140" show-overflow-tooltip>
<template #default="scope">
{{ getProcessField(scope.row, 'name') }}
- </template>
- </el-table-column>
- <el-table-column label="浜у搧瑙勬牸" prop="productModel" min-width="120" show-overflow-tooltip>
- <template #default="scope">
- {{ getProcessField(scope.row, 'productModel') }}
</template>
</el-table-column>
<el-table-column label="閮ㄤ欢缂栧彿" prop="no" width="120" show-overflow-tooltip>
@@ -92,6 +87,16 @@
<el-table-column label="閮ㄤ欢绫诲瀷" prop="typeText" width="120" show-overflow-tooltip>
<template #default="scope">
{{ getProcessTypeText(getProcessRaw(scope.row)?.type) || '-' }}
+ </template>
+ </el-table-column>
+ <el-table-column label="浜у搧鍚嶇О" prop="productName" min-width="140" show-overflow-tooltip>
+ <template #default="scope">
+ {{ scope.row.productName || getProcessField(scope.row, 'productName') }}
+ </template>
+ </el-table-column>
+ <el-table-column label="浜у搧瑙勬牸" prop="productModel" min-width="120" show-overflow-tooltip>
+ <template #default="scope">
+ {{ scope.row.model || getProcessField(scope.row, 'productModel') }}
</template>
</el-table-column>
<el-table-column label="璁″垝宸ユ椂(灏忔椂)" prop="salaryQuota" width="130" align="center">
@@ -130,7 +135,7 @@
<!-- 鍗＄墖瑙嗗浘 -->
<template v-else>
<div class="section-header">
- <div class="section-title">宸ヨ壓璺嚎椤圭洰鍒楄〃</div>
+ <div class="section-title">宸ュ簭鍒楄〃</div>
<div class="section-actions">
<el-button
icon="Menu"
@@ -162,7 +167,8 @@
<!-- 涓庡伐搴忎富琛ㄤ竴鑷寸殑绠�瑕佷俊鎭� -->
<div class="card-content">
<div class="product-info">
- <div class="product-name">{{ getProcessField(item, 'productModel') }}</div>
+ <div class="product-name">{{ item.productName || getProcessField(item, 'productName') }}</div>
+ <div class="product-model">{{ item.model || getProcessField(item, 'productModel') }}</div>
<div v-if="getProcessRaw(item)?.no" class="product-model">缂栧彿 {{ getProcessRaw(item)?.no }}</div>
<div v-if="getProcessTypeText(getProcessRaw(item)?.type)" class="product-model">
{{ getProcessTypeText(getProcessRaw(item)?.type) }}
@@ -184,7 +190,7 @@
<!-- 鏂板/缂栬緫寮圭獥锛堝竷灞�銆佸瓧娈典笌宸ュ簭/閮ㄤ欢椤� New銆丒dit 涓�鑷达紱鎻愪氦鍙傛暟浠嶄负鍘熸帴鍙ｅ瓧娈碉級 -->
<el-dialog
v-model="dialogVisible"
- :title="operationType === 'add' ? '鏂板宸ヨ壓璺嚎椤圭洰' : '缂栬緫宸ヨ壓璺嚎椤圭洰'"
+ :title="operationType === 'add' ? '鏂板宸ュ簭' : '缂栬緫宸ュ簭'"
width="760"
@close="closeDialog"
>
@@ -322,7 +328,7 @@
const submitLoading = ref(false);
const cardsContainer = ref(null);
const tableRef = ref(null);
-const viewMode = ref('table'); // table | card
+const viewMode = ref('card'); // table | card
const routeInfo = ref({
processRouteCode: '',
productName: '',
--
Gitblit v1.9.3