From 98e71b881a94c7cfe16314681cb2340af79cd708 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Tue, 17 Oct 2023 13:48:31 +0800
Subject: [PATCH] plm

---
 src/api/base/site.js                          |  1 +
 src/assets/scss/global.scss                   | 36 ++++++++++++++++
 src/views/modules/base/buInfo.vue             | 43 ++++---------------
 src/views/modules/base/factoryInformation.vue | 42 +++++++++++++++---
 .../com_projectInfo-add-or-update.vue         |  4 +-
 .../com_technical-add-or-update.vue           |  6 +--
 src/views/modules/sys/user.vue                | 34 +--------------
 7 files changed, 87 insertions(+), 79 deletions(-)

diff --git a/src/api/base/site.js b/src/api/base/site.js
index bb5a23a..309949d 100644
--- a/src/api/base/site.js
+++ b/src/api/base/site.js
@@ -49,3 +49,4 @@ export const searchAccessProjectForUser= data => createAPI(`/base/searchAccessPr
 export const saveAccessProject= data => createAPI(`/base/saveAccessProject`,'post',data)
 export const searchAccessSiteListBySite= data => createAPI(`/base/searchAccessSiteListBySite`,'post',data)
 
+export const  saveAccessSiteForSite= data => createAPI(`/base/saveAccessSiteForSite`,'post',data)
diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss
index bfdf7b8..2993825 100644
--- a/src/assets/scss/global.scss
+++ b/src/assets/scss/global.scss
@@ -431,3 +431,39 @@ a:hover{
  .rred input {
    color: red;
  }
+
+ .rq .el-transfer-panel {
+    border: 2px solid #17b3a3;
+    border-radius: 4px;
+    overflow: hidden;
+    background: #fff;
+    display: inline-block;
+    vertical-align: middle;
+    width: 200px;
+    max-height: 100%;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    position: relative;
+  }
+
+.rq .el-transfer-panel .el-transfer-panel__header {
+    height: 40px;
+    line-height: 40px;
+    background: #17b3a3;
+    margin: 0;
+    padding-left: 15px;
+    border-bottom: 1px solid #17b3a3;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    color: #000;
+  }
+
+.rq .el-transfer-panel .el-transfer-panel__header .el-checkbox .el-checkbox__label {
+    font-size: 14px;
+    color: #303133;
+    font-weight: 400;
+  }
+.rq .el-transfer-panel__filter .el-input__icon {
+    margin-left: -3px;
+    margin-top: -2px;
+  }
diff --git a/src/views/modules/base/buInfo.vue b/src/views/modules/base/buInfo.vue
index 90e289b..895513c 100644
--- a/src/views/modules/base/buInfo.vue
+++ b/src/views/modules/base/buInfo.vue
@@ -94,12 +94,14 @@
         <el-button type="primary" @click="visible = false">{{'关闭'}}</el-button>
       </span>
     </el-dialog>
-    <el-dialog
-      width="640px"
-      title="BU授权"
-      :close-on-click-modal="false"
-      :visible.sync="accessModelFlag">
-      <el-transfer v-model="accessBuList"  :props="{
+      <el-dialog
+        style="font-size: 12px"
+        v-drag
+        :title="'BU授权'"
+        :visible.sync="accessModelFlag"
+        width="518px"
+        :append-to-body="true">
+      <el-transfer v-model="accessBuList"  class="rq" filterable :props="{
       key: 'username',
       label: 'userDisplay'
     }" :data="userList" :titles="['未选择', '已选择']"></el-transfer>
@@ -423,35 +425,6 @@
 </script>
 
 <style scoped>
-  .el-transfer-panel {
-    border: 2px solid #17b3a3;
-    border-radius: 4px;
-    overflow: hidden;
-    background: #fff;
-    display: inline-block;
-    vertical-align: middle;
-    width: 200px;
-    max-height: 100%;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    position: relative;
-  }
 
-  .el-transfer-panel .el-transfer-panel__header {
-    height: 40px;
-    line-height: 40px;
-    background: #17b3a3;
-    margin: 0;
-    padding-left: 15px;
-    border-bottom: 1px solid #17b3a3;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    color: #000;
-  }
 
-  .el-transfer-panel .el-transfer-panel__header .el-checkbox .el-checkbox__label {
-    font-size: 14px;
-    color: #303133;
-    font-weight: 400;
-  }
 </style>
diff --git a/src/views/modules/base/factoryInformation.vue b/src/views/modules/base/factoryInformation.vue
index a13bbc3..21d3b35 100644
--- a/src/views/modules/base/factoryInformation.vue
+++ b/src/views/modules/base/factoryInformation.vue
@@ -142,13 +142,13 @@
       :visible.sync="accessSiteVisible"
       width="518px"
       :append-to-body="true">
-      <el-transfer v-model="accessSiteList" :props="{
-      key: 'buNo',
-      label: 'buDesc'
+      <el-transfer class="rq" v-model="accessSiteList" filterable :props="{
+      key: 'username',
+      label: 'userDisplay'
       }" :data="userList" :titles="['未授权', '已授权']"></el-transfer>
       <span slot="footer" class="dialog-footer">
         <div style="margin-top: 5px">
-                <el-button type="primary" @click="saveAssessSite()">确定</el-button>
+                <el-button type="primary" @click="saveAccessSite()">确定</el-button>
                 <el-button @click="accessSiteVisible = false" type="primary">取消</el-button>
         </div>
 
@@ -166,7 +166,8 @@
       getSiteData,
       getCompanyData,
       siteSave,
-      searchAccessSiteListBySite
+      searchAccessSiteListBySite,
+      saveAccessSiteForSite
     } from "@/api/base/site.js"
     import {
 
@@ -188,6 +189,7 @@
       },
       data() {
         return {
+          rowSite:'',
           accessSiteVisible:false,
           accessSiteList:[],
           userList:[],
@@ -810,6 +812,28 @@
             }
           })
         },
+        saveAccessSite(){
+          let accessSiteList=[]
+          for (let i = 0; i <this.accessSiteList.length ; i++) {
+            let inData={
+              site:this.rowSite,
+              userid:this.accessSiteList[i]
+            }
+            accessSiteList.push(inData)
+          }
+          let saveData={
+            site:this.rowSite,
+            accessSiteList:accessSiteList,
+          }
+          saveAccessSiteForSite(saveData).then(({data}) => {
+            if (data && data.code === 0) {
+              this.$message.success( '操作成功')
+              this.accessSiteVisible = false
+            } else {
+              this.$message.error(data.msg)
+            }
+          })
+        },
         //导出excel
         createExportData() {
 
@@ -861,12 +885,13 @@
           }
         },
 
-        accessSiteModel(){
-          searchAccessSiteListBySite({site:this.$store.state.user.site,
+        accessSiteModel(row){
+          searchAccessSiteListBySite({site:row.siteID,
             }).then(({data}) => {
             this.accessSiteList = data.accessSiteList
             this.userList=data.userList
           })
+          this.rowSite=row.siteID
           this.accessSiteVisible=true;
         },
 
@@ -942,7 +967,10 @@
 </script>
 
 <style >
+
+
   .el-textarea__inner {
     padding: 5px 5px;
   }
+
 </style>
diff --git a/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
index 8100dfb..96bc62a 100644
--- a/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
+++ b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
@@ -97,7 +97,7 @@
       title="项目经理"
       :close-on-click-modal="false"
       :visible.sync="managerFlag">
-      <el-transfer v-model="projectManagerList"  :props="{
+      <el-transfer class="rq" filterable v-model="projectManagerList"  :props="{
       key: 'operatorId',
       label: 'operatorName'
     }" :data="operatorList" :titles="['未选择', '已选择']"></el-transfer>
@@ -114,7 +114,7 @@
       title="项目负责人"
       :close-on-click-modal="false"
       :visible.sync="ownerFlag">
-      <el-transfer v-model="projectOwnerList"  :props="{
+      <el-transfer class="rq" filterable v-model="projectOwnerList"  :props="{
       key: 'operatorId',
       label: 'operatorName'
     }" :data="operatorList" :titles="['未选择', '已选择']"></el-transfer>
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 29cd87c..4b9d779 100644
--- a/src/views/modules/sampleManagement/com_technical-add-or-update.vue
+++ b/src/views/modules/sampleManagement/com_technical-add-or-update.vue
@@ -67,7 +67,7 @@
       title="报价员"
       :close-on-click-modal="false"
       :visible.sync="quotationOfficerFlag">
-      <el-transfer v-model="quotationOfficerList"  :props="{
+      <el-transfer v-model="quotationOfficerList" class="rq" filterable  :props="{
       key: 'operatorId',
       label: 'operatorName'
     }" :data="operatorList" :titles="['未选择', '已选择']"></el-transfer>
@@ -83,7 +83,7 @@
       title="工程师"
       :close-on-click-modal="false"
       :visible.sync="engineerFlag">
-      <el-transfer v-model="engineerList"  :props="{
+      <el-transfer v-model="engineerList" class="rq" filterable :props="{
       key: 'operatorId',
       label: 'operatorName'
     }" :data="operatorList" :titles="['未选择', '已选择']"></el-transfer>
@@ -99,7 +99,7 @@
       title="项目负责人"
       :close-on-click-modal="false"
       :visible.sync="ownerFlag">
-      <el-transfer v-model="technicianList"  :props="{
+      <el-transfer v-model="technicianList" class="rq" filterable :props="{
       key: 'operatorId',
       label: 'operatorName'
     }" :data="operatorList" :titles="['未选择', '已选择']"></el-transfer>
diff --git a/src/views/modules/sys/user.vue b/src/views/modules/sys/user.vue
index 89c817c..755dac5 100644
--- a/src/views/modules/sys/user.vue
+++ b/src/views/modules/sys/user.vue
@@ -165,7 +165,7 @@
       :visible.sync="siteVisible"
       width="518px"
       :append-to-body="true">
-      <el-transfer v-model="selectSitList" :data="siteList" :titles="['未授权工厂', '已授权工厂']"></el-transfer>
+      <el-transfer class="rq" filterable v-model="selectSitList" :data="siteList" :titles="['未授权工厂', '已授权工厂']"></el-transfer>
       <span slot="footer" class="dialog-footer">
         <div style="margin-top: 5px">
                 <el-button type="primary" @click="saveUserAssessSite()">确定</el-button>
@@ -183,7 +183,7 @@
       :visible.sync="buVisible"
       width="518px"
       :append-to-body="true">
-      <el-transfer v-model="selectBUList" :props="{
+      <el-transfer class="rq" filterable v-model="selectBUList" :props="{
       key: 'buNo',
       label: 'buDesc'
     }"  :data="buList" :titles="['未授权BU', '已授权BU']"></el-transfer>
@@ -799,37 +799,7 @@ export default {
 }
 </script>
 <style>
-.el-transfer-panel {
-  border: 2px solid #17b3a3;
-  border-radius: 4px;
-  overflow: hidden;
-  background: #fff;
-  display: inline-block;
-  vertical-align: middle;
-  width: 200px;
-  max-height: 100%;
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-  position: relative;
-}
-
-.el-transfer-panel .el-transfer-panel__header {
-  height: 40px;
-  line-height: 40px;
-  background: #17b3a3;
-  margin: 0;
-  padding-left: 15px;
-  border-bottom: 1px solid #17b3a3;
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-  color: #000;
-}
 
-.el-transfer-panel .el-transfer-panel__header .el-checkbox .el-checkbox__label {
-  font-size: 14px;
-  color: #303133;
-  font-weight: 400;
-}
 
 .el-dialog__title {
   line-height: 24px;