2개의 변경된 파일과 44개의 추가작업 그리고 44개의 파일을 삭제
분할 보기
Diff Options
-
+25 -44src/views/components_web/distWork/distWork.vue
-
+19 -0src/views/main_web/workspace/workspace.vue
+ 25
- 44
src/views/components_web/distWork/distWork.vue
파일 보기
| @@ -332,18 +332,12 @@ | |||
| <!-- 添加协作群与工作 --> | |||
| <el-collapse-item name="1" class="nomidline"> | |||
| <template slot="title"> | |||
| <!-- <span class="fr mr_20"> | |||
| <el-checkbox class="checkBoxCol" v-model="ischeckAll" @change="handleCheckTopAll">全选</el-checkbox> | |||
| </span> --> | |||
| <span>从部门中选择职员</span> | |||
| </template> | |||
| <el-collapse accordion v-for="(dept, group_index) in listDept" v-show="dept.listUser.length>0" :key="group_index"> | |||
| <!-- 二级折叠面板 --> | |||
| <el-collapse-item> | |||
| <template slot="title"> | |||
| <!-- <span class="fr mr_20"> | |||
| <el-checkbox class="checkBoxCol" v-model="dept.selected" :key="group_index" @change="handleCheckItemAll(group_index,$event)">全选</el-checkbox> | |||
| </span> --> | |||
| <span>{{ dept.deptName }} </span> | |||
| </template> | |||
| <!-- <div class="user_info_item" v-for="(user, index) in listUserManager( | |||
| @@ -408,12 +402,8 @@ | |||
| </div> | |||
| <!-- 项目负责人选择后 --> | |||
| <div v-if="listManagerComputed(selectedUser).length != 0"> | |||
| <!-- <div class="user_info_item mainpeople_H" v-for="(user, index) in listManagerComputed( | |||
| selectedUser | |||
| )" :key="index"> --> | |||
| <div class="user_info_item mainpeople_H" v-for="(user, index) in selectedUser" :key="index"> | |||
| <div class="user_info_item mainpeople_H" v-for="(user, index) in listManagerComputed(selectedUser)" :key="index"> | |||
| <i class="icon font_family icon-icon_huangguan-jihuo middlehuangguan fl" title="负责人"></i> | |||
| <!-- <img v-lazy="headSrc + user.headImgUrl" alt="" class="user_info_faceImg" /> --> | |||
| <img :src="user.headImgUrl | resolveAvator" alt="" class="user_info_faceImg" /> | |||
| <span class="user_info_name">{{ user.cnName }}</span> | |||
| <el-popover placement="bottom-start" width="180" trigger="hover"> | |||
| @@ -452,10 +442,8 @@ | |||
| <span>{{dept.deptName}}</span> | |||
| </div> | |||
| </div> | |||
| <!-- <div class="renyuanbox" v-for="(user,index) in listUserComputed(selectedUser)" :key="index"> --> | |||
| <div class="renyuanbox" v-for="(user,index) in selectedUser" :key="index"> | |||
| <div class="renyuanbox" v-for="(user,index) in listUserComputed(selectedUser)" :key="index"> | |||
| <div class="user_info_item" v-if="user.deptId == dept.id"> | |||
| <!-- <img v-lazy="headSrc+user.headImgUrl" alt="" class="user_info_faceImg"> --> | |||
| <img v-lazy="user.headImgUrl | resolveAvator" alt="" class="user_info_faceImg"> | |||
| <span class="user_info_name">{{user.cnName}}</span> | |||
| <el-popover placement="bottom-start" width="180" trigger="hover"> | |||
| @@ -467,7 +455,7 @@ | |||
| <span class="user_info_job" slot="reference">{{user.position}}</span> | |||
| </el-popover> | |||
| <span class="user_info_role"> | |||
| <template> | |||
| <!-- <template> | |||
| <el-select v-model="user.folderPerm" placeholder="设置角色" class="setroleselect"> | |||
| <el-option v-for="item in roles" allow-create :key="item.value" :label="item.label" | |||
| :value="item.value"> | |||
| @@ -475,7 +463,7 @@ | |||
| <span style="float: right; color: #8492a6; font-size: 13px">{{ item.description }}</span> | |||
| </el-option> | |||
| </el-select> | |||
| </template> | |||
| </template> --> | |||
| <i class="el-icon-close" @click="removeSelectUser(user)" title="移除协作人"></i> | |||
| </span> | |||
| </div> | |||
| @@ -512,12 +500,10 @@ | |||
| <div class="user_info_item" v-for="(user, index) in listUserStaff( | |||
| dept.listUser | |||
| )" :label="user" :key="index"> | |||
| <!-- <div class="user_info_item" v-for="(user, index) in dept.listUser" :label="user" :key="index"> --> | |||
| <el-checkbox class="checkBoxCol" v-model="user.selected" @change=" | |||
| handleCheckedOne(group_index, user, $event) | |||
| " :disabled="disabled"> | |||
| <div class="checkboxlabelitem"> | |||
| <!-- <img v-lazy="headSrc + user.headImgUrl" alt="" class="user_info_faceImg" /> --> | |||
| <img :src="user.headImgUrl | resolveAvator" alt="" class="user_info_faceImg" /> | |||
| <span class="user_info_name">{{ | |||
| user.cnName | |||
| @@ -563,16 +549,11 @@ | |||
| <div class="yiyun_line"></div> | |||
| <!-- 项目负责人选择前 --> | |||
| <div class="main_workerBox" v-if="listManagerComputed(selectedUser).length == 0"> | |||
| <!-- <div class="main_workerBox" v-if="selectedUser.length == 0"> --> | |||
| <i class="icon font_family icon-icon_huangguan-weijihuo largehuangguan"></i> | |||
| <div class="rentou_alrge"></div> | |||
| </div> | |||
| <!-- 项目负责人选择后 --> | |||
| <div v-if="listManagerComputed(selectedUser).length != 0"> | |||
| <!-- <div v-if="selectedUser.length != 0"> --> | |||
| <!-- <div class="user_info_item mainpeople_H" v-for="(user, index) in listManagerComputed( | |||
| selectedUser | |||
| )" :key="index"> --> | |||
| <div class="user_info_item mainpeople_H" v-for="(user, index) in listManagerComputed(selectedUser)" :key="index"> | |||
| <i class="icon font_family icon-icon_huangguan-jihuo middlehuangguan fl" title="负责人"></i> | |||
| <img :src="user.headImgUrl | resolveAvator" alt="" class="user_info_faceImg" /> | |||
| @@ -591,7 +572,7 @@ | |||
| </ul> | |||
| <span class="user_info_job" slot="reference">{{user.position}}</span> | |||
| </el-popover> | |||
| <span class="user_info_role" @click="removeManageUser(user)">修改</span> | |||
| <!-- <span class="user_info_role" @click="removeManageUser(user)">修改</span> --> | |||
| </div> | |||
| </div> | |||
| <p class="diaTip"> | |||
| @@ -631,14 +612,14 @@ | |||
| }}</span> | |||
| </el-popover> | |||
| <span class="user_info_role" v-if="isShowManager"> | |||
| <template> | |||
| <!-- <template> | |||
| <el-select v-model="user.folderPerm" placeholder="设置角色" class="setroleselect"> | |||
| <el-option v-for="item in roles" allow-create :key="item.value" :label="item.label" :value="item.value"> | |||
| <span style="float: left;margin-right:30px;">{{ item.label }}</span> | |||
| <!-- <span style="float: right; color: #8492a6; font-size: 13px">{{ item.description }}</span> --> | |||
| <span style="float: right; color: #8492a6; font-size: 13px">{{ item.description }}</span> | |||
| </el-option> | |||
| </el-select> | |||
| </template> | |||
| </template> --> | |||
| <i class="el-icon-close" @click="removeSelectUser(user)" title="移除协作人"></i> | |||
| </span> | |||
| <span class="user_info_role" v-if="!isShowManager"> | |||
| @@ -687,17 +668,17 @@ export default { | |||
| nowProject: {}, | |||
| isShowPrjDesc: false, //分配项目--项目概况 | |||
| isSlectPal: true, //分配项目--项目概况 | |||
| roles: [ | |||
| { | |||
| value: 1, | |||
| label: "编辑和查看", | |||
| description: "" | |||
| }, | |||
| { | |||
| value: 0, | |||
| label: "仅查看", | |||
| description: "" | |||
| }], | |||
| // roles: [ | |||
| // { | |||
| // value: 1, | |||
| // label: "编辑和查看", | |||
| // description: "" | |||
| // }, | |||
| // { | |||
| // value: 0, | |||
| // label: "仅查看", | |||
| // description: "" | |||
| // }], | |||
| folderPerm: "1", | |||
| // ----------------------------------------------- | |||
| isShowFirstPage: true, | |||
| @@ -1252,7 +1233,7 @@ export default { | |||
| * 移除选中人员 | |||
| */ | |||
| removeSelectUser: function (item) { | |||
| if(item.userID == sessionStorage.userId) | |||
| if(item.id == sessionStorage.userId && !this.isShowManager) | |||
| { | |||
| this.$notify.info({ | |||
| title: "温馨提示", | |||
| @@ -1263,7 +1244,7 @@ export default { | |||
| return; | |||
| } | |||
| this.checkDeptUserName(false, item); | |||
| this.cancelCheck(item.userID); | |||
| this.cancelCheck(item.id); | |||
| }, | |||
| /** | |||
| * 移除负责人 | |||
| @@ -1272,12 +1253,12 @@ export default { | |||
| user.folderPerm = 0; | |||
| // user.roleName = "查看编辑"; | |||
| for (var k = 0; k < this.selectedUser.length; k++) { | |||
| if (this.selectedUser[k].userID == user.userID) { | |||
| if (this.selectedUser[k].id == user.id) { | |||
| this.selectedUser[k].folderPerm = 0; | |||
| this.selectedUser.splice(k, 1); | |||
| } | |||
| } | |||
| this.cancelCheck(user.userID); | |||
| this.cancelCheck(user.id); | |||
| this.toSecondPage(); | |||
| }, | |||
| /* | |||
| @@ -1286,7 +1267,7 @@ export default { | |||
| cancelCheck: function (userID) { | |||
| for (var i = 0; i < this.listDept.length; i++) { | |||
| for (var j = 0; j < this.listDept[i].listUser.length; j++) { | |||
| if (this.listDept[i].listUser[j].userID === userID) { | |||
| if (this.listDept[i].listUser[j].id === userID) { | |||
| this.listDept[i].listUser[j].selected = false; | |||
| this.listDept[i].listUser[j].folderPerm = 0; | |||
| this.getIsCheckSecondLevel(i); | |||
| @@ -1306,7 +1287,7 @@ export default { | |||
| this.selectedUser.push(valueUser); | |||
| } else { | |||
| for (var i = 0; i < this.selectedUser.length; i++) { | |||
| if (this.selectedUser[i].userID == item.userID) { | |||
| if (this.selectedUser[i].id == item.id) { | |||
| this.selectedUser.splice(i, 1); | |||
| } | |||
| } | |||
+ 19
- 0
src/views/main_web/workspace/workspace.vue
파일 보기
| @@ -6470,6 +6470,25 @@ export default { | |||
| } | |||
| console.log(this.folderGroupData); | |||
| const Res = await services.createSubFolder(this.folderGroupData); | |||
| if (Res.Code != -1) { | |||
| this.refreshPages(); | |||
| this.$notify({ | |||
| title: "恭喜您", | |||
| message: "文件夹创建成功！", | |||
| type: "success", | |||
| offset: 100, | |||
| duration: 2500, | |||
| }); | |||
| } else { | |||
| this.$notify({ | |||
| title: "温馨提示", | |||
| message: "创建失败", | |||
| type: "error", | |||
| offset: 100, | |||
| duration: 5000, | |||
| }); | |||
| } | |||
| this.dialogNewFolderGroup = false; | |||
| }, | |||