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

public/static/css/main.css

@@ -7342,7 +7342,7 @@ h3.defualth3:hover{
 	border: 0;
     font-weight: 500;
     font-family: PingFang SC;
-    max-width: 76px;
+    max-width: 122px;
     padding: 0 14px;
     height: 28px;
     border-radius: 4px;

src/views/components_web/distWork/distWork.vue

@@ -112,12 +112,32 @@
                     <div class="fl chengyuanbox">
                       <ul class="ECworkerList">
                           <li v-for="(user, index) in listManagerUser" :key="index" :class="{notclick:!isAllowedAssignedManager}">
-                          <div v-if="index < 14 || showAll " >
+                          <!-- <div v-if="index < 14 || showAll " >
                             <div class="avtarface" :title="user.cnName" >
                               <img :src="user.headImgUrl | resolveAvator" />
                             </div>
                             <span class="Text_tiny tinyText_wirte">{{user.cnName}}</span>
+                          </div> -->
+                        <div v-if="index <14 || showAll">
+                          <div class="avtarface" :title="user.cnName">
+                            <img :src="user.headImgUrl | resolveAvator" />
                           </div>
+                          <span class="Text_tiny tinyText_wirte">{{ user.cnName }}</span>
+                        </div>
+                        <div class v-if="index == 14 && !showAll" @click="showAllClick">
+                          <span class="zhangkai_down"></span>
+                          <span class="Text_tiny tinyText_wirte">展开全部</span>
+                        </div>
+                        <div
+                          v-if="
+                            showAll && index == listManagerUser.length -1 && index >14
+                          "
+                          @click="showAll = false"
+                          class="newweizhi"
+                        >
+                          <span class="zhangkai_up"></span>
+                          <span class="Text_tiny tinyText_wirte">收起项目负责人</span>
+                        </div>
                         </li>
                       </ul>
                     </div>
@@ -423,10 +443,13 @@ export default {
       this.selectedUser.forEach(user => {
         user.folderPerm = (user.id === clickUser.id) ? 2 : 1;
         if(user.folderPerm === 2) {
-            this.InitData.manageUser.splice(0, 1, user);
-          } else {
-            this.InitData.manageUser.splice(0, 1);//取消选中的负责人状态
-          }
+          this.InitData.manageUser.splice(0,1,user);
+            // if(this.InitData.manageUser.length==0){
+            //   this.InitData.manageUser.push(user);
+            // }else{              
+            //   this.InitData.manageUser.splice(0,1,user);
+            // }
+        } 
       })
     },
     /**
@@ -1170,6 +1193,11 @@ export default {
       ]);
       // const deptHeadList = deptList[0].children || [];
       const oList = this.plainTreeNodes(deptList, userList);
+      oList.forEach(item=>{
+        // console.log(1)
+        // console.log(item.listUser)
+        item.listUser=item.listUser.sort((a, b) => a.cnName.localeCompare(b.cnName))
+      })
       this.listDept = oList;
       this.currListDeptUserData = oList;
 

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

@@ -86,7 +86,7 @@
               :key="index"
               :class="{notclick:!(isAllowedAssignedStaffFolder(folder)||isStaff(folder))}"
             >
-              <div v-if="index < 14 || showAll">
+              <div v-if="index <14 || showAll">
                 <div class="avtarface" title="编辑">
                   <img :src="user.headImgUrl | resolveAvator" />
                 </div>
@@ -98,7 +98,7 @@
               </div>
               <div
                 v-if="
-                  showAll && index == folder.listUser.length - 1 && index > 14
+                  showAll && index == listUserComputed(folder.listUser).length -1 && index >14
                 "
                 @click="showAll = false"
                 class="newweizhi"
@@ -141,7 +141,16 @@ export default {
     aloneAddUserOnlyStaff: Function,
     allChildrenLists:Array
   },
+  data(){
+    return{
+      showAll:false,
+    }
+  },
   methods: {
+    showAllClick(){
+      this.showAll = true;
+
+    },
     toggleFolderExpand(folder) {
       folder.expanded = !folder.expanded;
       this.$forceUpdate();

src/views/main_web/proj-item.vue

@@ -0,0 +1,23 @@
+<template>
+    <div>
+        <div class="prjitem_context">
+            <img src="" alt="">
+            <div class="prjitem_title"></div>
+        </div>
+        <div class="prjitem_select">
+            <div class=""></div>
+            <div class="prjmanager"></div>
+        </div>
+    </div>
+    
+</template>
+
+<script>
+export default {
+    
+}
+</script>
+
+<style lang="sass" scoped>
+
+</style>

src/views/manage_system/customer/index.vue

@@ -1438,6 +1438,7 @@ export default {
      * 取消更新企业信息
      */
     updateCancel: function () {
+      this.$refs['form'].resetFields();
       this.currentCompany = {...this.initCompanyRecord};
       this.boolEdit = false;
       this.editButtonGroup = 1;