2.2.0更新修改状态

src/views/education/edit-manager.vue

@@ -674,7 +674,6 @@
             <p class="fail-link" @click="download('fail')">下载错误数据></p>
           </div>
           <span slot="footer" class="dialog-footer">
-            <el-button class="fail-close" size="small" @click="dialogFail = false">取消</el-button>
             <el-upload
               class="upload-button"
               action="#"
@@ -683,11 +682,12 @@
               :limit="1"
               :before-upload="uploadOrganization"
             >
+              <el-button slot="tip" class="down-button-close" size="small" @click="dialogFail = false">取消</el-button>
               <el-button
                 stype="position: absolute;top: -14px;"
                 type="primary"
                 size="small"
-                @click="uploadOrganization()"
+                @click="closeFail()"
               >重新导入</el-button>
             </el-upload>
           </span>
@@ -1070,7 +1070,7 @@ export default {
       },
       updateNum: 0,
       dialogSuccess: false,
-      failType: 1,
+      failType: 2,
       failNum: 0,
       dialogFail: false,
       props: {
@@ -2479,7 +2479,7 @@ export default {
     initOrganizationStatus() {
       let tableStatus = this.tableOrganization;
       tableStatus.forEach(row => {
-        if (row.status == 1 && row.modifyFlag == 0) {
+        if (row.status == 1) {
           this.$nextTick(function() {
             this.$refs.multipleOrganization.toggleRowSelection(row);
           });
@@ -2854,7 +2854,7 @@ export default {
     initPeopleStatus() {
       let tableStatus = this.tablePerson;
       tableStatus.forEach(row => {
-        if (row.status == 1 && row.modifyFlag == 0) {
+        if (row.status == 1) {
           this.$nextTick(function() {
             this.$refs.multiplePerson.toggleRowSelection(row);
           });
@@ -3425,6 +3425,9 @@ export default {
       //   }
       // }
     },
+    closeFail() {
+      vm.dialogFail = false;
+    },
     uploadOrganization(file) {
       console.log(file);
     },
@@ -3826,6 +3829,25 @@ export default {
         }
       }
     }
+    .dialog-fail {
+      .fail-type {
+        p {
+          margin-top: 10px;
+        }
+        .fail-num {
+          color: #db3f52;
+        }
+        .fail-notice {
+          color: #e3e3e3;
+          font-size: 13px;
+        }
+        .fail-link {
+          text-align: center;
+          color: #449284;
+          cursor: pointer;
+        }
+      }
+    }
   }
   .third-step {
     margin: 30px 0 0px 30px;