工作日历ok

pages/basicData/calendar/class/add.vue

@@ -63,7 +63,6 @@ export default {
   },
   methods: {
     handleSubmit() {
-      console.log(this.entity)
       this.$refs.form.validate(v => {
         if (v) {
           this.disabled = true;

pages/basicData/calendar/class/index.vue

@@ -101,6 +101,7 @@ data() {
       addOk() {
           this.$refs.grid.load()
           this.addModal = false
+          this.$emit('on-ok')
           this.$refs.addModal.entity = {}
           this.detailModal = false
           this.editModal = false;

pages/basicData/calendar/index.vue

 <template>
-    <classView></classView>
+    <classView @on-ok="onLaode"></classView>
 </template>
 <script>
 import classView from './class/index'
 export default {
     components:{classView},
+    methods:{
+        onLaode(){
+            alert("reloade")
+            console.log("123123")
+        },
+    },
 }
 </script>
 <style lang="less">

pages/basicData/calendar/overtime/add.vue

@@ -61,11 +61,6 @@ export default {
     this.selectAry()
   },
   methods: {
-    selectAry() {
-      Api.getlist().then((res) => {
-        this.orderCatList = res.result
-      })
-    },
     handleSubmit() {
       this.$refs.form.validate((v) => {
         if (v) {
@@ -102,6 +97,12 @@ export default {
     handleClose() {
       this.$emit('on-close')
     },
+    selectAry() {
+      Api.getlist().then((res) => {
+        console.log("加班日历",res)
+        this.orderCatList = res.result
+      })
+    },
     getItems(v){ //获取所有选中项;
       var items=this.orderCatList.filter(u=>{
         return v.indexOf(u.id)>-1

pages/basicData/calendar/work/add.vue

@@ -47,7 +47,7 @@ export default {
       entity: {
         id:[],
         title:"",
-        calendarClassId:[],
+        mesShiftWorkSchedIds:[],
         calendarClassTitle:"",
         workHours:0        
       },
@@ -88,7 +88,7 @@ export default {
               this.disabled = false
               if (r.success) {
                 this.$Message.success('保存成功')
-                this.entity.calendarClassId=[];
+                this.entity.mesShiftWorkSchedIds=[];
                 this.$refs.form.resetFields();
                 this.$emit('on-ok')
               } else {
@@ -104,7 +104,7 @@ export default {
       })
     },
     handleClose() {
-      this.orderCatList = []
+      // this.orderCatList = []
       this.$emit('on-close')
     },
     selectAry() {
@@ -115,7 +115,7 @@ export default {
         pageSize: 20
       }
       Api.getlist().then((res) => {
-        console.log(res)
+        // console.log("工作日历",res)
         this.orderCatList = res.result
       })
     },

pages/basicData/calendar/work/index.vue

@@ -144,6 +144,7 @@ export default {
   },
   created(){
     this.tableHeight = window.innerHeight - 230
+    // this.$refs.addModal.entity = {}
   },
   mounted() {
     window.onresize = () => {///浏览器窗口大小变化