Merge branch 'liuqiang' into v3

index.html

@@ -9,7 +9,7 @@
 		<link rel="icon" href="/favicon.ico">
 		<title>聚合智慧文档管理系统</title>
 		<!--引入onlyoffice组件-->
-		 <script type="text/javascript" src="http://192.168.1.28:19531/web-apps/apps/api/documents/api.js" charset="utf-8" async></script>
+		 <script type="text/javascript" src="https://192.168.1.28:19443/web-apps/apps/api/documents/api.js" charset="utf-8" async></script>
 		<!-- <script type="text/javascript" src="http://http://8.142.173.95:19531/web-apps/apps/api/documents/api.js" charset="utf-8" async></script> -->
 <!--		<script type="text/javascript" src="http://192.168.188.88:19531/web-apps/apps/api/documents/api.js" charset="utf-8" async></script>-->
 		<!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->

src/views/department/MyFile.vue

@@ -753,7 +753,7 @@ export default {
             thisFolder.value = row
             console.log('row2',row);
             // topPath.value = row.dirPath
-            if(row.isEncrypt === "Y"){
+            if(row.isEncrypt === "Y" && row.encryptLevel){
                 getLeveldetailFn(row.encryptLevel)
             }else{
                 thisFolderRole.value = {}

src/views/department/modalComponebts/CreateFloder.vue

@@ -12,7 +12,7 @@
                             <el-radio :label="2">组织目录</el-radio>
                         </el-radio-group>
                     </el-form-item>
-                   <template v-if="(boserForm.dirType === 2 || thisType.dirType == '2')">
+                   <template v-if="(boserForm.dirType === 2 || thisType.dirType == '2') && free">
                         <template v-if="!upFolderData">
                             <el-form-item label="是否加密" v-if="!FolderRole.levelCode || free">
                                 <el-switch v-model="boserForm.isEncrypt" active-value="Y" inactive-value="N" />
@@ -193,7 +193,7 @@ export default {
                     })
                 } else {
                     let query = {}
-                    if(FolderRole.levelCode || thisRole.length){
+                    if(FolderRole.levelCode || thisRole.length ||thisType.dirType == "2"){
                         //父级有权限自动继承 没有就用添加的值
                         query={
                             "dirName": boserForm.value.dirName,
@@ -201,7 +201,7 @@ export default {
                             "spaceId": newspid - 0,
                             "dirType":2,
                             "isEncrypt":"Y",
-                            "encryptLevel":FolderRole.levelCode || boserForm.value.encryptLevel,
+                            "encryptLevel":FolderRole.levelCode,
                             "users":users.value,
                             "dirRole":thisRole.length?thisRole.join(','):''
                         }

src/views/publicment/MyFile.vue

@@ -1220,7 +1220,7 @@ export default {
             }else{
                 row =thisFolder.value
             }
-            if(row.isEncrypt === "Y"){
+            if(row.isEncrypt === "Y" && row.encryptLevel){
                 getLeveldetailFn(row.encryptLevel)
             }else{
                 thisFolderRole.value = {}

src/views/publicment/modalComponebts/CreateFloder.vue

@@ -12,7 +12,7 @@
                             <el-radio :label="2">组织目录</el-radio>
                         </el-radio-group>
                     </el-form-item>
-                   <template v-if="boserForm.dirType === 2 || thisType.dirType == '2'">
+                   <template v-if="(boserForm.dirType === 2 || thisType.dirType == '2') && free">
                         <template v-if="!upFolderData">
                             <el-form-item label="是否加密" v-if="!FolderRole.levelCode || free">
                                 <el-switch v-model="boserForm.isEncrypt" active-value="Y" inactive-value="N" />
@@ -192,7 +192,7 @@ export default {
                     })
                 } else {
                     let query = {}
-                    if(FolderRole.levelCode || thisRole.length){
+                    if(FolderRole.levelCode || thisRole.length ||thisType.dirType == "2"){
                         //父级有权限自动继承 没有就用添加的值
                         query={
                             "dirName": boserForm.value.dirName,
@@ -200,7 +200,7 @@ export default {
                             "spaceId": newspid - 0,
                             "dirType":2,
                             "isEncrypt":"Y",
-                            "encryptLevel":FolderRole.levelCode || boserForm.value.encryptLevel,
+                            "encryptLevel":FolderRole.levelCode,
                             "users":users.value,
                             "dirRole":thisRole.length?thisRole.join(','):''
                         }