新建项目 项目类型问题

src/views/education/add-manager.vue

@@ -438,6 +438,14 @@
             </div>
           </el-tab-pane>
         </el-tabs>
+        <el-dialog title :visible.sync="dialogShow" width="40%" center>
+          <p class="dialog-p">设定范围数据已经被其他管理员修改，是否强制提交进行覆盖</p>
+          
+          <span slot="footer" class="dialog-footer">
+            <el-button type="default" size="small" @click="dialogShow = false">取消</el-button>
+            <el-button type="primary" size="small" @click="coverData()">确定</el-button>
+          </span>
+        </el-dialog>
       </div>
       <div class="third-step" v-else-if="active === 2">
         <el-form
@@ -658,6 +666,7 @@ export default {
       changedPerson2: [],
       //dialog
       dialogShow: false,
+      flagCover: 0,
       //记录上次
       scopeOfOrganizationLast: [],
       scopeOfPeopleLast: [],
@@ -932,6 +941,7 @@ export default {
           //console.log(res);
           this.projectId = res.data.id;
           this.projectStatus = res.data.projectStatus;
+          this.idTypeProject = res.data.idType;
           this.operationLast();
           if (option != "storage" && option != "storageEdit") {
             this.active++;
@@ -1067,7 +1077,8 @@ export default {
           setKindOfAdministrative: this.getKind("administrativeScope"),
           setKindOfOrganization: this.getKind("organization"),
           setKindOfDepartment: this.getKind("department"),
-          setKindOfPeople: this.getKind("person")
+          setKindOfPeople: this.getKind("person"),
+          flag: this.flagCover,
         };
         if (req.setKindOfAdministrative == 3) {
           req.scopeOfAdministrative = this.getScope("administrativeUpdate");
@@ -1117,6 +1128,12 @@ export default {
         this.componentDraft(2);
       }
     },
+    //覆盖数据
+    coverData() {
+      this.dialogShow = false;
+      this.flagCover = 1;
+      this.nextStep();
+    },
     //点击下一步
     nextStep() {
       if (this.active == 0) {
@@ -1173,8 +1190,9 @@ export default {
               //scopeOfOrganization: "2|3|4|5|6|7",
               setKindOfDepartment: this.getKind("department"),
               //scopeOfDepartment: "54",
-              setKindOfPeople: this.getKind("person")
+              setKindOfPeople: this.getKind("person"),
               //scopeOfPeople: ""
+              flag: this.flagCover,
             };
             if (req.setKindOfAdministrative == 3) {
               req.scopeOfAdministrative = this.getScope("administrativeUpdate");
@@ -1200,8 +1218,8 @@ export default {
               if (res.code == "000000") {
                 //移动到选择项目组件
                 //console.log(res);
-                this.scopeStatus(res.data.status);
-                if(res.data.status === 0) { 
+                let statusMove = this.scopeStatus(res.data.status);
+                if(statusMove === 0) { 
                   this.active++;
                   this.stepData = [false, false, true];
                 } else {
@@ -1229,7 +1247,8 @@ export default {
             setKindOfAdministrative: 0,
             setKindOfOrganization: this.getKind("organization"),
             setKindOfDepartment: this.getKind("department"),
-            setKindOfPeople: this.getKind("person")
+            setKindOfPeople: this.getKind("person"),
+            flag: this.flagCover,
           };
           if (
             req.setKindOfOrganization == 2 ||
@@ -1248,8 +1267,8 @@ export default {
           vm.POST("portal/scope", req).then(res => {
             if (res.code == "000000") {
               //移动到选择项目组件
-              this.scopeStatus(res.data.status);
-              if(res.data.status === 0) { 
+              let statusMove = this.scopeStatus(res.data.status);
+              if(statusMove === 0) { 
                 this.active++;
                 this.stepData = [false, false, true];
               } else {
@@ -2317,17 +2336,23 @@ export default {
     },
     //scope的不同status操作
     scopeStatus(data) {
-      console.log(data);
+      //console.log('范围提交status:'+data);
       let status = data;
-      if(status === 1) {
+      //console.log('范围提交status:'+status);
+      if(status === 0) {
+        this.flagCover = 0;
+      } else if(status === 1) {
         vm.$message({
           type: "info",
           message: "您已被上级管理员移除项目，暂无权限操作",
         });
         this.$router.push("item-manager");
       } else if(status === 2) {
-        
+        console.log('弹框');
+        this.flagCover = 1;
+        this.dialogShow = true;
       }
+      return status;
     },
     //选择项目组件
     //改变组件选择情况
@@ -2506,6 +2531,12 @@ export default {
   }
   .second-step {
     margin: 10px 0 0 20px;
+    .dialog-p {
+      text-align: center;
+      span {
+        color: #449284;
+      }
+    }
     //隐藏树展开
     .table-empty {
       img {