From 254ecc8b3f537a2f16253ead6fe9efe0aae77f0b Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Mon, 16 Mar 2026 15:53:35 +0800
Subject: [PATCH] =?UTF-8?q?1.0.88=20=E9=87=87=E8=B4=AD=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E3=80=81=E5=85=B3=E8=81=94=E9=94=80=E5=94=AE=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E6=94=B9=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/oa/base/relationMaterial/index.vue | 10 +++++-----
 src/views/oa/erp/projectPurchase/edit.vue    | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/views/oa/base/relationMaterial/index.vue b/src/views/oa/base/relationMaterial/index.vue
index 1c5cfdb..a43581f 100644
--- a/src/views/oa/base/relationMaterial/index.vue
+++ b/src/views/oa/base/relationMaterial/index.vue
@@ -7,8 +7,8 @@
             <el-form-item label="SAP物料编码" prop="materialCode">
               <el-input v-model="queryParams.materialCode" placeholder="请输入SAP物料编码" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="SAP物料名称" prop="materialName">
-              <el-input v-model="queryParams.materialName" placeholder="请输入SAP物料名称" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="采购物料名称" prop="materialName">
+              <el-input v-model="queryParams.materialName" placeholder="请输入采购物料名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="客户名称" prop="customerId">
               <el-select v-model="queryParams.customerId" placeholder="请选择客户名称" filterable clearable @keyup.enter="handleQuery">
@@ -62,7 +62,7 @@
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="关联物料ID" align="center" prop="relationMaterialId" v-if="columns[0].visible" />
         <el-table-column label="物料编码" align="center" prop="materialCode" width="120"  v-if="columns[1].visible" />
-        <el-table-column label="物料名称" align="center" prop="materialName" width="280"  v-if="columns[2].visible" />
+        <el-table-column label="采购物料名称" align="center" prop="materialName" width="280"  v-if="columns[2].visible" />
         <el-table-column label="客户名称" align="center" prop="customerName" width="180"  v-if="columns[3].visible" />
         <el-table-column label="销售物料名称" align="center" prop="saleMaterialName" width="180"  v-if="columns[4].visible" />
         <el-table-column label="销售物料型号" align="center" prop="saleMaterialModel" width="180"  v-if="columns[5].visible" />
@@ -108,7 +108,7 @@
     <!-- 添加或修改关联销售物料信息对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="relationMaterialFormRef" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="物料名称" prop="materialId">
+        <el-form-item label="采购物料名称" prop="materialId">
           <el-input v-model="form.materialName" placeholder="请点击右侧图标检索物料" readonly>
             <template #suffix>
               <el-icon style="cursor: pointer" @click="openMaterialSelect">
@@ -195,7 +195,7 @@ const getCustomerInfoListSelect = async () => {
 const columns = ref<FieldOption[]>([
   { key: 0, label: `关联物料ID`, visible: false },
   { key: 1, label: `物料编码`, visible: true },
-  { key: 2, label: `物料名称`, visible: true },
+  { key: 2, label: `采购物料名称`, visible: true },
   { key: 3, label: `客户名称`, visible: true },
   { key: 4, label: `销售物料名称`, visible: true },
   { key: 5, label: `销售物料型号`, visible: true },
diff --git a/src/views/oa/erp/projectPurchase/edit.vue b/src/views/oa/erp/projectPurchase/edit.vue
index 0e669ae..be228bc 100644
--- a/src/views/oa/erp/projectPurchase/edit.vue
+++ b/src/views/oa/erp/projectPurchase/edit.vue
@@ -119,7 +119,7 @@
           </template>
         </el-table-column>
         <el-table-column label="关联物料编号" prop="relationMaterialCode" min-width="140" show-overflow-tooltip align="center" />
-        <el-table-column label="关联物料名称" prop="relationMaterialName" min-width="160" show-overflow-tooltip align="center" />
+        <el-table-column label="销售物料名称" prop="relationMaterialName" min-width="160" show-overflow-tooltip align="center" />
         <el-table-column label="采购物料名称" prop="materialName" min-width="160" show-overflow-tooltip align="center" />
         <el-table-column label="规格参数" prop="specificationDescription" min-width="160" show-overflow-tooltip align="center" />
         <el-table-column label="计划标识" prop="purchasePlanFlag" width="100" align="center">
@@ -137,7 +137,7 @@
         <el-table-column label="备注" prop="remark" min-width="160" show-overflow-tooltip align="center" />
         <el-table-column label="操作" fixed="right" width="150" align="center" v-if="canEditMaterial">
           <template #default="scope">
-            <el-button link type="warning" @click="splitMaterial(scope.row)">拆分</el-button>
+<!--            <el-button link type="warning" @click="splitMaterial(scope.row)">拆分</el-button>-->
             <el-button link type="primary" @click="handleEditMaterial(scope.row)">编辑</el-button>
             <el-button link type="danger" @click="handleDeleteMaterial(scope.row)">删除</el-button>
           </template>
@@ -161,7 +161,7 @@
             {{ scope.$index + 1 }}
           </template>
         </el-table-column>
-        <el-table-column label="关联物料名称" prop="relationMaterialName" min-width="160" show-overflow-tooltip align="center" />
+        <el-table-column label="销售物料名称" prop="relationMaterialName" min-width="160" show-overflow-tooltip align="center" />
         <el-table-column label="采购物料名称" min-width="160" show-overflow-tooltip align="center">
           <template #default="scope">
             <span>{{ scope.row.purchaseMaterialName || scope.row.materialName }}</span>
@@ -207,12 +207,12 @@
             </el-form-item>
           </el-col>
           <el-col v-if="materialForm.materialFlag === '1'" :span="12">
-            <el-form-item label="关联物料名称">
+            <el-form-item label="销售物料名称">
               <el-input v-model="materialForm.relationMaterialName" disabled />
             </el-form-item>
           </el-col>
           <el-col v-if="materialForm.materialFlag === '2'" :span="12">
-            <el-form-item label="关联物料名称">
+            <el-form-item label="销售物料名称">
               <el-input v-model="materialForm.relationMaterialName" disabled />
             </el-form-item>
           </el-col>