Merge branch 'xiaoqin' into mergeBranch

src/SManagement/orderclue/components/list.vue

@@ -26,6 +26,9 @@
             <p>{{ scope.column.data[scope.column.columnname] }}</p>
             <span :class="scope.column.data.isTeam == '总部' ? 'all-team' : 'team'">{{ scope.column.data.isTeam }}</span>
           </div>
+          <div v-else-if="scope.column.columnname == 'leadername'">
+            <p>{{ scope.column.data[scope.column.columnname]}}</p>
+          </div>
           <div v-else-if="scope.column.columnname == 'city'">
             <p>{{ scope.column.data.province }}、{{ scope.column.data.city }}、{{ scope.column.data.county }}</p>
           </div>
@@ -85,6 +88,7 @@ export default {
       tablecols: [],
       total: 0,
       list: [],
+      userName:JSON.parse(window.sessionStorage.getItem('active_account')).name,
       //table选中数据
       checkboxArr: [],
       statusStyle: {
@@ -111,6 +115,8 @@ export default {
       let res = await this.$api.requested(this.param)
       this.list = res.data
       this.total = res.total
+      console.log(this.list);
+      
     },
     searchActive (data) {
       this.param.content.where.condition = data

src/SManagement/orderclue/components/move.vue

@@ -6,7 +6,7 @@
       <div class="handle">
         <p class="title">团队成员</p>
         <el-select placeholder="请选择转移人" v-model="param.content.sa_agent_hrid" size="small">
-          <el-option v-for="(item,index) in teamList" :key="index" :label="item.name" :value="item.userid">{{item.name}}</el-option>
+          <el-option v-for="(item,index) in teamList" :key="index" :label="item.name" :value="item.sa_agent_hrid">{{item.name}}</el-option>
         </el-select>
       </div>
       <span slot="footer" class="dialog-footer">

src/SManagement/orderclue/index.vue

@@ -8,18 +8,18 @@
           <edit :data="scope.data" 
                 @updataList="updataList"
                 :arealist="arealist" 
-                v-if="scope.data.data.status == '待跟进' || scope.data.data.status == '跟进中' && tool.checkAuth($route.name,'update')"></edit>
+                v-if="userInfo.isAuth == 0 || userInfo.name == scope.data.data.leadername && scope.data.data.status == '待跟进' || scope.data.data.status == '跟进中'"></edit>
       </template>
       <template v-slot:goUp="scope">
         <follow :data="scope.data" 
                 @updataList="updataList" 
-                v-if="scope.data.data.status == '待跟进' || scope.data.data.status == '跟进中' && tool.checkAuth($route.name,'follow')"></follow>
+                v-if="userInfo.isAuth == 0 || userInfo.name == scope.data.data.leadername && scope.data.data.status == '待跟进' || scope.data.data.status == '跟进中'"></follow>
       </template>
       <template v-slot:move="scope">
         <move :data="[scope.data.data.sat_orderclueid]" 
               @updataList="updataList" 
-              :teamList="teamList"
-              v-if="scope.data.data.status == '待跟进' || scope.data.data.status == '跟进中' && tool.checkAuth($route.name,'handleMove')"></move>
+              :teamList="teamList"  
+              v-if="userInfo.isAuth == 1 && scope.data.data.status == '待跟进' || scope.data.data.status == '跟进中'"></move>
       </template>
     </list>
   </div>
@@ -39,7 +39,8 @@ export default {
   data() {
     return {
       teamList:[],
-      arealist:[]
+      arealist:[],
+      userInfo: ''
     };
   },
   provide() {
@@ -55,6 +56,7 @@ export default {
   created() {
     this.getTeamList()
     this.query_arealist()
+    this.queryUserInfo()
   },
   methods: {
     detail(data) {
@@ -93,6 +95,30 @@ export default {
       console.log(res.data);
       
       this.arealist = this.tool.createMenu(res.data)
+    },
+    async queryUserInfo() {
+      let res = await this.$api.requested({
+        "classname": "common.usercenter.usercenter",
+        "method": "queryUserMsg",
+        "content": {
+        }
+      })
+      this.userInfo = {
+        isAuth : res.data.agenthr.isleader,
+        name: res.data.name
+      }
+      console.log(this.userInfo.isAuth);
+      
+    },
+    //操作权限
+    handlePower(role) {
+      if(role == '员工') {
+        console.log(this.userInfo.isAuth == 0);
+        
+        return this.userInfo.isAuth == 0
+      } else {
+        return this.userInfo.isAuth == 1
+      }
     }
   },
 };