2026-05-18

RoHs功能优化

src/api/rohs/rohs.js

@@ -39,5 +39,8 @@ export const getRohsNodeAuthority = data => createAPI(`/plm/changeManagement/get
 // 查询BM角色人员（复用技术参数卡接口）
 export const searchBmUser = data => createAPI(`/technicalSpecification/searchBMUser`, 'post', data);
 
+// 查询流程节点列表（复用技术参数卡接口）
+export const getNodeList = data => createAPI(`/technicalSpecification/node/list`, 'post', data);
+
 // 导出
 export const exportRohs = params => createAPI(`/rohs/export`, 'get', params);

src/views/modules/rohs/rohsRecord.vue

@@ -5,8 +5,25 @@
       <el-form-item label="序列号">
         <el-input v-model="searchData.referenceNo" clearable style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item label="申请人">
-        <el-input v-model="searchData.applicant" clearable style="width: 120px"></el-input>
+      <el-form-item label="单据状态">
+        <el-select v-model="searchData.status" clearable style="width: 120px">
+          <el-option label="草稿" value="草稿"></el-option>
+          <el-option label="审批中" value="审批中"></el-option>
+          <el-option label="已完成" value="已完成"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="节点审批人">
+        <el-input v-model="searchData.currentApprover" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item label="当前节点">
+        <el-select v-model="searchData.nodeId" placeholder="请选择节点" clearable style="width: 120px">
+          <el-option
+            v-for="option in nodeOptions"
+            :key="option.id"
+            :label="option.name"
+            :value="option.id">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item :label="' '">
         <el-button v-if="authSearch" @click="getDataList">查询</el-button>
@@ -549,7 +566,7 @@
           <el-input type="textarea" v-model="rejectOpinion" :rows="3" resize="none" show-word-limit style="width: 479px;height: 30px"></el-input>
         </el-form-item>
       </el-form>
-      <el-footer style="height:35px;text-align:center">
+      <el-footer style="height:35px;margin-top:50px;text-align:center">
         <el-button type="primary" :loading="submitLoading" @click="rejectSubmit">确定</el-button>
         <el-button type="primary" @click="submitModalFlag = false">取消</el-button>
       </el-footer>
@@ -850,7 +867,9 @@ export default {
       searchData: {
         site: this.$store.state.user.site,
         referenceNo: '',
-        applicant: ''
+        status: '',
+        currentApprover: '',
+        nodeId: ''
       },
       dataList: [],
       pageIndex: 1,
@@ -1036,6 +1055,7 @@ export default {
       projectMaterialPageSize: 20,
       projectMaterialTotal: 0,
       projectMaterialLoading: false,
+      nodeOptions: [],
       projectList: [],
       hsfApproverOptionList: [],
       fileList: [],
@@ -1127,6 +1147,7 @@ export default {
     this.checkSuperAdmin()
   },
   mounted () {
+    this.fetchNodeOptions()
     if (this.authSearch) {
       this.getDataList()
     }
@@ -1137,6 +1158,30 @@ export default {
     })
   },
   methods: {
+    fetchNodeOptions () {
+      if (!this.searchData.site || !this.menuId) {
+        this.nodeOptions = []
+        return
+      }
+      let params = {
+        site: this.searchData.site,
+        menuId: this.menuId
+      }
+      api.getNodeList(params).then(({data}) => {
+        if (data && data.code === 0 && Array.isArray(data.rows)) {
+          this.nodeOptions = data.rows
+            .filter(item => item && item.nodeId)
+            .map(item => ({
+              id: item.nodeId,
+              name: item.nodeName
+            }))
+        } else {
+          this.nodeOptions = []
+        }
+      }).catch(() => {
+        this.nodeOptions = []
+      })
+    },
     loadNodeAuthority (site, stepId) {
       if (!site || stepId === null || stepId === undefined || !this.menuId) {
         this.plmRohsAuthorityArr = []
@@ -1554,7 +1599,9 @@ export default {
         site: this.$store.state.user.site,
         menuId: this.menuId,
         referenceNo: this.searchData.referenceNo,
-        applicant: this.searchData.applicant
+        status: this.searchData.status,
+        currentApprover: this.searchData.currentApprover,
+        nodeId: this.searchData.nodeId
       }
       api.getRohsList(params).then(({data}) => {
         if (data && data.code === 0) {