Merge branch 'dev-circle-seven-2-20201020' of...

Merge branch 'dev-circle-seven-2-20201020' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-circle-seven-2-20201020

src/components/yqrange/member-management/org.vue

@@ -117,7 +117,8 @@
         </span>
       </div>
       <div v-if="!importSuccessFlag" style="text-align: center;">
-        <div>有<span style="color: red;">&nbsp;{{importNum}}条&nbsp;</span>数据不符合格式要求，请修正后再次导入</div>
+        <div v-if="importNum == 0">数据不符合格式要求，请修正后再次导入</div>
+        <div v-if="importNum != 0">有<span style="color: red;">&nbsp;{{importNum}}条&nbsp;</span>数据不符合格式要求，请修正后再次导入</div>
         <br>
         <div>
         <span>
@@ -278,8 +279,15 @@ export default {
       this.showImportFlag = true;
     }
     else {
-      this.showImportFlag = false;
-      // this.showImportFlag = true;
+      let highMainManager = localStorage.getItem('highMainManager');
+      let mainManager = localStorage.getItem('mainManager');
+      let manager = localStorage.getItem('manager');
+      if(highMainManager == 1 || mainManager == 1 || manager == 1){
+        this.showImportFlag = true;
+      }
+      else {
+        this.showImportFlag = false;
+      }
     }
   },
   mounted() {
@@ -551,7 +559,7 @@ export default {
             vm.dialogImportVisible = false;
 
             // 导入成功
-            if(res.data.failNum == 0){
+            if(res.data.status){
 
               vm.dialogVisible = true;
               vm.dialogTitle = "导入成功";

src/components/yqrange/member-management/renyuan.vue

@@ -132,7 +132,8 @@
         </span>
       </div>
       <div v-if="!importSuccessFlag" style="text-align: center;">
-        <div>有<span style="color: red;">&nbsp;{{importNum}}条&nbsp;</span>数据不符合格式要求，请修正后再次导入</div>
+        <div v-if="importNum == 0">数据不符合格式要求，请修正后再次导入</div>
+        <div v-if="importNum != 0">有<span style="color: red;">&nbsp;{{importNum}}条&nbsp;</span>数据不符合格式要求，请修正后再次导入</div>
         <br>
         <div>
         <span>
@@ -297,8 +298,15 @@ export default {
       this.showImportFlag = true;
     }
     else {
-      this.showImportFlag = false;
-      // this.showImportFlag = true;
+      let highMainManager = localStorage.getItem('highMainManager');
+      let mainManager = localStorage.getItem('mainManager');
+      let manager = localStorage.getItem('manager');
+      if(highMainManager == 1 || mainManager == 1 || manager == 1){
+        this.showImportFlag = true;
+      }
+      else {
+        this.showImportFlag = false;
+      }
     }
   },
   mounted() {
@@ -452,8 +460,7 @@ export default {
           vm.dialogImportVisible = false;
 
           // 导入成功
-          if(res.data.failNum == 0){
-
+          if(res.data.status){
             vm.dialogVisible = true;
             vm.dialogTitle = "导入成功";
             vm.importSuccessFlag = true;