Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/api/sale/sale.js

@@ -585,7 +585,14 @@ export function BatchForwardStudent(data) {
 }
 
 
-
+//全公司每日数据统计
+export function GetStudentCompany(data) {
+  return request({
+    url: '/StudentStat/GetStudentCompany',
+    method: 'post',
+    data
+  });
+}
 
 
 

src/components/school/student/stulist.vue

@@ -78,7 +78,8 @@
             label="下载" @click="downloadStudent" />
         </div>
         <div class="page-option" v-if="pushMode">
-          <q-btn color="accent" unelevated class="q-mr-md" size="sm" icon="swap_horiz" label="转交" @click="isShowTrans = true">
+          <q-btn color="accent" unelevated class="q-mr-md" size="sm" icon="swap_horiz" label="转交"
+            @click="isShowTrans = true">
             <q-popup-proxy :offset="[10, 10]">
               <q-banner v-if="isShowTrans">
                 <q-select style="margin-top:20px;" filled v-model="transMsg.CreateBy" @filter="filterEmployee" use-input
@@ -473,18 +474,18 @@
         stuOption: null,
         isShowAdd: false,
         selection: [],
-        isShowTransfer: false,//是否显示转订单弹窗
+        isShowTransfer: false, //是否显示转订单弹窗
         BelongType: 1,
-        pushMode: false,//是否显示推送按钮
+        pushMode: false, //是否显示推送按钮
         pushing: false,
         assistListFormat: [],
         checkType: 1, //打开右侧弹窗类型
         isShowAbroad: false, //是否显示转留学就业订单弹窗
         userInfo: {}, //当前登录人员
         isShowTrans: false,
-        transMsg:{
-          StuIds:'',
-          CreateBy:1
+        transMsg: {
+          StuIds: '',
+          CreateBy: ''
         },
         //员工列表
         employeeList: [],
@@ -803,35 +804,44 @@
           );
         });
       },
-
       //保存批量转交
-      saveTransForm(){
-        console.log(this.transMsg,'transMsg');
-        if(this.selection.length==0){
+      saveTransForm() {
+        if (this.selection.length == 0) {
           this.$q.notify({
             type: "negative",
             position: "top",
             message: '请选择推送学员'
           });
-        }else{
-          let newArr = []
-          this.selection.forEach(x=>{
-            newArr.push(x.StuId);
-          })
-          this.transMsg.StuIds = newArr.toString();
-          BatchForwardStudent(this.transMsg).then(res => {
-            if(res.Code==1){
-              this.refreshStuList();
-              this.selection = [];
-              this.pushMode = false;
-              this.$q.notify({
-                type: "iconfont icon-chenggong",
-                position: "top",
-                message: r.Message
-              });
-            }
+          return;
+        }
+        if (this.transMsg.CreateBy == "") {
+          this.$q.notify({
+            type: "negative",
+            position: "top",
+            message: '请选择接收人员!'
           });
+          return;
         }
+        let newArr = []
+        this.selection.forEach(x => {
+          newArr.push(x.StuId);
+        })
+        this.transMsg.StuIds = newArr.toString();
+        BatchForwardStudent(this.transMsg).then(res => {
+          if (res.Code == 1) {
+            this.refreshStuList();
+            this.selection = [];
+            this.transMsg.StuIds = "";
+            this.transMsg.CreateBy = "";
+            this.pushMode = false;
+            this.$q.notify({
+              type: "iconfont icon-chenggong",
+              position: "top",
+              message: r.Message
+            });
+          }
+        });
+
       }
     }
   };

src/pages/sale/monthTotal2.vue → src/pages/sale/companyday.vue

@@ -42,7 +42,7 @@
 </template>
 <script>
   import {
-    GetStudentStatic
+    GetStudentCompany
   } from '../../api/sale/sale';
   import {
     EduDownLoad
@@ -50,7 +50,7 @@
   export default {
     props: {},
     meta: {
-      title: "课程顾问部每日数据统计"
+      title: "全公司每日数据统计"
     },
     components: {},
     data() {
@@ -277,9 +277,9 @@
         this.loading = true;
         var msg = JSON.parse(JSON.stringify(this.msg));
         EduDownLoad(
-          "/StudentStat/DownLoadStudentStatic",
+          "/StudentStat/DownLoadStudentCompany",
           msg,
-          "课程顾问部每日数据统计.xls", res => {
+          "全公司每日数据统计.xls", res => {
             this.loading = false;
           }
         );
@@ -294,7 +294,7 @@
       //获取数据
       getList() {
         this.loading = true;
-        GetStudentStatic(this.msg).then(res => {
+        GetStudentCompany(this.msg).then(res => {
           this.loading = false;
           if (res.Code == 1) {
             this.dataList = res.Data;

src/router/routes.js

@@ -1096,9 +1096,9 @@ const routes = [{
       import("pages/sale/everyMonthTotal.vue")
   },
   {
-    path: "/sale/monthTotal2",
+    path: "/sale/companyday",
     component: ()=>
-      import("pages/sale/monthTotal2.vue")
+      import("pages/sale/companyday.vue")
   },
   {
     path: "/activity/activeType", //活动 活动类型