plm BM

src/api/sampleManagement/technicalSpecificationList.js

@@ -114,3 +114,7 @@ export const deleteBMprintIndigoColor= data => createAPI(`/technicalSpecificatio
  */
 export const issueChange= data => createAPI(`/technicalSpecification/issueChange`,'post',data)
 export const submitChange= data => createAPI(`/technicalSpecification/submitChange`,'post',data)
+
+
+
+export const getBMStatusDesc= data => createAPI(`/technicalSpecification/getBMStatusDesc`,'post',data)

src/views/modules/common/ChooseUser.vue

@@ -173,7 +173,7 @@ export default {
       this.dataListLoading = false
     },
     getDataList (bool) {
-      let sql = "select a.username,a.user_display userDisplay,b.site,b.bu_no as buNo from sys_user  a left join AccessBu b on a.username=b.username where b.bu_no='"
+      let sql = "select a.username,a.user_display userDisplay,b.site,b.bu_no as buNo from sys_user  a left join AccessBu b on a.username=b.username where b.bu_no like '"
 
       sql += this.conSql+"'"
       sql += " and b.site = '" + this.site + "'"

src/views/modules/sampleManagement/com_technical-add-or-update.vue

@@ -38,6 +38,14 @@
         <el-form-item :label="'版本号'" prop="revNo" :rules="dataRole.revNo">
           <el-input v-model="dataForm.revNo" style="width: 130px" :disabled="dataForm.id!=0" ></el-input>
         </el-form-item>
+        <el-form-item >
+          <span slot="label" style="" @click="getUserList(1)"><a herf="#">CQC人员</a></span>
+          <el-input  v-model="dataForm.cqcOperatorName" ref="cqcOperatorName" placeholder="请选择人员" readonly style="width: 130px" ></el-input>
+        </el-form-item>
+        <el-form-item >
+          <span slot="label" style="" @click="getUserList(2)"><a herf="#">FAI人员</a></span>
+          <el-input  v-model="dataForm.faiOperatorName" ref="faiOperatorName"  placeholder="请选择人员" readonly style="width: 130px" ></el-input>
+        </el-form-item>
 <!--        <el-form-item >-->
 <!--          <span slot="label" style="" @click="quotationOfficerChooseModal()"><a herf="#">报价员</a></span>-->
 <!--          <el-input v-model="dataForm.quotationOfficer" readonly style="width: 274px"  @focus="quotationOfficerChooseModal()"></el-input>-->
@@ -53,6 +61,24 @@
           <el-input v-model="dataForm.technician" readonly style="width: 274px"  @focus="technicianModal()"></el-input>
         </el-form-item>
       </el-form>
+      <el-form :inline="true" label-position="top" label-width="100px" :rules="dataRole">
+        <el-form-item >
+          <span slot="label" style="" @click="getUserList(3)"><a herf="#">PE人员</a></span>
+          <el-input v-model="dataForm.peOperaterName" ref="peOperaterName"  placeholder="请选择人员" readonly style="width: 130px" ></el-input>
+        </el-form-item>
+        <el-form-item >
+          <span slot="label" style="" @click="getUserList(4)"><a herf="#">CS人员</a></span>
+          <el-input v-model="dataForm.csOperaterName" ref="csOperaterName"  placeholder="请选择人员" readonly style="width: 130px" ></el-input>
+        </el-form-item>
+        <el-form-item >
+          <span slot="label" style="" @click="getUserList(5)"><a herf="#">DCC人员</a></span>
+          <el-input v-model="dataForm.dccOperaterName" ref="dccOperaterName"  placeholder="请选择人员" readonly style="width: 130px" ></el-input>
+        </el-form-item>
+        <el-form-item >
+          <span slot="label" style="" @click="getUserList(6)"><a herf="#">MP人员</a></span>
+          <el-input v-model="dataForm.mpOperatorName" ref="mpOperatorName" placeholder="请选择人员" readonly style="width: 130px" ></el-input>
+        </el-form-item>
+      </el-form>
       <el-form :inline="true" label-position="top" label-width="100px" >
         <el-form-item :label="'备注'">
           <el-input
@@ -208,6 +234,7 @@
 
 
     <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+    <ChooseUser ref="userList"  @getBaseData="getUserData"></ChooseUser>
   </div>
 </template>
 
@@ -222,9 +249,10 @@
     getProofingDataByUserRole,
   } from "@/api/sampleManagement/technicalSpecificationList.js"
   import Chooselist from '@/views/modules/common/Chooselist'
+  import ChooseUser from '@/views/modules/common/ChooseUser'
   export default {
     components: {
-      Chooselist
+      Chooselist,ChooseUser
     },
     data () {
       return {
@@ -257,6 +285,18 @@
           engineerList:[],
           technicianList:[],
           oriCodeNo:'',
+          cqcOperator:'',
+          faiOperator:'',
+          cqcOperatorName:'',
+          faiOperatorName:'',
+          peOperater:'',
+          peOperaterName:'',
+          csOperater:'',
+          csOperaterName:'',
+          dccOperater:'',
+          dccOperaterName:'',
+          mpOperatorName:'',
+          mpOperator:'',
         },
         proofingSearch:{
           projectId:'',
@@ -315,6 +355,79 @@
 
     },
     methods: {
+      getUserList (type) {
+        this.tagNo1 = type
+        this.$nextTick(() => {
+          let strVal = ''
+
+          if(type==1) {
+            strVal = this.dataForm.cqcOperator
+          }
+          if(type==2) {
+            strVal = this.dataForm.faiOperator
+          }
+          if(type==3) {
+            strVal = this.dataForm.peOperater
+          }
+          if(type==4) {
+            strVal = this.dataForm.csOperater
+          }
+          if(type==5) {
+            strVal = this.dataForm.dccOperater
+          }
+          if(type==6) {
+            strVal = this.dataForm.mpOperator
+          }
+
+          this.$refs.userList.init(this.$store.state.user.site,'%%', strVal)
+        })
+      },
+      /* 列表方法的回调 */
+      getUserData (val) {
+
+        if(this.tagNo1==1) {
+          this.dataForm.cqcOperator = val.username
+          this.dataForm.cqcOperatorName = val.userDisplay
+          // this.$nextTick(() => {
+          //   this.$triggerInputEvent(this.$refs.cqcOperatorName);
+          // });
+        }
+        if(this.tagNo1==2) {
+          this.dataForm.faiOperator = val.username
+          this.dataForm.faiOperatorName = val.userDisplay
+          // this.$nextTick(() => {
+          //   this.$triggerInputEvent(this.$refs.faiOperatorName);
+          // });
+        }
+        if(this.tagNo1==3) {
+          this.dataForm.peOperater = val.username
+          this.dataForm.peOperaterName = val.userDisplay
+          // this.$nextTick(() => {
+          //   this.$triggerInputEvent(this.$refs.peOperaterName);
+          // });
+        }
+        if(this.tagNo1==4) {
+          this.dataForm.csOperater = val.username
+          this.dataForm.csOperaterName = val.userDisplay
+          // this.$nextTick(() => {
+          //   this.$triggerInputEvent(this.$refs.csOperaterName);
+          // });
+        }
+        if(this.tagNo1==5) {
+          this.dataForm.dccOperater = val.username
+          this.dataForm.dccOperaterName = val.userDisplay
+          // this.$nextTick(() => {
+          //   this.$triggerInputEvent(this.$refs.dccOperaterName);
+          // });
+        }
+        if(this.tagNo1==6) {
+          this.dataForm.mpOperator = val.username
+          this.dataForm.mpOperatorName = val.userDisplay
+          // this.$nextTick(() => {
+          //   this.$triggerInputEvent(this.$refs.mpOperatorName);
+          // });
+        }
+      },
       // 获取基础数据列表S
       getBaseList (val, type) {
         this.tagNo = val
@@ -462,6 +575,18 @@
             quotationOfficerList:[],
             engineerList:[],
             technicianList:[],
+            cqcOperator:'',
+            faiOperator:'',
+            cqcOperatorName:'',
+            faiOperatorName:'',
+            peOperater:'',
+            peOperaterName:'',
+            csOperater:'',
+            csOperaterName:'',
+            dccOperater:'',
+            dccOperaterName:'',
+            mpOperatorName:'',
+            mpOperator:'',
             oriCodeNo:'',
           }
 

src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue

@@ -129,7 +129,7 @@
     searchBMBom,
     searchBMBomDetail,
     updateBMBomRev,
-    tsdBasicInformationSearch,
+    tsdBasicInformationSearch,getBMStatusDesc,
     submitChange, // 提交
   } from "@/api/sampleManagement/technicalSpecificationList.js"
   import {
@@ -496,25 +496,32 @@
       },
       // 获取流程的配置权限
       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
+        getBMStatusDesc(this.searchData).then(({data})=>{
+          if(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 === this.searchData.fieldId)
+                if (arr.length > 0) {
+                  if (arr[0].updateFlag === 'N') {
+                    this.ifDisableFlag = true
+                  } else {
+                    this.ifDisableFlag = false
+                  }
+                } else {
+                  this.ifDisableFlag = true
+                }
+              }
+            })
           }
         })
       },

src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue

@@ -169,7 +169,7 @@
   import {
     searchBMcustomerInfo,
     updateBMcustomerInfo,
-    tsdBasicInformationSearch,
+    tsdBasicInformationSearch,getBMStatusDesc,
     submitChange, // 提交
   } from "@/api/sampleManagement/technicalSpecificationList.js"
   import {
@@ -331,6 +331,11 @@
 
       // 获取流程的配置权限
       getNodeAuthority (row) {
+        getBMStatusDesc(this.searchData).then(({data})=>{
+          if(data.status==='已完成'){
+            this.ifDisableFlag=true
+            return false
+          }else {
           //区分请求成功和失败的状况
             let tempData = {
               site: row.site,
@@ -352,6 +357,8 @@
                 }
               }
             })
+          }
+        })
       },
 
       // 同意提交

src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue

@@ -98,7 +98,7 @@
     refreshBMPageModal,
     searchBMPropertiesHeaderForBM,
     checkUrl,
-    tsdBasicInformationSearch,
+    tsdBasicInformationSearch,getBMStatusDesc,
     submitChange, // 提交
   } from "@/api/sampleManagement/technicalSpecificationList.js"
   import {
@@ -240,27 +240,34 @@
       },
       // 获取流程的配置权限
       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 {
-                if(!this.searchData.ifDisableFlag){
-                  this.ifDisableFlag = false
+        getBMStatusDesc(this.searchData).then(({data})=>{
+          if(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 === this.searchData.fieldId)
+                if (arr.length > 0) {
+                  if (arr[0].updateFlag === 'N') {
+                    this.ifDisableFlag = true
+                  } else {
+                    if(!this.searchData.ifDisableFlag){
+                      this.ifDisableFlag = false
+                    }
+                  }
+                } else {
+                  this.ifDisableFlag = true
                 }
               }
-            } else {
-              this.ifDisableFlag = true
-            }
+            })
           }
         })
       },

src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue

@@ -194,7 +194,7 @@
           width="60"
           label="操作">
           <template slot-scope="scope">
-            <a type="text" size="small" @click="bmModel(scope.row)">填写</a>
+            <a type="text" size="small" @click="bmModel(scope.row)" v-if="!ifDisableFlag">填写</a>
           </template>
         </el-table-column>
         <el-table-column
@@ -443,7 +443,7 @@
     updateBMRouteRev,
     tsdBasicInformationSearch,
     updateBMProcess,
-    submitChange, // 提交
+    submitChange,getBMStatusDesc, // 提交
   } from "@/api/sampleManagement/technicalSpecificationList.js"
   import {
     getNodeAuthority, // 获取节点权限
@@ -1420,25 +1420,33 @@
       },
       // 获取流程的配置权限
       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
+        getBMStatusDesc(this.searchData).then(({data})=>{
+          if(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 === this.searchData.fieldId)
+                if (arr.length > 0) {
+                  if (arr[0].updateFlag === 'N') {
+                    this.ifDisableFlag = true
+                  } else {
+                    this.ifDisableFlag = false
+                  }
+                } else {
+                  this.ifDisableFlag = true
+                }
+              }
+            })
           }
         })
       },

src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue

@@ -240,7 +240,7 @@
     tsdBasicInformationSearch,
     searchTechnicalSpecificationTeamStr,
     updateBMBasicInformation,
-    searchPartLastQuotationNo,
+    searchPartLastQuotationNo,getBMStatusDesc,
     submitChange, // 提交
   } from "@/api/sampleManagement/technicalSpecificationList.js"
   import {
@@ -648,24 +648,31 @@
       },
       // 获取流程的配置权限
        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 === '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==='已完成'){
+             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
+                 }
+               }
+             })
            }
          })
       },

src/views/modules/sampleManagement/technicalSpecificationList.vue

@@ -61,10 +61,10 @@
         fixed="right"
         label="操作">
         <template slot-scope="scope">
-          <a type="text" size="small" @click="addRevModel(scope.row)">升版</a>
+          <a type="text" size="small" @click="addRevModel(scope.row)" v-if="scope.row.statusDesc!=='已完成'">升版</a>
           <a type="text" size="small" @click="jumpDetail(scope.row)">详情</a>
-          <a type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</a>
-          <a type="text" size="small" @click="deleteData(scope.row)">删除</a>
+          <a type="text" size="small" @click="addOrUpdateHandle(scope.row.id)" v-if="scope.row.statusDesc!=='已完成'">修改</a>
+          <a type="text" size="small" @click="deleteData(scope.row)" v-if="scope.row.statusDesc!=='已完成'">删除</a>
           <a type="text" size="small" v-if="scope.row.status === 'cg'" @click="issueModal(scope.row)">下达</a>
         </template>
       </el-table-column>