Merge branch 'dev' of http://47.104.91.134:3000/yiyun-fe/yiyunjianzhu-vue into dev

src/views/components_web/distWork/distWork.vue

@@ -105,10 +105,15 @@
                     <div class="fl vhLine mlr-20"></div>
                     <!-- 添加职员 -->
                     <div class="fl addBtn_new" title="添加项目负责人" 
-                    :class="{notclick:!(currUser.id == userId||(listManagerUser.length > 0 && listManagerUser.find(item=>item.id ==userId)))}"
+                    v-if="(currUser.id == userId||(listManagerUser.length > 0 && listManagerUser.find(item=>item.id ==userId)))"
                     @click="addProjManager()">
                       <i class="el-icon-plus middleaddEC"></i>
                     </div>
+                    <div class="fl addBtn_new notclick" title="添加项目负责人" 
+                    v-else
+                    >
+                      <i class="el-icon-plus middleaddEC notclick"></i>
+                    </div>
                     <div class="fl chengyuanbox">
                       <ul class="ECworkerList">
                           <li v-for="(user, index) in listManagerUser" :key="index">
@@ -1748,7 +1753,8 @@ function mergeFolderList(plainFolderList, userHash) {
     margin-right: 30px;
 }
   .notclick{
-    pointer-events: none;
+    cursor:not-allowed !important;
+    filter: grayscale(80%);
   }
 
 

src/views/components_web/distWork/folder-list.vue

@@ -39,7 +39,14 @@
         <div class="fl firstPeople">
           <!-- 默认添加 -->
           <div v-if="folder.manageUser == ''">
-            <div class="avtarface"  :class="{notclick:!isAllowedAssignedFolder(folder)}"  @click="aloneAddUserForFolder(folder)">
+           
+            <div class="avtarface" v-if="isAllowedAssignedFolder(folder)"
+              @click="aloneAddUserForFolder(folder)">
+              <!-- <i class="large_huangguan icon font_family icon-icon_huangguan-jihuo"></i> -->
+              <i class="large_huangguan el-icon-plus"></i>
+            </div>
+            
+            <div class="avtarface notclick" v-else>
               <!-- <i class="large_huangguan icon font_family icon-icon_huangguan-jihuo"></i> -->
               <i class="large_huangguan el-icon-plus"></i>
             </div>
@@ -47,14 +54,19 @@
           </div>
           <li v-for="(user, index) in folder.manageUser" :key="index">
             <div>
-              <div class="avtarface" title="编辑">
+              <div class="avtarface" title="编辑" v-if="isAllowedAssignedFolder(folder)">
                 <!-- <img src="" v-lazy="headSrc + user.headImgUrl" @click="aloneAddUserForFolder(folder)" /> -->
                 <img
                   :src="user.headImgUrl | resolveAvator"
-                  :class="{notclick:!isAllowedAssignedFolder(folder)}"
                   @click="aloneAddUserForFolder(folder)"
                 />
               </div>
+              <div class="avtarface notclick" title="编辑" v-else>
+                <!-- <img src="" v-lazy="headSrc + user.headImgUrl" @click="aloneAddUserForFolder(folder)" /> -->
+                <img
+                  :src="user.headImgUrl | resolveAvator"
+                />
+              </div>
               <span class="Text_tiny tinyText_wirte">{{ user.cnName }}</span>
             </div>
           </li>
@@ -62,12 +74,18 @@
         <!-- 竖线 -->
         <div class="fl vhLine mlr-20"></div>
         <!-- 添加职员 -->
+        <div
+          class="fl addBtn_new notclick"
+          title="添加职员"
+          v-if="folder.manageUser != ''&&folder.manageUser[0].id!=id&&!isAllowedAssignedFolder(folder)"
+        >
+          <i class="el-icon-plus middleaddEC notclick"></i>
+        </div>
         <div
           class="fl addBtn_new"
           title="添加职员"
-          :class="{notclick:folder.manageUser[0].id!=id&&!isAllowedAssignedFolder(folder)}"
           @click="aloneAddUserOnlyStaff(folder)"
-          v-if="folder.manageUser != ''"
+          v-else-if="folder.manageUser != ''"
         >
           <i class="el-icon-plus middleaddEC"></i>
         </div>
@@ -162,6 +180,7 @@ export default {
     padding-left: 30px;
   }
   .notclick{
-    pointer-events: none;
+    cursor:not-allowed !important;
+    filter: grayscale(80%);
   }
 </style>