From 49e4d7dce7048400279f9182c883b21d06a6ab0e Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Mon, 30 Mar 2026 16:14:42 +0800
Subject: [PATCH] =?UTF-8?q?4=E3=80=81=E5=8E=9F=E6=9D=90=E6=96=99=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E5=A2=9E=E5=8A=A0=E5=B7=A5=E5=BA=8F=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E4=B8=8B=E6=8B=89=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=205=E3=80=81=E5=8E=9F=E6=9D=90=E6=96=99=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E8=AE=BE=E7=BD=AE=E6=88=90=E5=8F=AA=E6=9C=89?=
 =?UTF-8?q?=E8=AF=95=E9=AA=8C=E8=B4=9F=E8=B4=A3=E4=BA=BA=E6=89=8D=E6=9C=89?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E5=A2=9E=E5=88=A0=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erf/components/expRawMaterialList.vue     | 175 +++++++++++++++++-
 src/views/modules/erf/expApplyList.vue        |   7 +-
 2 files changed, 176 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/erf/components/expRawMaterialList.vue b/src/views/modules/erf/components/expRawMaterialList.vue
index 732db1c..bebfd70 100644
--- a/src/views/modules/erf/components/expRawMaterialList.vue
+++ b/src/views/modules/erf/components/expRawMaterialList.vue
@@ -7,7 +7,7 @@
         type="primary"
         size="small"
         class="add-btn"
-        v-if="!disabled"
+        v-if="canEdit"
         @click="openAddDialog">
         新增物料
       </el-button>
@@ -15,11 +15,16 @@
         type="primary"
         size="small"
         class="reset-btn"
-        v-if="!disabled"
+        v-if="canEdit"
         :disabled="selectedRows.length === 0"
         @click="batchDeleteRawMaterial">
         批量删除
       </el-button>
+      <span
+        v-if="!disabled && !canEdit"
+        style="margin-left: 8px; color: #909399; font-size: 12px;">
+        仅试验负责人可维护原材料清单
+      </span>
     </div>
 
     <!-- 数据表格 -->
@@ -37,7 +42,7 @@
         type="selection"
         width="55"
         align="center"
-        v-if="!disabled">
+        v-if="canEdit">
       </el-table-column>
 
       <!-- 序号 -->
@@ -71,6 +76,19 @@
         show-overflow-tooltip>
       </el-table-column>
 
+      <!-- 工序 -->
+      <el-table-column
+        prop="processStep"
+        label="工序"
+        min-width="140"
+        align="center"
+        header-align="center"
+        show-overflow-tooltip>
+        <template slot-scope="scope">
+          {{ scope.row.processStep || '-' }}
+        </template>
+      </el-table-column>
+
       <!-- 数量 -->
       <el-table-column
         prop="quantity"
@@ -111,7 +129,7 @@
         width="150"
         align="center"
         header-align="center"
-        v-if="!disabled">
+        v-if="canEdit">
         <template slot-scope="scope">
           <el-link
             style="cursor:pointer; margin-right: 10px;"
@@ -136,6 +154,23 @@
       :close-on-click-modal="false">
 
       <el-form :model="formData" label-width="80px" size="small">
+        <el-form-item label="工序" required>
+          <el-select
+            v-model="formData.processStep"
+            placeholder="请选择工序"
+            filterable
+            clearable
+            :loading="processOptionsLoading"
+            style="width: 100%">
+            <el-option
+              v-for="item in processOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
         <el-form-item label="物料编码">
           <el-input
             v-model="formData.partNo"
@@ -198,6 +233,7 @@
 
 <script>
 import { getRawMaterialList, saveRawMaterial, deleteRawMaterial, batchDeleteRawMaterial, getPartDescByPartNo } from '@/api/erf/erf'
+import { searchStandardRoutingOperationList } from '@/api/part/standardRoutingOperation'
 
 export default {
   name: 'ExpRawMaterialList',
@@ -218,6 +254,16 @@ export default {
       type: String,
       default: ''
     },
+    // 试验负责人（显示名）
+    projectLeader: {
+      type: String,
+      default: ''
+    },
+    // 试验负责人（用户名）
+    projectLeaderName: {
+      type: String,
+      default: ''
+    },
     // 是否禁用编辑
     disabled: {
       type: Boolean,
@@ -248,6 +294,7 @@ export default {
         applyNo: '',
         site: '',
         buNo: '',
+        processStep: '',
         partNo: '',
         partDesc: '',
         quantity: '',
@@ -256,7 +303,13 @@ export default {
       },
 
       // 保存加载状态
-      saveLoading: false
+      saveLoading: false,
+
+      // 标准工序下拉选项
+      processOptions: [],
+
+      // 标准工序加载状态
+      processOptionsLoading: false
     }
   },
 
@@ -269,6 +322,44 @@ export default {
       if (newVal) {
         this.loadRawMaterialList()
       }
+    },
+    buNo(newVal, oldVal) {
+      if (newVal !== oldVal) {
+        if (this.canEdit) {
+          this.loadProcessOptions()
+        } else {
+          this.processOptions = []
+        }
+      }
+    },
+    canEdit(newVal) {
+      if (newVal) {
+        this.loadProcessOptions()
+      } else {
+        this.processOptions = []
+      }
+    }
+  },
+
+  computed: {
+    /**
+     * 是否可编辑原材料清单（仅试验负责人）
+     */
+    canEdit() {
+      if (this.disabled) {
+        return false
+      }
+      const currentUserName = (this.$store.state.user.name || '').trim()
+      const currentUserDisplay = (this.$store.state.user.userDisplay || '').trim()
+      const leaderList = [this.projectLeaderName, this.projectLeader]
+        .filter(item => item && item.trim())
+        .map(item => item.trim())
+
+      if (leaderList.length === 0) {
+        return false
+      }
+
+      return leaderList.some(item => item === currentUserName || item === currentUserDisplay)
     }
   },
 
@@ -297,16 +388,82 @@ export default {
       })
     },
 
+    /**
+     * 按BU加载标准工序下拉
+     */
+    loadProcessOptions() {
+      if (!this.buNo) {
+        this.processOptions = []
+        return
+      }
+
+      this.processOptionsLoading = true
+      const queryData = {
+        userName: this.$store.state.user.name,
+        site: this.site || this.$store.state.user.site,
+        buNo: this.buNo,
+        page: 1,
+        limit: 500
+      }
+
+      searchStandardRoutingOperationList(queryData).then(({data}) => {
+        this.processOptionsLoading = false
+        if (data && data.code === 0) {
+          const list = (data.page && data.page.list) ? data.page.list : []
+          const optionMap = {}
+          list.forEach(item => {
+            const processName = item.operationName ? item.operationName.trim() : ''
+            if (!processName) {
+              return
+            }
+            if (!optionMap[processName]) {
+              const hasOperationNo = item.operationNo !== null && item.operationNo !== undefined && item.operationNo !== ''
+              optionMap[processName] = {
+                value: processName,
+                label: hasOperationNo ? `${item.operationNo} - ${processName}` : processName
+              }
+            }
+          })
+          this.processOptions = Object.values(optionMap)
+        } else {
+          this.processOptions = []
+          this.$message.error(data.msg || '加载标准工序失败')
+        }
+      }).catch(() => {
+        this.processOptionsLoading = false
+        this.processOptions = []
+        this.$message.error('加载标准工序异常')
+      })
+    },
+
+    /**
+     * 编辑场景兜底：已选工序不在下拉时补充显示
+     */
+    ensureProcessOption(processStep) {
+      if (!processStep) {
+        return
+      }
+      const exists = this.processOptions.some(item => item.value === processStep)
+      if (!exists) {
+        this.processOptions.push({
+          value: processStep,
+          label: processStep
+        })
+      }
+    },
+
     /**
      * 打开新增弹窗
      */
     openAddDialog() {
+      this.loadProcessOptions()
       this.dialogTitle = '新增物料'
       this.formData = {
         id: null,
         applyNo: this.applyNo,
         site: this.site || this.$store.state.user.site,
         buNo: this.buNo,
+        processStep: '',
         partNo: '',
         partDesc: '',
         quantity: '',
@@ -326,12 +483,14 @@ export default {
         applyNo: row.applyNo,
         site: row.site,
         buNo: this.buNo,
+        processStep: row.processStep || '',
         partNo: row.partNo,
         partDesc: row.partDesc,
         quantity: row.quantity,
         umid: row.umid || '',
         remark: row.remark
       }
+      this.ensureProcessOption(this.formData.processStep)
       this.dialogVisible = true
     },
 
@@ -345,6 +504,11 @@ export default {
         return
       }
 
+      if (!this.formData.processStep) {
+        this.$message.warning('请选择工序')
+        return
+      }
+
       const qty = Number(this.formData.quantity)
       if (isNaN(qty) || qty <= 0) {
         this.$message.warning('请输入有效数字（必须大于0）')
@@ -358,6 +522,7 @@ export default {
         id: this.formData.id,
         applyNo: this.formData.applyNo,
         site: this.formData.site,
+        processStep: this.formData.processStep,
         partNo: this.formData.partNo || null,
         partDesc: this.formData.partDesc,
         quantity: this.formData.quantity,
diff --git a/src/views/modules/erf/expApplyList.vue b/src/views/modules/erf/expApplyList.vue
index a6ae395..b35a97e 100644
--- a/src/views/modules/erf/expApplyList.vue
+++ b/src/views/modules/erf/expApplyList.vue
@@ -329,6 +329,8 @@
           :apply-no="currentRow.applyNo"
           :site="currentRow.site || $store.state.user.site"
           :buNo="currentRow.buNo"
+          :project-leader="currentRow.projectLeader"
+          :project-leader-name="currentRow.projectLeaderName"
           :disabled="currentRow.status === '已完成' || currentRow.status === '已取消'"
           :height="detailHeight">
         </exp-raw-material-list>
@@ -1647,17 +1649,20 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
+        this.sendLoading = true
         cancelExpApply({
           applyNo: this.currentRow.applyNo,
           currentUserId: this.$store.state.user.id
         }).then(({data}) => {
+          this.sendLoading = false
           if (data && data.code === 0) {
-            this.$message.success('取消成功')
+            this.$message.success(data.msg || '取消成功')
             this.getDataList()
           } else {
             this.$message.error(data.msg || '取消失败')
           }
         }).catch(() => {
+          this.sendLoading = false
           this.$message.error('取消异常')
         })
       })