From bce8d06f53c0267c70d140acbe8558acbfcdb7d3 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Tue, 15 Apr 2025 16:13:51 +0800
Subject: [PATCH] 2025-04-15

---
 src/views/modules/common/ChooseUser.vue        | 10 +++++-----
 .../com_technical-add-or-update.vue            | 16 ++++++++--------
 .../com_bm_routing.vue                         | 18 ++++++++++--------
 .../com_tsd_basicInformation.vue               | 16 ++++++++--------
 4 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/src/views/modules/common/ChooseUser.vue b/src/views/modules/common/ChooseUser.vue
index 97960ad..c1f96aa 100644
--- a/src/views/modules/common/ChooseUser.vue
+++ b/src/views/modules/common/ChooseUser.vue
@@ -126,6 +126,7 @@ export default {
       param3: '',
       param: '',
       site: '',
+      roleId:'',
       conSql: '',
       param4: this.$store.state.user.site,
       dataList: [],
@@ -161,19 +162,18 @@ export default {
      },
 
     // 获取 用户的配置
-    init(site,conSql,param) {
+    init(site,conSql,param,roleId) {
       this.visible = true;
       this.site=site
+      this.roleId = roleId
       this.param = param===null?'':param
       this.conSql = conSql?conSql: ''
       // 根据 tagNo 获取列表
-
-        this.getDataList(true)
-
+      this.getDataList(true)
       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 like '"
+      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 inner join AccessRole c on a.username = c.username and c.role_no = '${this.roleId?this.roleId:''}'  where b.bu_no like '`
 
       sql += this.conSql+"'"
       sql += " and b.site = '" + this.site + "'"
diff --git a/src/views/modules/sampleManagement/com_technical-add-or-update.vue b/src/views/modules/sampleManagement/com_technical-add-or-update.vue
index 35a9307..c18b610 100644
--- a/src/views/modules/sampleManagement/com_technical-add-or-update.vue
+++ b/src/views/modules/sampleManagement/com_technical-add-or-update.vue
@@ -516,32 +516,32 @@
         this.tagNo1 = type
         this.$nextTick(() => {
           let strVal = ''
-
+          let roleId = ''
           if(type==1) {
             strVal = this.dataForm.cqcOperator
+            roleId = 'R008'
           }
           if(type==2) {
             strVal = this.dataForm.faiOperator
-          }
-          if(type==3) {
-            strVal = this.dataForm.peOperater
+            roleId = 'R009'
           }
           if(type==4) {
             strVal = this.dataForm.csOperater
-          }
-          if(type==5) {
-            strVal = this.dataForm.dccOperater
+            roleId = 'R010'
           }
           if(type==6) {
             strVal = this.dataForm.mpOperator
+            roleId = 'R021'
           }
           if(type==7) {
             strVal = this.dataForm.engineerNo
+            roleId = 'R020'
           }
           if(type==8) {
             strVal = this.dataForm.technicianNo
+            roleId = 'R014'
           }
-          this.$refs.userList.init(this.$store.state.user.site,this.dataForm.buNo!==''?this.dataForm.buNo:'%%', strVal)
+          this.$refs.userList.init(this.$store.state.user.site,this.dataForm.buNo!==''?this.dataForm.buNo:'%%', strVal,roleId)
         })
       },
       /* 列表方法的回调 */
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
index 9a02bfd..d5b8acd 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
@@ -939,15 +939,17 @@
         this.tagNo1 = type
         this.$nextTick(() => {
           let strVal = ''
+          let roleId = ''
+          if(type==1) {
+            strVal = this.sheetData.overPrintOperator
+            roleId = 'R018'
+          }
+          if(type==2) {
+            strVal = this.sheetData.printOperator
+            roleId = 'R019'
+          }
 
-            if(type==1) {
-              strVal = this.sheetData.overPrintOperator
-            }
-            if(type==2) {
-              strVal = this.sheetData.printOperator
-            }
-
-          this.$refs.baseList.init(this.searchData.site,this.searchData.buNo, strVal)
+          this.$refs.baseList.init(this.searchData.site,this.searchData.buNo, strVal,roleId)
         })
       },
       /* 列表方法的回调 */
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
index 9afcfd0..2d56eee 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
@@ -452,32 +452,32 @@
         this.tagNo1 = type
         this.$nextTick(() => {
           let strVal = ''
-
+          let roleId = ''
             if(type==1) {
               strVal = this.dataForm.cqcOperator
+              roleId = 'R008'
             }
             if(type==2) {
               strVal = this.dataForm.faiOperator
-            }
-            if(type==3) {
-              strVal = this.dataForm.peOperater
+              roleId = 'R009'
             }
             if(type==4) {
               strVal = this.dataForm.csOperater
-            }
-            if(type==5) {
-              strVal = this.dataForm.dccOperater
+              roleId = 'R010'
             }
             if(type==6) {
               strVal = this.dataForm.mpOperator
+              roleId = 'R021'
             }
             if(type==7) {
               strVal = this.dataForm.engineerNo
+              roleId = 'R020'
             }
             if(type==8) {
               strVal = this.dataForm.technicianNo
+              roleId = 'R014'
             }
-          this.$refs.baseList.init(this.searchData.site,this.searchData.buNo, strVal)
+          this.$refs.baseList.init(this.searchData.site,this.searchData.buNo, strVal,roleId)
         })
       },
       /* 列表方法的回调 */