Merge remote-tracking branch 'origin/master'

src/views/modules/part/partInformation.vue

@@ -3228,6 +3228,10 @@
             if (data && data.code === 0) {
               this.queryPartRevisionList()
               this.updateRevisionModelFlag = false
+              // 如果是同步物料阶段，需要刷新下面BOM的列表
+              if (this.modalData.flag === '3') {
+                this.getBomAndRoutingList()
+              }
               this.$message({
                 message: '操作成功',
                 type: 'success',

src/views/modules/tooling/searchToolApply.vue

@@ -1278,6 +1278,7 @@
         }
       },
       editModal (row) {
+        this.getNodeAuthority(row)
         this.dataForm = {
           site: row.site,
           applyNo: row.applyNo,
@@ -1606,6 +1607,25 @@
           });
         }
       },
+      // 获取流程的配置权限
+      async getNodeAuthority (row) {
+        let tempData = {
+          site: row.site,
+          stepId: row.stepId,
+          menuId: this.$route.meta.menuId
+        }
+        await getNodeAuthority(tempData).then(({data}) => {
+          if (data && data.code === 0) {
+            // this.plmChangeRequestArr = data.rows.plm_change_request
+            // this.plmChangeRequestDetailArr = data.rows.plm_change_request_detail
+            // this.plmChangeCostImpactArr = data.rows.plm_change_cost_impact
+            // this.plmChangeFAItemArr = data.rows.plm_change_FA_item
+            // this.plmChangeExecutionInfoArr = data.rows.plm_change_execution_info
+            // this.plmChangeItemArr = data.rows.plm_change_item
+            // this.plmChangeCountersignatureItemArr = data.rows.plm_change_countersignature_item
+          }
+        })
+      },
     },
     activated() {