Merge branch 'dev' of http://47.104.91.134:3000/yiyun-fe/yiyunjianzhu-vue into dev

src/views/components_web/projSetting/projSetting.vue

@@ -538,10 +538,12 @@ import { wrapOssProtocol} from "@/services/oss";
       FileUploader
     },
     props: {
-      isProjManager: {
-        type: Boolean,
-        default: false
+      isProjManager:{
+        type:Boolean,
+        default:false
+
       },
+
       isSetFolder: {
         type: Boolean,
         default: false
@@ -601,7 +603,7 @@ import { wrapOssProtocol} from "@/services/oss";
         isShowSetUsers: false, // 分配工作人员面板
         isShowProjInfo: true, // 项目概况
         isShowInfoEdit: false, // 项目概况编辑
-        isShowEditProjBtn: true, // 编辑项目概况按钮
+        isShowEditProjBtn: false, // 编辑项目概况按钮
         isShowSaveAllBtn: false, // 保存全部信息按钮
         currWorkName: "", // 分配人员时工作名称
         currentProjId:"",
@@ -706,8 +708,6 @@ import { wrapOssProtocol} from "@/services/oss";
        * 保存项目概况
        */
       async saveProjectInfo(){
-        
-
         var CustomProps=[];
         
         this.listProjProp.forEach(item=>{
@@ -1159,8 +1159,11 @@ import { wrapOssProtocol} from "@/services/oss";
         this.nowProject.ProjCreateTime=dayjs(this.nowProject.ProjCreateTime).format('YYYY-MM-DD HH:mm:ss');
         this.nowProject = {...this.nowProject};
         this.listProjProp=projectInfoRes.Data.CustomProps;
+        //this.isProjManager=projectInfoRes.Data.Status;
         this.listProjProp = [...this.listProjProp];
         this.coverSrc=projectInfoRes.Data.ShowImgUrl;
+        console.log(projectInfoRes);
+        console.log(this.isProjManager);
       },
       /**
        * 获取全部的Dept数据

src/views/main_web/index/index.vue

@@ -136,7 +136,7 @@
                     round
                     class="longBtn defualtBtnInfo"
                     @click="addNewFolders(projItem)"
-                    v-if="projItem.folderPerm == 2 && projItem.allocated == 0"
+                    v-if="projItem.Allocated == 1"
                   >请完成工作指派</el-button>
                 </div>
               </div>
@@ -202,7 +202,7 @@
         :key="2"
       >
         <ProjSetting
-          :isProjManager="isProjectManager"
+        :isProjManager="isProjectManager"
           :createUserId="createUserId"
           :projId="currProjId"
           :nowprj="nowProj"
@@ -251,6 +251,7 @@ export default {
       projPageList: [], // 分页项目数据
       isEmpty: false,
       createUserId:'',
+      isProjectManager:0,
       newProjData: {
         projectData: {
           projID: "",
@@ -302,7 +303,7 @@ export default {
       scrollIndex: 12, //默认值滚动数
       welcome: "", //时间旁的欢迎语
       isShowProjSetting: false,
-      isProjectManager: false,
+     
       isEditProjFolder: false,
     };
   },
@@ -646,6 +647,7 @@ export default {
       //const projectInfoRes= await prjService.QueryProjectInfoByProjId(proj.Id);
       //this.isProjectManager = projectInfoRes.Data.Status;
       this.currProjId = proj.Id;
+      this.isProjectManager=proj.Status;
       this.isShowProjSetting = true;
       this.isEditProjFolder = false;    
       //this.nowProj=projectInfoRes.Data;  

src/views/main_web/workspace/service.js

@@ -20,6 +20,9 @@ export async function fetchWorkFlow(projectId, userId) {
  */
 export async function fetchFolderFileList(folderId, userId) {
   const res = await fetchApi('folder/queryFileListByFolderId', {folderId, userId});
-  console.log(res);
   return res;
+}
+
+export async function createSubFolder() {
+  const res = await fetchApi('folder/createSubfolder', {});
 }

src/views/main_web/workspace/workspace.vue

@@ -904,7 +904,7 @@
                   <div
                     class="yiyun_wenjian_list lisy-group-item"
                     v-for="foldergroup in myListFolderGroups"
-                    :key="foldergroup.folderGroupID"
+                    :key="foldergroup.Id"
                     @dblclick="intoFoldergroup(foldergroup)"
                   >
                     <div
@@ -915,11 +915,11 @@
                     ></div>
                     <strong
                       class="yiyunwenjian_name"
-                      :title="foldergroup.folderGroupName"
-                      >{{ foldergroup.folderGroupName }}</strong
+                      :title="foldergroup.FolderName"
+                      >{{ foldergroup.FolderName }}</strong
                     >
                     <strong class="visontext"
-                      >{{ foldergroup.childrenTotalCount }}个项目</strong
+                      >{{ foldergroup.ChildCount }}个项目</strong
                     >
                   </div>
                 </draggable>
@@ -2717,6 +2717,7 @@ import draggable from "vuedraggable";
 import vuetify from "vuetify";
 import back from '@/services/system';
 import * as services from './service';
+import { firstCharToLowerCase, firstCharToUpperCase } from '@/utils/tool';
 
 const $ = window.jQuery;
 const Velocity = window.Velocity;
@@ -6447,7 +6448,7 @@ export default {
       this.folderGroupData.levelId = this.dbClickSelectedFolderGroupData.levelId;
       this.folderGroupData.folderID = this.nowFolder.folderID;
       this.folderGroupData.createUserID = sessionStorage.userId;
-      // debugger;
+      debugger;
       this.$axios({
         method: "post",
         url: encodeURI(process.env.API_HOST + "folders/foldergroup"),
@@ -6489,6 +6490,7 @@ export default {
      * 双击文件夹组名称 进入文件夹
      */
     intoFoldergroup: function (foldergroup) {
+      // console.log('intoFoldergroup: ', foldergroup);
       if (foldergroup == null || JSON.stringify(foldergroup) == "{}") {
         this.$notify({
           title: "温馨提示",
@@ -6503,9 +6505,9 @@ export default {
       this.isShowWorkt = false;
       this.isShowBread = true;
       var param = {
-        folderId: foldergroup.folderID,
-        foldergroupId: foldergroup.folderGroupID,
-        levelId: foldergroup.levelId,
+        folderId: foldergroup.Id,
+        foldergroupId: foldergroup.FirstFolderId,
+        levelId: foldergroup.LevelId,
         userId: sessionStorage.userId,
       };
       this.$axios({