Merge branch 'portal' of git.mes123.com:zhouyx/mes-ui into portal

pages/basicData/calendar/overtime/index.vue

@@ -154,17 +154,36 @@ export default {
             ]
         }
     },
-    created() {
-        this.getWeekTypeListFn()
-        this.tableHeight = window.innerHeight - 230
+    //获取公休日数组
+    getweekList() {
+        let parmse = {
+            conditions: [],
+            isDesc: true,
+            pageSize: 10
+        }
+        Api.getWeekTypeList(parmse).then((res) => {
+            console.log(res.result)
+            this.weekTypeList = res.result
+        })
     },
-    mounted() {
-        window.onresize = () => {
-            ///浏览器窗口大小变化
-            return (() => {
-                window.screenHeight = window.innerHeight
-                this.tableHeight = window.screenHeight - 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('设置失败')
                 }
             },
             async fetch({
@@ -299,7 +318,7 @@ export default {
                         return this.$t(vkey) || key
                     }
                 }
-}
+        }
 </script>
 
 <style lang="less">

pages/basicData/calendar/work/add.vue

@@ -149,7 +149,9 @@ export default {
   },
   watch: {
     v() {
+      console.log(v)
       this.entity = this.$u.clone(this.v);
+      this.selectAry();
     },
   },
 };