From 421f6da5f106f189ed4445214d4a2bb56103fe20 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 12 Jun 2026 14:10:52 +0800
Subject: [PATCH] =?UTF-8?q?2026-06-12=20RoHs=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/rohs/rohs.js                  |  2 +-
 src/views/modules/rohs/rohsRecord.vue | 25 +++++--------------------
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/src/api/rohs/rohs.js b/src/api/rohs/rohs.js
index 1edc79f..8a417fa 100644
--- a/src/api/rohs/rohs.js
+++ b/src/api/rohs/rohs.js
@@ -6,7 +6,7 @@ export const getRohsList = params => createAPI(`/rohs/list`, 'get', params);
 // 获取详情
 export const getRohsDetail = (site, referenceNo) => createAPI(`/rohs/info`, 'get', { site, referenceNo });
 
-// 查询项目物料（用于RoHs材料明细选择）
+// 查询物料（用于RoHs材料明细选择）
 export const getRohsProjectMaterialList = params => createAPI(`/rohs/projectMaterialList`, 'get', params);
 
 // 新增
diff --git a/src/views/modules/rohs/rohsRecord.vue b/src/views/modules/rohs/rohsRecord.vue
index 46d6488..b613e07 100644
--- a/src/views/modules/rohs/rohsRecord.vue
+++ b/src/views/modules/rohs/rohsRecord.vue
@@ -593,7 +593,7 @@
       </el-footer>
     </el-dialog>
 
-    <el-dialog title="选择项目物料" top="15vh" width="75%" :close-on-click-modal="false" v-drag :visible.sync="projectMaterialDialogFlag">
+    <el-dialog title="选择物料" top="15vh" width="50%" :close-on-click-modal="false" v-drag :visible.sync="projectMaterialDialogFlag">
       <el-form :inline="true" label-position="top" :model="projectMaterialSearchData">
         <el-form-item label="IFS物料编码/Final Part No.">
           <el-input v-model="projectMaterialSearchData.finalPartNo" clearable style="width: 150px"></el-input>
@@ -619,9 +619,9 @@
         :height="320"
         style="width: 100%">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="finalPartNo" label="IFS物料编码/Final Part No." min-width="150" header-align="center" align="left" :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column prop="finalPartNo" label="IFS物料编码/Final Part No." min-width="120" header-align="center" align="left" :show-overflow-tooltip="true"></el-table-column>
         <el-table-column prop="partDesc" label="描述/Part Desc." min-width="250" header-align="center" align="left" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column prop="partStatus" label="状态/Part Status" min-width="100" header-align="center" align="left" :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column prop="partStatus" label="状态/Part Status" min-width="80" header-align="center" align="left" :show-overflow-tooltip="true"></el-table-column>
       </el-table>
       <el-pagination
         style="margin-top: 10px"
@@ -2842,31 +2842,16 @@ export default {
         this.$message.warning('当前状态不允许编辑材料')
         return
       }
-      if (!this.modalData.projectId) {
-        this.$message.warning('请先选择项目编码')
-        return
-      }
-      if (!this.modalData.endCustomer) {
-        this.$message.warning('请先选择最终客户')
-        return
-      }
       this.projectMaterialDialogFlag = true
       this.projectMaterialPageIndex = 1
       this.searchProjectMaterialList()
     },
     searchProjectMaterialList () {
-      if (!this.modalData.projectId) {
-        this.projectMaterialList = []
-        this.projectMaterialTotal = 0
-        return
-      }
       this.projectMaterialLoading = true
       const params = {
         page: this.projectMaterialPageIndex,
         limit: this.projectMaterialPageSize,
         site: this.$store.state.user.site,
-        projectId: this.modalData.projectId,
-        endCustomer: this.modalData.endCustomer,
         partDesc: this.projectMaterialSearchData.partDesc,
         finalPartNo: this.projectMaterialSearchData.finalPartNo,
         partStatus: this.projectMaterialSearchData.partStatus
@@ -2883,7 +2868,7 @@ export default {
         } else {
           this.projectMaterialList = []
           this.projectMaterialTotal = 0
-          this.$message.error(data.msg || '项目物料查询失败')
+          this.$message.error(data.msg || '物料查询失败')
         }
         this.projectMaterialLoading = false
       }).catch(() => {
@@ -2910,7 +2895,7 @@ export default {
         return
       }
       if (!this.projectMaterialSelections || this.projectMaterialSelections.length === 0) {
-        this.$message.warning('请至少选择一条项目物料')
+        this.$message.warning('请至少选择一条物料')
         return
       }
       const appendResult = this.appendMaterialRows(this.projectMaterialSelections)