Merge branch 'master-v32-xwx' into 'master'

杭州-文档管理-上传刷新优化



See merge request !353

@@ -678,7 +678,9 @@ export default {
         }
         }
         let uploadCallBack = ({document, fileInfo}) => {
         let uploadCallBack = ({document, fileInfo}) => {
             reload(false);
             reload(false);
-            props.fileIds.push(document.id)
+            if (document.category.toUpperCase() == document.category){
+                props.fileIds.push(document.id);
+            }
             // 执行回调
             // 执行回调
             emit('callback', {document, fileInfo});
             emit('callback', {document, fileInfo});
         }
         }

@@ -151,6 +151,8 @@ export default {
                     if (res && res.data) {
                     if (res && res.data) {
                         count.value = res.count;
                         count.value = res.count;
                         tableDataList.value = res.data;
                         tableDataList.value = res.data;
+                    }else{
+                        tableDataList.value='暂无数据';
                     }
                     }
                 });
                 });
             }
             }