diff --git a/src/api/base.js b/src/api/base.js
index a99ed8b..7fadd13 100644
--- a/src/api/base.js
+++ b/src/api/base.js
@@ -36,4 +36,9 @@ export const getCalendarExceptionShiftData = data => createAPI(`/base/getCalenda
 
 export const updateCESShift = data => createAPI(`/base/updateCESShift`,'post',data)
 
+export const getCalendarDatetypeInfo = data => createAPI(`/base/getCalendarDatetypeInfo`,'post',data)
+
+export const updateWorkingCalendar = data => createAPI(`/base/updateWorkingCalendar`,'post',data)
+
+
 
diff --git a/src/views/modules/base/calendar.vue b/src/views/modules/base/calendar.vue
index 68d46b6..cba3628 100644
--- a/src/views/modules/base/calendar.vue
+++ b/src/views/modules/base/calendar.vue
@@ -2,10 +2,10 @@
   <div class="mod-config">
     <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;">
       <el-form-item :label="'工厂编号：'">
-        <el-input v-model="searchData.site"   style="width: 130px"></el-input>
+        <el-input v-model="searchData.site" style="width: 130px"></el-input>
       </el-form-item>
       <el-form-item :label="'日历编码：'">
-        <el-input v-model="searchData.calendarId"   style="width: 130px"></el-input>
+        <el-input v-model="searchData.calendarId" style="width: 130px"></el-input>
       </el-form-item>
       <el-form-item :label="'状态：'">
         <el-select filterable v-model="searchData.status" style="width: 80px">
@@ -66,16 +66,17 @@
         </template>
       </el-table-column>
     </el-table>
-    <el-dialog title="维护工作日历" :close-on-click-modal="false" v-drag :visible.sync="calendarModelFlag" width="341px" >
+    <el-dialog title="维护工作日历" :close-on-click-modal="false" v-drag :visible.sync="calendarModelFlag" width="341px">
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item :label="'工厂编号：'">
           <el-input v-model="newCalendarData.site" :disabled="calendarModelDisableFlag" style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item :label="'日历编号：'">
-          <el-input v-model="newCalendarData.calendarId" :disabled="calendarModelDisableFlag" style="width: 130px" ></el-input>
+          <el-input v-model="newCalendarData.calendarId" :disabled="calendarModelDisableFlag"
+                    style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item :label="'日历描述：'">
-          <el-input v-model="newCalendarData.calendarDesc"  style="width: 130px"></el-input>
+          <el-input v-model="newCalendarData.calendarDesc" style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item :label="'状态：'">
           <el-select filterable v-model="newCalendarData.status" style="width: 130px">
@@ -84,21 +85,21 @@
           </el-select>
         </el-form-item>
       </el-form>
-      <el-footer  style="height:40px;margin-top: 20px;text-align:center"  >
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
         <el-button type="primary" @click="calendarSave()">保存</el-button>
         <el-button type="primary" @click="calendarModelFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
-    <el-dialog title="工作日历例外" :close-on-click-modal="false" v-drag :visible.sync="CEFlag" width="1200px"  >
-      <el-form :inline="true"  label-position="top" label-width="100px" style="margin-top: -5px;">
+    <el-dialog title="工作日历例外" :close-on-click-modal="false" v-drag :visible.sync="CEFlag" width="1200px">
+      <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;">
         <el-form-item :label="'工厂编号：'">
-          <el-input v-model="CESearchData.site"   style="width: 130px"></el-input>
+          <el-input v-model="CESearchData.site" style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item :label="'日历编码：'">
-          <el-input v-model="CESearchData.calendarId"   style="width: 130px"></el-input>
+          <el-input v-model="CESearchData.calendarId" style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item :label="'日历描述：'">
-          <el-input v-model="CESearchData.calendarDesc"   style="width: 130px"></el-input>
+          <el-input v-model="CESearchData.calendarDesc" style="width: 130px"></el-input>
           <download-excel
             :fields="fields()"
             :data="exportData2"
@@ -123,10 +124,11 @@
         <el-table-column
           header-align="center"
           align="center"
-          width="50"
+          width="80"
           label="操作">
           <template slot-scope="scope">
             <a type="text" size="small" @click="shiftModal(scope.row)">班次</a>
+            <a type="text" size="small" @click="editShiftModal(scope.row)"> | 编辑</a>
           </template>
         </el-table-column>
         <el-table-column
@@ -146,17 +148,18 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-footer  style="height:40px;margin-top: 20px;text-align:center"  >
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
         <el-button type="primary" @click="CEFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
-    <el-dialog title="批量维护工作日历" :close-on-click-modal="false" v-drag :visible.sync="maintainCalendarFlag" width="1200px"  >
-      <el-form :inline="true"  label-position="top" label-width="100px" style="margin-top: -5px;">
+    <el-dialog title="批量维护工作日历" :close-on-click-modal="false" v-drag :visible.sync="maintainCalendarFlag"
+               width="1200px">
+      <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;">
         <el-form-item :label="'日历编码：'">
-          <el-input v-model="maintainCalendarSearchData.calendarId"   style="width: 130px"></el-input>
+          <el-input v-model="maintainCalendarSearchData.calendarId" style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item :label="'日历描述：'">
-          <el-input v-model="maintainCalendarSearchData.calendarDesc"   style="width: 130px"></el-input>
+          <el-input v-model="maintainCalendarSearchData.calendarDesc" style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item :label="'起始时间：'">
           <el-date-picker
@@ -166,16 +169,16 @@
             placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
-<!--        <el-form-item :label="'至：'">-->
-<!--          <el-date-picker-->
-<!--            style="width: 130px"-->
-<!--            v-model="maintainCalendarSearchData.endDate"-->
-<!--            value-format="yyyy-MM-dd"-->
-<!--            placeholder="选择日期">-->
-<!--          </el-date-picker>-->
-<!--        </el-form-item>-->
+        <!--        <el-form-item :label="'至：'">-->
+        <!--          <el-date-picker-->
+        <!--            style="width: 130px"-->
+        <!--            v-model="maintainCalendarSearchData.endDate"-->
+        <!--            value-format="yyyy-MM-dd"-->
+        <!--            placeholder="选择日期">-->
+        <!--          </el-date-picker>-->
+        <!--        </el-form-item>-->
         <el-form-item :label="'工作日类型：'">
-          <el-select v-model="maintainCalendarSearchData.datetype"  style="width: 130px"
+          <el-select v-model="maintainCalendarSearchData.datetype" style="width: 130px"
                      placeholder="请选择">
             <el-option
               v-for="(item,index) in selectList"
@@ -190,143 +193,162 @@
 
       </el-form>
       <div class="calendar">
-      <el-table
-        height="400"
-        :data="dataList3"
-        border
-        :vertical-align="'middle'"
-        @selection-change="selectionChangeHandle"
-        style="width: 100%;"
-        :row-style="{height:'20px'}">
-        <el-table-column
-          v-for="(item,index) in columnList3" :key="index"
-          :sortable="item.columnSortable"
-          :prop="item.columnProp"
-          :header-align="item.headerAlign"
-          :show-overflow-tooltip="item.showOverflowTooltip"
-          :align="item.align"
-          :fixed="item.fixed==''?false:item.fixed"
-          :width="item.columnWidth"
-          :label="item.columnLabel">
-          <template slot-scope="scope">
-            <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
-            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
-                                               style="width: 100px; height: 80px"/></span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          type="selection"
-          align="center"
-          width="30px">
-        </el-table-column>
-<!--        <el-table-column-->
-<!--          v-for="(item,index) in maintainColumnList2" :key="index"-->
-<!--          :prop="item.columnProp"-->
-<!--          :header-align="item.headerAlign"-->
-<!--          :align="item.align"-->
-<!--          :min-width="item.width"-->
-<!--          :vertical-align="'middle'"-->
-<!--          :label="item.columnLabel"-->
-<!--          :formatter="getSelections">-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-select v-model="item.columnProp" placeholder="请选择" style="height: 12px;padding: 0px " filterable allow-create>-->
-<!--               <el-option v-for="item2 in selectList " :key="index" :label="item2.label" :value="item2.value">-->
-<!--               </el-option>-->
-<!--            </el-select>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-        <el-table-column
-          prop="val0"
-          header-align="center"
-          align="left"
-          :label="this.timeArray[0]">
-          <template slot-scope="scope">
-            <el-select v-model="scope.row.val0" placeholder="请选择" style="height: 12px;padding: 0px " filterable allow-create>
-              <el-option v-for="item in selectList " :key="index" :label="item.label" :value="item.value">
+        <el-table
+          height="400"
+          :data="dataList3"
+          border
+          :vertical-align="'middle'"
+          @selection-change="selectionChangeHandle"
+          style="width: 100%;"
+          :row-style="{height:'20px'}">
+          <el-table-column
+            v-for="(item,index) in columnList3" :key="index"
+            :sortable="item.columnSortable"
+            :prop="item.columnProp"
+            :header-align="item.headerAlign"
+            :show-overflow-tooltip="item.showOverflowTooltip"
+            :align="item.align"
+            :fixed="item.fixed==''?false:item.fixed"
+            :width="item.columnWidth"
+            :label="item.columnLabel">
+            <template slot-scope="scope">
+              <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
+              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                                 style="width: 100px; height: 80px"/></span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            type="selection"
+            align="center"
+            width="30px">
+          </el-table-column>
+          <!--        <el-table-column-->
+          <!--          v-for="(item,index) in maintainColumnList2" :key="index"-->
+          <!--          :prop="item.columnProp"-->
+          <!--          :header-align="item.headerAlign"-->
+          <!--          :align="item.align"-->
+          <!--          :min-width="item.width"-->
+          <!--          :vertical-align="'middle'"-->
+          <!--          :label="item.columnLabel"-->
+          <!--          :formatter="getSelections">-->
+          <!--          <template slot-scope="scope">-->
+          <!--            <el-select v-model="item.columnProp" placeholder="请选择" style="height: 12px;padding: 0px " filterable allow-create>-->
+          <!--               <el-option v-for="item2 in selectList " :key="index" :label="item2.label" :value="item2.value">-->
+          <!--               </el-option>-->
+          <!--            </el-select>-->
+          <!--          </template>-->
+          <!--        </el-table-column>-->
+          <el-table-column
+            prop="val0"
+            header-align="center"
+            align="left"
+            :label="this.timeArray[0]">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.val0" placeholder="请选择" style="height: 12px;padding: 0px " filterable
+                         allow-create>
+                <el-option v-for="item in selectList " :key="index" :label="item.label" :value="item.value">
 
-              </el-option>
-            </el-select>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="val1"
-          header-align="center"
-          align="left"
-          :label="this.timeArray[1]">
-          <template slot-scope="scope">
-            <el-select v-model="scope.row.val1" placeholder="请选择" style="height: 12px;padding: 0px " filterable allow-create>
-               <el-option v-for="item in selectList " :key="index" :label="item.label" :value="item.value">
-               </el-option>
-            </el-select>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="val2"
-          header-align="center"
-          align="left"
-          :label="this.timeArray[2]">
-          <template slot-scope="scope">
-            <el-select v-model="scope.row.val2" placeholder="请选择" style="height: 12px;padding: 0px " filterable allow-create>
-               <el-option v-for="item in selectList " :key="index" :label="item.label" :value="item.value">
-               </el-option>
-            </el-select>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="val3"
-          header-align="center"
-          align="left"
-          :label="this.timeArray[3]">
-          <template slot-scope="scope">
-            <el-select v-model="scope.row.val3" placeholder="请选择" style="height: 12px;padding: 0px " filterable allow-create>
-               <el-option v-for="item in selectList " :key="index" :label="item.label" :value="item.value">
-               </el-option>
-            </el-select>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="val4"
-          header-align="center"
-          align="left"
-          :label="this.timeArray[4]">
-          <template slot-scope="scope">
-            <el-select v-model="scope.row.val4" placeholder="请选择" style="height: 12px;padding: 0px " filterable allow-create>
-               <el-option v-for="item in selectList " :key="index" :label="item.label" :value="item.value">
-               </el-option>
-            </el-select>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="val5"
-          header-align="center"
-          align="left"
-          :label="this.timeArray[5]">
-          <template slot-scope="scope">
-            <el-select v-model="scope.row.val5" placeholder="请选择" style="height: 12px;padding: 0px " filterable allow-create>
-               <el-option v-for="item in selectList " :key="index" :label="item.label" :value="item.value">
-               </el-option>
-            </el-select>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="val6"
-          header-align="center"
-          align="left"
-          :label="this.timeArray[6]">
-          <template slot-scope="scope">
-            <el-select v-model="scope.row.val6" placeholder="请选择" style="height: 12px;padding: 0px " filterable allow-create>
-               <el-option v-for="item in selectList " :key="index" :label="item.label" :value="item.value">
-               </el-option>
-            </el-select>
-          </template>
-        </el-table-column>
-      </el-table>
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="val1"
+            header-align="center"
+            align="left"
+            :label="this.timeArray[1]">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.val1" placeholder="请选择" style="height: 12px;padding: 0px " filterable
+                         allow-create>
+                 
+                <el-option v-for="item in selectList " :key="index" :label="item.label" :value="item.value">
+                   
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="val2"
+            header-align="center"
+            align="left"
+            :label="this.timeArray[2]">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.val2" placeholder="请选择" style="height: 12px;padding: 0px " filterable
+                         allow-create>
+                 
+                <el-option v-for="item in selectList " :key="index" :label="item.label" :value="item.value">
+                   
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="val3"
+            header-align="center"
+            align="left"
+            :label="this.timeArray[3]">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.val3" placeholder="请选择" style="height: 12px;padding: 0px " filterable
+                         allow-create>
+                 
+                <el-option v-for="item in selectList " :key="index" :label="item.label" :value="item.value">
+                   
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="val4"
+            header-align="center"
+            align="left"
+            :label="this.timeArray[4]">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.val4" placeholder="请选择" style="height: 12px;padding: 0px " filterable
+                         allow-create>
+                 
+                <el-option v-for="item in selectList " :key="index" :label="item.label" :value="item.value">
+                   
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="val5"
+            header-align="center"
+            align="left"
+            :label="this.timeArray[5]">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.val5" placeholder="请选择" style="height: 12px;padding: 0px " filterable
+                         allow-create>
+                 
+                <el-option v-for="item in selectList " :key="index" :label="item.label" :value="item.value">
+                   
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="val6"
+            header-align="center"
+            align="left"
+            :label="this.timeArray[6]">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.val6" placeholder="请选择" style="height: 12px;padding: 0px " filterable
+                         allow-create>
+                 
+                <el-option v-for="item in selectList " :key="index" :label="item.label" :value="item.value">
+                   
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+        </el-table>
       </div>
-      <el-footer  style="height:40px;margin-top: 20px;text-align:center"  >
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
         <el-button type="primary" @click="maintainCalendarFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
-    <el-dialog title="班次信息" :close-on-click-modal="false" v-drag :visible.sync="shiftFlag" width="600px"  >
+    <el-dialog title="班次信息" :close-on-click-modal="false" v-drag :visible.sync="shiftFlag" width="600px">
       <el-table
         height="300"
         :data="dataList4"
@@ -354,18 +376,19 @@
           width="50"
           label="操作">
           <template slot-scope="scope">
-            <a  type="text" size="small" @click="editShift(scope.row)">编辑</a>
+            <a type="text" size="small" @click="editShift(scope.row)">编辑</a>
           </template>
         </el-table-column>
       </el-table>
-      <el-footer  style="height:40px;margin-top: 20px;text-align:center"  >
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
         <el-button type="primary" @click="shiftFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
-    <el-dialog title="维护班次" :close-on-click-modal="false" v-drag :visible.sync="updateShiftFlag" width="341px" >
+    <el-dialog title="维护班次" :close-on-click-modal="false" v-drag :visible.sync="updateShiftFlag" width="341px">
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item :label="'班次编码：'">
-          <el-input v-model="newShiftData.shiftno" disabled style="width: 130px" onblur="this.value=this.value.toUpperCase()"></el-input>
+          <el-input v-model="newShiftData.shiftno" disabled style="width: 130px"
+                    onblur="this.value=this.value.toUpperCase()"></el-input>
         </el-form-item>
         <el-form-item :label="'班次名称：'">
           <el-input v-model="newShiftData.shiftdesc" disabled style="width: 130px"></el-input>
@@ -379,7 +402,7 @@
             value-format="HH:mm">
           </el-time-picker>
         </el-form-item>
-        <el-form-item :label="'下班时间：'" >
+        <el-form-item :label="'下班时间：'">
           <el-time-picker
             format="HH:mm"
             style="width: 130px"
@@ -389,644 +412,775 @@
           </el-time-picker>
         </el-form-item>
       </el-form>
-      <el-footer  style="height:40px;margin-top: 20px;text-align:center"  >
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
         <el-button type="primary" @click="updateCESShift()">保存</el-button>
         <el-button type="primary" @click="updateShiftFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
+
+    <el-dialog title="维护班次信息" :close-on-click-modal="false" v-drag :visible.sync="workDateDialog" width="341px">
+
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="日历编码">
+          <el-input v-model="workingCalendar.calendarId" :disabled="true" style="width: 130px;color: red"></el-input>
+        </el-form-item>
+        <el-form-item label="日期">
+          <el-input v-model="workingCalendar.scheduledate" :disabled="true" style="width: 130px;color: red"></el-input>
+        </el-form-item>
+        <el-form-item label="工厂编号">
+          <el-input v-model="workingCalendar.site" :disabled="true" style="width: 130px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'工作日类型：'">
+          <el-select @change="selectDateType" v-model="workingCalendar.datetype" style="width: 130px">
+            <el-option v-for="(item,index) in calendarDatetype" :key="index"
+                       :label="item.datetype" :value="item.datetype">
+
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="'休息时间点1：'">
+          <el-time-picker
+            format="HH:mm"
+            style="width: 130px"
+            v-model="workingCalendar.exceptexacttime1"
+            placeholder="请选择"
+            value-format="HH:mm">
+          </el-time-picker>
+        </el-form-item>
+        <el-form-item :label="'休息时长1：'">
+          <el-input v-model="workingCalendar.exceptduration1" style="width: 130px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'休息时间点2：'">
+          <el-time-picker
+            format="HH:mm"
+            style="width: 130px"
+            v-model="workingCalendar.exceptexacttime2"
+            placeholder="请选择"
+            value-format="HH:mm">
+          </el-time-picker>
+        </el-form-item>
+        <el-form-item :label="'休息时长2：'">
+          <el-input v-model="workingCalendar.exceptduration2" style="width: 130px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'休息时间点3：'">
+          <el-time-picker
+            format="HH:mm"
+            style="width: 130px"
+            v-model="workingCalendar.exceptexacttime3"
+            placeholder="请选择"
+            value-format="HH:mm">
+          </el-time-picker>
+        </el-form-item>
+        <el-form-item :label="'休息时长3：'">
+          <el-input v-model="workingCalendar.exceptduration3" style="width: 130px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'休息时间点4：'">
+          <el-time-picker
+            format="HH:mm"
+            style="width: 130px"
+            v-model="workingCalendar.exceptexacttime4"
+            placeholder="请选择"
+            value-format="HH:mm">
+          </el-time-picker>
+        </el-form-item>
+        <el-form-item :label="'休息时长4：'">
+          <el-input v-model="workingCalendar.exceptduration4" style="width: 130px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'休息时间点5：'">
+          <el-time-picker
+            format="HH:mm"
+            style="width: 130px"
+            v-model="workingCalendar.exceptexacttime5"
+            placeholder="请选择"
+            value-format="HH:mm">
+          </el-time-picker>
+        </el-form-item>
+        <el-form-item :label="'休息时长5：'">
+          <el-input v-model="workingCalendar.exceptduration5" style="width: 130px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'休息时间点6：'">
+          <el-time-picker
+            format="HH:mm"
+            style="width: 130px"
+            v-model="workingCalendar.exceptexacttime6"
+            placeholder="请选择"
+            value-format="HH:mm">
+          </el-time-picker>
+        </el-form-item>
+        <el-form-item :label="'休息时长6：'">
+          <el-input v-model="workingCalendar.exceptduration6" style="width: 130px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'备注：'">
+          <el-input v-model="workingCalendar.remark" style="width: 275px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+
+        <el-button type="primary" @click="updateWorkingCalendar()">保存</el-button>
+        <el-button type="primary" @click="workDateDialog = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-    import {
-      getCalendarData,
-      saveCalendar,
-      delCalendar,
-      getCalendarExceptionData,
-      calendarDatetypeInfo,
-      batchSaveCDData,
-      getCalendarExceptionShiftData,
-      updateCESShift
-    }from "@/api/base.js"
-    export default {
-      name: "calendar",
+  import {
+    getCalendarData,
+    saveCalendar,
+    delCalendar,
+    getCalendarExceptionData,
+    calendarDatetypeInfo,
+    batchSaveCDData,
+    getCalendarExceptionShiftData,
+    updateCESShift,
+    getCalendarDatetypeInfo,
+    updateWorkingCalendar
+  } from "@/api/base.js"
 
-      data () {
-        return {
-          newShiftData:{
-            shiftno:'',
-            shiftdesc:'',
-            startexacttime:'',
-            endexacttime:'',
-            datetype:'',
-            id:'',
-            site:'',
+  export default {
+    name: "calendar",
+
+    data() {
+      return {
+        workDateDialog: false,
+        workingCalendar: {},
+        calendarDatetype: [],
+        newShiftData: {
+          shiftno: '',
+          shiftdesc: '',
+          startexacttime: '',
+          endexacttime: '',
+          datetype: '',
+          id: '',
+          site: '',
+        },
+        updateShiftFlag: false,
+        shiftFlag: false,
+        dataList4: [],
+        columnList4: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6038,
+            serialNumber: '6038Table2Shiftno',
+            tableId: "6038Table2",
+            tableName: "班次表",
+            columnProp: "shiftno",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "班次编码",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
           },
-          updateShiftFlag:false,
-          shiftFlag:false,
-          dataList4:[],
-          columnList4: [
-            {
-              userId: this.$store.state.user.name,
-              functionId: 6038,
-              serialNumber: '6038Table2Shiftno',
-              tableId: "6038Table2",
-              tableName: "班次表",
-              columnProp: "shiftno",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "班次编码",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 0,
-              status: true,
-              fixed: false,
-              columnWidth: 100
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 6038,
-              serialNumber: '6038Table2Shiftdesc',
-              tableId: "6038Table2",
-              tableName: "班次表",
-              columnProp: "shiftdesc",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "班次名称",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 0,
-              status: true,
-              fixed: false,
-              columnWidth: 100
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 6038,
-              serialNumber: '6038Table2Startexacttime',
-              tableId: "6038Table2",
-              tableName: "班次表",
-              columnProp: "startexacttime",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "上班时间",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 0,
-              status: true,
-              fixed: false,
-              columnWidth: 100
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 6038,
-              serialNumber: '6038Table2Endexacttime',
-              tableId: "6038Table2",
-              tableName: "班次表",
-              columnProp: "endexacttime",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "下班时间",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 0,
-              status: true,
-              fixed: false,
-              columnWidth: 100
-            }
-          ],
-          // 导出 start
-          exportData: [],
-          exportName: "工厂日历"+this.dayjs().format('YYYYMMDDHHmmss'),
-          exportHeader: ["工厂日历"],
-          exportFooter: [],
-          // 导出 end
-          // 导出 start
-          exportData2: [],
-          exportName2: "工作日历例外"+this.dayjs().format('YYYYMMDDHHmmss'),
-          exportHeader2: ["工作日历例外"],
-          exportFooter2: [],
-          // 导出 end
-          buttons:{
-            download:'导出',
-            download2:'导出',
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6038,
+            serialNumber: '6038Table2Shiftdesc',
+            tableId: "6038Table2",
+            tableName: "班次表",
+            columnProp: "shiftdesc",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "班次名称",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
           },
-          selectList:[],
-          calendarModelFlag:false,
-          calendarModelDisableFlag:false,
-          maintainCalendarFlag:false,
-          CEFlag:false,
-          newCalendarData:{
-            site:'',
-            calendarId:'',
-            calendarDesc:'',
-            status:'使用中',
-            id:0,
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6038,
+            serialNumber: '6038Table2Startexacttime',
+            tableId: "6038Table2",
+            tableName: "班次表",
+            columnProp: "startexacttime",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "上班时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6038,
+            serialNumber: '6038Table2Endexacttime',
+            tableId: "6038Table2",
+            tableName: "班次表",
+            columnProp: "endexacttime",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "下班时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          }
+        ],
+        // 导出 start
+        exportData: [],
+        exportName: "工厂日历" + this.dayjs().format('YYYYMMDDHHmmss'),
+        exportHeader: '',
+        exportFooter: [],
+        // 导出 end
+        // 导出 start
+        exportData2: [],
+        exportName2: "工作日历例外" + this.dayjs().format('YYYYMMDDHHmmss'),
+        exportHeader2: ["工作日历例外"],
+        exportFooter2: [],
+        // 导出 end
+        buttons: {
+          download: '导出',
+          download2: '导出',
+        },
+        selectList: [],
+        calendarModelFlag: false,
+        calendarModelDisableFlag: false,
+        maintainCalendarFlag: false,
+        CEFlag: false,
+        newCalendarData: {
+          site: '',
+          calendarId: '',
+          calendarDesc: '',
+          status: '使用中',
+          id: 0,
+        },
+        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6038,
+            serialNumber: '6038TableSite',
+            tableId: "6038Table",
+            tableName: "工作日类型表",
+            columnProp: "site",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "工厂编号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6038,
+            serialNumber: '6038TableCalendarId',
+            tableId: "6038Table",
+            tableName: "工作日类型表",
+            columnProp: "calendarId",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "日历编码",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6038,
+            serialNumber: '6038TableCalendarDesc',
+            tableId: "6038Table",
+            tableName: "工作日类型表",
+            columnProp: "calendarDesc",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "日历描述",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 160
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6038,
+            serialNumber: '6038TableStatus',
+            tableId: "6038Table",
+            tableName: "工作日类型表",
+            columnProp: "status",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "使用状态",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
           },
-          columnList:[
-            {
-              userId: this.$store.state.user.name,
-              functionId: 6038,
-              serialNumber: '6038TableSite',
-              tableId: "6038Table",
-              tableName: "工作日类型表",
-              columnProp: "site",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "工厂编号",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 0,
-              status: true,
-              fixed: false,
-              columnWidth: 100
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 6038,
-              serialNumber: '6038TableCalendarId',
-              tableId: "6038Table",
-              tableName: "工作日类型表",
-              columnProp: "calendarId",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "日历编码",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 0,
-              status: true,
-              fixed: false,
-              columnWidth: 100
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 6038,
-              serialNumber: '6038TableCalendarDesc',
-              tableId: "6038Table",
-              tableName: "工作日类型表",
-              columnProp: "calendarDesc",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "日历描述",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 0,
-              status: true,
-              fixed: false,
-              columnWidth: 160
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 6038,
-              serialNumber: '6038TableStatus',
-              tableId: "6038Table",
-              tableName: "工作日类型表",
-              columnProp: "status",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "使用状态",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 0,
-              status: true,
-              fixed: false,
-              columnWidth: 100
-            },
 
-          ],
-          columnList2: [
-            {
-              userId: this.$store.state.user.name,
-              functionId: 6038,
-              serialNumber: '6038Table2Scheduledate',
-              tableId: "6038Table2",
-              tableName: "工作日历表2",
-              columnProp: "scheduledate",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "日期",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 0,
-              status: true,
-              fixed: false,
-              columnWidth: 100
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 6038,
-              serialNumber: '6038Table2Datetype',
-              tableId: "6038Table2",
-              tableName: "工作日历表2",
-              columnProp: "datetype",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "工作日类型",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 0,
-              status: true,
-              fixed: false,
-              columnWidth: 100
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 6038,
-              serialNumber: '6038Table2Worktime',
-              tableId: "6038Table2",
-              tableName: "工作日历表2",
-              columnProp: "worktime",
-              headerAlign: "center",
-              align: "right",
-              columnLabel: "累计工作时间",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 0,
-              status: true,
-              fixed: false,
-              columnWidth: 100
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 6038,
-              serialNumber: '6038Table2Exceptexacttime1',
-              tableId: "6038Table2",
-              tableName: "工作日历表2",
-              columnProp: "exceptexacttime1",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "休息时间点1",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 0,
-              status: true,
-              fixed: false,
-              columnWidth: 100
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 6038,
-              serialNumber: '6038Table2Exceptduration1',
-              tableId: "6038Table2",
-              tableName: "工作日历表2",
-              columnProp: "exceptduration1",
-              headerAlign: "center",
-              align: "right",
-              columnLabel: "休息时长1",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 0,
-              status: true,
-              fixed: false,
-              columnWidth: 100
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 6038,
-              serialNumber: '6038Table2Exceptexacttime2',
-              tableId: "6038Table2",
-              tableName: "工作日历表2",
-              columnProp: "exceptexacttime2",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "休息时间点2",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 0,
-              status: true,
-              fixed: false,
-              columnWidth: 100
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 6038,
-              serialNumber: '6038Table2Exceptduration2',
-              tableId: "6038Table2",
-              tableName: "工作日历表2",
-              columnProp: "exceptduration2",
-              headerAlign: "center",
-              align: "right",
-              columnLabel: "休息时长2",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 0,
-              status: true,
-              fixed: false,
-              columnWidth: 100
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 6038,
-              serialNumber: '6038Table2Exceptexacttime3',
-              tableId: "6038Table2",
-              tableName: "工作日历表2",
-              columnProp: "exceptexacttime3",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "休息时间点3",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 0,
-              status: true,
-              fixed: false,
-              columnWidth: 100
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 6038,
-              serialNumber: '6038Table2Exceptduration3',
-              tableId: "6038Table2",
-              tableName: "工作日历表2",
-              columnProp: "exceptduration3",
-              headerAlign: "center",
-              align: "right",
-              columnLabel: "休息时长3",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 0,
-              status: true,
-              fixed: false,
-              columnWidth: 100
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 6038,
-              serialNumber: '6038Table2Exceptexacttime4',
-              tableId: "6038Table2",
-              tableName: "工作日历表2",
-              columnProp: "exceptexacttime4",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "休息时间点4",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 0,
-              status: true,
-              fixed: false,
-              columnWidth: 100
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 6038,
-              serialNumber: '6038Table2Exceptduration4',
-              tableId: "6038Table2",
-              tableName: "工作日历表2",
-              columnProp: "exceptduration4",
-              headerAlign: "center",
-              align: "right",
-              columnLabel: "休息时长4",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 0,
-              status: true,
-              fixed: false,
-              columnWidth: 100
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 6038,
-              serialNumber: '6038Table2Exceptexacttime5',
-              tableId: "6038Table2",
-              tableName: "工作日历表2",
-              columnProp: "exceptexacttime5",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "休息时间点5",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 0,
-              status: true,
-              fixed: false,
-              columnWidth: 100
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 6038,
-              serialNumber: '6038Table2Exceptduration5',
-              tableId: "6038Table2",
-              tableName: "工作日历表2",
-              columnProp: "exceptduration5",
-              headerAlign: "center",
-              align: "right",
-              columnLabel: "休息时长5",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 0,
-              status: true,
-              fixed: false,
-              columnWidth: 100
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 6038,
-              serialNumber: '6038Table2Exceptexacttime6',
-              tableId: "6038Table2",
-              tableName: "工作日历表2",
-              columnProp: "exceptexacttime6",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "休息时间点6",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 0,
-              status: true,
-              fixed: false,
-              columnWidth: 100
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 6038,
-              serialNumber: '6038Table2Exceptduration6',
-              tableId: "6038Table2",
-              tableName: "工作日历表2",
-              columnProp: "exceptduration6",
-              headerAlign: "center",
-              align: "right",
-              columnLabel: "休息时长6",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 0,
-              status: true,
-              fixed: false,
-              columnWidth: 100
-            }
-          ],
-          columnList3:[
-            {
-              userId: this.$store.state.user.name,
-              functionId: 6038,
-              serialNumber: '6038Table3Site',
-              tableId: "6038Table3",
-              tableName: "工作日历表3",
-              columnProp: "site",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "工厂编码",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 0,
-              status: true,
-              fixed: false,
-              columnWidth: 80
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 6038,
-              serialNumber: '6038Table3CalendarId',
-              tableId: "6038Table3",
-              tableName: "工作日历表3",
-              columnProp: "calendarId",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "日历编码",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 0,
-              status: true,
-              fixed: false,
-              columnWidth: 80
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 6038,
-              serialNumber: '6038Table3CalendarDesc',
-              tableId: "6038Table3",
-              tableName: "工作日历表3",
-              columnProp: "calendarDesc",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "日历描述",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 0,
-              status: true,
-              fixed: false,
-              columnWidth: 100
-            },
-          ],
-          maintainColumnList2:[],
-          height:'200',
-          searchData:{
-            site:'',
-            calendarId:'',
-            status:'使用中',
+        ],
+        columnList2: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6038,
+            serialNumber: '6038Table2Scheduledate',
+            tableId: "6038Table2",
+            tableName: "工作日历表2",
+            columnProp: "scheduledate",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "日期",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
           },
-          CESearchData:{
-            site:'',
-            calendarId:'',
-            calendarDesc:'',
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6038,
+            serialNumber: '6038Table2Datetype',
+            tableId: "6038Table2",
+            tableName: "工作日历表2",
+            columnProp: "datetype",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "工作日类型",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
           },
-          maintainCalendarSearchData:{
-            site:this.$store.state.user.site.toString(),
-            calendarId:'',
-            calendarDesc:'',
-            startDate:'',
-            endDate:'',
-            datetype:'',
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6038,
+            serialNumber: '6038Table2Worktime',
+            tableId: "6038Table2",
+            tableName: "工作日历表2",
+            columnProp: "worktime",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "累计工作时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
           },
-          dataList:[],
-          dataList2:[],
-          dataList3:[],
-          timeArray:[],
-          valueList:[],
-          valList:[],
-          dataListSelections:[],
-        }
-      },
-      mounted() {
-        this.$nextTick(()=>{
-          this.height = window.innerHeight - 150;
-        })
-      },
-      watch: {
-        '$route' (to, from) {
-          if(localStorage.getItem('calendar')!=undefined){
-            this.jump();
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6038,
+            serialNumber: '6038Table2Exceptexacttime1',
+            tableId: "6038Table2",
+            tableName: "工作日历表2",
+            columnProp: "exceptexacttime1",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "休息时间点1",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6038,
+            serialNumber: '6038Table2Exceptduration1',
+            tableId: "6038Table2",
+            tableName: "工作日历表2",
+            columnProp: "exceptduration1",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "休息时长1",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6038,
+            serialNumber: '6038Table2Exceptexacttime2',
+            tableId: "6038Table2",
+            tableName: "工作日历表2",
+            columnProp: "exceptexacttime2",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "休息时间点2",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6038,
+            serialNumber: '6038Table2Exceptduration2',
+            tableId: "6038Table2",
+            tableName: "工作日历表2",
+            columnProp: "exceptduration2",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "休息时长2",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6038,
+            serialNumber: '6038Table2Exceptexacttime3',
+            tableId: "6038Table2",
+            tableName: "工作日历表2",
+            columnProp: "exceptexacttime3",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "休息时间点3",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6038,
+            serialNumber: '6038Table2Exceptduration3',
+            tableId: "6038Table2",
+            tableName: "工作日历表2",
+            columnProp: "exceptduration3",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "休息时长3",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6038,
+            serialNumber: '6038Table2Exceptexacttime4',
+            tableId: "6038Table2",
+            tableName: "工作日历表2",
+            columnProp: "exceptexacttime4",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "休息时间点4",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6038,
+            serialNumber: '6038Table2Exceptduration4',
+            tableId: "6038Table2",
+            tableName: "工作日历表2",
+            columnProp: "exceptduration4",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "休息时长4",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6038,
+            serialNumber: '6038Table2Exceptexacttime5',
+            tableId: "6038Table2",
+            tableName: "工作日历表2",
+            columnProp: "exceptexacttime5",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "休息时间点5",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6038,
+            serialNumber: '6038Table2Exceptduration5',
+            tableId: "6038Table2",
+            tableName: "工作日历表2",
+            columnProp: "exceptduration5",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "休息时长5",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6038,
+            serialNumber: '6038Table2Exceptexacttime6',
+            tableId: "6038Table2",
+            tableName: "工作日历表2",
+            columnProp: "exceptexacttime6",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "休息时间点6",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6038,
+            serialNumber: '6038Table2Exceptduration6',
+            tableId: "6038Table2",
+            tableName: "工作日历表2",
+            columnProp: "exceptduration6",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "休息时长6",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
           }
+        ],
+        columnList3: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6038,
+            serialNumber: '6038Table3Site',
+            tableId: "6038Table3",
+            tableName: "工作日历表3",
+            columnProp: "site",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "工厂编码",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6038,
+            serialNumber: '6038Table3CalendarId',
+            tableId: "6038Table3",
+            tableName: "工作日历表3",
+            columnProp: "calendarId",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "日历编码",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6038,
+            serialNumber: '6038Table3CalendarDesc',
+            tableId: "6038Table3",
+            tableName: "工作日历表3",
+            columnProp: "calendarDesc",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "日历描述",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+        ],
+        maintainColumnList2: [],
+        height: '200',
+        searchData: {
+          site: '',
+          calendarId: '',
+          status: '使用中',
         },
-        newCalendarData: {
-          deep: true,
-          handler: function (newV, oldV) {
-            this.newCalendarData.calendarId = this.newCalendarData.calendarId.toUpperCase()
-          }
+        CESearchData: {
+          site: '',
+          calendarId: '',
+          calendarDesc: '',
         },
-        searchData: {
-          deep: true,
-          handler: function (newV, oldV) {
-            this.searchData.calendarId = this.searchData.calendarId.toUpperCase()
-          }
+        maintainCalendarSearchData: {
+          site: this.$store.state.user.site.toString(),
+          calendarId: '',
+          calendarDesc: '',
+          startDate: '',
+          endDate: '',
+          datetype: '',
+        },
+        dataList: [],
+        dataList2: [],
+        dataList3: [],
+        timeArray: [],
+        valueList: [],
+        valList: [],
+        dataListSelections: [],
+      }
+    },
+    mounted() {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 150;
+      })
+    },
+    watch: {
+      '$route'(to, from) {
+        if (localStorage.getItem('calendar') != undefined) {
+          this.jump();
+        }
+      },
+      newCalendarData: {
+        deep: true,
+        handler: function (newV, oldV) {
+          this.newCalendarData.calendarId = this.newCalendarData.calendarId.toUpperCase()
         }
       },
-      methods: {
-        jump(){
-          let data=JSON.parse(localStorage.getItem('calendar'));
-          localStorage.removeItem('calendar');
-          getCalendarData(data).then(({data}) => {
+      searchData: {
+        deep: true,
+        handler: function (newV, oldV) {
+          this.searchData.calendarId = this.searchData.calendarId.toUpperCase()
+        }
+      }
+    },
+    methods: {
+      jump() {
+        let data = JSON.parse(localStorage.getItem('calendar'));
+        localStorage.removeItem('calendar');
+        getCalendarData(data).then(({data}) => {
+          this.dataList = data.rows
+        })
+      },
+      // 多选数据
+      selectionChangeHandle(val) {
+        this.dataListSelections = val
+      },
+      getData() {
+        if (localStorage.getItem('calendar') != undefined) {
+          this.jump();
+        } else {
+          getCalendarData(this.searchData).then(({data}) => {
             this.dataList = data.rows
           })
-        },
-        // 多选数据
-        selectionChangeHandle (val) {
-          this.dataListSelections = val
-        },
-        getData(){
-          if(localStorage.getItem('calendar')!=undefined){
-            this.jump();
-          }else {
-            getCalendarData(this.searchData).then(({data}) => {
-              this.dataList = data.rows
+        }
+      },
+      newCalendarModel() {
+        this.newCalendarData.id = 0,
+          this.newCalendarData.site = this.$store.state.user.site,
+          this.newCalendarData.calendarId = '',
+          this.newCalendarData.calendarDesc = '',
+          this.newCalendarData.status = '使用中',
+          this.calendarModelDisableFlag = false;
+        this.calendarModelFlag = true;
+      },
+      editData(row) {
+        this.newCalendarData.id = 1,
+          this.newCalendarData.site = row.site,
+          this.newCalendarData.calendarId = row.calendarId,
+          this.newCalendarData.calendarDesc = row.calendarDesc,
+          this.newCalendarData.status = row.status,
+          this.calendarModelDisableFlag = true;
+        this.calendarModelFlag = true;
+      },
+      calendarSave() {
+        saveCalendar(this.newCalendarData).then(({data}) => {
+          if (data.code == 200) {
+            this.getData()
+            this.calendarModelFlag = false;
+            this.$message.success('操作成功')
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
             })
           }
-        },
-        newCalendarModel(){
-          this.newCalendarData.id=0,
-          this.newCalendarData.site=this.$store.state.user.site,
-          this.newCalendarData.calendarId='',
-          this.newCalendarData.calendarDesc='',
-          this.newCalendarData.status='使用中',
-          this.calendarModelDisableFlag=false;
-          this.calendarModelFlag=true;
-        },
-        editData(row){
-          this.newCalendarData.id=1,
-            this.newCalendarData.site=row.site,
-            this.newCalendarData.calendarId=row.calendarId,
-            this.newCalendarData.calendarDesc=row.calendarDesc,
-            this.newCalendarData.status=row.status,
-            this.calendarModelDisableFlag=true;
-          this.calendarModelFlag=true;
-        },
-        calendarSave(){
-          saveCalendar(this.newCalendarData).then(({data}) => {
+        })
+      },
+      delData(row) {
+        this.$confirm(`是否删除此条工作日历?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+
+        }).then(() => {
+          let inData = {
+            site: row.site.toString(),
+            calendarId: row.calendarId,
+          }
+          delCalendar(inData).then(({data}) => {
             if (data.code == 200) {
               this.getData()
-              this.calendarModelFlag=false;
               this.$message.success('操作成功')
             } else {
               this.$alert(data.msg, '错误', {
@@ -1034,331 +1188,356 @@
               })
             }
           })
-        },
-        delData(row){
-          this.$confirm(`是否删除此条工作日历?`, '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-
-          }).then(() => {
-            let inData={
-              site:row.site.toString(),
-              calendarId:row.calendarId,
+        })
+      },
+      getCEModel(row) {
+        this.CESearchData.site = row.site;
+        this.CESearchData.calendarDesc = row.calendarDesc;
+        this.CESearchData.calendarId = row.calendarId;
+        this.CEFlag = true;
+        getCalendarExceptionData(this.CESearchData).then(({data}) => {
+          this.dataList2 = data.rows
+        })
+      },
+      maintainCalendar() {
+        this.getSelectData();
+        this.maintainCalendarSearchData.calendarId = '';
+        this.maintainCalendarSearchData.calendarDesc = '';
+        this.maintainCalendarSearchData.startDate = this.GetDateStr(0);
+        this.maintainCalendarSearchData.endDate = this.GetDateStr(7);
+        this.refreshModel();
+        this.maintainCalendarFlag = true;
+      },
+      refreshModel() {
+        this.getAll();
+        let mainData = {
+          site: this.$store.state.user.site.toString(),
+          calendarId: this.maintainCalendarSearchData.calendarId,
+          calendarDesc: this.maintainCalendarSearchData.calendarDesc,
+        }
+        getCalendarData(mainData).then(({data}) => {
+          let list = data.rows;
+          if (list.length > 0) {
+            for (let i = 0; i < list.length; i++) {
+              list[i].val0 = this.maintainCalendarSearchData.datetype;
+              list[i].val1 = this.maintainCalendarSearchData.datetype;
+              list[i].val2 = this.maintainCalendarSearchData.datetype;
+              list[i].val3 = this.maintainCalendarSearchData.datetype;
+              list[i].val4 = this.maintainCalendarSearchData.datetype;
+              list[i].val5 = this.maintainCalendarSearchData.datetype;
+              list[i].val6 = this.maintainCalendarSearchData.datetype;
             }
-            delCalendar(inData).then(({data}) => {
-              if (data.code == 200) {
-                this.getData()
-                this.$message.success( '操作成功')
-              } else {
-                this.$alert(data.msg, '错误', {
-                  confirmButtonText: '确定'
-                })
-              }
-            })
-          })
-        },
-        getCEModel(row){
-          this.CESearchData.site=row.site;
-          this.CESearchData.calendarDesc=row.calendarDesc;
-          this.CESearchData.calendarId=row.calendarId;
-          this.CEFlag=true;
-          getCalendarExceptionData(this.CESearchData).then(({data}) => {
-            this.dataList2 = data.rows
-          })
-        },
-        maintainCalendar(){
-          this.getSelectData();
-          this.maintainCalendarSearchData.calendarId='';
-          this.maintainCalendarSearchData.calendarDesc='';
-          this.maintainCalendarSearchData.startDate= this.GetDateStr(0);
-          this.maintainCalendarSearchData.endDate=this.GetDateStr(7);
-          this.refreshModel();
-          this.maintainCalendarFlag=true;
-        },
-        refreshModel(){
-          this.getAll();
-          let mainData={
-            site:this.$store.state.user.site.toString(),
-            calendarId:this.maintainCalendarSearchData.calendarId,
-            calendarDesc:this.maintainCalendarSearchData.calendarDesc,
           }
-          getCalendarData(mainData).then(({data}) => {
-            let list=data.rows;
-            if(list.length>0){
-              for (let i = 0; i <list.length ; i++) {
-                list[i].val0=this.maintainCalendarSearchData.datetype;
-                list[i].val1=this.maintainCalendarSearchData.datetype;
-                list[i].val2=this.maintainCalendarSearchData.datetype;
-                list[i].val3=this.maintainCalendarSearchData.datetype;
-                list[i].val4=this.maintainCalendarSearchData.datetype;
-                list[i].val5=this.maintainCalendarSearchData.datetype;
-                list[i].val6=this.maintainCalendarSearchData.datetype;
-              }
+          this.dataList3 = list;
+        })
+      },
+      getSelections() {
+
+      },
+      getSelectData() {
+        this.selectList = [];
+        let newData = {
+          value: '',
+          label: '请选择',
+        }
+        this.selectList.push(newData)
+        let inputData = {
+          site: this.$store.state.user.site.toString()
+        };
+        calendarDatetypeInfo(inputData).then(({data}) => {
+          let list = data.rows
+          this.maintainCalendarSearchData.datetype = list[0].datetype;
+          for (let i = 0; i < list.length; i++) {
+            let resultData = {
+              value: list[i].datetype,
+              label: list[i].datetype
             }
-            this.dataList3 = list;
+            this.selectList.push(resultData)
+          }
+        })
+      },
+      //获取日期
+      GetDateStr(AddDayCount) {
+        var dd = new Date();
+        dd.setDate(dd.getDate() + AddDayCount);//获取AddDayCount天后的日期
+        var y = dd.getFullYear();
+        var m = (dd.getMonth() + 1) < 10 ? "0" + (dd.getMonth() + 1) : (dd.getMonth() + 1);//获取当前月份的日期，不足10补0
+        var d = dd.getDate() < 10 ? "0" + dd.getDate() : dd.getDate();//获取当前几号，不足10补0
+        return y + "-" + m + "-" + d;
+      },
+      //获取区间所有时间并生成动态列
+      getAll() {
+        let begin = this.maintainCalendarSearchData.startDate;
+        var dd = new Date(begin);
+        dd.setDate(dd.getDate() + 6);//获取AddDayCount天后的日期
+        var y = dd.getFullYear();
+        var m = (dd.getMonth() + 1) < 10 ? "0" + (dd.getMonth() + 1) : (dd.getMonth() + 1);//获取当前月份的日期，不足10补0
+        var d = dd.getDate() < 10 ? "0" + dd.getDate() : dd.getDate();//获取当前几号，不足10补0
+        let end = y + "-" + m + "-" + d;
+        var startNum = parseInt(begin.replace(/-/g, ''), 10);
+        var endNum = parseInt(end.replace(/-/g, ''), 10);
+        if (startNum > endNum) {
+          this.$alert('结束时间不能在开始时间之前！', '错误', {
+            confirmButtonText: '确定'
           })
-        },
-        getSelections(){
+          return false;
+        }
+        if (this.DateDiff(begin, end) > 9) {
+          this.$alert('时间不得相差10天！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        this.timeArray = [];
+        this.maintainColumnList2 = [];
+        let ab = begin.split("-");
+        let ae = end.split("-");
+        let db = new Date();
+        db.setUTCFullYear(ab[0], ab[1] - 1, ab[2]);
+        let de = new Date();
+        de.setUTCFullYear(ae[0], ae[1] - 1, ae[2]);
+        let unixDb = db.getTime();
+        let unixDe = de.getTime();
+        for (let k = unixDb; k <= unixDe;) {
+          this.timeArray.push(this.dateFormat(new Date(parseInt(k))));
+          k = k + 24 * 60 * 60 * 1000;
+        }
 
-         },
-        getSelectData () {
-          this.selectList = [];
-          let newData={
-            value:'',
-            label:'请选择',
-          }
-          this.selectList.push(newData)
-          let inputData={
-            site:this.$store.state.user.site.toString()
-          };
-          calendarDatetypeInfo(inputData).then(({data}) => {
-            let list = data.rows
-            this.maintainCalendarSearchData.datetype= list[0].datetype;
-            for (let i = 0; i < list.length; i++) {
-              let resultData = {
-                value: list[i].datetype,
-                label: list[i].datetype
-              }
-              this.selectList.push(resultData)
+        for (let i = 0; i < this.timeArray.length; i++) {
+          let property = this.timeArray[i];
+          let val = "val" + i;
+          this.maintainColumnList2.push(
+            {
+              columnProp: val,
+              headerAlign: 'center',
+              align: 'left',
+              width: '100px',
+              columnLabel: property,
+              value: '',
             }
-          })
-        },
-        //获取日期
-        GetDateStr(AddDayCount) {
-          var dd = new Date();
-          dd.setDate(dd.getDate()+AddDayCount);//获取AddDayCount天后的日期
-          var y = dd.getFullYear();
-          var m = (dd.getMonth()+1)<10?"0"+(dd.getMonth()+1):(dd.getMonth()+1);//获取当前月份的日期，不足10补0
-          var d = dd.getDate()<10?"0"+dd.getDate():dd.getDate();//获取当前几号，不足10补0
-          return y+"-"+m+"-"+d;
-        },
-        //获取区间所有时间并生成动态列
-        getAll(){
-          let begin=this.maintainCalendarSearchData.startDate;
-          var dd = new Date(begin);
-          dd.setDate(dd.getDate()+6);//获取AddDayCount天后的日期
-          var y = dd.getFullYear();
-          var m = (dd.getMonth()+1)<10?"0"+(dd.getMonth()+1):(dd.getMonth()+1);//获取当前月份的日期，不足10补0
-          var d = dd.getDate()<10?"0"+dd.getDate():dd.getDate();//获取当前几号，不足10补0
-          let end=y+"-"+m+"-"+d;
-          var startNum = parseInt(begin.replace(/-/g, ''), 10);
-          var endNum = parseInt(end.replace(/-/g, ''), 10);
-          if (startNum > endNum) {
-            this.$alert('结束时间不能在开始时间之前！', '错误', {
-              confirmButtonText: '确定'
-            })
-            return false;
-          }
-          if(this.DateDiff(begin, end)>9){
-            this.$alert('时间不得相差10天！', '错误', {
+          );
+        }
+      },
+      // getAll(){
+      //   let begin=this.maintainCalendarSearchData.startDate;
+      //   let end=this.maintainCalendarSearchData.endDate;
+      //   var startNum = parseInt(begin.replace(/-/g, ''), 10);
+      //   var endNum = parseInt(end.replace(/-/g, ''), 10);
+      //   if (startNum > endNum) {
+      //     this.$alert('结束时间不能在开始时间之前！', '错误', {
+      //       confirmButtonText: '确定'
+      //     })
+      //     return false;
+      //   }
+      //   if(this.DateDiff(begin, end)>9){
+      //     this.$alert('时间不得相差10天！', '错误', {
+      //       confirmButtonText: '确定'
+      //     })
+      //     return false;
+      //   }
+      //   this.timeArray = [];
+      //   this.maintainColumnList2=[];
+      //   let ab = begin.split("-");
+      //   let ae = end.split("-");
+      //   let db = new Date();
+      //   db.setUTCFullYear(ab[0], ab[1]-1, ab[2]);
+      //   let de = new Date();
+      //   de.setUTCFullYear(ae[0], ae[1]-1, ae[2]);
+      //   let unixDb=db.getTime();
+      //   let unixDe=de.getTime();
+      //   for(let k=unixDb;k<=unixDe;){
+      //     this.timeArray.push(this.dateFormat(new Date(parseInt(k))));
+      //     k=k+24*60*60*1000;
+      //   }
+      //
+      //   for (let i = 0; i <this.timeArray.length ; i++) {
+      //     let property = this.timeArray[i];
+      //     let val = "val"+i;
+      //     this.maintainColumnList2.push(
+      //       {
+      //         columnProp:val,
+      //         headerAlign:'center',
+      //         align:'left',
+      //         width:'100px',
+      //         columnLabel:property,
+      //         value:'',
+      //       }
+      //     );
+      //   }
+      // },
+      dateFormat(date) {
+        let s = '';
+        s += date.getFullYear() + '-';          // 获取年份。
+        s += (date.getMonth() + 1) + "-";         // 获取月份。
+        s += date.getDate();                 // 获取日。
+        return (s);                          // 返回日期。
+      },
+      //计算两个日期相差多少天
+      DateDiff(sDate1, sDate2) {
+        let aDate = sDate1.split("-");
+        let oDate1 = new Date(aDate[1] + '-' + aDate[2] + '-' + aDate[0]);  //转换为yyyy-MM-dd格式
+        aDate = sDate2.split("-");
+        let oDate2 = new Date(aDate[1] + '-' + aDate[2] + '-' + aDate[0]);
+        let iDays = parseInt(Math.abs(oDate1 - oDate2) / 1000 / 60 / 60 / 24);
+        return iDays;
+      },
+      saveList() {
+        let inData = {
+          timeList: this.timeArray,
+          batchCDVoList: this.dataListSelections
+        }
+        batchSaveCDData(inData).then(({data}) => {
+          if (data && data.code == 200) {
+            this.maintainCalendarFlag = false
+            this.$message.success('操作成功')
+          } else {
+            this.$alert(data.msg, '错误', {
               confirmButtonText: '确定'
             })
-            return false;
-          }
-          this.timeArray = [];
-          this.maintainColumnList2=[];
-          let ab = begin.split("-");
-          let ae = end.split("-");
-          let db = new Date();
-          db.setUTCFullYear(ab[0], ab[1]-1, ab[2]);
-          let de = new Date();
-          de.setUTCFullYear(ae[0], ae[1]-1, ae[2]);
-          let unixDb=db.getTime();
-          let unixDe=de.getTime();
-          for(let k=unixDb;k<=unixDe;){
-            this.timeArray.push(this.dateFormat(new Date(parseInt(k))));
-            k=k+24*60*60*1000;
-          }
-
-          for (let i = 0; i <this.timeArray.length ; i++) {
-            let property = this.timeArray[i];
-            let val = "val"+i;
-            this.maintainColumnList2.push(
-              {
-                columnProp:val,
-                headerAlign:'center',
-                align:'left',
-                width:'100px',
-                columnLabel:property,
-                value:'',
-              }
-            );
           }
-        },
-        // getAll(){
-        //   let begin=this.maintainCalendarSearchData.startDate;
-        //   let end=this.maintainCalendarSearchData.endDate;
-        //   var startNum = parseInt(begin.replace(/-/g, ''), 10);
-        //   var endNum = parseInt(end.replace(/-/g, ''), 10);
-        //   if (startNum > endNum) {
-        //     this.$alert('结束时间不能在开始时间之前！', '错误', {
-        //       confirmButtonText: '确定'
-        //     })
-        //     return false;
-        //   }
-        //   if(this.DateDiff(begin, end)>9){
-        //     this.$alert('时间不得相差10天！', '错误', {
-        //       confirmButtonText: '确定'
-        //     })
-        //     return false;
-        //   }
-        //   this.timeArray = [];
-        //   this.maintainColumnList2=[];
-        //   let ab = begin.split("-");
-        //   let ae = end.split("-");
-        //   let db = new Date();
-        //   db.setUTCFullYear(ab[0], ab[1]-1, ab[2]);
-        //   let de = new Date();
-        //   de.setUTCFullYear(ae[0], ae[1]-1, ae[2]);
-        //   let unixDb=db.getTime();
-        //   let unixDe=de.getTime();
-        //   for(let k=unixDb;k<=unixDe;){
-        //     this.timeArray.push(this.dateFormat(new Date(parseInt(k))));
-        //     k=k+24*60*60*1000;
-        //   }
-        //
-        //   for (let i = 0; i <this.timeArray.length ; i++) {
-        //     let property = this.timeArray[i];
-        //     let val = "val"+i;
-        //     this.maintainColumnList2.push(
-        //       {
-        //         columnProp:val,
-        //         headerAlign:'center',
-        //         align:'left',
-        //         width:'100px',
-        //         columnLabel:property,
-        //         value:'',
-        //       }
-        //     );
-        //   }
-        // },
-        dateFormat(date){
-          let s='';
-          s+=date.getFullYear()+'-';          // 获取年份。
-          s+=(date.getMonth()+1)+"-";         // 获取月份。
-          s+= date.getDate();                 // 获取日。
-          return(s);                          // 返回日期。
-        },
-        //计算两个日期相差多少天
-        DateDiff(sDate1, sDate2) {
-          let aDate = sDate1.split("-");
-          let oDate1 = new Date(aDate[1] + '-' + aDate[2] + '-' + aDate[0]);  //转换为yyyy-MM-dd格式
-          aDate = sDate2.split("-");
-          let oDate2 = new Date(aDate[1] + '-' + aDate[2] + '-' + aDate[0]);
-          let iDays = parseInt(Math.abs(oDate1 - oDate2) / 1000 / 60 / 60 / 24);
-          return iDays;
-        },
-        saveList() {
-          let inData = {
-            timeList: this.timeArray,
-            batchCDVoList: this.dataListSelections
-          }
-          batchSaveCDData(inData).then(({data}) => {
-            if (data && data.code == 200) {
-              this.maintainCalendarFlag = false
-             this.$message.success('操作成功')
-            } else {
-              this.$alert(data.msg, '错误', {
-                confirmButtonText: '确定'
-              })
-            }
-          })
-        },
-        //导出excel
-        createExportData() {
-
-          return this.dataList;
+        })
+      },
+      //导出excel
+      createExportData() {
 
-        },
-        startDownload() {
-          //  this.exportData = this.dataList
+        return this.dataList;
 
-        },
-        finishDownload() {
+      },
+      startDownload() {
+        //  this.exportData = this.dataList
 
-        },
-        fields() {
-          let json = "{"
-          this.columnList.forEach((item, index) => {
-            if (index == this.columnList.length - 1) {
-              json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
-            } else {
-              json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
-            }
-          })
-          json += "}"
-          let s = eval("(" + json + ")")
+      },
+      finishDownload() {
 
-          return s
-        },
-        // 导出 end
-        //导出excel
-        createExportData2() {
+      },
+      fields() {
+        let json = "{"
+        this.columnList.forEach((item, index) => {
+          if (index == this.columnList.length - 1) {
+            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
+          } else {
+            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
+          }
+        })
+        json += "}"
+        let s = eval("(" + json + ")")
 
-          return this.dataList2;
+        return s
+      },
+      // 导出 end
+      //导出excel
+      createExportData2() {
 
-        },
-        startDownload2() {
-          //  this.exportData = this.dataList
+        return this.dataList2;
 
-        },
-        finishDownload2() {
+      },
+      startDownload2() {
+        //  this.exportData = this.dataList
 
-        },
-        fields2() {
-          let json = "{"
-          this.columnList2.forEach((item, index) => {
-            if (index == this.columnList2.length - 1) {
-              json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
-            } else {
-              json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
-            }
-          })
-          json += "}"
-          let s = eval("(" + json + ")")
+      },
+      finishDownload2() {
 
-          return s
-        },
-        // 导出 end
-        shiftModal(row){
-          let inData={
-            site:row.site,
-            scheduledate:row.scheduledate,
-            calendarId:row.calendarId
+      },
+      fields2() {
+        let json = "{"
+        this.columnList2.forEach((item, index) => {
+          if (index == this.columnList2.length - 1) {
+            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
+          } else {
+            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
           }
-          getCalendarExceptionShiftData(inData).then(({data}) => {
-            this.dataList4=data.rows;
-            this.shiftFlag=true;
-          })
-        },
-        editShift(row){
-          this.newShiftData=row;
-          this.updateShiftFlag=true;
-        },
-        updateCESShift(){
-          updateCESShift(this.newShiftData).then(({data}) => {
-            if(data.code===0){
-              getCalendarExceptionData(this.CESearchData).then(({data}) => {
-                this.dataList2 = data.rows
-              })
-              this.updateShiftFlag=false;
-              this.$message.success('保存成功')
-            }else {
-              this.$alert(data.msg, '错误', {
-                confirmButtonText: '确定'
-              })
-            }
-          })
+        })
+        json += "}"
+        let s = eval("(" + json + ")")
+
+        return s
+      },
+      // 导出 end
+      shiftModal(row) {
+        let inData = {
+          site: row.site,
+          scheduledate: row.scheduledate,
+          calendarId: row.calendarId
+        }
+        getCalendarExceptionShiftData(inData).then(({data}) => {
+          this.dataList4 = data.rows;
+          this.shiftFlag = true;
+        })
+      },
+      // 编辑班次
+      editShiftModal(row) {
+        this.workDateDialog = true
+        this.workingCalendar = JSON.parse(JSON.stringify(row))
+        this.getcalendarDatetype()
+      },
+      // 获取工作类型
+      getcalendarDatetype() {
+        let dto = {
+          site: this.workingCalendar.site
         }
+        calendarDatetypeInfo(dto).then(({data}) => {
+          this.calendarDatetype = data.rows
+        })
+      },
+      // 选择班次类型之后
+      selectDateType() {
+        getCalendarDatetypeInfo(this.workingCalendar).then(({data}) =>{
+          if (data && data.code == 0){
+            this.workingCalendar.exceptexacttime1 = data.data.exceptexacttime1
+            this.workingCalendar.exceptduration1 = data.data.exceptduration1
+            this.workingCalendar.exceptexacttime2 = data.data.exceptexacttime2
+            this.workingCalendar.exceptduration2 = data.data.exceptduration2
+            this.workingCalendar.exceptexacttime3 = data.data.exceptexacttime3
+            this.workingCalendar.exceptduration3 = data.data.exceptduration3
+            this.workingCalendar.exceptexacttime4 = data.data.exceptexacttime4
+            this.workingCalendar.exceptduration4 = data.data.exceptduration4
+            this.workingCalendar.exceptexacttime5 = data.data.exceptexacttime5
+            this.workingCalendar.exceptduration5 = data.data.exceptduration5
+            this.workingCalendar.exceptexacttime6 = data.data.exceptexacttime6
+            this.workingCalendar.exceptduration6 = data.data.exceptduration6
+          }
+
+        })
       },
-      created() {
-        this.getData()
+      // 保存修改后的班次信息
+      updateWorkingCalendar(){
+        updateWorkingCalendar(this.workingCalendar).then(({data}) => {
+              if (data && data.code == 0){
+                this.$message.success(data.msg)
+                this.workDateDialog = false
+                this.getCEModel(this.workingCalendar)
+              }else {
+                this.$message.warning(data.msg)
+              }
+        })
+      },
+      editShift(row) {
+        this.newShiftData = row;
+        this.updateShiftFlag = true;
+      },
+      updateCESShift() {
+        updateCESShift(this.newShiftData).then(({data}) => {
+          if (data.code === 0) {
+            getCalendarExceptionData(this.CESearchData).then(({data}) => {
+              this.dataList2 = data.rows
+            })
+            this.updateShiftFlag = false;
+            this.$message.success('保存成功')
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
       }
+    },
+    created() {
+      this.getData()
     }
+  }
 </script>
 
-<style >
+<style>
   .calendar .el-table .cell {
     height: 28px;
   }