From d2de075da3978502d4dcbbace7b998d4c3a8192f Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 20 五月 2024 14:33:45 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master

---
 src/components/view/b2-standard.vue   |    6 +++---
 src/components/view/person-manage.vue |   19 +++++++++++--------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/components/view/b2-standard.vue b/src/components/view/b2-standard.vue
index 10ec394..8249df7 100644
--- a/src/components/view/b2-standard.vue
+++ b/src/components/view/b2-standard.vue
@@ -1144,7 +1144,7 @@
             this.productList.forEach(a => {
               if (a.state == 1) this.toggleSelection(a)
             })
-          }, 200)
+          }, 300)
           this.tableLoad2 = false
         })
       },
@@ -1183,13 +1183,13 @@
       },
       handleAll(e) {
         if (e.length > 0) {
-          this.productList = this.productList.map(m => {
+          this.productList.map(m => {
             m.state = 0
             this.upProductSelect(null, m)
             return m
           })
         } else {
-          this.productList = this.productList.map(m => {
+          this.productList.map(m => {
             m.state = 1
             this.upProductSelect(null, m)
             return m
diff --git a/src/components/view/person-manage.vue b/src/components/view/person-manage.vue
index 791815b..43f52d3 100644
--- a/src/components/view/person-manage.vue
+++ b/src/components/view/person-manage.vue
@@ -174,7 +174,7 @@
           <el-button size="small" @click="refresh()">閲� 缃�</el-button>
           <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
         </div>
-        <div class="search_thing">
+        <div class="search_thing" style="display: flex;justify-content: right;margin-right: 10px;">
           <el-button size="small" type="primary" @click="openthirdParty" v-if="addUserPower">鑾峰彇涓夋柟浜哄憳</el-button>
           <el-button size="small" type="primary" @click="opeaAdd" v-if="addPower">鏂板鐢ㄦ埛</el-button>
         </div>
@@ -184,7 +184,7 @@
           :componentData="componentData" :key="upIndex" />
       </div>
     </div>
-    <el-dialog title="鏋舵瀯鏂板" :visible.sync="addDia0" width="400px">
+    <el-dialog title="鏋舵瀯鏂板" :visible.sync="addDia" width="400px">
       <div class="body">
         <el-row style="line-height: 50px;">
           <el-col :span="6" style="text-align: right;">
@@ -196,7 +196,7 @@
         </el-row>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="addDia0 = false">鍙� 娑�</el-button>
+        <el-button @click="addDia = false">鍙� 娑�</el-button>
         <el-button type="primary" @click="addStandardTree" :loading="addLoad">纭� 瀹�</el-button>
       </span>
     </el-dialog>
@@ -204,7 +204,7 @@
       <div class="body">
         <el-row>
           <el-col :span="9" style="height: 70vh;overflow: hidden;">
-            <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="search2" size="small" style="width: 90%;padding: 0 5% 10px 5%;"
+            <el-input placeholder="杈撳叆鍏抽敭瀛楁悳绱�" v-model="search2" size="small" style="width: 90%;padding: 0 5% 10px 5%;"
               clearable @blur="searchFilter2" @clear="searchFilter2" @keyup.enter.native="searchFilter2()">
             </el-input>
             <el-tree :data="datathirdParty" node-key="id" :props="defaultProps" @node-click="nodeClick2"
@@ -477,7 +477,7 @@
           if (power[i].menuMethod == 'delDepartment') {
             delStandardTree = true
           }
-          if (power[i].menuMethod == 'addPersonUser') {
+          if (power[i].menuMethod == 'selectCompaniesList') {
             addUserPower = true
           }
         }
@@ -630,11 +630,11 @@
         }
         let arr = []
         this.currentCompaniesList.forEach(b=>{
-          this.companiesList.forEach(a=>{
+          /* this.companiesList.forEach(a=>{
             if(a.companyId===b){
               console.log(a)
             }
-          })
+          }) */
           let obj = this.companiesList.find(a=>a.companyId==b)
           arr.push(obj)
           })
@@ -652,10 +652,13 @@
             return
           }
           this.$message.success('鎿嶄綔鎴愬姛')
-          this.refresh()
           this.multipleSelection = []
           this.$refs.personTable.clearSelection()
           this.addthirdParty = false
+          this.addLoad = false
+          this.personList = []
+          this.userSearch2 = ''
+          this.refresh()
         }).catch(e => {
           this.addthirdParty = false
           this.addLoad = false

--
Gitblit v1.9.3