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

src/api/scheduling/schedu.js

@@ -278,4 +278,16 @@ export function RemoveVisitorReserve(data) {
     method: 'post',
     data
   })
+}
+
+/**
+ * 获取交接班次
+ * @param {JSON参数} data 
+ */
+export function GetHandoverShiftList() {
+  return request({
+    url: '/DutyPlan/GetHandoverShiftList',
+    method: 'post',
+    data: ""
+  })
 }
\ No newline at end of file

src/pages/financial/lessonCostStatistics.vue

@@ -260,8 +260,22 @@
                 this.getList()
             },
             txexport() {
+                if(this.valuemonth ==null || this.valueyear==null){
+                    this.$q.notify({
+                        type: 'negative',
+                        position: "top",
+                        message: `请选择日期`
+                    })
+                     return
+                }
+                let text = '';
+                if (this.datetype == 2) {
+                    text = this.valuemonth +'课耗统计.xls'
+                } else if (this.datetype == 1) {
+                    text = this.valueyear+'年课耗统计.xls'
+                }
                 var msg = JSON.parse(JSON.stringify(this.msg));
-                EduDownLoad("/finance/GetTeacherConsumptionHoursStatisticsToExcel", msg, "课耗统计.xls")
+                EduDownLoad("/finance/GetTeacherConsumptionHoursStatisticsToExcel", msg, text)
             }
 
 

src/pages/financial/studentsClassfee.vue

@@ -278,8 +278,22 @@
                 this.getList()
             },
             txexport(){
+                if(this.valuemonth ==null || this.valueyear==null){
+                    this.$q.notify({
+                        type: 'negative',
+                        position: "top",
+                        message: `请选择日期`
+                    })
+                     return
+                }
+                let text = '';
+                if (this.datetype == 2) {
+                    text = this.valuemonth +'课耗学生明细.xls'
+                } else if (this.datetype == 1) {
+                    text = this.valueyear+'年课耗学生明细.xls'
+                }
                 var msg = JSON.parse(JSON.stringify(this.msg));
-                EduDownLoad("/finance/GetStudentConsumptionHoursDetialPageListToExcel", msg, "课耗学生明细.xls")
+                EduDownLoad("/finance/GetStudentConsumptionHoursDetialPageListToExcel", msg, text)
             },
             gobaoming(Id){
                 this.OpenNewUrl('/sale/orderStatistics', {

src/pages/financial/teacherclassfee.vue

@@ -248,8 +248,22 @@
                 this.getList()
             },
             txexport(){
+                if(this.valuemonth ==null || this.valueyear==null){
+                    this.$q.notify({
+                        type: 'negative',
+                        position: "top",
+                        message: `请选择日期`
+                    })
+                     return
+                }
+                let text = '';
+                if (this.datetype == 2) {
+                    text = this.valuemonth +'课耗老师明细.xls'
+                } else if (this.datetype == 1) {
+                    text = this.valueyear+'年课耗老师明细.xls'
+                }
                 var msg = JSON.parse(JSON.stringify(this.msg));
-                EduDownLoad("/finance/GetTeacherConsumptionHoursDetialPageListToExcel", msg, "课耗老师明细.xls")
+                EduDownLoad("/finance/GetTeacherConsumptionHoursDetialPageListToExcel", msg, text)
             }
 
         },

src/pages/scheduling/scheduleBoard.vue

@@ -280,16 +280,23 @@
           <div class="text-h6">值班交接</div>
         </q-card-section>
         <q-card-section class="q-pt-none">
-          <div class="q-gutter-sm" style="width:300px;" v-if="isShowOne">
+          <div class="q-gutter-sm" style="width:400px;" v-if="isShowOne">
             <span style="position:relative;top:6px;">突发事件：</span>
             <q-radio v-model="isHaveTufa" :val="2" label="有" />
             <q-radio v-model="isHaveTufa" :val="1" label="无" />
           </div>
-          <div class="q-gutter-sm" style="width:280px;" v-if="isShowTwo">
+          <div class="q-gutter-sm" style="width:400px;" v-if="isShowTwo">
             <span style="position:relative;top:6px;">交接工作：</span>
             <q-radio v-model="isHaveHand" :val="2" label="有" />
             <q-radio v-model="isHaveHand" :val="1" label="无" />
           </div>
+          <div class="q-gutter-sm" style="width:400px;margin-top:10px;">
+            <span>交接班次：</span>
+            <q-select filled multiple option-value="Id" style="display:inline-block;width:300px;" option-label="Name"
+              v-model="classCked" :options="classData" emit-value map-options
+              label="交接班次">
+            </q-select>
+          </div>
         </q-card-section>
         <q-card-actions align="right">
           <q-btn flat label="关闭" color="primary" @click="isShowTuFA=false" />
@@ -305,6 +312,7 @@
     OnDuty,
     OnDuty_V2,
     saveDutyCheck, //值班打卡
+    GetHandoverShiftList
   } from '../../api/scheduling/schedu'
 
   import schedulOrder from '../../components/schedul/schedul-orderlist'
@@ -332,7 +340,8 @@
           Shift: 0,
           Status: 0, //Status(1-值班打卡，2-交接打卡)
           IsBurst: 0, //突发
-          IsHandover: 0 //交接
+          IsHandover: 0, //交接
+          HandoverDlandetails:'' //交接班次
         },
         dataList: {},
         //是否显示访客操作按钮
@@ -350,7 +359,9 @@
         isHaveHand: 1, //是否有交接
         isShowOne: false,
         isShowTwo: false,
-        status: 0
+        status: 0,
+        classData:[], //交接班次选择\
+        classCked:[],
       }
     },
     created() {
@@ -363,6 +374,7 @@
         this.checkMsg.Shift = this.$route.query.Shift;
       }
       this.getList();
+      this.GetHandoverList();
     },
     methods: {
       //请求数据
@@ -410,6 +422,7 @@
         if (this.status == 2) {
           diaMsg = '是否确定值班交接?'
         }
+        this.checkMsg.HandoverDlandetails = this.classCked.toString();
         this.$q.dialog({
           title: '消息提示',
           message: diaMsg,
@@ -476,6 +489,14 @@
       //刷新父页面
       refreshPage() {
         this.getList();
+      },
+      //获取交接班次下拉
+      GetHandoverList(){
+        GetHandoverShiftList().then(res => {
+          if (res.Code == 1) {
+            this.classData = res.Data;
+          }
+        })
       }
     },
   }