工厂日历联调

pages/basicData/calendar/class/add.vue

@@ -53,8 +53,8 @@ export default {
              message: "请选择班次时间段",
              trigger: 'blur',
              fields: {
-               0: {type: "date", required: true, message: "请选择班次时间段"},
-               1: {type: "date", required: true, message: "请选择班次时间段"}
+               0: {type: "time", required: true, message: "请选择班次时间段"},
+               1: {type: "time", required: true, message: "请选择班次时间段"}
              }
            }
         ],

pages/basicData/calendar/class/api.js

@@ -11,7 +11,7 @@ export default {
     return Api.post(`${systemUrl}/messhiftworksched/create`,params);
     },
     update(params){
-    return Api.put(`${systemUrl}/messhiftworksched/update`,params);
+    return Api.post(`${systemUrl}/messhiftworksched/update`,params);
     },
     //删除：
     delete(params) {

pages/basicData/calendar/class/edit.vue

@@ -61,7 +61,10 @@ export default {
       this.$refs.form.validate(v => {
         if (v) {
           this.disabled = true;
-          Api.update(this.entity)
+          var data = this.entity
+          data.shiftStartEnd = this.entity.shiftStart+ '-' +this.entity.shiftEnd//.slice()
+          console.log(data)
+          Api.update(data)
             .then(r => {
               this.disabled = false;
               if (r.success) {

pages/basicData/calendar/holiday/api.js

@@ -12,7 +12,7 @@ export default {
     return Api.post(`${systemUrl}/mesholiday/create`,params);
     },
     update(params){
-    return Api.put(`${systemUrl}/mesholiday/update`,params);
+    return Api.post(`${systemUrl}/mesholiday/update`,params);
     },
     //删除：
     delete(params) {

pages/basicData/calendar/holiday/index.vue

@@ -87,13 +87,31 @@ export default {
           key: 'holidayStart',
           title: this.l('holidayStart'),
           high: true,
-          align: 'left'
+          align: 'left',
+          render: (h, params) => {
+            return h('div', { class: 'action' }, [
+              h(
+                'span',
+                {},
+                params.row.holidayStart.slice(0,10)
+              )
+            ])
+          }
         },
         {
           key: 'holidayEnd',
           title: this.l('holidayEnd'),
           high: true,
-          align: 'left'
+          align: 'left',
+          render: (h, params) => {
+            return h('div', { class: 'action' }, [
+              h(
+                'span',
+                {},
+                params.row.holidayEnd.slice(0,10)
+              )
+            ])
+          }
         },
         {
           key: 'creationTime',

pages/basicData/calendar/overtime/api.js

@@ -23,7 +23,7 @@ export default {
     return Api.post(`${systemUrl}/mesholidaycal/create`, params)
   },
   update (params) {
-    return Api.put(`${systemUrl}/mesholidaycal/update`, params)
+    return Api.post(`${systemUrl}/mesholidaycal/update`, params)
   },
   //删除：
   delete (params) {

pages/basicData/calendar/work/api.js

@@ -14,7 +14,7 @@ export default {
     return Api.post(`${systemUrl}/mesdailyworksched/create`,params);
     },
     update(params){
-    return Api.put(`${systemUrl}/mesdailyworksched/update`,params);
+    return Api.post(`${systemUrl}/mesdailyworksched/update`,params);
     },
     //删除：
     delete(params) {