From 06bea42e538d820b1837c14ba87691a63bf51936 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 19 三月 2026 17:42:22 +0800
Subject: [PATCH] 军泰伟业 1.修改生产模块的图纸编号和规格型号字段
---
src/views/productionManagement/processRoute/index.vue | 10 +-
src/views/basicData/product/ProductSelectDialog.vue | 6
src/views/productionManagement/workOrder/index.vue | 6
src/views/productionManagement/processRoute/processRouteItem/index.vue | 22 ++--
src/views/productionManagement/productionCosting/index.vue | 4
src/views/productionManagement/productStructure/StructureEdit.vue | 44 +++++-----
src/views/productionManagement/productionReporting/Input.vue | 4
src/views/productionManagement/productStructure/index.vue | 14 +-
src/views/productionManagement/processRoute/ItemsForm.vue | 4
src/views/productionManagement/productStructure/Detail/index.vue | 46 +++++-----
src/views/productionManagement/productionOrder/New.vue | 17 +--
src/views/productionManagement/productionReporting/index.vue | 4
src/views/productionManagement/productionOrder/index.vue | 6
13 files changed, 92 insertions(+), 95 deletions(-)
diff --git a/src/views/basicData/product/ProductSelectDialog.vue b/src/views/basicData/product/ProductSelectDialog.vue
index df3b3ca..a754a68 100644
--- a/src/views/basicData/product/ProductSelectDialog.vue
+++ b/src/views/basicData/product/ProductSelectDialog.vue
@@ -5,8 +5,8 @@
<el-input v-model="query.productName" placeholder="杈撳叆浜у搧澶х被" clearable @keyup.enter="onSearch" />
</el-form-item>
- <el-form-item label="鍨嬪彿鍚嶇О">
- <el-input v-model="query.model" placeholder="杈撳叆鍨嬪彿鍚嶇О" clearable @keyup.enter="onSearch" />
+ <el-form-item label="鍥剧焊缂栧彿">
+ <el-input v-model="query.model" placeholder="杈撳叆鍥剧焊缂栧彿" clearable @keyup.enter="onSearch" />
</el-form-item>
<el-form-item>
@@ -21,8 +21,8 @@
<el-table-column type="selection" width="55" />
<el-table-column type="index" label="搴忓彿" width="60" />
<el-table-column prop="productName" label="浜у搧澶х被" min-width="160" />
- <el-table-column prop="drawingNumber" label="瑙勬牸鍨嬪彿" min-width="160" />
<el-table-column prop="model" label="鍥剧焊缂栧彿" min-width="200" />
+ <el-table-column prop="drawingNumber" label="瑙勬牸鍨嬪彿" min-width="160" />
<el-table-column prop="unit" label="鍗曚綅" min-width="160" />
</el-table>
diff --git a/src/views/productionManagement/processRoute/ItemsForm.vue b/src/views/productionManagement/processRoute/ItemsForm.vue
index 9be0b44..37cbebd 100644
--- a/src/views/productionManagement/processRoute/ItemsForm.vue
+++ b/src/views/productionManagement/processRoute/ItemsForm.vue
@@ -190,8 +190,8 @@
const tableColumn = ref([
{ label: "浜у搧鍚嶇О", prop: "productName", width: 180 },
- { label: "浜у搧鍥剧焊缂栧彿", prop: "drawingNumber", width: 150 },
- { label: "瑙勬牸鍚嶇О", prop: "model", width: 150 },
+ { label: "鍥剧焊缂栧彿", prop: "model", width: 150 },
+ { label: "瑙勬牸鍨嬪彿", prop: "drawingNumber", width: 150 },
{ label: "鍗曚綅", prop: "unit", width: 80 },
{ label: "宸ュ簭鍚嶇О", prop: "processId", width: 180 },
{
diff --git a/src/views/productionManagement/processRoute/index.vue b/src/views/productionManagement/processRoute/index.vue
index 44592d6..9a4950d 100644
--- a/src/views/productionManagement/processRoute/index.vue
+++ b/src/views/productionManagement/processRoute/index.vue
@@ -75,13 +75,13 @@
label: "浜у搧鍚嶇О",
prop: "productName",
},
- {
- label: "浜у搧鍥剧焊缂栧彿",
- prop: "drawingNumber",
- },
+ {
+ label: "鍥剧焊缂栧彿",
+ prop: "model",
+ },
{
label: "瑙勬牸鍚嶇О",
- prop: "model",
+ prop: "drawingNumber",
},
{
label: "BOM缂栧彿",
diff --git a/src/views/productionManagement/processRoute/processRouteItem/index.vue b/src/views/productionManagement/processRoute/processRouteItem/index.vue
index f61afe9..0f0be43 100644
--- a/src/views/productionManagement/processRoute/processRouteItem/index.vue
+++ b/src/views/productionManagement/processRoute/processRouteItem/index.vue
@@ -21,20 +21,20 @@
<span class="info-value">{{ routeInfo.productName || '-' }}</span>
</div>
</div>
+ <div class="info-item">
+ <div class="info-label-wrapper">
+ <span class="info-label">鍥剧焊缂栧彿</span>
+ </div>
+ <div class="info-value-wrapper">
+ <span class="info-value">{{ routeInfo.model || '-' }}</span>
+ </div>
+ </div>
<div class="info-item">
<div class="info-label-wrapper">
- <span class="info-label">浜у搧鍥剧焊缂栧彿</span>
+ <span class="info-label">瑙勬牸鍨嬪彿</span>
</div>
<div class="info-value-wrapper">
<span class="info-value">{{ routeInfo.drawingNumber || '-' }}</span>
- </div>
- </div>
- <div class="info-item">
- <div class="info-label-wrapper">
- <span class="info-label">瑙勬牸鍚嶇О</span>
- </div>
- <div class="info-value-wrapper">
- <span class="info-value">{{ routeInfo.model || '-' }}</span>
</div>
</div>
<div class="info-item">
@@ -88,8 +88,8 @@
</template>
</el-table-column>
<el-table-column label="浜у搧鍚嶇О" prop="productName" min-width="160" />
- <el-table-column label="鍥剧焊缂栧彿" prop="drawingNumber" min-width="160" />
- <el-table-column label="瑙勬牸鍚嶇О" prop="model" min-width="140" />
+ <el-table-column label="鍥剧焊缂栧彿" prop="model" min-width="140" />
+ <el-table-column label="瑙勬牸鍨嬪彿" prop="drawingNumber" min-width="160" />
<el-table-column label="鍗曚綅" prop="unit" width="100" />
<el-table-column label="鏄惁璐ㄦ" prop="isQuality" width="100">
<template #default="scope">
diff --git a/src/views/productionManagement/productStructure/Detail/index.vue b/src/views/productionManagement/productStructure/Detail/index.vue
index 6d77d9b..8f05214 100644
--- a/src/views/productionManagement/productStructure/Detail/index.vue
+++ b/src/views/productionManagement/productStructure/Detail/index.vue
@@ -34,27 +34,27 @@
style="width: 100%">
<el-table-column prop="productName"
label="浜у搧" />
+ <el-table-column prop="model"
+ label="鍥剧焊缂栧彿">
+ <template #default="{ row, $index }">
+ <el-form-item v-if="dataValue.isEdit"
+ :rules="[{ required: true, message: '璇烽�夋嫨瑙勬牸', trigger: ['blur','change'] }]"
+ style="margin: 0">
+ <el-select v-model="row.model"
+ placeholder="璇烽�夋嫨瑙勬牸"
+ clearable
+ :disabled="!dataValue.isEdit || dataValue.dataList.some(item => (item as any).tempId === row.tempId)"
+ style="width: 100%"
+ @visible-change="(v) => { if (v) openDialog(row.tempId) }">
+ <el-option v-if="row.model"
+ :label="row.model"
+ :value="row.model" />
+ </el-select>
+ </el-form-item>
+ </template>
+ </el-table-column>
<el-table-column prop="drawingNumber"
- label="浜у搧鍥剧焊缂栧彿" />
- <el-table-column prop="model"
- label="瑙勬牸">
- <template #default="{ row, $index }">
- <el-form-item v-if="dataValue.isEdit"
- :rules="[{ required: true, message: '璇烽�夋嫨瑙勬牸', trigger: ['blur','change'] }]"
- style="margin: 0">
- <el-select v-model="row.model"
- placeholder="璇烽�夋嫨瑙勬牸"
- clearable
- :disabled="!dataValue.isEdit || dataValue.dataList.some(item => (item as any).tempId === row.tempId)"
- style="width: 100%"
- @visible-change="(v) => { if (v) openDialog(row.tempId) }">
- <el-option v-if="row.model"
- :label="row.model"
- :value="row.model" />
- </el-select>
- </el-form-item>
- </template>
- </el-table-column>
+ label="瑙勬牸鍨嬪彿" />
<el-table-column prop="processName"
label="娑堣�楀伐搴�">
<template #default="{ row, $index }">
@@ -145,10 +145,10 @@
prop="bomNo" />
<el-table-column label="浜у搧鍚嶇О"
prop="productName" />
- <el-table-column label="浜у搧鍥剧焊缂栧彿"
- prop="drawingNumber" />
+ <el-table-column label="鍥剧焊缂栧彿"
+ prop="model" />
<el-table-column label="瑙勬牸鍨嬪彿"
- prop="model" />
+ prop="drawingNumber" />
</el-table>
<product-select-dialog v-if="dataValue.showProductDialog"
v-model:model-value="dataValue.showProductDialog"
diff --git a/src/views/productionManagement/productStructure/StructureEdit.vue b/src/views/productionManagement/productStructure/StructureEdit.vue
index c73a0bc..f610637 100644
--- a/src/views/productionManagement/productStructure/StructureEdit.vue
+++ b/src/views/productionManagement/productStructure/StructureEdit.vue
@@ -35,30 +35,30 @@
<el-table-column prop="productName"
label="浜у搧"
width="150" />
+ <el-table-column prop="model"
+ label="鍥剧焊缂栧彿"
+ width="150">
+ <template #default="{ row, $index }">
+ <el-form-item v-if="dataValue.isEdit"
+ :prop="`dataList.${$index}.model`"
+ :rules="[{ required: true, message: '璇烽�夋嫨鍥剧焊缂栧彿', trigger: ['blur','change'] }]"
+ style="margin: 0">
+ <el-select v-model="row.model"
+ placeholder="璇烽�夋嫨浜у搧"
+ clearable
+ :disabled="!dataValue.isEdit"
+ style="width: 100%"
+ @visible-change="(v) => { if (v) openDialog($index) }">
+ <el-option v-if="row.model"
+ :label="row.model"
+ :value="row.model" />
+ </el-select>
+ </el-form-item>
+ </template>
+ </el-table-column>
<el-table-column prop="drawingNumber"
- label="鍥剧焊缂栧彿"
+ label="瑙勬牸鍨嬪彿"
width="150" />
- <el-table-column prop="model"
- label="瑙勬牸"
- width="150">
- <template #default="{ row, $index }">
- <el-form-item v-if="dataValue.isEdit"
- :prop="`dataList.${$index}.model`"
- :rules="[{ required: true, message: '璇烽�夋嫨瑙勬牸', trigger: ['blur','change'] }]"
- style="margin: 0">
- <el-select v-model="row.model"
- placeholder="璇烽�夋嫨浜у搧"
- clearable
- :disabled="!dataValue.isEdit"
- style="width: 100%"
- @visible-change="(v) => { if (v) openDialog($index) }">
- <el-option v-if="row.model"
- :label="row.model"
- :value="row.model" />
- </el-select>
- </el-form-item>
- </template>
- </el-table-column>
<el-table-column prop="processId"
label="娑堣�楀伐搴�"
width="150">
diff --git a/src/views/productionManagement/productStructure/index.vue b/src/views/productionManagement/productStructure/index.vue
index 5d4dbe1..e5de928 100644
--- a/src/views/productionManagement/productStructure/index.vue
+++ b/src/views/productionManagement/productStructure/index.vue
@@ -77,15 +77,15 @@
minWidth: 160
},
- {
- label: "浜у搧鍥剧焊缂栧彿",
- prop: "drawingNumber",
- minWidth: 160
- },
+ {
+ label: "鍥剧焊缂栧彿",
+ prop: "productModelName",
+ minWidth: 140
+ },
{
label: "瑙勬牸鍨嬪彿",
- prop: "productModelName",
- minWidth: 140
+ prop: "drawingNumber",
+ minWidth: 160
},
{
label: "鐗堟湰鍙�",
diff --git a/src/views/productionManagement/productionCosting/index.vue b/src/views/productionManagement/productionCosting/index.vue
index bc78c38..f73e121 100644
--- a/src/views/productionManagement/productionCosting/index.vue
+++ b/src/views/productionManagement/productionCosting/index.vue
@@ -99,12 +99,12 @@
},
{
label: "浜у搧鍥剧焊缂栧彿",
- prop: "drawingNumber",
+ prop: "productModelName",
minWidth: 100,
},
{
label: "瑙勬牸鍨嬪彿",
- prop: "productModelName",
+ prop: "drawingNumber",
minWidth: 100,
},
{
diff --git a/src/views/productionManagement/productionOrder/New.vue b/src/views/productionManagement/productionOrder/New.vue
index baa2578..b8dcaf3 100644
--- a/src/views/productionManagement/productionOrder/New.vue
+++ b/src/views/productionManagement/productionOrder/New.vue
@@ -22,21 +22,18 @@
{{ formState.productName ? formState.productName : '閫夋嫨浜у搧' }}
</el-button>
</el-form-item>
-
+ <el-form-item
+ label="鍥剧焊缂栧彿"
+ prop="productModelName"
+ >
+ <el-input v-model="formState.productModelName" disabled />
+ </el-form-item>
<el-form-item
- label="鍥剧焊缂栧彿"
+ label="瑙勬牸鍨嬪彿"
prop="drawingNumber"
>
<el-input v-model="formState.drawingNumber" disabled />
</el-form-item>
-
- <el-form-item
- label="瑙勬牸"
- prop="productModelName"
- >
- <el-input v-model="formState.productModelName" disabled />
- </el-form-item>
-
<el-form-item
label="鍗曚綅"
prop="unit"
diff --git a/src/views/productionManagement/productionOrder/index.vue b/src/views/productionManagement/productionOrder/index.vue
index 494c646..b053a3f 100644
--- a/src/views/productionManagement/productionOrder/index.vue
+++ b/src/views/productionManagement/productionOrder/index.vue
@@ -141,12 +141,12 @@
},
{
label: "鍥剧焊缂栧彿",
- prop: "drawingNumber",
+ prop: "specificationModel",
width: '160px',
},
{
- label: "瑙勬牸",
- prop: "specificationModel",
+ label: "瑙勬牸鍨嬪彿",
+ prop: "drawingNumber",
width: '120px',
},
{
diff --git a/src/views/productionManagement/productionReporting/Input.vue b/src/views/productionManagement/productionReporting/Input.vue
index 800e02f..f026efc 100644
--- a/src/views/productionManagement/productionReporting/Input.vue
+++ b/src/views/productionManagement/productionReporting/Input.vue
@@ -64,11 +64,11 @@
},
{
label: '鎶曞叆浜у搧鍥剧焊缂栧彿',
- prop: 'drawingNumber',
+ prop: 'model'
},
{
label: '鎶曞叆浜у搧鍨嬪彿',
- prop: 'model',
+ prop: 'drawingNumber',
},
{
label: '鎶曞叆鏁伴噺',
diff --git a/src/views/productionManagement/productionReporting/index.vue b/src/views/productionManagement/productionReporting/index.vue
index 37e8665..9ad5eee 100644
--- a/src/views/productionManagement/productionReporting/index.vue
+++ b/src/views/productionManagement/productionReporting/index.vue
@@ -179,12 +179,12 @@
},
{
label: "浜у搧鍥剧焊缂栧彿",
- prop: "drawingNumber",
+ prop: "productModelName"
width: 160,
},
{
label: "浜у搧瑙勬牸鍨嬪彿",
- prop: "productModelName",
+ prop: "drawingNumber",
width: 120,
},
{
diff --git a/src/views/productionManagement/workOrder/index.vue b/src/views/productionManagement/workOrder/index.vue
index cc41361..e12fe84 100644
--- a/src/views/productionManagement/workOrder/index.vue
+++ b/src/views/productionManagement/workOrder/index.vue
@@ -252,11 +252,11 @@
},
{
label: "鍥剧焊缂栧彿",
- prop: "drawingNumber",
+ prop: "model"
},
{
- label: "瑙勬牸",
- prop: "model",
+ label: "瑙勬牸鍨嬪彿",
+ prop: "drawingNumber",
},
{
label: "鍗曚綅",
--
Gitblit v1.9.3