From 218372e6a9c53bfa6356aff7ee347bf5984ac00c Mon Sep 17 00:00:00 2001
From: zhusiyu <410827992@qq.com>
Date: Tue, 23 Aug 2022 17:25:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=80=BB=E7=BB=93=E7=BB=9F=E8=AE=A1=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../moduleCom/oa/common/dateChoose.vue        | 134 +++++++++++-------
 1 file changed, 81 insertions(+), 53 deletions(-)

diff --git a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/common/dateChoose.vue b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/common/dateChoose.vue
index 63b048f..90debfe 100644
--- a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/common/dateChoose.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/common/dateChoose.vue
@@ -1,41 +1,54 @@
 <template>
     <div class="date-choose-div">
+        <a-icon type="left" class="dateIcon"></a-icon>
         <a-date-picker v-model="beginDate"
                        :getCalendarContainer="getCalendarContainer()"
                        @change="getBeginDateRange"></a-date-picker>
-        <span>至</span>
-        <a-date-picker v-model="endDate" :getCalendarContainer="getCalendarContainer()" @change="getEndDateRange"></a-date-picker>
-        <span class="date-choose-icon" v-on:click="flushDate">刷新</span>
+        <span class="middleText">至</span>
+        <a-date-picker v-model="endDate" :getCalendarContainer="getCalendarContainer()"
+                       @change="getEndDateRange"></a-date-picker>
+        <a-icon type="right" class="dateIcon"></a-icon>
+        <a-select
+                ref="select"
+                v-model:value="value1"
+                @change="handleChange"
+                v-if="deptSelect"
+        >
+            <a-select-option value="jack">部门1</a-select-option>
+            <a-select-option value="lucy">部门2</a-select-option>
+            <a-select-option value="disabled">部门3</a-select-option>
+            <a-select-option value="Yiminghe">部门4</a-select-option>
+        </a-select>
     </div>
 </template>
 <script>
     /*
-    * 日期选择组件
-    * 2021-05-01 至 2021-05-19(今)
-    * 日期可选
-    * begin_date:"" 默认当前月1号
-    * end_date:""   默认当天
-    * hideDefaultDate:"" 是否隐藏默认日期
-    * callInter:是否立刻回调
-    * @flushDate 接收回传起止日期
-    * */
+     * 日期选择组件
+     * 2021-05-01 至 2021-05-19(今)
+     * 日期可选
+     * begin_date:"" 默认当前月1号
+     * end_date:""   默认当天
+     * hideDefaultDate:"" 是否隐藏默认日期
+     * callInter:是否立刻回调
+     * */
 
-    import {DatePicker} from 'ant-design-vue';
+    import {DatePicker, Icon, Select} from 'ant-design-vue';
     import moment from 'moment';
     import interConfig from './interConfig';
     export default{
         data(){
             return {
-                beginDate:"",
-                endDate:"",
+                beginDate: "",
+                endDate: "",
+                value1: 'jack',
             }
         },
         created(){
-            if(!this.$props.hideDefaultDate){
+            if (!this.$props.hideDefaultDate) {
                 this.getNowTime();
             }
         },
-        props:['begin_date','end_date','hideDefaultDate','callInter'],
+        props: ['begin_date', 'end_date', 'hideDefaultDate', 'callInter', 'deptSelect'],
 //        props:{
 //            begin_date:{
 //                type:moment,
@@ -50,16 +63,16 @@
 //                }
 //            }
 //        },
-        watch:{
-            begin_date:function (newVal) {
-                if(typeof newVal == 'string'){
+        watch: {
+            begin_date: function (newVal) {
+                if (typeof newVal == 'string') {
                     this.beginDate = moment(newVal);
                     return
                 }
                 this.beginDate = newVal;
             },
-            end_date:function (newVal) {
-                if(typeof newVal == 'string'){
+            end_date: function (newVal) {
+                if (typeof newVal == 'string') {
                     this.endDate = moment(newVal);
                     return
                 }
@@ -70,8 +83,8 @@
             this.beginDate = this.$props.begin_date;
             this.endDate = this.$props.end_date;
         },
-        methods:{
-            getNowTime:function () {
+        methods: {
+            getNowTime: function () {
                 this.InterfaceConfig.callInterface([{
                     url: interConfig.getNowTime.url,
                     params: {},
@@ -86,55 +99,70 @@
                             let day = resData.data.day;
                             this.beginDate = moment(year + "-" + month + "-01");
                             this.endDate = moment(year + "-" + month + "-" + day);
-                            if(this.callInter === true){
-                                this.flushDate();
-                            }
                         }
                     }
                 })
             },
-            getCalendarContainer:function () {
+            getCalendarContainer: function () {
                 return triggerNode => triggerNode.parentNode;
             },
-            getBeginDateRange:function (date) {
+            getBeginDateRange: function (date) {
                 this.beginDate = date;
             },
-            getEndDateRange:function (date) {
+            getEndDateRange: function (date) {
                 this.endDate = date;
             },
-            flushDate:function () {
-                this.$emit("flushDate",{beginDate:this.beginDate,endDate:this.endDate});
-            }
         },
-        components:{
-            ADatePicker:DatePicker,
+        components: {
+            ADatePicker: DatePicker,
+            AIcon: Icon,
+            ASelect: Select,
+            ASelectOption: Select.Option,
         }
     }
 </script>
 
-<style lang="scss">
-    .date-choose-div{
+<style lang="scss" scoped>
+    .date-choose-div {
         width: 100%;
-        height: 3rem;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        .ant-calendar-picker{
-            width: 8rem;
+        height: 2rem;
+        /*display: flex;*/
+        /*align-items: center;*/
+        /deep/ .ant-select {
+            width: 85px !important;
+            float: right !important;
+            z-index: 8888;
+            .ant-select-selection {
+                background: none !important;
+                border: 1px solid #08E2ED !important;
+                color: #08E2ED !important;
+                height: 26px !important;
+                .ant-select-arrow {
+                    color: #08E2ED !important;
+                    margin-top: -4px !important;
+                }
+                .ant-select-selection__rendered {
+                    line-height: 26px !important;
+                }
+            }
+        }
+        .dateIcon {
+            font-size: 12px;
         }
-        .ant-calendar-picker-container{
+        /deep/ .ant-calendar-picker {
+            width: 5.5rem;
+            .ant-input {
+                padding: 0 !important;
+                background: rgba(0, 0, 0, 0) !important;
+                color: #fff !important;
+                border: none !important;
+                text-align: center !important;
+            }
+        }
+        /deep/ .ant-calendar-picker-container {
             position: absolute;
             left: 0 !important;
             top: 0 !important;
         }
-        span:nth-child(2){
-            padding: 0 0.5rem;
-        }
-        .date-choose-icon{
-            font-size: 14px;
-            color: #31a8fa;
-            cursor: pointer;
-            margin-left: 0.5rem;
-        }
     }
 </style>
\ No newline at end of file