Merge remote-tracking branch 'origin/master'

src/api/school-center/networkPlace/networkPlaceAPI.js

+import {postAction,downFilePost} from '@/api/manage'
+const prefix = '/manager/ciop/';
+
+//报表
+let reportList = (params) => postAction(prefix + "networkPlace/list",params);
+let reportDownload = (params) => downFilePost(prefix + "networkPlace/reportDownload",params);
+
+let excelMBOut = (params) => downFilePost(prefix + "networkPlace/excelMBOut",params);
+// 编辑
+let modifyData = (params) => postAction(prefix + "networkPlace/updateData" , params);
+
+//新增
+let insertData = (params) => postAction(prefix + "networkPlace/insertData" , params);
+
+//删除
+let deleteId = (params) => postAction(prefix + "networkPlace/deleteId" , params);
+
+export {
+    excelMBOut,
+    reportList,
+    reportDownload,
+    modifyData,
+    insertData,
+    deleteId
+}

src/api/school-center/schoolManagermentAPI.js

@@ -18,7 +18,7 @@ let insert= (params) => postAction(prefix + "/school/schoolManagement/insert" ,
 let hidestatus= (params) => postAction(prefix + "/school/schoolManagement/hidestatus" , params);
 let hidestatus= (params) => postAction(prefix + "/school/schoolManagement/hidestatus" , params);
 
 
 // 下载学校模板
 // 下载学校模板
-let excelMBOut = (params) => postAction(prefix + "/school/schoolManagement/excelMBOut" , params);
+let excelMBOut = (params) => downFilePost(prefix + "/school/schoolManagement/excelMBOut" , params);
 
 
 // 下载学校列表
 // 下载学校列表
 let reportDownload = (params) => downFilePost(prefix + "/school/schoolManagement/excelOut",params);
 let reportDownload = (params) => downFilePost(prefix + "/school/schoolManagement/excelOut",params);

src/views/school-center/schoolmanager/schoolmanagement.vue

@@ -580,7 +580,6 @@
             },
             },
             // 执行上传
             // 执行上传
             doPush(res) {
             doPush(res) {
-              debugger
               if (!res || !res.response) {
               if (!res || !res.response) {
                 this.$message.error("上传文件出错！", 10);
                 this.$message.error("上传文件出错！", 10);
                 return false;
                 return false;
@@ -593,9 +592,7 @@
               this.$message.success("上传成功！" + response.data, 5);
               this.$message.success("上传成功！" + response.data, 5);
               this.impXXModal = false;
               this.impXXModal = false;
             },
             },
-            downloadXXMoBan:function (){
-              exportFile(excelMBOut(), "学校列表模板.xlsx");
-            },
+
             add(){
             add(){
                 this.titleName="添加"
                 this.titleName="添加"
                 this.isShowMore = true;
                 this.isShowMore = true;
@@ -906,6 +903,9 @@
                   this.downloadstatu
                   this.downloadstatu
               );
               );
             },
             },
+            downloadXXMoBan:function (){
+              exportFile(excelMBOut(), "学校列表模板.xlsx");
+            },
             downloadstatu() {
             downloadstatu() {
               this.callback = false;
               this.callback = false;
             },
             },

src/views/school-center/uploadVerify/studentCardVerify.vue

@@ -62,7 +62,7 @@
                                 批量不通过
                                 批量不通过
                             </a-button>
                             </a-button>
                             <a-divider type="vertical"/>
                             <a-divider type="vertical"/>
-                            <a-button @click="excelOut()" type="primary">导出所有数据</a-button>
+                            <a-button @click="excelOut()" type="primary">导出数据</a-button>
                         </a-col>
                         </a-col>
                     </span>
                     </span>
                 </a-row>
                 </a-row>
@@ -428,7 +428,7 @@
                 if(this.tempstate == '是'){
                 if(this.tempstate == '是'){
                     this.Formtable.auditState = 2
                     this.Formtable.auditState = 2
                 }else if(this.tempstate == '否'){
                 }else if(this.tempstate == '否'){
-                    this.Formtable.auditState == 3
+                    this.Formtable.auditState = 3
                 }else if(this.tempstate == '无效'){
                 }else if(this.tempstate == '无效'){
                     this.Formtable.auditState = 4
                     this.Formtable.auditState = 4
                 }
                 }

src/views/school-center/userManager/PartnerManagement.vue

@@ -454,7 +454,6 @@
         },
         },
         watch : {
         watch : {
           treeModelValue(data) {
           treeModelValue(data) {
-              console.log(data);
           }
           }
         },
         },
         methods:{
         methods:{
@@ -476,7 +475,6 @@
                         grade: data.grade,
                         grade: data.grade,
                         ysm: data.ysm,
                         ysm: data.ysm,
                     })
                     })
-                    console.log(data.schools);
                     if (data.schools == undefined) {
                     if (data.schools == undefined) {
                       this.treeModelValue = [];
                       this.treeModelValue = [];
                     }else{
                     }else{
@@ -511,8 +509,6 @@
                         this.modifyForm.password = values.password
                         this.modifyForm.password = values.password
                         const subNames = [];
                         const subNames = [];
                         const schools = [];
                         const schools = [];
-                        console.log(this.treeModelValue);
-                        console.log(this.subNames);
                         out : for(let i = 0; i < this.treeModelValue.length; ++i) {
                         out : for(let i = 0; i < this.treeModelValue.length; ++i) {
                           for(let j = 0; j < this.subNames.length; ++j) {
                           for(let j = 0; j < this.subNames.length; ++j) {
                               if (this.treeModelValue[i] == this.subNames[j].value) {
                               if (this.treeModelValue[i] == this.subNames[j].value) {
@@ -522,8 +518,6 @@
                           }
                           }
                           schools.push(this.treeModelValue[i]);
                           schools.push(this.treeModelValue[i]);
                         }
                         }
-                        console.log(this.modifyForm);
-                        console.log(this.xzUserList);
                         if(this.modifyForm.parentId == undefined){
                         if(this.modifyForm.parentId == undefined){
                           this.modifyForm.parentId = ''
                           this.modifyForm.parentId = ''
                           this.modifyForm.parentIds = ''
                           this.modifyForm.parentIds = ''
@@ -852,7 +846,6 @@
             changeDongjie(event,id){
             changeDongjie(event,id){
               if(event){
               if(event){
                 unlockUser({userId:id}).then(res =>{
                 unlockUser({userId:id}).then(res =>{
-                  console.log(res);
                   if(res.state == 'success'){
                   if(res.state == 'success'){
                     notification.success({ message: '系统提示', description: '解冻成功'})
                     notification.success({ message: '系统提示', description: '解冻成功'})
                   }else{
                   }else{
@@ -861,7 +854,6 @@
                 });
                 });
               }else{
               }else{
                 lockUser({userId:id}).then(res =>{
                 lockUser({userId:id}).then(res =>{
-                  console.log(res);
                   if(res.state == 'success'){
                   if(res.state == 'success'){
                     notification.success({ message: '系统提示', description: '冻结成功'})
                     notification.success({ message: '系统提示', description: '冻结成功'})
                   }else{
                   }else{
@@ -935,7 +927,6 @@
                               });
                               });
                             })
                             })
                             this.treeData[i].children = temp;
                             this.treeData[i].children = temp;
-                            console.log(this.treeData);
                           }
                           }
                         })
                         })
                       }
                       }