Merge remote-tracking branch 'remotes/origin/master'

src/api/school-center/salesOrdersAPI.js

@@ -3,7 +3,6 @@ const prefix = '/manager/ciop';
 
 
 // 获取县分下拉列表
 // 获取县分下拉列表
 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/userManager/newUser.js

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

src/api/school-center/userManager/newUserAPI.js

+import {postAction} from '@/api/manage'
+const prefix = '/manager/ciop';
+
+//获取县分下拉列表
+let initSubstName = (params) => postAction(prefix + "/ysmUser/initSubstName" , params);
+//获取学校下拉列表
+let getSchoolNames  = (params) => postAction(prefix + "/ysmUser/getSchoolNames" , params);
+let list = (params) => postAction(prefix + "/newUser/list" , params);
+let update = (params) => postAction(prefix + "/newUser/update" , params);
+export {
+    initSubstName,
+    getSchoolNames,
+    list,
+    update,
+}

src/views/school-center/salesOrders/salesOrder.vue

@@ -160,7 +160,7 @@
 
 
 <script>
 <script>
     import STable from '@/components/table';
     import STable from '@/components/table';
-    import {} from "@/api/school-center/salesOrder";
+    import {} from "../../../api/school-center/salesOrder";
     import {
     import {
         getSchoolNames, initSubstName, getList, deleteOrder,
         getSchoolNames, initSubstName, getList, deleteOrder,
         downloadTemplateFH, downloadTemplateCZ, downloadResult, exportOut
         downloadTemplateFH, downloadTemplateCZ, downloadResult, exportOut
@@ -380,6 +380,7 @@
 
 
 
 
             getSchoolNames() {
             getSchoolNames() {
+                this.schoolNames = []
                 this.queryParam.schoolName = ''
                 this.queryParam.schoolName = ''
                 getSchoolNames({"substName": this.queryParam.salesSubst}).then((res) => {
                 getSchoolNames({"substName": this.queryParam.salesSubst}).then((res) => {
                     if (res.state == "success") {
                     if (res.state == "success") {

src/views/school-center/statistics/saleCensus.vue

@@ -313,6 +313,7 @@
 
 
 
 
             getSchoolNames() {
             getSchoolNames() {
+                this.schoolNames = []
                 this.queryParam.schoolName = ''
                 this.queryParam.schoolName = ''
                 getSchoolNames({"substName": this.queryParam.salesSubst}).then((res) => {
                 getSchoolNames({"substName": this.queryParam.salesSubst}).then((res) => {
                     if (res.state == "success") {
                     if (res.state == "success") {

src/views/school-center/statistics/salesOrder.vue

@@ -375,6 +375,7 @@
 
 
 
 
             getSchoolNames() {
             getSchoolNames() {
+                this.schoolNames = []
                 this.queryParam.schoolName = ''
                 this.queryParam.schoolName = ''
                 getSchoolNames({"substName": this.queryParam.salesSubst}).then((res) => {
                 getSchoolNames({"substName": this.queryParam.salesSubst}).then((res) => {
                     if (res.state == "success") {
                     if (res.state == "success") {