Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

src/api/mes/cal/calholiday.js

@@ -12,7 +12,7 @@ export function listCalholiday(query) {
 // 查询上班数据工作单元列表
 export function listItem(query) {
   return request({
-    url: "/md/cal/plan/workunit/list",
+    url: "/mes/cal/shift/listOnWorkShift",
     method: "get",
     params: query,
   });

src/views/mes/cal/holiday/index.vue

@@ -135,8 +135,10 @@ export default {
         submitForm(isWork){
           const datas = this.$refs.itemIndex.selectRow.map(item => {
             return {
-              id: item.id,
-              isWork
+              isWork,
+              theDay: item.theDay,
+              shiftName: item.shiftName,
+              workunitId: item.workunitId
             }
           })
           addCalholiday(datas).then(response => {