Merge branch 'master' of http://192.168.5.34:10101/r/YiYunJianZhuBeta

src/views/main_web/workspace.vue

@@ -4233,6 +4233,18 @@ export default {
      * 设置历史文件界面
      */
     showFileMilestone: function(file) {
+      if(file.status == 1 && file.modifyUserID != sessionStorage.userId)
+      {
+        this.$notify({
+              title: "温馨提示",
+              message: "其他人编辑中，不能设置历史文件",
+              type: "warning",
+              offset: 100,
+              duration: 5000
+            });
+        return;        
+      }
+
       this.dialogFileHistory = true;
       this.loadFileMilestones(file);
       this.currentArchID = file.archID;
@@ -4275,6 +4287,17 @@ export default {
       if (this.isCreating) {
         return;
       }
+      if(file.status == 1 && file.modifyUserID != sessionStorage.userId)
+      {
+        this.$notify({
+              title: "温馨提示",
+              message: "其他人编辑中，不能设置历史文件",
+              type: "warning",
+              offset: 100,
+              duration: 5000
+            });
+        return;        
+      }
       this.isCreating = true;
       var thisApp = this;
       this.$axios({