From 34f4b1254ad0807fa4e700a963bb52a26b87740b Mon Sep 17 00:00:00 2001
From: yxq <y1530857136@qq.com>
Date: Fri, 7 Jun 2024 15:23:27 +0800
Subject: [PATCH] =?UTF-8?q?web=20=E8=AF=BE=E6=97=B6=E8=B4=B9=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=97=B6=E9=97=B4=E6=AE=B5=E6=8E=92=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ArrangeLessonTerm/coursestatictis.cshtml  | 93 ++++++++++---------
 .../ArrangeLessonTerm/coursestatictis.js      |  4 +
 2 files changed, 51 insertions(+), 46 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.cshtml
index 3f14612e8..65b914a5a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.cshtml	
@@ -10,19 +10,13 @@
                     <div class="lr-layout-tool-item">
                         <div id="datesearch" style="min-width:150px"></div>
                     </div>
-                    <div class="lr-layout-tool-item">
-                        <div id="weeks" style="min-width:150px"></div>
-                    </div>
-                    <div class="lr-layout-tool-item">
-                        <div id="DeptNo" style="min-width:200px"></div>
-                    </div>
-                    <div class="lr-layout-tool-item">
-                        <div id="status" style="min-width:150px"></div>
-                    </div>
                     <div class="lr-layout-tool-item">
                         <div class=" btn-group btn-group-sm">
+                            <script src="~/Content/vue/vue.js"></script>
+                            <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
+                            <script src="https://unpkg.com/element-ui/lib/index.js"></script>
                             <div id="app">
-                                <a class="btn btn-default" v-on:click="nocludesVisible = true">时间段排除</a>
+                                <a id="timeNoCludes" class="btn btn-default" v-on:click="nocludesVisible = true">时间段排除</a>
                                 <el-dialog title="时间段排除"
                                            :visible.sync="nocludesVisible"
                                            width="500px"
@@ -39,8 +33,7 @@
                                                         end-placeholder="结束日期"
                                                         align="right">
                                         </el-date-picker>
-                                        <el-button
-                                                   size="small"
+                                        <el-button size="small"
                                                    type="warning"
                                                    plain
                                                    class="el-icon-delete"
@@ -48,65 +41,73 @@
                                         </el-button>
                                     </div>
                                     <div>
-                                        <el-button size="small" type="primary" plain v-on:click="addNoCludes">新增</el-button>
+                                        <el-button size="small" type="primary" plain v-on:click="addNoCludes">新 增</el-button>
                                     </div>
                                     <span slot="footer" class="dialog-footer">
-                                        <el-button size="small" type="primary" v-on:click="nocludesVisible = false">确 定</el-button>
+                                        <el-button size="small" type="primary" v-on:click="handleClose">确 定</el-button>
                                     </span>
                                 </el-dialog>
                             </div>
-                            <script src="~/Content/vue/vue.js"></script>
-                            <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
-                            <script src="https://unpkg.com/element-ui/lib/index.js"></script>
                             <script>
                                 new Vue({
                                     el: "#app",
                                     data: {
-                                        searchNoIncludes: [{value:null}],
+                                        searchNoIncludes: [{ value: null }],
                                         nocludesVisible: false,
-                                        pickerOptions: {
-                                            shortcuts: [{
-                                                text: '最近一周',
-                                                onClick(picker) {
-                                                    const end = new Date();
-                                                    const start = new Date();
-                                                    start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-                                                    picker.$emit('pick', [start, end]);
-                                                }
-                                            }, {
-                                                text: '最近一个月',
-                                                onClick(picker) {
-                                                    const end = new Date();
-                                                    const start = new Date();
-                                                    start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-                                                    picker.$emit('pick', [start, end]);
-                                                }
-                                            }, {
-                                                text: '最近三个月',
-                                                onClick(picker) {
-                                                    const end = new Date();
-                                                    const start = new Date();
-                                                    start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-                                                    picker.$emit('pick', [start, end]);
-                                                }
-                                            }]
-                                        },
+                                        pickerOptions: {},
+                                        begin: '',
+                                        end: '',
+                                    },
+                                    mounted() {
+                                        window.datesearchChange = this.datesearchChange
                                     },
                                     methods: {
+                                        datesearchChange() {
+                                            this.begin = $('#datesearch').attr('starttime')
+                                            this.end = $('#datesearch').attr('endtime')
+                                            this.pickerOptions = {
+                                                disabledDate: (e)=> {
+                                                    let datetime = e.valueOf()
+                                                    if (datetime >= new Date(this.begin).valueOf() && datetime < new Date(this.end).valueOf()+1000) {
+                                                        return false
+                                                    }
+                                                    return true
+                                                }
+                                            }
+                                            this.searchNoIncludes = [{ value: null }]
+                                            this.setDataNoIncludes()
+                                        },
                                         handleClose() {
+                                            this.setDataNoIncludes()
                                             this.nocludesVisible = false
                                         },
                                         addNoCludes() {
                                             this.searchNoIncludes.push({ value: null })
                                         },
                                         delNoIcludes(index) {
-                                            this.searchNoIncludes.splice(index,1)
+                                            this.searchNoIncludes.splice(index, 1)
+                                        },
+                                        setDataNoIncludes() {
+                                            let arr = this.searchNoIncludes.filter(e => {
+                                                return e.value && e.value.length
+                                            })
+                                            let data = arr.map(e => e.value.toString())
+                                            $('#timeNoCludes').attr("timeNoCludes", data.join("&"))
                                         }
                                     }
                                 })
                             </script>
                         </div>
                     </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="weeks" style="min-width:150px"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="DeptNo" style="min-width:200px"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="status" style="min-width:150px"></div>
+                    </div>
                     <div class="lr-layout-tool-item">
                         <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;查询</a>
                     </div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.js
index 8009affaa..13a05ad8f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.js	
@@ -53,8 +53,11 @@ var bootstrap = function ($, learun) {
                 // 默认
                 dfvalue: '0',
                 selectfn: function (begin, end) {
+                    $('#datesearch').attr('starttime', begin)
+                    $('#datesearch').attr('endtime', end)
                     startTime = begin;
                     endTime = end;
+                    window.datesearchChange()
                 }
             });
             // 查询
@@ -166,6 +169,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = startTime;
             param.EndTime = endTime;
+            param.noTime = $('#timeNoCludes').attr("timeNoCludes")
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };