overtime work

pages/basicData/calendar/overtime/index.vue

@@ -104,6 +104,12 @@ export default {
                     high: true,
                     align: 'left'
                 },
+                {
+                    key: 'mesHolidayIds',
+                    title: this.l('mesHolidayIds'),
+                    hide: true,
+                    align: 'left'
+                },
                 {
                     key: 'creationTime',
                     title: this.l('creationTime'),
@@ -154,36 +160,17 @@ export default {
             ]
         }
     },
-    //获取公休日数组
-    getweekList() {
-        let parmse = {
-            conditions: [],
-            isDesc: true,
-            pageSize: 10
-        }
-        Api.getWeekTypeList(parmse).then((res) => {
-            console.log(res.result)
-            this.weekTypeList = res.result
-        })
+    created() {
+        this.getWeekTypeListFn()
+        this.tableHeight = window.innerHeight - 230
     },
-    //设置公休日
-    radioChange(a) {
-        console.log(a)
-        let datArray = this.weekTypeList
-        datArray.map(u => {
-            if (a == u.weekendTypeName) {
-                this.weekTypeid = u.id
-            }
-        })
-        let id = this.weekTypeid
-        Api.setweek({
-            id: id
-        }).then((res) => {
-                if (res.success) {
-                    this.weekFlag = true
-                } else {
-                    this.weekFlag = false
-                    console.log('设置失败')
+    mounted() {
+        window.onresize = () => {
+            ///浏览器窗口大小变化
+            return (() => {
+                window.screenHeight = window.innerHeight
+                this.tableHeight = window.screenHeight - 230
+            })()
         }
     },
     async fetch({
@@ -225,14 +212,16 @@ export default {
                 pageSize: 10
             }
             Api.getWeekTypeList(parmse).then((res) => {
+                console.log(res.result)
                 this.weekTypeList = res.result
             })
         },
         //设置公休日
         radioChange(a) {
+            console.log(a)
             let datArray = this.weekTypeList
             datArray.map(u => {
-                            if (a == u.title) {
+                if (a == u.weekendTypeName) {
                     this.weekTypeid = u.id
                 }
             })
@@ -318,7 +307,7 @@ export default {
             return this.$t(vkey) || key
         }
     }
-        }
+}
 </script>
 
 <style lang="less">

pages/basicData/calendar/work/index.vue

@@ -198,25 +198,6 @@ export default {
             this.editModal = true;
             this.curId = id;
         },
-        methods: {
-            addOk() {
-                this.$refs.grid.load()
-                this.addModal = false
-                this.$refs.addModal.entity = {}
-                this.editModal = false
-                this.curId = 0
-            },
-            addFn() {
-                this.addModal = true
-                this.$refs.addmodal.entity = {}
-            },
-            search() {
-                this.$refs.grid.reload(this.easySearch)
-            },
-            edit(id) {
-                this.editModal = true
-                this.curId = id
-            },
 
         remove(id) {
             this.deletelModal = true;
@@ -276,7 +257,7 @@ export default {
             return this.$t(vkey) || key;
         },
     },
-    };
+};
 </script>
 
 <style lang="less">