From b3799b06271d8ab9e4dec970a75b09b721114836 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Wed, 12 Feb 2025 12:20:50 +0800
Subject: [PATCH] plm BMM

---
 .../com_bm_bom.vue                            | 15 ++---
 .../com_bm_customerInformation.vue            | 15 ++---
 .../com_bm_demoSlot.vue                       | 19 +++---
 .../com_bm_routing.vue                        | 16 ++---
 .../com_tsd_basicInformation.vue              | 62 ++++++++++---------
 5 files changed, 66 insertions(+), 61 deletions(-)

diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
index 005f4ab..07767cd 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
@@ -19,8 +19,8 @@
         <el-button type="primary" @click="searchTable(true)" >刷新</el-button>
         <el-button type="primary" v-if="!ifDisableFlag" @click="changeBomRev()" >变更</el-button>
         <el-button type="primary" @click="jumpBom()" >跳转至BOM</el-button>
-        <el-button v-if="baseForm.status === 'spz'&&!ifDisableFlag&&spForm.sp.include(searchData.username+';')" type="primary" @click="agreeSubmit">同意</el-button>
-        <el-button v-if="baseForm.status === 'spz' && baseForm.isReject === 'Y' &&!ifDisableFlag&&spForm.sp.include(searchData.username+';')" type="primary" @click="submitDataModal">驳回</el-button>
+        <el-button v-if="baseForm.status === 'spz'&&!ifDisableFlag&&spForm.sp.includes(searchData.username)" type="primary" @click="agreeSubmit">同意</el-button>
+        <el-button v-if="baseForm.status === 'spz' && baseForm.isReject === 'Y' &&!ifDisableFlag&&spForm.sp.includes(searchData.username)" type="primary" @click="submitDataModal">驳回</el-button>
 <!--        <el-button type="primary" @click="newData()" v-if="!ifDisableFlag">新增</el-button>-->
       </el-form-item>
         </el-col>
@@ -560,12 +560,12 @@
       },
       // 获取流程的配置权限
       getNodeAuthority (row) {
-        getBMStatusDesc(this.searchData).then(({data})=>{
-          if(data.status==='已完成'||data.status==='已升版'){
-            this.ifDisableFlag=true
+        getBMStatusDesc(this.searchData).then(({data}) => {
+          if (data.status === '已完成' || data.status === '已升版') {
+            this.ifDisableFlag = true
             return false
-          }else {
-            //区分请求成功和失败的状况
+          }
+          if(data.status === '审批中') {
             let tempData = {
               site: row.site,
               stepId: row.stepId,
@@ -573,6 +573,7 @@
             }
             getNodeAuthority(tempData).then(({data}) => {
               if (data && data.code === 0) {
+                this.ifDisableFlag = true
                 let plmStepRoleBaseBm = data.rows.plm_stepRole_base_bm
                 let arr = plmStepRoleBaseBm.filter(a => a.fieldId === this.searchData.fieldId)
                 if (arr.length > 0) {
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
index 39930da..c6aa11a 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
@@ -6,8 +6,8 @@
           <el-form-item label=" " style="width: 100%">
       <el-button type="primary" @click="refresh()" >刷新数据</el-button>
       <el-button type="primary" @click="saveData()" v-if="!ifDisableFlag&&isAuth('103002:bmSave')">保存</el-button>
-      <el-button v-if="baseForm.status === 'spz'&&!ifDisableFlag&&spForm.sp.include(searchData.username+';')" type="primary" @click="agreeSubmit">同意</el-button>
-      <el-button v-if="baseForm.status === 'spz' && baseForm.isReject === 'Y' &&!ifDisableFlag&&spForm.sp.include(searchData.username+';')" type="primary" @click="submitDataModal">驳回</el-button>
+      <el-button v-if="baseForm.status === 'spz'&&!ifDisableFlag&&spForm.sp.includes(searchData.username)" type="primary" @click="agreeSubmit">同意</el-button>
+      <el-button v-if="baseForm.status === 'spz' && baseForm.isReject === 'Y' &&!ifDisableFlag&&spForm.sp.includes(searchData.username)" type="primary" @click="submitDataModal">驳回</el-button>
           </el-form-item>
         </el-col>
         <el-col :span="3"><div class="grid-content bg-purple">
@@ -381,12 +381,12 @@
 
       // 获取流程的配置权限
       getNodeAuthority (row) {
-        getBMStatusDesc(this.searchData).then(({data})=>{
-          if(data.status==='已完成'||data.status==='已升版'){
-            this.ifDisableFlag=true
+        getBMStatusDesc(this.searchData).then(({data}) => {
+          if (data.status === '已完成' || data.status === '已升版') {
+          this.ifDisableFlag = true
             return false
-          }else {
-          //区分请求成功和失败的状况
+          }
+          if(data.status === '审批中') {
             let tempData = {
               site: row.site,
               stepId: row.stepId,
@@ -394,6 +394,7 @@
             }
             getNodeAuthority(tempData).then(({data}) => {
               if (data && data.code === 0) {
+                this.ifDisableFlag = true
                 let plmStepRoleBaseBm = data.rows.plm_stepRole_base_bm
                 let arr = plmStepRoleBaseBm.filter(a => a.fieldId === this.searchData.fieldId)
                 if (arr.length > 0) {
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
index 8474f14..eb79327 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
@@ -13,8 +13,8 @@
         <el-button type="primary" @click="refreshBMPageModal()" v-if="!ifDisableFlag&&isAuth('103002:bmModel')">更新模板</el-button>
         <el-button type="primary" @click="searchTable()" >刷新数据</el-button>
         <el-button type="primary" @click="saveTable()" v-if="!ifDisableFlag&&isAuth('103002:bmSave')">保存数据</el-button>
-        <el-button v-if="baseForm.status === 'spz'&&!ifDisableFlag&&spForm.sp.include(searchData.username+';')" type="primary" @click="agreeSubmit">同意</el-button>
-        <el-button v-if="baseForm.status === 'spz' && baseForm.isReject === 'Y' &&!ifDisableFlag&&spForm.sp.include(searchData.username+';')" type="primary" @click="submitDataModal">驳回</el-button>
+        <el-button v-if="baseForm.status === 'spz'&&!ifDisableFlag&&spForm.sp.includes(searchData.username)" type="primary" @click="agreeSubmit">同意</el-button>
+        <el-button v-if="baseForm.status === 'spz' && baseForm.isReject === 'Y' &&!ifDisableFlag&&spForm.sp.includes(searchData.username)" type="primary" @click="submitDataModal">驳回</el-button>
       </el-form-item>
         </el-col>
         <el-col :span="3"><div class="grid-content bg-purple">
@@ -310,12 +310,12 @@
       },
       // 获取流程的配置权限
       getNodeAuthority (row) {
-        getBMStatusDesc(this.searchData).then(({data})=>{
-          if(data.status==='已完成'||data.status==='已升版'){
-            this.ifDisableFlag=true
+        getBMStatusDesc(this.searchData).then(({data}) => {
+          if (data.status === '已完成' || data.status === '已升版') {
+            this.ifDisableFlag = true
             return false
-          }else {
-            //区分请求成功和失败的状况
+          }
+          if(data.status === '审批中') {
             let tempData = {
               site: row.site,
               stepId: row.stepId,
@@ -323,15 +323,14 @@
             }
             getNodeAuthority(tempData).then(({data}) => {
               if (data && data.code === 0) {
+                this.ifDisableFlag = true
                 let plmStepRoleBaseBm = data.rows.plm_stepRole_base_bm
                 let arr = plmStepRoleBaseBm.filter(a => a.fieldId === this.searchData.fieldId)
                 if (arr.length > 0) {
                   if (arr[0].updateFlag === 'N') {
                     this.ifDisableFlag = true
                   } else {
-                    if(!this.searchData.ifDisableFlag){
-                      this.ifDisableFlag = false
-                    }
+                    this.ifDisableFlag = false
                   }
                 } else {
                   this.ifDisableFlag = true
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
index 2ed833b..c09c1cc 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
@@ -16,8 +16,8 @@
             </el-form-item>
             <el-form-item  label=" ">
               <el-button type="primary" @click="updateBMProcess()" v-if="!ifDisableFlag&&isAuth('103002:bmSave')">保存</el-button>
-              <el-button v-if="baseForm.status === 'spz'&&!ifDisableFlag&&spForm.sp.include(searchData.username+';')" type="primary" @click="agreeSubmit">同意</el-button>
-              <el-button v-if="baseForm.status === 'spz' && baseForm.isReject === 'Y' &&!ifDisableFlag&&spForm.sp.include(searchData.username+';')" type="primary" @click="submitDataModal">驳回</el-button>
+              <el-button v-if="baseForm.status === 'spz'&&!ifDisableFlag&&spForm.sp.includes(searchData.username)" type="primary" @click="agreeSubmit">同意</el-button>
+              <el-button v-if="baseForm.status === 'spz' && baseForm.isReject === 'Y' &&!ifDisableFlag&&spForm.sp.includes(searchData.username)" type="primary" @click="submitDataModal">驳回</el-button>
             </el-form-item>
           </el-col>
           <el-col :span="3"><div class="grid-content bg-purple">
@@ -1485,13 +1485,12 @@
       },
       // 获取流程的配置权限
       getNodeAuthority (row) {
-        getBMStatusDesc(this.searchData).then(({data})=>{
-          if(data.status==='已完成'||data.status==='已升版'){
-            this.ifDisableFlag=true
+        getBMStatusDesc(this.searchData).then(({data}) => {
+          if (data.status === '已完成' || data.status === '已升版') {
+            this.ifDisableFlag = true
             return false
-          }else {
-
-            //区分请求成功和失败的状况
+          }
+          if(data.status === '审批中') {
             let tempData = {
               site: row.site,
               stepId: row.stepId,
@@ -1499,6 +1498,7 @@
             }
             getNodeAuthority(tempData).then(({data}) => {
               if (data && data.code === 0) {
+                this.ifDisableFlag = true
                 let plmStepRoleBaseBm = data.rows.plm_stepRole_base_bm
                 let arr = plmStepRoleBaseBm.filter(a => a.fieldId === this.searchData.fieldId)
                 if (arr.length > 0) {
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
index 05940ec..9ddf166 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
@@ -6,8 +6,8 @@
       <el-form-item :label="' '">
         <el-button type="primary" @click="refresh()" >刷新数据</el-button>
         <el-button type="primary" @click="saveData()" v-if="!ifDisableFlag&&isAuth('103002:bmSave')">保存</el-button>
-        <el-button v-if="dataForm.status === 'spz'&&!ifDisableFlag&&spForm.sp.include(searchData.username+';')" type="primary" @click="agreeSubmit">同意</el-button>
-        <el-button v-if="dataForm.status === 'spz' && dataForm.isReject === 'Y' &&!ifDisableFlag&&spForm.sp.include(searchData.username+';')" type="primary" @click="submitDataModal">驳回</el-button>
+        <el-button v-if="dataForm.status === 'spz'&&!ifDisableFlag&&spForm.sp.includes(searchData.username)" type="primary" @click="agreeSubmit">同意</el-button>
+        <el-button v-if="dataForm.status === 'spz' && dataForm.isReject === 'Y' &&!ifDisableFlag&&spForm.sp.includes(searchData.username)" type="primary" @click="submitDataModal">驳回</el-button>
         <el-button v-if="dataForm.status === 'cg'&&!ifDisableFlag" type="primary" @click="issueModal">下达</el-button>
       </el-form-item>
         </div>
@@ -800,33 +800,37 @@
       },
       // 获取流程的配置权限
        getNodeAuthority (row) {
-         getBMStatusDesc(this.searchData).then(({data})=>{
-           if(data.status==='已完成'||data.status==='已升版'){
-             this.ifDisableFlag=true
-             return false
-           }else {
-             let tempData = {
-               site: row.site,
-               stepId: row.stepId,
-               menuId: '103002'
-             }
-             getNodeAuthority(tempData).then(({data}) => {
-               if (data && data.code === 0) {
-                 let plmStepRoleBaseBm = data.rows.plm_stepRole_base_bm
-                 let arr = plmStepRoleBaseBm.filter(a => a.fieldId === 'basicInformation')
-                 if (arr.length > 0) {
-                   if(arr[0].updateFlag==='N'){
-                     this.ifDisableFlag=true
-                   }else {
-                     this.ifDisableFlag=false
-                   }
-                 }else {
-                   this.ifDisableFlag=true
-                 }
-               }
-             })
-           }
-         })
+
+            getBMStatusDesc(this.searchData).then(({data}) => {
+              if (data.status === '已完成' || data.status === '已升版') {
+                this.ifDisableFlag = true
+                return false
+              }
+              if(data.status === '审批中') {
+                let tempData = {
+                  site: row.site,
+                  stepId: row.stepId,
+                  menuId: '103002'
+                }
+                getNodeAuthority(tempData).then(({data}) => {
+                  if (data && data.code === 0) {
+                    this.ifDisableFlag = true
+                    let plmStepRoleBaseBm = data.rows.plm_stepRole_base_bm
+                    let arr = plmStepRoleBaseBm.filter(a => a.fieldId === 'basicInformation')
+                    if (arr.length > 0) {
+                      if (arr[0].updateFlag === 'N') {
+                        this.ifDisableFlag = true
+                      } else {
+                        this.ifDisableFlag = false
+                      }
+                    } else {
+                      this.ifDisableFlag = true
+                    }
+                  }
+                })
+              }
+            })
+
       },
 
       // 同意提交