私有码继承，根目录可上传

src/views/department/MyFile.vue

@@ -96,7 +96,8 @@
                     <!-- 众多功能 -->
                     <div class="manyUse">
                         <div class="useMenu">
-                            <div v-if="(thisRole.some(item=>item == 'upload') || (isDept && thisFolder.dirId)) && (pathLabelData.length || leftShowList == 1)&& thisFolder.parentId != 0"
+                            <!-- <div v-if="(thisRole.some(item=>item == 'upload') || (isDept && thisFolder.dirId)) && (pathLabelData.length || leftShowList == 1)&& thisFolder.parentId != 0" -->
+                            <div v-if="(thisRole.some(item=>item == 'upload') || (isDept))"
                             style="display: flex;width: 92px;height: 32px;justify-content: flex-start;align-items: center;line-height: 18px;">
                             <div style="margin-left: 5px;">
                                 <img src="../../assets/images/upload.png" style="width: 24px;height: 24px;" alt="">

src/views/department/modalComponebts/CreateFloder.vue

@@ -142,8 +142,8 @@ export default {
         const openTrans = ref(true)
         // console.log("FolderRole",FolderRole);
         // console.log("thisRole",thisRole);
-        console.log("thisType",thisType);
-        console.log("upFolderData",upFolderData);
+        // console.log("thisType",thisType);
+        // console.log("upFolderData",upFolderData);
         let addBoser = ref(false)
         let boserForm = ref({
             dirName: upFolderData?upFolderData.dirName:"",
@@ -153,7 +153,8 @@ export default {
             encryptLevel:upFolderData?upFolderData.encryptLevel:"L1",
             memberRoles:upFolderData?upFolderData.dirRole.split(','):[],
             users:upFolderData?upFolderData.users:[],
-            accessCode:upFolderData?upFolderData.accessCode:''
+            accessCode:upFolderData?upFolderData.accessCode:'',
+            remark:upFolderData?upFolderData.remark:''
         })
         const levelList = ref([])
         const needCode = ref(false) // 需要私有码
@@ -163,7 +164,7 @@ export default {
         const preTemp = ref()
         const preTempTitle = ref('')
         function inital() {
-            console.log(free, 'free');
+            // console.log(free, 'free');
             addBoser.value = result
         }
         function backTo() {
@@ -256,10 +257,11 @@ export default {
                             "encryptLevel":FolderRole?.levelCode,
                             "users":thisType.dirType === "1"?boserForm.value.users:users.value,
                             "dirRole":thisRole.length?thisRole.join(','):'',
-                            "accessCode":FolderRole.accessCode
+                            "accessCode":FolderRole.accessCode,
+                            "remark":'extend'
                         }
-                        console.log('query',query);
-                        console.log('FolderRole',FolderRole);
+                        // console.log('query',query);
+                        // console.log('FolderRole',FolderRole);
                     }else{
                         if (boserForm.value.accessCode === '' && needCode.value) {
                             ElMessage({
@@ -339,7 +341,8 @@ export default {
                     "users":boserForm.value.users,
                     "isEncrypt":boserForm.value.isEncrypt,
                     "encryptLevel":boserForm.value.isEncrypt == "Y"?boserForm.value.encryptLevel:null,
-                    "accessCode":boserForm.value.accessCode?sm3(boserForm.value.accessCode):''
+                    "accessCode":boserForm.value.accessCode?sm3(boserForm.value.accessCode):'',
+                    "remark":boserForm.value.remark?boserForm.value.remark:'',
                 }
             }else{
                  query ={
@@ -352,11 +355,12 @@ export default {
                     "users":boserForm.value.users,
                     "isEncrypt":boserForm.value.isEncrypt,
                     "encryptLevel":boserForm.value.isEncrypt == "Y"?boserForm.value.encryptLevel:null,
-                    "accessCode":boserForm.value.accessCode?sm3(boserForm.value.accessCode):''
+                    "accessCode":boserForm.value.accessCode?sm3(boserForm.value.accessCode):'',
+                    "remark":boserForm.value.remark?boserForm.value.remark:'',
                 }
             }
             
-                console.log('query',query);
+                // console.log('query',query);
                 documents.editFolerDocument(
                        query
                     ).then(res => {

src/views/myfile/MyFile.vue

@@ -107,7 +107,8 @@
                     <!-- 众多功能 -->
                     <div class="manyUse">
                         <div class="useMenu">
-                            <div v-if="thisFolder.dirType == '1' && (pathLabelData.length || leftShowList === 1)  && thisFolder.parentId != 0"
+                            <!-- <div v-if="thisFolder.dirType == '1' && (pathLabelData.length || leftShowList === 1)  && thisFolder.parentId != 0" -->
+                            <div v-if="true"
                                 style="display: flex;width: 92px;height: 32px;justify-content: flex-start;align-items: center;line-height: 18px;">
                                 <div style="margin-left: 5px;">
                                     <img src="../../assets/images/upload.png" style="width: 24px;height: 24px;" alt="">

src/views/myfile/modalComponebts/CreateFloder.vue

@@ -196,7 +196,8 @@ export default {
                             "spaceId": newspid - 0,
                             "isEncrypt":"Y",
                             "encryptLevel":FolderRole.levelCode,
-                            "accessCode":FolderRole.accessCode
+                            "accessCode":FolderRole.accessCode,
+                            "remark":'extend'
                         }
                         console.log('query',query);
                         console.log('FolderRole',FolderRole);

src/views/publicment/MyFile.vue

@@ -92,7 +92,8 @@
                     <!-- 众多功能 -->
                     <div class="manyUse">
                         <div class="useMenu">
-                            <div v-if="(thisRole.some(item=>item == 'upload') || (isDept && thisFolder.dirId)) && (pathLabelData.length || leftShowList == 1)&& thisFolder.parentId != 0"
+                            <!-- <div v-if="(thisRole.some(item=>item == 'upload') || (isDept && thisFolder.dirId)) && (pathLabelData.length || leftShowList == 1)&& thisFolder.parentId != 0" -->
+                            <div v-if="(thisRole.some(item=>item == 'upload') || (isDept))"
                             style="display: flex;width: 92px;height: 32px;justify-content: flex-start;align-items: center;line-height: 18px;">
                             <div style="margin-left: 5px;">
                                 <img src="../../assets/images/upload.png" style="width: 24px;height: 24px;" alt="">

src/views/publicment/modalComponebts/CreateFloder.vue

@@ -152,7 +152,8 @@ export default {
             encryptLevel:upFolderData?upFolderData.encryptLevel:"L1",
             memberRoles:upFolderData?upFolderData.dirRole.split(','):[],
             users:upFolderData?upFolderData.users:[],
-            accessCode:upFolderData?upFolderData.accessCode:''
+            accessCode:upFolderData?upFolderData.accessCode:'',
+            remark:upFolderData?upFolderData.remark:''
         })
         const levelList = ref([])
         const needCode = ref(false) // 需要私有码
@@ -162,7 +163,7 @@ export default {
         const preTemp = ref()
         const preTempTitle = ref('')
         function inital() {
-            console.log(free, 'free');
+            // console.log(free, 'free');
             addBoser.value = result
         }
         function backTo() {
@@ -255,10 +256,11 @@ export default {
                             "encryptLevel":FolderRole?.levelCode,
                             "users":thisType.dirType === "1"?boserForm.value.users:users.value,
                             "dirRole":thisRole.length?thisRole.join(','):'',
-                            "accessCode":FolderRole.accessCode
+                            "accessCode":FolderRole.accessCode,
+                            "remark":'extend'
                         }
-                        console.log('query',query);
-                        console.log('FolderRole',FolderRole);
+                        // console.log('query',query);
+                        // console.log('FolderRole',FolderRole);
                     }else{
                          if (boserForm.value.accessCode === '' && needCode.value) {
                             ElMessage({
@@ -339,7 +341,8 @@ export default {
                     "users":boserForm.value.users,
                     "isEncrypt":boserForm.value.isEncrypt,
                     "encryptLevel":boserForm.value.isEncrypt == "Y"?boserForm.value.encryptLevel:null,
-                    "accessCode":boserForm.value.accessCode?sm3(boserForm.value.accessCode):''
+                    "accessCode":boserForm.value.accessCode?sm3(boserForm.value.accessCode):'',
+                    "remark":boserForm.value.remark?boserForm.value.remark:'',
                 }
             }else{
                  query ={
@@ -352,10 +355,11 @@ export default {
                     "users":boserForm.value.users,
                     "isEncrypt":boserForm.value.isEncrypt,
                     "encryptLevel":boserForm.value.isEncrypt == "Y"?boserForm.value.encryptLevel:null,
-                    "accessCode":boserForm.value.accessCode?sm3(boserForm.value.accessCode):''
+                    "accessCode":boserForm.value.accessCode?sm3(boserForm.value.accessCode):'',
+                    "remark":boserForm.value.remark?boserForm.value.remark:'',
                 }
             }
-                console.log('query',query);
+                // console.log('query',query);
                 documents.editFolerDocument(
                        query
                     ).then(res => {

src/views/system/dept/index.vue

@@ -57,11 +57,11 @@
       >
          <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
          <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
-         <el-table-column prop="status" label="状态" width="100">
+         <!-- <el-table-column prop="status" label="状态" width="100">
             <template #default="scope">
                <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
             </template>
-         </el-table-column>
+         </el-table-column> -->
          <el-table-column label="创建时间" align="center" prop="createTime" width="200">
             <template #default="scope">
                <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -117,7 +117,7 @@
                      <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
                   </el-form-item>
                </el-col>
-               <el-col :span="12">
+               <!-- <el-col :span="12">
                   <el-form-item label="部门状态">
                      <el-radio-group v-model="form.status">
                         <el-radio
@@ -127,7 +127,7 @@
                         >{{ dict.label }}</el-radio>
                      </el-radio-group>
                   </el-form-item>
-               </el-col>
+               </el-col> -->
             </el-row>
          </el-form>
          <template #footer>