Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/HDrpManagement/serveWorkBill/components/teamSelect.vue

@@ -61,7 +61,6 @@ export default {
         "content": {
             "where":{
                 "condition":"",
-                "isleader":0
             }
 
         }

src/HDrpManagement/serveWorkBill/modules/teamList/index.vue

@@ -71,6 +71,7 @@ export default {
           "ownerid":this.$route.query.id
         }
       })
+      res.data[0].team.unshift(...res.data[0].teamleader)
       this.teamList = res.data[0].team
       console.log(this.teamList,'团队数据');
     },

src/HManagement/archives_sc/list/modules/edit.vue

@@ -73,7 +73,7 @@
           <!-- 附件列表 -->
           <div class="container normal-panel">
             <attachmentList :attinfos="form.attinfos" @onSuccess="selectDetail" :onlyread="store.state.pageOnlyRead">
-              <upload slot="upload" :folderid="folderid"
+              <upload slot="upload" :folderid="folderid" ref="upload"
                 :bindData="{ ownertable: 'SAT_COURSEWARE', ownerid: form.sat_coursewareid, usetype: 'default' }"
                 @onSuccess="onSubmit"></upload>
             </attachmentList>
@@ -155,9 +155,14 @@ export default {
 
         /*this.selectDetail()*/
         this.insertCoursewareauth(() => {
-          this.$router.push({path:'/archives_scdetails',query:{id:res.data.sat_coursewareid,rowindex:res.data.rowindex}})
+          if (Object.prototype.toString.call(callback).indexOf('Function') != -1) {
+            this.$router.push({path:'/archives_scdetails',query:{id:res.data.sat_coursewareid,rowindex:res.data.rowindex}})
+            callback(res)
+          } else {
+            this.$refs.upload.dialogUploadVisible = false
+            this.selectDetail()
+          }
         })
-        callback?callback(res):''
       });
     },
     async selectDetail() {

src/SManagement/archives/components/FileList.vue

@@ -16,7 +16,7 @@
           fit="fill">
         </el-image>
       </div>
-      <p>{{item.document}}</p>
+      <p class="text">{{item.document}}</p>
       <div class="icon" v-show="item.fileType != 'folder' && isCollect == true && isIconShowIndex === index || $route.path == '/archivesmag_list' || item.isCollect == 1">
         <img
           src="@/assets/file_icons/收藏.png"
@@ -169,7 +169,7 @@ export default {
   width: 100%;
   height: 100%;
 }
-.file-list .file-item p {
+.file-list .file-item .text {
   font-size: 14px;
   width: 120px;
   font-family: PingFang SC-Regular, PingFang SC;
@@ -177,9 +177,11 @@ export default {
   color: #333333;
   text-align: center;
   padding: 0 9px;
+  display: -webkit-box;
   overflow: hidden;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
   text-overflow: ellipsis;
-  white-space: nowrap;
 }
 .file-list .file-item .icon {
   position: absolute;

src/SManagement/user/user-info/UserInfo.vue

@@ -71,7 +71,6 @@ export default {
     async getUserInfo() {
       let res = await this.$api.requested(this.param)
       this.userInfo = res.data
-
     },
     //上传头像成功
     onSuccess(id) {

src/components/file-block/index.vue

@@ -128,7 +128,7 @@ export default {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
-  width: 160px;
+  max-width: 220px;
 }
 .item-file .left .text p:last-child {
   font-size: 10px;

src/components/upload/hw_obs_upload.vue

@@ -84,7 +84,8 @@ export default {
         }
       },
       file: {},
-      filelist: []
+      filelist: [],
+      count:0
     }
   },
   methods: {
@@ -140,9 +141,16 @@ export default {
         "content":obj
       }
       const res = await this.$api.requested(param)
-      if (res.code ===  1) {
+      this.count++
+      console.log(this.count);
+      if (this.count == this.filelist.length) {
         this.$emit('onSuccess',res)
+        this.count = 0
+        console.log('触发');
       }
+      // if (res.code ===  1) {
+      //   this.$emit('onSuccess',res)
+      // }
     },
 
     clearFiles () {