From 46da7e87d693cd8d8ad5c89caf4c5a9d3485f3fe Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 3 Jun 2024 19:43:58 +0800
Subject: [PATCH] plm BM

---
 .../com_bm_bom.vue                            |  91 +++++++++++++-
 .../com_bm_customerInformation.vue            | 102 ++++++++++++++-
 .../com_bm_demoSlot.vue                       | 109 ++++++++++++++--
 .../com_bm_packageInfo.vue                    |   1 +
 .../com_bm_routing.vue                        | 117 +++++++++++++++++-
 .../com_tsd_basicInformation.vue              |   3 -
 .../technicalSpecificationDetail.vue          |   3 +-
 7 files changed, 406 insertions(+), 20 deletions(-)

diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
index cc70bf0..894305c 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
@@ -15,8 +15,10 @@
       </el-form-item>
       <el-form-item  label=" ">
         <el-button type="primary" @click="searchTable()" >刷新</el-button>
-        <el-button type="primary" @click="changeBomRev()" >变更</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" type="primary" @click="agreeSubmit">同意</el-button>
+        <el-button v-if="baseForm.status === 'spz' && baseForm.isReject === 'Y' &&!ifDisableFlag" type="primary" @click="rejectSubmit">驳回</el-button>
 <!--        <el-button type="primary" @click="newData()" v-if="!ifDisableFlag">新增</el-button>-->
       </el-form-item>
 
@@ -127,7 +129,12 @@
     searchBMBom,
     searchBMBomDetail,
     updateBMBomRev,
+    tsdBasicInformationSearch,
+    submitChange, // 提交
   } from "@/api/sampleManagement/technicalSpecificationList.js"
+  import {
+    getNodeAuthority, // 获取节点权限
+  } from '@/api/changeManagement/changeManagement.js'
   import Chooselist from '@/views/modules/common/Chooselist'
   export default {
     components: {
@@ -144,6 +151,7 @@
           username: this.$store.state.user.name,
           codeNo: '',
           buNo:'',
+          fieldId:'',
         },
         bomData:{
           site: '',
@@ -355,7 +363,10 @@
             columnWidth: 150
           },
         ],
-
+        baseForm:{
+          status:'',
+          isReject:'',
+        },
 
 
         ifDisableFlag:false,
@@ -424,6 +435,10 @@
             this.$message.error(data.msg)
           }
         });
+        tsdBasicInformationSearch(this.searchData).then(({data}) => {
+          this.baseForm=data.row;
+          this.getNodeAuthority(data.row)
+        })
       },
       searchDetailTable(){
         searchBMBomDetail(this.bomData).then(({data}) => {
@@ -479,6 +494,78 @@
         localStorage.setItem('bomData', JSON.stringify(inData))
         window.open('#/part-bomManagement');
       },
+      // 获取流程的配置权限
+      getNodeAuthority (row) {
+        //区分请求成功和失败的状况
+        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 === this.searchData.fieldId)
+            if (arr.length > 0) {
+              if (arr[0].updateFlag === 'N') {
+                this.ifDisableFlag = true
+              } else {
+                this.ifDisableFlag = false
+              }
+            } else {
+              this.ifDisableFlag = true
+            }
+          }
+        })
+      },
+
+      // 同意提交
+      agreeSubmit () {
+        this.$confirm(`是否确认提交?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let tempData = {
+            site: this.searchData.site,
+            userName: this.$store.state.user.name,
+            codeNo: this.searchData.codeNo,
+            menuId: '103002',
+            nodeConclusion: 'Y'
+          }
+          this.submitData(tempData)
+        })
+      },
+
+      // 驳回提交
+      rejectSubmit () {
+        this.$confirm(`是否确认驳回?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let tempData = {
+            site: this.searchData.site,
+            userName: this.$store.state.user.name,
+            codeNo: this.searchData.codeNo,
+            menuId: '103002',
+            nodeConclusion: 'N'
+          }
+          this.submitData(tempData)
+        })
+      },
+      submitData (tempData) {
+        submitChange(tempData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.$message({message: '操作成功', type: 'success'})
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+
+      },
     },
   }
 </script>
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
index 614476d..66aaae5 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
@@ -3,8 +3,8 @@
     <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
       <el-button type="primary" @click="refresh()" >刷新数据</el-button>
       <el-button type="primary" @click="saveData()" v-if="!ifDisableFlag">保存</el-button>
-      <el-button v-if="baseForm.status === 'spz'&&!ifDisableFlag" type="primary" @click="saveData">同意</el-button>
-      <el-button v-if="baseForm.status === 'spz' && baseForm.isReject === 'Y' &&!ifDisableFlag" type="primary" @click="saveData">驳回</el-button>
+      <el-button v-if="baseForm.status === 'spz'&&!ifDisableFlag" type="primary" @click="agreeSubmit">同意</el-button>
+      <el-button v-if="baseForm.status === 'spz' && baseForm.isReject === 'Y' &&!ifDisableFlag" type="primary" @click="rejectSubmit">驳回</el-button>
     </el-form>
     <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
       <el-row :gutter="20">
@@ -157,9 +157,9 @@
       </el-row>
 
     </el-form>
-<!--    <el-form label-position="top" style="margin-top: 60px; margin-left: 0px;text-align:center">-->
+    <el-form label-position="top" style="margin-top: 60px; margin-left: 0px;text-align:center">
 <!--      <el-button type="primary" @click="saveData()" v-if="!ifDisableFlag">保存</el-button>-->
-<!--    </el-form>-->
+    </el-form>
 
     <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
   </div>
@@ -169,7 +169,12 @@
   import {
     searchBMcustomerInfo,
     updateBMcustomerInfo,
+    tsdBasicInformationSearch,
+    submitChange, // 提交
   } from "@/api/sampleManagement/technicalSpecificationList.js"
+  import {
+    getNodeAuthority, // 获取节点权限
+  } from '@/api/changeManagement/changeManagement.js'
   import Chooselist from '@/views/modules/common/Chooselist'
   export default {
     components: {
@@ -182,6 +187,7 @@
           username: this.$store.state.user.name,
           codeNo: '',
           buNo:'',
+          fieldId:'',
         },
         ifDisableFlag:false,
         baseForm:{
@@ -271,6 +277,10 @@
           })
           return false
         }
+        tsdBasicInformationSearch(this.searchData).then(({data}) => {
+          this.baseForm=data.row;
+          this.getNodeAuthority(data.row)
+        })
         searchBMcustomerInfo(this.searchData).then(({data}) => {
           if(data.rows.length>0){
             this.dataForm = data.rows[0];
@@ -286,6 +296,10 @@
         });
       },
       searchTable(){
+        tsdBasicInformationSearch(this.searchData).then(({data}) => {
+          this.baseForm=data.row;
+          this.getNodeAuthority(data.row)
+        })
         searchBMcustomerInfo(this.searchData).then(({data}) => {
           if(data.rows.length>0){
             this.dataForm = data.rows[0];
@@ -311,6 +325,86 @@
           return
         })
       },
+
+      // 获取流程的配置权限
+      getNodeAuthority (row) {
+          //区分请求成功和失败的状况
+            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 === this.searchData.fieldId)
+                if (arr.length > 0) {
+                  if (arr[0].updateFlag === 'N') {
+                    this.ifDisableFlag = true
+                  } else {
+                    this.ifDisableFlag = false
+                  }
+                } else {
+                  this.ifDisableFlag = true
+                }
+              }
+            })
+      },
+
+      // 同意提交
+      agreeSubmit () {
+        this.$confirm(`是否确认提交?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let tempData = {
+            site: this.searchData.site,
+            userName: this.$store.state.user.name,
+            codeNo: this.searchData.codeNo,
+            menuId: '103002',
+            nodeConclusion: 'Y'
+          }
+          this.submitData(tempData)
+        })
+      },
+
+      // 驳回提交
+      rejectSubmit () {
+        this.$confirm(`是否确认驳回?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let tempData = {
+            site: this.searchData.site,
+            userName: this.$store.state.user.name,
+            codeNo: this.searchData.codeNo,
+            menuId: '103002',
+            nodeConclusion: 'N'
+          }
+          this.submitData(tempData)
+        })
+      },
+      submitData (tempData) {
+
+        updateBMcustomerInfo(this.dataForm).then(({data}) => {
+          if (data && data.code === 0) {
+            submitChange(tempData).then(({data}) => {
+              if (data && data.code === 0) {
+                this.$message({message: '操作成功', type: 'success'})
+              } else {
+                this.$alert(data.msg, '错误', {
+                  confirmButtonText: '确定'
+                })
+              }
+            })
+          } else {
+            this.$message.error(data.msg)
+          }
+        })
+
+      },
     },
   }
 </script>
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
index 7358986..6b1c4e8 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
@@ -11,6 +11,8 @@
         <el-button type="primary" @click="refreshBMPageModal()" v-if="!ifDisableFlag">更新模板</el-button>
         <el-button type="primary" @click="searchTable()" >刷新数据</el-button>
         <el-button type="primary" @click="saveTable()" v-if="!ifDisableFlag">保存数据</el-button>
+        <el-button v-if="baseForm.status === 'spz'&&!ifDisableFlag" type="primary" @click="agreeSubmit">同意</el-button>
+        <el-button v-if="baseForm.status === 'spz' && baseForm.isReject === 'Y' &&!ifDisableFlag" type="primary" @click="rejectSubmit">驳回</el-button>
       </el-form-item>
       <div class="rq ">
         <el-table
@@ -51,10 +53,10 @@
             min-width="400"
             label="值">
             <template slot-scope="scope">
-              <el-input v-if="scope.row.valueTypeDb === 'T'&&scope.row.valueChooseFlag === 'N'" v-model="scope.row.textValue" style="height: 11px;padding: 0px ;width:98%" allow-create></el-input>
-              <div v-if="scope.row.valueTypeDb === 'S'&&scope.row.valueChooseFlag === 'N'"><el-input  v-model="scope.row.textValue" style="height: 11px;padding: 0px ;width:98%" allow-create></el-input></div>
-              <el-input v-if="scope.row.valueTypeDb === 'N'&&scope.row.valueChooseFlag === 'N'" v-model="scope.row.numValue" type="number" style="height: 11px;padding: 0px;width:98%"  allow-create></el-input>
-              <el-select v-if="scope.row.valueTypeDb === 'T'&&scope.row.valueChooseFlag === 'Y'" v-model="scope.row.textValue" placeholder="请选择" style="height: 11px;padding: 0px " allow-create>
+              <el-input v-if="scope.row.valueTypeDb === 'T'&&scope.row.valueChooseFlag === 'N'" v-model="scope.row.textValue" style="height: 11px;padding: 0px ;width:98%" allow-create :disabled="ifDisableFlag" ></el-input>
+              <div v-if="scope.row.valueTypeDb === 'S'&&scope.row.valueChooseFlag === 'N'"><el-input  v-model="scope.row.textValue" style="height: 11px;padding: 0px ;width:98%" allow-create :disabled="ifDisableFlag"></el-input></div>
+              <el-input v-if="scope.row.valueTypeDb === 'N'&&scope.row.valueChooseFlag === 'N'" v-model="scope.row.numValue" type="number" style="height: 11px;padding: 0px;width:98%"  allow-create :disabled="ifDisableFlag"></el-input>
+              <el-select v-if="scope.row.valueTypeDb === 'T'&&scope.row.valueChooseFlag === 'Y'" v-model="scope.row.textValue" placeholder="请选择" style="height: 11px;padding: 0px " allow-create :disabled="ifDisableFlag">
                 <el-option
                   v-for="item in scope.row.availableValueList"
                   :key="index"
@@ -62,7 +64,7 @@
                   :value="item.availableValue">
                 </el-option>
               </el-select>
-              <el-select v-if="scope.row.valueTypeDb === 'N'&&scope.row.valueChooseFlag === 'Y'" v-model="scope.row.numValue" placeholder="请选择" style="height: 11px;padding: 0px " allow-create>
+              <el-select v-if="scope.row.valueTypeDb === 'N'&&scope.row.valueChooseFlag === 'Y'" v-model="scope.row.numValue" placeholder="请选择" style="height: 11px;padding: 0px " allow-create :disabled="ifDisableFlag">
                 <el-option
                   v-for="item in scope.row.availableValueList"
                   :key="index"
@@ -70,7 +72,7 @@
                   :value="item.availableValue">
                 </el-option>
               </el-select>
-              <div v-if="scope.row.valueTypeDb === 'S'&&scope.row.valueChooseFlag === 'Y'"> <el-select v-model="scope.row.textValue" placeholder="请选择" style="height: 11px;padding: 0px ;width:98%" allow-create>
+              <div v-if="scope.row.valueTypeDb === 'S'&&scope.row.valueChooseFlag === 'Y'"> <el-select v-model="scope.row.textValue" placeholder="请选择" style="height: 11px;padding: 0px ;width:98%" allow-create :disabled="ifDisableFlag">
                 <el-option
                   v-for="item in scope.row.availableValueList"
                   :key="index"
@@ -95,8 +97,12 @@
     refreshBMPageModal,
     searchBMPropertiesHeaderForBM,
     checkUrl,
+    tsdBasicInformationSearch,
+    submitChange, // 提交
   } from "@/api/sampleManagement/technicalSpecificationList.js"
-
+  import {
+    getNodeAuthority, // 获取节点权限
+  } from '@/api/changeManagement/changeManagement.js'
   export default {
     components: {
 
@@ -113,10 +119,15 @@
           buNo:'',
           type:'',
           propertiesCodeNo:'',
+          fieldId:'',
         },
         type:'prepress',
         ifDisableFlag:false,
         tableData:[],
+        baseForm:{
+          status:'',
+          isReject:'',
+        },
       }
     },
     mounted () {
@@ -151,6 +162,10 @@
             // this.searchData.propertiesCodeNo = data.row.propertiesCodeNo;
           this.$set(this.searchData, 'propertiesCodeNo', data.row.propertiesCodeNo);
         });
+        tsdBasicInformationSearch(this.searchData).then(({data}) => {
+          this.baseForm=data.row;
+          this.getNodeAuthority(data.row)
+        })
       },
       refreshBMPageModal(){
         this.$confirm(`是否刷新至最新模板界面，已填数据会更新到新模板中，若旧属性在新模板中被删除，该条数据会消失。`, '提示', {
@@ -218,6 +233,86 @@
         });
 
       },
+      // 获取流程的配置权限
+      getNodeAuthority (row) {
+        //区分请求成功和失败的状况
+        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 === this.searchData.fieldId)
+            if (arr.length > 0) {
+              if (arr[0].updateFlag === 'N') {
+                this.ifDisableFlag = true
+              } else {
+                this.ifDisableFlag = false
+              }
+            } else {
+              this.ifDisableFlag = true
+            }
+          }
+        })
+      },
+
+      // 同意提交
+      agreeSubmit () {
+        this.$confirm(`是否确认提交?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let tempData = {
+            site: this.searchData.site,
+            userName: this.$store.state.user.name,
+            codeNo: this.searchData.codeNo,
+            menuId: '103002',
+            nodeConclusion: 'Y'
+          }
+          this.submitData(tempData)
+        })
+      },
+
+      // 驳回提交
+      rejectSubmit () {
+        this.$confirm(`是否确认驳回?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let tempData = {
+            site: this.searchData.site,
+            userName: this.$store.state.user.name,
+            codeNo: this.searchData.codeNo,
+            menuId: '103002',
+            nodeConclusion: 'N'
+          }
+          this.submitData(tempData)
+        })
+      },
+      submitData (tempData) {
+
+        saveBMPropertiesValue(this.tableData).then(({data}) => {
+          if (data && data.code === 0) {
+            submitChange(tempData).then(({data}) => {
+              if (data && data.code === 0) {
+                this.$message({message: '操作成功', type: 'success'})
+                this.$emit("closeModel")
+              } else {
+                this.$alert(data.msg, '错误', {
+                  confirmButtonText: '确定'
+                })
+              }
+            })
+          } else {
+            this.$message.error(data.msg)
+          }
+        })
+
+      },
     },
   }
 </script>
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_packageInfo.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_packageInfo.vue
index 3fe36ff..73f3de3 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_packageInfo.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_packageInfo.vue
@@ -35,6 +35,7 @@
           codeNo: '',
           buNo:'',
           type:'',
+          fieldId:'',
         },
         ifDisableFlag:false,
         picUrl:this.$store.state.user.bmPicUrl+'defaultPaperOrientation.png',
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
index 5ef3e4a..f0529d0 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
@@ -13,7 +13,9 @@
         <el-input v-model="sheetData.printOperatorName"  placeholder="请选择人员" readonly style="width: 120px" ></el-input>
       </el-form-item>
       <el-form-item  label=" ">
-        <el-button type="primary" @click="updateBMProcess()" >保存</el-button>
+        <el-button type="primary" @click="updateBMProcess()" v-if="!ifDisableFlag">保存</el-button>
+        <el-button v-if="baseForm.status === 'spz'&&!ifDisableFlag" type="primary" @click="agreeSubmit">同意</el-button>
+        <el-button v-if="baseForm.status === 'spz' && baseForm.isReject === 'Y' &&!ifDisableFlag" type="primary" @click="rejectSubmit">驳回</el-button>
       </el-form-item>
     </el-form>
     <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;" v-if="searchData.buNo=='RDC'">
@@ -173,8 +175,8 @@
         </el-form-item>
         <el-form-item  label=" ">
           <el-button type="primary" @click="searchTable()" >刷新</el-button>
-          <el-button type="primary" @click="changeRouteRev()" >变更</el-button>
-          <el-button type="primary" @click="jumpRoute()" >调整至Routing</el-button>
+          <el-button type="primary" @click="changeRouteRev()" v-if="!ifDisableFlag">变更</el-button>
+          <el-button type="primary" @click="jumpRoute()" >跳转至Routing</el-button>
 
         </el-form-item>
       </el-form>
@@ -441,7 +443,11 @@
     updateBMRouteRev,
     tsdBasicInformationSearch,
     updateBMProcess,
+    submitChange, // 提交
   } from "@/api/sampleManagement/technicalSpecificationList.js"
+  import {
+    getNodeAuthority, // 获取节点权限
+  } from '@/api/changeManagement/changeManagement.js'
   import Chooselist from '@/views/modules/common/Chooselist'
   import {
     searchOperatorWithSite,
@@ -507,6 +513,11 @@
           username: this.$store.state.user.name,
           codeNo: '',
           buNo:'',
+          fieldId:'',
+        },
+        baseForm:{
+          status:'',
+          isReject:'',
         },
         tableData:'',
         partList:[],
@@ -865,6 +876,9 @@
     methods: {
       // 获取基础数据列表S
       getBaseList (val, type) {
+        if(this.ifDisableFlag){
+          return false
+        }
         this.tagNo = val
         this.tagNo1 = type
         this.$nextTick(() => {
@@ -911,6 +925,8 @@
         tsdBasicInformationSearch(this.searchData).then(({data}) => {
           if(data&& data.code===0){
             this.sheetData=data.row
+            this.baseForm=data.row;
+            this.getNodeAuthority(data.row)
           }else {
             this.$message.error(data.msg)
           }
@@ -1139,6 +1155,7 @@
       },
 
       savepeEngineerList(){
+
         let peEngineerName='';
         for (let i = 0; i < this.peEngineerList.length; i++) {
           let select= this.operatorList.filter(item => item.operatorId === this.peEngineerList[i])
@@ -1396,7 +1413,101 @@
         window.open('#/part-routingManagement');
 
       },
+      // 获取流程的配置权限
+      getNodeAuthority (row) {
+        //区分请求成功和失败的状况
+        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 === this.searchData.fieldId)
+            if (arr.length > 0) {
+              if (arr[0].updateFlag === 'N') {
+                this.ifDisableFlag = true
+              } else {
+                this.ifDisableFlag = false
+              }
+            } else {
+              this.ifDisableFlag = true
+            }
+          }
+        })
+      },
+
+      // 同意提交
+      agreeSubmit () {
+        this.$confirm(`是否确认提交?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let tempData = {
+            site: this.searchData.site,
+            userName: this.$store.state.user.name,
+            codeNo: this.searchData.codeNo,
+            menuId: '103002',
+            nodeConclusion: 'Y'
+          }
+          this.submitData(tempData)
+        })
+      },
+
+      // 驳回提交
+      rejectSubmit () {
+        this.$confirm(`是否确认驳回?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let tempData = {
+            site: this.searchData.site,
+            userName: this.$store.state.user.name,
+            codeNo: this.searchData.codeNo,
+            menuId: '103002',
+            nodeConclusion: 'N'
+          }
+          this.submitData(tempData)
+        })
+      },
+      async submitData (tempData) {
+       await  updateBMProcess(this.sheetData).then(({data}) => {
+          if (data && data.code === 0) {
+            tsdBasicInformationSearch(this.searchData).then(({data}) => {
+              if(data.row){
+                this.sheetData=data.row
+              }else {
+
+              }
+
+            });
+          } else {
+            this.$message.error(data.msg)
+            return false
+          }
+        })
+        await  updateBMRoutingDetail(this.dataForm).then(({data}) => {
+          if (data && data.code === 0) {
+          } else {
+            this.$message.error(data.msg)
+            return false
+          }
+        })
+        await submitChange(tempData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.$message({message: '操作成功', type: 'success'})
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+
 
+      },
     },
   }
 </script>
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
index c7b038a..7cc28c5 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
@@ -610,7 +610,6 @@
            stepId: row.stepId,
            menuId: '103002'
          }
-         debugger
          getNodeAuthority(tempData).then(({data}) => {
            if (data && data.code === 0) {
              let plmStepRoleBaseBm = data.rows.plm_stepRole_base_bm
@@ -670,8 +669,6 @@
             submitChange(tempData).then(({data}) => {
               if (data && data.code === 0) {
                 this.$message({message: '操作成功', type: 'success'})
-                this.submitModalFlag = false
-                this.modalFlag = false
               } else {
                 this.$alert(data.msg, '错误', {
                   confirmButtonText: '确定'
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
index 4daa2f7..017fa62 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
@@ -119,10 +119,10 @@
           username:this.$store.state.user.name,
           type:'',
           ifDisableFlag:false,
+          fieldId:'',
         },
         pageRole:'',
         activeName:'baseInfo',
-
       }
     },
     mounted() {
@@ -141,6 +141,7 @@
     },
     methods: {
       refreshCurrentTabTable(){
+        this.dataForm.fieldId=this.activeName
         //先调整页面的高度
         this.changeHeightAuto()
         if (this.activeName == 'baseInfo') {