From d49ffb6b38604f6a7ad777f9df8a83c6c8ee1f4f Mon Sep 17 00:00:00 2001
From: kim131 <1035828775@qq.com>
Date: Thu, 5 Nov 2020 17:03:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=96=87=E4=BB=B6=E5=8D=8F?=
 =?UTF-8?q?=E5=90=8C=20=E4=BB=A5=E5=8F=8A=E5=88=A4=E6=96=AD=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=AD=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components_web/distWork/distWork.vue      | 22 +++++++--------
 src/views/main_web/workspace/workspace.vue    | 28 +++++++++----------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/views/components_web/distWork/distWork.vue b/src/views/components_web/distWork/distWork.vue
index b58c92ee..edb959b8 100644
--- a/src/views/components_web/distWork/distWork.vue
+++ b/src/views/components_web/distWork/distWork.vue
@@ -1133,17 +1133,17 @@ export default {
     handleCheckedOne(topIndex, user, e) {
       if(!this.isShowManager)
       {
-        // if(user.userID == sessionStorage.userId)
-        // {
-        //   this.$notify.info({
-        //     title: "温馨提示",
-        //     message: "不能移除自己哦",
-        //     offset: 100,
-        //     duration: 5000
-        //   });
-        //   user.selected=true;
-        //   return;
-        // }
+        if(user.id == sessionStorage.userId)
+        {
+          this.$notify.info({
+            title: "温馨提示",
+            message: "不能移除自己哦",
+            offset: 100,
+            duration: 5000
+          });
+          user.selected=true;
+          return;
+        }
         if(user.id == this.currUser.accountId)
         {
             this.$notify.info({
diff --git a/src/views/main_web/workspace/workspace.vue b/src/views/main_web/workspace/workspace.vue
index 7df3d036..0102b816 100644
--- a/src/views/main_web/workspace/workspace.vue
+++ b/src/views/main_web/workspace/workspace.vue
@@ -538,7 +538,7 @@
                           <div
                             class="eidtTip"
                             v-if="
-                              file.status == 1 && file.modifyUserID != userId
+                              file.status == 1 && file.modifyUserId != userId
                             "
                           >
                             工作中
@@ -556,7 +556,7 @@
                           </div>
                           <div
                             v-if="
-                              file.status == 1 && file.modifyUserID == userId
+                              file.status == 1 && file.modifyUserId == userId
                             "
                             class="yijianxietong isonselect_update"
                           >
@@ -831,7 +831,7 @@
                                 <el-dropdown-item
                                   divided
                                   @click.native="
-                                    setFileStatus(file, 3, '文件已取消协同', 1)
+                                    setFileStatus(file, 1, '文件已取消协同', 1)
                                   "
                                   v-if="
                                     isUseShare &&
@@ -844,7 +844,7 @@
                                 <el-dropdown-item
                                   divided
                                   @click.native="
-                                    setFileStatus(file, 3, '文件已取消协同', 1)
+                                    setFileStatus(file, 1, '文件已取消协同', 1)
                                   "
                                   v-else-if="
                                     isUseShare &&
@@ -1177,7 +1177,7 @@
                         </strong>
                         <div
                           class="eidtTip"
-                          v-if="file.status == 0 || file.status == 1"
+                          v-if="file.workStatus == 2"
                         >
                           工作中
                         </div>
@@ -1212,8 +1212,8 @@
                             <div class="minifont">下载中</div>
                           </span>
                         </div>
-                        <div class="eidtTip" v-if="file.status == 3">
-                          文件已取消协同
+                        <div class="eidtTip" v-if="file.status == 1">
+                          文件未开启协同
                         </div>
                         <span class="yiyunwenjian_infodesc">{{
                           file.folderName
@@ -1392,7 +1392,7 @@
                         </div>
                         <div
                           class="eidtTip"
-                          v-if="file.status == 0 || file.status == 1"
+                          v-if="file.workStatus == 2"
                         >
                           工作中
                         </div>
@@ -1430,8 +1430,8 @@
                         <!-- <div class="eidtTip" v-if="file.status == 1">
                           编辑中
                         </div>-->
-                        <div class="eidtTip" v-if="file.status == 3">
-                          文件已取消协同
+                        <div class="eidtTip" v-if="file.status == 1">
+                          文件未开启协同
                         </div>
                         <strong
                           :class="
@@ -1650,8 +1650,8 @@
                         <!-- <div class="eidtTip" v-if="file.status == 1">
                           编辑中
                         </div>-->
-                        <div class="eidtTip" v-if="file.status == 3">
-                          文件已取消协同
+                        <div class="eidtTip" v-if="file.status == 1">
+                          文件未开启协同
                         </div>
                         <strong :class="'yiyunwenjian_name '">
                           <i
@@ -1959,7 +1959,7 @@
             </li> -->
             <div class="line" v-if="BtnRightFile.status != 3"></div>
             <li
-              @click="setFileStatus(BtnRightFile, 3, '文件已取消协同', 1)"
+              @click="setFileStatus(BtnRightFile, 1, '文件已取消协同', 1)"
               v-if="
                 isUseShare && BtnRightFile.status != 3 && isShowMenuFile == true
               "
@@ -1968,7 +1968,7 @@
               取消协同
             </li>
             <li
-              @click="setFileStatus(BtnRightFile, 3, '文件已取消协同', 1)"
+              @click="setFileStatus(BtnRightFile, 1, '文件已取消协同', 1)"
               v-else-if="isUseShare && BtnRightFile.status != 3"
               class="redbtn"
             >