Merge remote-tracking branch 'origin/master'

src/api/manage.js

@@ -2,7 +2,7 @@ import { axios } from '@/utils/request'
 
 
 const api = {
 const api = {
   user: '/api/user',
   user: '/api/user',
-  role: '/api/role',
+  role: '/api/role',downFilePost,
   service: '/api/service',
   service: '/api/service',
   permission: '/api/permission',
   permission: '/api/permission',
   permissionNoPager: '/api/permission/no-pager'
   permissionNoPager: '/api/permission/no-pager'

src/api/school-center/PartnerManagementAPI.js

@@ -17,7 +17,7 @@ let addPartner = (params) => postAction(prefix + "/school/partner/addPartner" ,
 // 获取县分下拉列表
 // 获取县分下拉列表
 let getSubstList = (params) => postAction(prefix + "/school/schoolManagement/substList" , params);
 let getSubstList = (params) => postAction(prefix + "/school/schoolManagement/substList" , params);
 
 
-// 获取县分下拉列表
+// 获取学校下拉列表
 let getSchoolList = (params) => postAction(prefix + "/school/schoolManagement/schoolList" , params);
 let getSchoolList = (params) => postAction(prefix + "/school/schoolManagement/schoolList" , params);
 
 
 // 获取学子公司职位下级成员列表
 // 获取学子公司职位下级成员列表

src/api/school-center/activityAPI.js

@@ -10,10 +10,13 @@ let addActivity = (params) => postAction(prefix + "/activity/addActivity" , para
 // 编辑
 // 编辑
 let updateActivity = (params) => postAction(prefix + "/activity/updateActivity" , params);
 let updateActivity = (params) => postAction(prefix + "/activity/updateActivity" , params);
 
 
-//新增
+// 删除
 let deleteActivity = (params) => postAction(prefix + "/activity/deleteActivity" , params);
 let deleteActivity = (params) => postAction(prefix + "/activity/deleteActivity" , params);
 
 
+// 上传图片
+let uploadImg = (params) => postAction(prefix + "/activity/uploadImg" , params);
+
 
 
 export {
 export {
-    getList,addActivity,updateActivity,deleteActivity
+    getList,addActivity,updateActivity,deleteActivity,uploadImg
 }
 }

src/api/school-center/exchangeCouponAPI.js

+import {postAction,downFilePost} from '@/api/manage'
+const prefix = '/manager/ciop';
+
+// 楼长KPI管理
+let initSubstName = (params) => postAction(prefix + "/yxtCoupon/initSubstName" , params);
+let getSchoolNames  = (params) => postAction(prefix + "/yxtCoupon/getSchoolNames" , params);
+let uploadExcel = (params) => downFilePost(prefix + "/yxtCoupon/excelOut" , params);
+let downloadMoBan = (params) => downFilePost(prefix + "/yxtCoupon/downloadMoBan" , params);
+let yxtCouponList = (params) => postAction(prefix + "/yxtCoupon/list" , params);
+let yxtCouponDelete = (params) => postAction(prefix + "/yxtCoupon/delete", params);
+let yxtCouponInsert = (params) => postAction(prefix + "/yxtCoupon/insert" , params);
+let yxtCouponUpdate = (params) => postAction(prefix + "/yxtCoupon/update",params);
+
+export {
+    initSubstName,
+    getSchoolNames,
+    uploadExcel,
+    downloadMoBan,
+    yxtCouponList,
+    yxtCouponDelete,
+    yxtCouponInsert,
+    yxtCouponUpdate,
+}

src/api/school-center/louZhangManagerAPI.js

+import {postAction,downFilePost} from '@/api/manage'
+const prefix = '/manager/ciop';
+
+// 楼长KPI管理
+let initSubstName = (params) => postAction(prefix + "/lzKpi/initSubstName" , params);
+let getSchoolNames  = (params) => postAction(prefix + "/lzKpi/getSchoolNames" , params);
+let uploadExcel = (params) => downFilePost(prefix + "/lzKpi/excelOut" , params);
+let downloadMoBan = (params) => downFilePost(prefix + "/lzKpi/downloadMoBan" , params);
+let lzKpiList = (params) => postAction(prefix + "/lzKpi/list" , params);
+let lzKpiDelete = (params) => postAction(prefix + "/lzKpi/delete", params);
+let lzKpiInsert = (params) => postAction(prefix + "/lzKpi/insert" , params);
+let lzKpiUpdate = (params) => postAction(prefix + "/lzKpi/update",params);
+
+export {
+    initSubstName,
+    getSchoolNames,
+    uploadExcel,
+    downloadMoBan,
+    lzKpiList,
+    lzKpiDelete,
+    lzKpiInsert,
+    lzKpiUpdate,
+}

src/api/school-center/lzSalaryManagerAPI.js

+import {postAction,downFilePost} from '@/api/manage'
+const prefix = '/manager/ciop';
+
+// 楼长KPI管理
+let initSubstName = (params) => postAction(prefix + "/lzWage/initSubstName" , params);
+let getSchoolNames  = (params) => postAction(prefix + "/lzWage/getSchoolNames" , params);
+let uploadExcel = (params) => downFilePost(prefix + "/lzWage/excelOut" , params);
+let downloadMoBan = (params) => downFilePost(prefix + "/lzWage/downloadMoBan" , params);
+let lzSalaryList = (params) => postAction(prefix + "/lzWage/list" , params);
+let lzSalaryDelete = (params) => postAction(prefix + "/lzWage/delete", params);
+let lzSalaryInsert = (params) => postAction(prefix + "/lzWage/insert" , params);
+let lzSalaryUpdate = (params) => postAction(prefix + "/lzWage/update",params);
+//生成楼长上月薪酬
+let createSalary = (params) => postAction(prefix + "/lzWage/createSalary",params);
+
+export {
+    initSubstName,
+    getSchoolNames,
+    uploadExcel,
+    downloadMoBan,
+    lzSalaryList,
+    lzSalaryDelete,
+    lzSalaryInsert,
+    lzSalaryUpdate,
+    createSalary
+}

src/api/school-center/managerKpiAPI.js

+import {postAction,downFilePost} from '@/api/manage'
+const prefix = '/manager/ciop';
+
+// 楼长KPI管理
+let uploadExcel = (params) => downFilePost(prefix + "/managerKpi/excelOut" , params);
+let downloadMoBan = (params) => downFilePost(prefix + "/managerKpi/downloadMoBan" , params);
+let zjlKpiList = (params) => postAction(prefix + "/managerKpi/list" , params);
+
+export {
+    uploadExcel,
+    downloadMoBan,
+    zjlKpiList
+}

src/api/school-center/verCodesAPI.js

+import {postAction} from '@/api/manage'
+const prefix = '/manager/ciop';
+
+// 宽带产品
+let regularList = (params) => postAction(prefix + "/regular/list" , params);
+let regularDelete = (params) => postAction(prefix + "/regular/delete", params);
+let regularInsert = (params) => postAction(prefix + "/regular/insert" , params);
+let regularUpdate = (params) => postAction(prefix + "/regular/update",params);
+
+export {
+    regularList,
+    regularDelete,
+    regularInsert,
+    regularUpdate,
+}

src/api/school-center/yxtOrderAPI.js

+import {postAction,downFilePost} from '@/api/manage'
+const prefix = '/manager/ciop';
+
+// 楼长KPI管理
+let initSubstName = (params) => postAction(prefix + "/yxtOrder/initSubstName" , params);
+let getSchoolNames  = (params) => postAction(prefix + "/yxtOrder/getSchoolNames" , params);
+let uploadExcel = (params) => downFilePost(prefix + "/yxtOrder/excelOut" , params);
+let downloadMoBan = (params) => downFilePost(prefix + "/yxtOrder/downloadMoBan" , params);
+let yxtOrderList = (params) => postAction(prefix + "/yxtOrder/list" , params);
+let yxtOrderDelete = (params) => postAction(prefix + "/yxtOrder/delete", params);
+let yxtOrderInsert = (params) => postAction(prefix + "/yxtOrder/insert" , params);
+let yxtOrderUpdate = (params) => postAction(prefix + "/yxtOrder/update",params);
+let getYxtCard  = (params) => postAction(prefix + "/yxtOrder/getYxtCard",params);
+
+export {
+    initSubstName,
+    getSchoolNames,
+    uploadExcel,
+    downloadMoBan,
+    yxtOrderList,
+    yxtOrderDelete,
+    yxtOrderInsert,
+    yxtOrderUpdate,
+    getYxtCard
+}

src/api/school-center/zjlSalaryManagerAPI.js

+import {postAction,downFilePost} from '@/api/manage'
+const prefix = '/manager/ciop';
+
+// 楼长KPI管理
+let initSubstName = (params) => postAction(prefix + "/zjlWage/initSubstName" , params);
+let getSchoolNames  = (params) => postAction(prefix + "/zjlWage/getSchoolNames" , params);
+let uploadExcel = (params) => downFilePost(prefix + "/zjlWage/excelOut" , params);
+let downloadMoBan = (params) => downFilePost(prefix + "/zjlWage/downloadMoBan" , params);
+let zjlSalaryList = (params) => postAction(prefix + "/zjlWage/list" , params);
+let zjlSalaryDelete = (params) => postAction(prefix + "/zjlWage/delete", params);
+let zjlSalaryInsert = (params) => postAction(prefix + "/zjlWage/insert" , params);
+let zjlSalaryUpdate = (params) => postAction(prefix + "/zjlWage/update",params);
+//生成楼长上月薪酬
+let createSalary = (params) => postAction(prefix + "/zjlWage/createSalary",params);
+
+export {
+    initSubstName,
+    getSchoolNames,
+    uploadExcel,
+    downloadMoBan,
+    zjlSalaryList,
+    zjlSalaryDelete,
+    zjlSalaryInsert,
+    zjlSalaryUpdate,
+    createSalary
+}

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

@@ -486,8 +486,8 @@
                             this.$message.error( '身份证不合法', 5);
                             this.$message.error( '身份证不合法', 5);
                             return null;
                             return null;
                         }
                         }
-                        if(this.addForm.password.length != 8){
-                            this.$message.error( '密码长度不对', 5);
+                        if(this.addForm.password.length <= 8){
+                            this.$message.error( '密码长度必须大于8', 5);
                             return null;
                             return null;
                         }
                         }
                         if(this.addForm.password != this.addForm.repassword){
                         if(this.addForm.password != this.addForm.repassword){
@@ -611,9 +611,9 @@
             changeSubst(type){
             changeSubst(type){
                 let schoolParams = {};
                 let schoolParams = {};
                 if(type == 1){
                 if(type == 1){
-                    schoolParams.subName = this.addForm.subName;
+                    schoolParams.substName = this.addForm.subName;
                 }else{
                 }else{
-                    schoolParams.subName = this.modifyForm.subName;
+                    schoolParams.substName = this.modifyForm.subName;
                 }
                 }
 
 
                 this.schoolList = [];
                 this.schoolList = [];
@@ -627,7 +627,7 @@
             },
             },
             changeSchool(schoolId){
             changeSchool(schoolId){
                 let schoolParams = {};
                 let schoolParams = {};
-                schoolParams.subName = this.modifyForm.subName;
+                schoolParams.substName = this.modifyForm.subName;
                 this.schoolList = [];
                 this.schoolList = [];
 
 
                 getSchoolList(schoolParams).then(res => {
                 getSchoolList(schoolParams).then(res => {

src/views/school-center/management/schoolmanagement.vue → src/views/school-center/louZhang/schoolmanagement.vue

@@ -363,6 +363,8 @@
                         netPhone:"0",
                         netPhone:"0",
                         isShowrh:"0",
                         isShowrh:"0",
                         isRecv:"0",
                         isRecv:"0",
+                        networkCode: '',
+                        networkName: '',
                     })
                     })
                 },0)
                 },0)
                 this.modifyvisible=true;
                 this.modifyvisible=true;
@@ -415,6 +417,8 @@
                         netPhone:new String(data.netPhone).toString(),
                         netPhone:new String(data.netPhone).toString(),
                         isShowrh:isShowrh,
                         isShowrh:isShowrh,
                         isRecv:new String(data.isRecv).toString(),
                         isRecv:new String(data.isRecv).toString(),
+                        networkName: data.networkName,
+                        networkCode: data.networkCode
                     })
                     })
                 },0)
                 },0)
                 this.customimg="./img/custom"+data.serviceQrcode
                 this.customimg="./img/custom"+data.serviceQrcode

src/views/school-center/order/order.vue

@@ -7,7 +7,7 @@
         <a-row :gutter="24">
         <a-row :gutter="24">
           <a-col :md="6" :sm="12">
           <a-col :md="6" :sm="12">
             <a-form-item label="时间选择：">
             <a-form-item label="时间选择：">
-              <a-range-picker @change="onChange" />
+              <a-range-picker @change="onChange" format="YYYY-MM" />
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
           <a-col :md="4" :sm="12">
           <a-col :md="4" :sm="12">
@@ -766,11 +766,11 @@ export default {
     //时间事件
     //时间事件
     onChange(date, dateString) {
     onChange(date, dateString) {
       if (dateString.length == 0) {
       if (dateString.length == 0) {
-        this.queryParam.startTime = "";
-        this.queryParam.endTime = "";
+        this.queryParam.createTimeStart = "";
+        this.queryParam.createTimeEnd = "";
       } else {
       } else {
-        this.queryParam.startTime = dateString[0];
-        this.queryParam.endTime = dateString[1];
+        this.queryParam.createTimeStart = dateString[0];
+        this.queryParam.createTimeEnd = dateString[1];
       }
       }
     },
     },
     handleSubmit() {
     handleSubmit() {

src/views/school-center/orderView/orderView.vue

@@ -43,8 +43,8 @@
                     <span class="table-page-search-submitButtons" style="float: left; overflow: hidden;">
                     <span class="table-page-search-submitButtons" style="float: left; overflow: hidden;">
                         <a-col :md="4" :sm="24">
                         <a-col :md="4" :sm="24">
                              <a-button @click="search()" type="primary">查询</a-button>
                              <a-button @click="search()" type="primary">查询</a-button>
-                    <a-button  v-show="!callback" @click="handleSubmit" style="margin-left: 10px">导出</a-button>
-                    <a-button v-show="callback" style="margin-left: 10px">导出中<a-spin  style="margin-left: 5px" size="small"/></a-button>
+                            <a-button  v-show="!callback" @click="handleSubmit" style="margin-left: 10px">导出</a-button>
+                            <a-button v-show="callback" style="margin-left: 10px">导出中<a-spin  style="margin-left: 5px" size="small"/></a-button>
                         </a-col>
                         </a-col>
                     </span>
                     </span>