日历验证

pages/basicData/calendar/class/add.vue

@@ -44,18 +44,20 @@ export default {
       rules: {
         shiftWorkSchedCode: [{ required: true, message: "请填写班次编号", trigger: "blur" }],
         shiftName: [{ required: true, message: "请填写班次名称", trigger: "blur" }],
-        // shiftStartEnd: [//{ required: true, message: "请选择班次时间段", trigger: "blur" }
-        // {
-        //      required: true,
-        //      type: 'array',
-        //      message: "请选择班次时间段",
-        //      trigger: 'blur',
-        //      fields: {
-        //        0: {type: "date", required: true, message: "请选择班次时间段"},
-        //        1: {type: "date", required: true, message: "请选择班次时间段"}
-        //      }
-        //    }
-        // ],
+        shiftStartEnd: [
+        //  { required: true, type: 'array', message: 'Please select time', trigger: 'change' }
+        //{ required: true, message: "请选择班次时间段", trigger: "blur" }
+        {
+             required: true,
+             type: 'array',
+             message: "请选择班次时间段",
+             trigger: 'blur',
+             fields: {
+               0: {type: "date", required: true, message: "请选择班次时间段"},
+               1: {type: "date", required: true, message: "请选择班次时间段"}
+             }
+           }
+        ],
       }
     };
   },
@@ -64,6 +66,7 @@ export default {
   },
   methods: {
     handleSubmit() {
+      console.log(this.entity)
       this.$refs.form.validate(v => {
         if (v) {
           this.disabled = true;

pages/basicData/calendar/holiday/add.vue

@@ -37,7 +37,11 @@ export default {
       disabled: false,
       entity: {},
       rules: {
-        name: [{ required: true, message: '必填', trigger: 'blur' }]
+        holidayId: [{ required: true, message: '请填写节假日编号', trigger: 'blur' }],
+        holidayName: [{ required: true, message: '请填写节假日名称', trigger: 'blur' }],
+        // holidayStart: [
+        //   { required: true, type: 'array', min: 1, message: '请选择关联班次', trigger: 'change' },
+        // ]
       }
     }
   },

pages/basicData/calendar/holiday/edit.vue

@@ -37,7 +37,8 @@ export default {
       disabled: false,
       entity: {},
       rules: {
-        name: [{ required: true, message: '必填', trigger: 'blur' }]
+        holidayId: [{ required: true, message: '请填写节假日编号', trigger: 'blur' }],
+        holidayName: [{ required: true, message: '请填写节假日名称', trigger: 'blur' }],
       }
     }
   },

pages/basicData/calendar/holiday/index.vue

@@ -27,7 +27,7 @@
         <Button @click="deleteMore" class="span ml20"><Icon type="md-close"/>批量删除</Button>
     </div>
     <Modal v-model="addModal" title="新增" footer-hide>
-      <Add @on-close="cancel" @on-ok="addOk" />
+      <Add ref="addmodal" @on-close="cancel" @on-ok="addOk" />
     </Modal>
     <Modal v-model="editModal" title="编辑" footer-hide>
       <Edit :eid="curId" @on-close="cancel" @on-ok="addOk" />
@@ -161,6 +161,7 @@ export default {
     addOk() {
       this.$refs.grid.load()
       this.addModal = false
+      this.$refs.addmodal.entity = {}
       this.editModal = false
       this.curId = 0
     },
@@ -191,6 +192,7 @@ export default {
     cancel() {
       this.curId = 0
       this.addModal = false
+      this.$refs.addmodal.entity = {}
       this.editModal = false
       this.deletedlModal = false
       this.deletelMore = false

pages/basicData/calendar/overtime/add.vue

@@ -46,7 +46,8 @@ export default {
       },
       orderCatList: [],
       rules: {
-        title: [{ required: true, message: '请填写日历名称', trigger: 'blur' }],
+        holidayCalId: [{ required: true, message: '请填写日历编号', trigger: 'blur' }],
+        holidayCalName: [{ required: true, message: '请填写日历名称', trigger: 'blur' }],
         holidayId: [
           { required: true, type: 'array', min: 1, message: '请选择关联假日', trigger: 'change' },
         ]

pages/basicData/calendar/overtime/api.js

@@ -8,13 +8,13 @@ export default {
     return Api.get(`${systemUrl}/mesholidaycal/getselectclass`, params)
   },
   getWeekTypeList (params) {
-    return Api.post(`${systemUrl}/calendarweektype/list`, params)
+    return Api.post(`${systemUrl}/mesweekendtype/list`, params)
   },
   setweek (params) {
-    return Api.post(`${systemUrl}/calendarweektype/setweek`, params)
+    return Api.post(`${systemUrl}/mesweekendtype/setweek `, params)
   },
   getsetweek (params) {
-    return Api.get(`${systemUrl}/calendarweektype/getcurrentset`, params)
+    return Api.get(`${systemUrl}/mesweekendtype/getcurrentset`, params)
   },
   get (params) {
     return Api.get(`${systemUrl}/mesholidaycal/get`, params)

pages/basicData/calendar/overtime/edit.vue

@@ -41,7 +41,8 @@ export default {
       selectItems: [], //选中的加班日历
       orderCatList: [],
       rules: {
-        title: [{ required: true, message: '请填写日历名称', trigger: 'blur' }],
+        holidayCalId: [{ required: true, message: '请填写日历编号', trigger: 'blur' }],
+        holidayCalName: [{ required: true, message: '请填写日历名称', trigger: 'blur' }],
         classId: [
             { required: true, type: 'array', min: 1, message: '请选择关联节日', trigger: 'change' },
         ]

pages/basicData/calendar/work/edit.vue

@@ -41,7 +41,8 @@ export default {
       orderCatList: [],
       selectItems: [], //选中的加班日历
       rules: {
-        title: [{ required: true, message: '请填写日历名称', trigger: 'blur' }],
+        calId: [{ required: true, message: '请填写日历编号', trigger: 'blur' }],
+        calName: [{ required: true, message: '请填写日历名称', trigger: 'blur' }],
         classId: [
           { required: true, type: 'array', min: 1, message: '请选择关联班次', trigger: 'change' },
         ]