Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/Resource/OfficialActivities.vue

@@ -226,8 +226,12 @@ export default {
         },
     },
     filters: {
-        capitalize: function (value) {
-            return value.split(" ")[0]
+        capitalize(val) {
+            if(val.split(" ")){
+                return val.split(" ")[0]
+            }else{
+                return val
+            }
         }
     },
     created(){

src/components/Resource/invitationLetter.vue

@@ -91,13 +91,14 @@ export default {
                 }
             }).then(function (res) {
                 console.log(res)
-
                 if (res.data.code == 200) {
                     debugger
                     that.tableData = res.data.data.deleClient;
                     that.tableDatas = that.tableData;
                     that.delegations = res.data.data.delegations
-                    that.DiId = that.delegations[0].id
+                    if(that.DiId==0){
+                        that.DiId = that.delegations[0].id
+                    }
                     if (that.tableDatas.slice((that.currentPage - 1) * that.pageSize, that.currentPage * that.pageSize).length == 0) {
                         if (that.currentPage > 1) {
                             that.currentPage = that.currentPage - 1;