From 1a0dc92ff4bcabb47ca27900c28ce21ccda0967e Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Thu, 13 Jan 2022 13:46:04 +0800
Subject: [PATCH] =?UTF-8?q?0823=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/base/site.js                        |   26 +
 src/api/chooselist/chooselist.js            |    7 +
 src/assets/scss/global.scss                 |  205 +-
 src/views/modules/base/calendar.vue         | 1871 +++++++++----------
 src/views/modules/base/calendarDatetype.vue | 1568 ++++++++--------
 src/views/modules/base/workCenter.vue       | 1387 ++++++++++++++
 src/views/modules/common/Chooselist.vue     |  198 ++
 7 files changed, 3516 insertions(+), 1746 deletions(-)
 create mode 100644 src/api/base/site.js
 create mode 100644 src/api/chooselist/chooselist.js
 create mode 100644 src/views/modules/base/workCenter.vue
 create mode 100644 src/views/modules/common/Chooselist.vue

diff --git a/src/api/base/site.js b/src/api/base/site.js
new file mode 100644
index 0000000..7332225
--- /dev/null
+++ b/src/api/base/site.js
@@ -0,0 +1,26 @@
+import { createAPI } from "@/utils/httpRequest.js";
+
+//------------加工中心----------------
+// 加工中心数据
+export const getWorkCenterData = data => createAPI(`/base/getWorkCenterData`,'post',data)
+// 获取加工中心子数据
+export const getWorkCenterDataDetail = data => createAPI(`/base/getWorkCenterDataDetail`,'post',data)
+
+// 生产线数据
+export const getProLineNoDetail = data => createAPI(`/base/getProLineNoDetail`,'post',data)
+// 保存加工中心数据
+export const saveWorkCenterData = data => createAPI(`/base/saveWorkCenterData`,'post',data)
+// 删除加工中心数据
+export const deleteWorkCenterData = data => createAPI(`/base/deleteWorkCenterData`,'post',data)
+
+//校验客户编号是否存在
+export const checkCustomerID = data => createAPI(`/base/checkCustomerID`,'post',data)
+//保存机台
+export const saveResource = data => createAPI(`/base/saveResource`,'post',data)
+//删除机台
+export const deleteResource = data => createAPI(`/base/deleteResource`,'post',data)
+
+//删除机台
+export const setResourceFlag = data => createAPI(`/base/setResourceFlag`,'post',data)
+
+export const searchPartNoData = data => createAPI(`/base/searchPartNoData`,'post',data)
diff --git a/src/api/chooselist/chooselist.js b/src/api/chooselist/chooselist.js
new file mode 100644
index 0000000..75b72c8
--- /dev/null
+++ b/src/api/chooselist/chooselist.js
@@ -0,0 +1,7 @@
+import { createAPI } from "@/utils/httpRequest.js";
+
+
+export const getChooselist = data => createAPI(`/chooselist/getChooselist/${data.tagNo}`,'get',data)
+
+
+export const getChooselistData = data => createAPI(`/chooselist/getChooselistData`,'post',data)
diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss
index fa96f3c..2097949 100644
--- a/src/assets/scss/global.scss
+++ b/src/assets/scss/global.scss
@@ -14,27 +14,31 @@
   padding: 0 45px;
   min-width: 200px;
 }
+.site-sidebar__inner {
+  width: 256px;
+}
+.site-sidebar__inner {
+  width: 260px;
+}
 /* 侧边导航栏 end*/
 
 /*table start*/
-
 .el-table th {
   display: table-cell !important;
   background-color: #17b3a3;
   color: #fff;
   height: 20px;
-
 }
+
 .el-table .cell {
   line-height: 14px;
   font-size: 12px;
-  height: 15px;
+  height: 14px;
 }
 .el-input--medium .el-input__inner {
   height: 28px;
   line-height: 20px;
 }
-
 .el-table--medium td, .el-table--medium th {
   padding: 5px 0;
 }
@@ -52,7 +56,6 @@
 .el-select-dropdown__item {
   font-size: 12px;
 }
-
 .el-form-item {
   margin-bottom: 0px;
 }
@@ -60,7 +63,6 @@
   width: 12px;
   height: 11px;
 }
-
 /* 输入框 end*/
 
 
@@ -95,12 +97,23 @@
 
 /* el-dialog  start*/
 .el-dialog__body{
-  padding: 0px 20px;
+  padding: 0px 10px;
 }
 /* el-dialog  end*/
 
+/* el-form-item 间距 start*/
+.el-form--label-top .el-form-item__label {
+  float: none;
+  display: inline-block;
+  text-align: left;
+  padding: 0px 0 0px;
+
+}
+/* el-form-item 间距 end*/
+
 
 /* el-form-item 间距 start*/
+
 .el-form--label-top .el-form-item__label {
   float: none;
   display: inline-block;
@@ -111,26 +124,18 @@
 .el-form-item--medium .el-form-item__content, .el-form-item--medium .el-form-item__label {
   line-height: 30px;
 }
-/* el-form-item 间距 end*/
 
-/* el-form-item 对话框标题 start*/
-.el-dialog__title{
-  font-size: 14px;
-  font-weight: bold;
+.el-form-item--mini.el-form-item, .el-form-item--small.el-form-item {
+  margin-bottom: 1px;
 }
-/* el-form-item 对话框标题 end*/
+/* el-form-item 间距 end*/
 
-/* el-form-item 控件标题 start*/
-.el-form-item__label{
-  font-size: 12px;
+/* 提示消息 start  */
+.el-message{
+  margin-top: 20%;
 }
-/* el-form-item 控件标题 end*/
+/* end */
 
-/* el-form-item 时间选择器图标 start*/
-.el-input--medium .el-input__icon {
-  line-height: 31px;
-}
-/* el-form-item 时间选择器图标 end*/
 
 
 /* 布局间距 */
@@ -172,6 +177,15 @@
   line-height: 40px;
 }
 
+/*按钮*/
+.el-dialog__footer {
+  padding: 10px 20px 20px;
+  text-align: center;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+}
+
+
 /*提示消息  按钮   确认在右 取消仔左*/
 .el-message-box__btns {
   padding: 5px 15px 0;
@@ -179,3 +193,150 @@
   flex-direction: row-reverse;
   gap: 10px;
 }
+
+/* 树结构label 字体*/
+.el-tree-node__label {
+  font-size: 12px;
+}
+/* form-item__label*/
+.el-form-item__label {
+  font-size: 12px;
+}
+
+/* checkbox__label */
+.el-checkbox__label {
+  font-size: 12px;
+}
+/* radio__label */
+.el-radio__label {
+  font-size: 12px;
+}
+
+
+.el-table .cell, .el-table th div, .el-table--border td:first-child .cell, .el-table--border th:first-child .cell {
+  padding-left: 5px;
+}
+.el-table .cell, .el-table th div {
+  padding-right: 4px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+/* 全局缩小行间距 LR*/
+/* 针对普通的input*/
+.el-form-item__content{
+  margin-top: -3px;
+}
+
+
+/*全局年与日类型  宽度*/
+div.el-time-width{
+  width: 120px !important;
+}
+/* 全局时间右边框*/
+input.el-input__inner{
+  height: 22px !important;
+  padding-right: 0px !important;
+}
+
+/* 时间框选择样式 */
+.customer-css span.el-input__prefix{
+  left: 1px;
+}
+/* 时间HH:MM的样式*/
+.el-input--prefix .el-input__inner {
+  padding-left: 23px;
+}
+
+/*  table单击选中行的样式 */
+.el-table__body tr.current-row > td{
+  background-color: #d9edf7 !important; ;
+  /* color: #f19944; */  /* 设置文字颜色，可以选择不设置 */
+}
+
+/*全局的fieldset样式*/
+.customer-fieldset{
+  padding: 0.125em;
+}
+/*全局fieldset的legend的样式*/
+.customer-fieldset > .customer-legend{
+  font-size: 12px;
+  line-height: 20px;
+}
+
+/*全局fieldset的页签内容的样式*/
+.customer-fieldset .el-tabs__item {
+  padding: 0 13px;
+  height: 26px;
+  line-height: 26px;
+  font-size: 12px;
+  font-weight: 500;
+}
+
+/*定制组件的样式*/
+.customer-css .el-dialog{
+  top: 10vh !important;
+  margin-top: 0px !important;
+  margin-bottom: 10px;
+}
+/* 定制模态框中 table的样式 */
+.customer-tab .el-table .is-leaf{
+  line-height: 16px;
+}
+
+/*.el-form {
+  margin-top: -8px !important;
+}*/
+
+
+
+// 2021-12-14 13:29 sxm
+.el-form-item--medium .el-form-item__label {
+  height: 20px;
+  line-height: 20px;
+}
+.el-input--medium .el-input__inner,.el-form-item--medium .el-form-item__content {
+  height: 24px;
+  line-height: 20px;
+}
+.el-input--medium .el-input__icon {
+  line-height: 20px;
+}
+
+.el-form-item--mini .el-form-item__content, .el-form-item--mini .el-form-item__label {
+  line-height: 20px;
+}
+.el-form-item--mini .el-form-item__label {
+  line-height: 20px;
+}
+
+
+// sxm 模态框 2021-12-22
+.el-dialog__header {
+  padding: 5px 10px 5px;
+}
+
+.el-dialog__footer {
+  padding: 5px 10px 5px;
+}
+.el-dialog--center .el-dialog__body {
+  text-align: initial;
+  padding: 0px 10px 0px;
+}
+
+.el-dialog__headerbtn {
+  position: absolute;
+  top: 5px;
+  right: 10px;
+  padding: 0;
+  background: 0 0;
+  border: none;
+  outline: 0;
+  cursor: pointer;
+  font-size: 16px;
+}
+
+
+
+
+
diff --git a/src/views/modules/base/calendar.vue b/src/views/modules/base/calendar.vue
index b94af77..438994b 100644
--- a/src/views/modules/base/calendar.vue
+++ b/src/views/modules/base/calendar.vue
@@ -46,7 +46,7 @@
         :show-overflow-tooltip="item.showOverflowTooltip"
         :align="item.align"
         :fixed="item.fixed"
-        :width="item.columnWidth"
+        :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
           <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
@@ -72,7 +72,7 @@
           <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" onblur="this.value=this.value.toUpperCase()"></el-input>
         </el-form-item>
         <el-form-item :label="'日历描述：'">
           <el-input v-model="newCalendarData.calendarDesc"  style="width: 130px"></el-input>
@@ -157,14 +157,14 @@
             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"
                      placeholder="请选择">
@@ -175,144 +175,143 @@
               :value="item.value">
             </el-option>
           </el-select>
+          <el-button @click="refreshModel()" type="primary" style="margin-top: 0px">{{'查询'}}</el-button>
+          <el-button @click="saveList()" type="primary" style="margin-top: 0px">{{'保存日历'}}</el-button>
         </el-form-item>
-        <el-form-item>
-          <el-button @click="refreshModel()" type="primary" style="margin-top: 33px">{{'查询'}}</el-button>
-          <el-button @click="saveList()" type="primary" style="margin-top: 33px">{{'保存日历'}}</el-button>
-        </el-form-item>
+
       </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"
-          :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"
+            :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-button type="primary" @click="maintainCalendarFlag = false">关闭</el-button>
@@ -322,534 +321,562 @@
 </template>
 
 <script>
-    import {
-      getCalendarData,
-      saveCalendar,
-      delCalendar,
-      getCalendarExceptionData,
-      calendarDatetypeInfo,
-      batchSaveCDData,
-    }from "@/api/base.js"
-    export default {
-      name: "calendar",
-      data () {
-        return {
-          // 导出 start
-          exportData: [],
-          exportName: "工厂日历"+this.dayjs().format('YYYYMMDDHHmmss'),
-          exportHeader: ["工厂日历"],
-          exportFooter: [],
-          // 导出 end
-          // 导出 start
-          exportData2: [],
-          exportName2: "工作日历例外"+this.dayjs().format('YYYYMMDDHHmmss'),
-          exportHeader2: ["工作日历例外"],
-          exportFooter2: [],
-          // 导出 end
-          buttons:{
-            download:'导出',
-            download2:'导出',
+  import {
+    getCalendarData,
+    saveCalendar,
+    delCalendar,
+    getCalendarExceptionData,
+    calendarDatetypeInfo,
+    batchSaveCDData,
+  }from "@/api/base.js"
+  export default {
+    name: "calendar",
+    data () {
+      return {
+        // 导出 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
           },
-          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: '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
+          },
+          {
+            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
           },
-          CESearchData:{
-            site:'',
-            calendarId:'',
-            calendarDesc:'',
+          {
+            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
           },
-          maintainCalendarSearchData:{
-            site:this.$store.state.user.site.toString(),
-            calendarId:'',
-            calendarDesc:'',
-            startDate:'',
-            endDate:'',
-            datetype:'',
+          {
+            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
           },
-          dataList:[],
-          dataList2:[],
-          dataList3:[],
-          timeArray:[],
-          valueList:[],
-          valList:[],
-          dataListSelections:[],
+          {
+            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:'使用中',
+        },
+        CESearchData:{
+          site:'',
+          calendarId:'',
+          calendarDesc:'',
+        },
+        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();
         }
-      },
-      mounted() {
-        this.$nextTick(()=>{
-          this.height = window.innerHeight - 190;
+      }
+    },
+    methods: {
+      jump(){
+        let data=JSON.parse(localStorage.getItem('calendar'));
+        localStorage.removeItem('calendar');
+        getCalendarData(data).then(({data}) => {
+          this.dataList = data.rows
         })
       },
-      watch: {
-        '$route' (to, from) {
-          if(localStorage.getItem('calendar')!=undefined){
-            this.jump();
-          }
-        }
+      // 多选数据
+      selectionChangeHandle (val) {
+        this.dataListSelections = val
       },
-      methods: {
-        jump(){
-          let data=JSON.parse(localStorage.getItem('calendar'));
-          localStorage.removeItem('calendar');
-          getCalendarData(data).then(({data}) => {
+      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='',
+        }
+      },
+      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}) => {
+        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({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+              }
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+      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({
                 message: '操作成功',
                 type: 'success',
@@ -863,310 +890,282 @@
               })
             }
           })
-        },
-        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({
-                  message: '操作成功',
-                  type: 'success',
-                  duration: 1500,
-                  onClose: () => {
-                  }
-                })
-              } 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: '确定'
+          );
+        }
+      },
+      // 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({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+              }
             })
-            return false;
-          }
-          if(this.DateDiff(begin, end)>9){
-            this.$alert('时间不得相差10天！', '错误', {
+          } 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({
-                message: '操作成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {
-                }
-              })
-            } else {
-              this.$alert(data.msg, '错误', {
-                confirmButtonText: '确定'
-              })
-            }
-          })
-        },
-        //导出excel
-        createExportData() {
+        })
+      },
+      //导出excel
+      createExportData() {
 
-          return this.dataList;
+        return this.dataList;
 
-        },
-        startDownload() {
-          //  this.exportData = this.dataList
+      },
+      startDownload() {
+        //  this.exportData = this.dataList
 
-        },
-        finishDownload() {
+      },
+      finishDownload() {
 
-        },
-        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 + ")")
+      },
+      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 s
-        },
-        // 导出 end
-        //导出excel
-        createExportData2() {
+        return s
+      },
+      // 导出 end
+      //导出excel
+      createExportData2() {
 
-          return this.dataList2;
+        return this.dataList2;
 
-        },
-        startDownload2() {
-          //  this.exportData = this.dataList
+      },
+      startDownload2() {
+        //  this.exportData = this.dataList
 
-        },
-        finishDownload2() {
+      },
+      finishDownload2() {
 
-        },
-        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 + ")")
+      },
+      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 + ")")
 
-          return s
-        },
-        // 导出 end
+        return s
       },
-      created() {
-        this.getData()
-      }
+      // 导出 end
+    },
+    created() {
+      this.getData()
     }
+  }
 </script>
 
 <style >
diff --git a/src/views/modules/base/calendarDatetype.vue b/src/views/modules/base/calendarDatetype.vue
index 3b50cb2..95a00c1 100644
--- a/src/views/modules/base/calendarDatetype.vue
+++ b/src/views/modules/base/calendarDatetype.vue
@@ -1,24 +1,24 @@
 <template>
   <div class="mod-config">
     <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 5px;">
-    <el-form-item>
-      <el-button @click="newData()" type="primary" style="margin-left: 2px">{{buttons.newData}}</el-button>
-      <el-button @click="searchList()" type="primary">{{buttons.searchList}}</el-button>
-      <download-excel
-        :fields="fields()"
-        :data="exportData"
-        type="xls"
-        :name="exportName"
-        :header="exportHeader"
-        :footer="exportFooter"
-        :fetch="createExportData"
-        :before-generate="startDownload"
-        :before-finish="finishDownload"
-        worksheet="导出信息"
-        class="el-button el-button--primary el-button--medium">
-        {{ buttons.download }}
-      </download-excel>
-    </el-form-item>
+      <el-form-item>
+        <el-button @click="newData()" type="primary" style="margin-left: 2px">{{buttons.newData}}</el-button>
+        <el-button @click="searchList()" type="primary">{{buttons.searchList}}</el-button>
+        <download-excel
+          :fields="fields()"
+          :data="exportData"
+          type="xls"
+          :name="exportName"
+          :header="exportHeader"
+          :footer="exportFooter"
+          :fetch="createExportData"
+          :before-generate="startDownload"
+          :before-finish="finishDownload"
+          worksheet="导出信息"
+          class="el-button el-button--primary el-button--medium">
+          {{ buttons.download }}
+        </download-excel>
+      </el-form-item>
     </el-form>
     <el-table
       :height="height"
@@ -64,7 +64,6 @@
         <el-form-item :label="'休息时间点1：'">
           <el-time-picker
             format="HH:mm"
-            arrow-control
             style="width: 130px"
             v-model="dateTypeList.exceptexacttime1"
             placeholder="请选择"
@@ -77,7 +76,6 @@
         <el-form-item :label="'休息时间点2：'">
           <el-time-picker
             format="HH:mm"
-            arrow-control
             style="width: 130px"
             v-model="dateTypeList.exceptexacttime2"
             placeholder="请选择"
@@ -90,7 +88,6 @@
         <el-form-item :label="'休息时间点3：'">
           <el-time-picker
             format="HH:mm"
-            arrow-control
             style="width: 130px"
             v-model="dateTypeList.exceptexacttime3"
             placeholder="请选择"
@@ -103,7 +100,6 @@
         <el-form-item :label="'休息时间点4：'">
           <el-time-picker
             format="HH:mm"
-            arrow-control
             style="width: 130px"
             v-model="dateTypeList.exceptexacttime4"
             placeholder="请选择"
@@ -116,7 +112,6 @@
         <el-form-item :label="'休息时间点5：'">
           <el-time-picker
             format="HH:mm"
-            arrow-control
             style="width: 130px"
             v-model="dateTypeList.exceptexacttime5"
             placeholder="请选择"
@@ -129,7 +124,6 @@
         <el-form-item :label="'休息时间点6：'">
           <el-time-picker
             format="HH:mm"
-            arrow-control
             style="width: 130px"
             v-model="dateTypeList.exceptexacttime6"
             placeholder="请选择"
@@ -179,7 +173,7 @@
           :show-overflow-tooltip="item.showOverflowTooltip"
           :align="item.align"
           :fixed="item.fixed"
-          :width="item.columnWidth"
+          :min-width="item.columnWidth"
           :label="item.columnLabel">
           <template slot-scope="scope">
             <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
@@ -206,7 +200,7 @@
     <el-dialog title="维护班次" :close-on-click-modal="false" v-drag :visible.sync="newShiftFlag" 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="newShiftFlag1" style="width: 130px"></el-input>
+          <el-input v-model="newShiftData.shiftno" :disabled="newShiftFlag1" style="width: 130px" onblur="this.value=this.value.toUpperCase()"></el-input>
         </el-form-item>
         <el-form-item :label="'班次名称：'">
           <el-input v-model="newShiftData.shiftdesc"  style="width: 130px"></el-input>
@@ -214,7 +208,6 @@
         <el-form-item :label="'上班时间：'">
           <el-time-picker
             format="HH:mm"
-            arrow-control
             style="width: 130px"
             v-model="newShiftData.startexacttime"
             placeholder="请选择"
@@ -223,7 +216,6 @@
         </el-form-item>
         <el-form-item :label="'下班时间：'" >
           <el-time-picker
-            arrow-control
             format="HH:mm"
             style="width: 130px"
             v-model="newShiftData.endexacttime"
@@ -241,535 +233,608 @@
 </template>
 
 <script>
-    import {
-      calendarDatetypeInfo,
-      saveCalendarDatetypeData,
-      delCalendarType,
-      getShiftData,
-      saveShift,
-      updateShift,
-      delShift,
-    }from "@/api/base.js"
-    export default {
-      name: "calendarDatetype",
-      data () {
-        return {
-          // 导出 start
-          exportData: [],
-          exportName: "工作日类型"+this.dayjs().format('YYYYMMDDHHmmss'),
-          exportHeader: ["工作日类型"],
-          exportFooter: [],
-          // 导出 end
-          // 导出 start
-          exportData2: [],
-          exportName2: "班次信息"+this.dayjs().format('YYYYMMDDHHmmss'),
-          exportHeader2: ["班次信息"],
-          exportFooter2: [],
-          // 导出 end
-          // table高度
-          height:450,
-          height2:300,
-          newDateTypeFlag: false,
-          newDateTypeChangeFlag: false,
-          shiftFlag:false,
-          newShiftFlag: false,
-          newShiftFlag1:false,
-          buttons: {
-            newData: '新增工作日类型',
-            searchList:'查询',
-            download:'导出',
-            download2:'导出',
-          },
-          newShiftData:{
-            shiftno:'',
-            shiftdesc:'',
-            startexacttime:'',
-            endexacttime:'',
-            datetype:'',
-            id:'',
-            site:this.$store.state.user.site.toString(),
+  import {
+    calendarDatetypeInfo,
+    saveCalendarDatetypeData,
+    delCalendarType,
+    getShiftData,
+    saveShift,
+    updateShift,
+    delShift,
+  }from "@/api/base.js"
+  export default {
+    name: "calendarDatetype",
+    data () {
+      return {
+        // 导出 start
+        exportData: [],
+        exportName: "工作日类型"+this.dayjs().format('YYYYMMDDHHmmss'),
+        exportHeader: ["工作日类型"],
+        exportFooter: [],
+        // 导出 end
+        // 导出 start
+        exportData2: [],
+        exportName2: "班次信息"+this.dayjs().format('YYYYMMDDHHmmss'),
+        exportHeader2: ["班次信息"],
+        exportFooter2: [],
+        // 导出 end
+        // table高度
+        height:450,
+        height2:300,
+        newDateTypeFlag: false,
+        newDateTypeChangeFlag: false,
+        shiftFlag:false,
+        newShiftFlag: false,
+        newShiftFlag1:false,
+        buttons: {
+          newData: '新增工作日类型',
+          searchList:'查询',
+          download:'导出',
+          download2:'导出',
+        },
+        newShiftData:{
+          shiftno:'',
+          shiftdesc:'',
+          startexacttime:'',
+          endexacttime:'',
+          datetype:'',
+          id:'',
+          site:this.$store.state.user.site.toString(),
+        },
+        shiftSearchData:{
+          site:'',
+          datetype:'',
+        },
+        // 数据集
+        dataList: [],
+        dataList2:[],
+        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6039,
+            serialNumber: '6039TableDatetype',
+            tableId: "6039Table",
+            tableName: "工作日类型",
+            columnProp: "datetype",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "工作日类型",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
           },
-          shiftSearchData:{
-              site:'',
-              datetype:'',
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6039,
+            serialNumber: '6039TableExceptexacttime1',
+            tableId: "6039Table",
+            tableName: "工作日类型",
+            columnProp: "exceptexacttime1",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "工作日类型",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
           },
-          // 数据集
-          dataList: [],
-          dataList2:[],
-          columnList: [
-            {
-              userId: this.$store.state.user.name,
-              functionId: 6039,
-              serialNumber: '6039TableDatetype',
-              tableId: "6039Table",
-              tableName: "工作日类型",
-              columnProp: "datetype",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "工作日类型",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 0,
-              status: true,
-              fixed: false,
-              columnWidth: 120
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 6039,
-              serialNumber: '6039TableExceptexacttime1',
-              tableId: "6039Table",
-              tableName: "工作日类型",
-              columnProp: "exceptexacttime1",
-              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: 6039,
-              serialNumber: '6039TableExceptduration1',
-              tableId: "6039Table",
-              tableName: "工作日类型",
-              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: 6039,
-              serialNumber: '6039TableExceptexacttime2',
-              tableId: "6039Table",
-              tableName: "工作日类型",
-              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: 6039,
-              serialNumber: '6039TableExceptduration2',
-              tableId: "6039Table",
-              tableName: "工作日类型",
-              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: 6039,
-              serialNumber: '6039TableExceptexacttime3',
-              tableId: "6039Table",
-              tableName: "工作日类型",
-              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: 6039,
-              serialNumber: '6039TableExceptduration3',
-              tableId: "6039Table",
-              tableName: "工作日类型",
-              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: 6039,
-              serialNumber: '6039TableExceptexacttime4',
-              tableId: "6039Table",
-              tableName: "工作日类型",
-              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: 6039,
-              serialNumber: '6039TableExceptduration4',
-              tableId: "6039Table",
-              tableName: "工作日类型",
-              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: 6039,
-              serialNumber: '6039TableExceptexacttime5',
-              tableId: "6039Table",
-              tableName: "工作日类型",
-              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: 6039,
-              serialNumber: '6039TableExceptduration5',
-              tableId: "6039Table",
-              tableName: "工作日类型",
-              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: 6039,
-              serialNumber: '6039TableExceptexacttime6',
-              tableId: "6039Table",
-              tableName: "工作日类型",
-              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: 6039,
-              serialNumber: '6039TableExceptduration6',
-              tableId: "6039Table",
-              tableName: "工作日类型",
-              columnProp: "exceptduration6",
-              headerAlign: "center",
-              align: "right",
-              columnLabel: "休息时长6",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 0,
-              status: true,
-              fixed: false,
-              columnWidth: 100
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 6039,
-              serialNumber: '6039TableWorktime',
-              tableId: "6039Table",
-              tableName: "工作日类型",
-              columnProp: "worktime",
-              headerAlign: "center",
-              align: "right",
-              columnLabel: "累计工作时间",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 0,
-              status: true,
-              fixed: false,
-              columnWidth: 100
-            },
-          ],
-          columnList2: [
-            {
-              userId: this.$store.state.user.name,
-              functionId: 6039,
-              serialNumber: '6039Table2Shiftno',
-              tableId: "6039Table2",
-              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: 6039,
-              serialNumber: '6039Table2Shiftdesc',
-              tableId: "6039Table2",
-              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: 6039,
-              serialNumber: '6039Table2Startexacttime',
-              tableId: "6039Table2",
-              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: 6039,
-              serialNumber: '6039Table2Endexacttime',
-              tableId: "6039Table2",
-              tableName: "班次表",
-              columnProp: "endexacttime",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "下班时间",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 0,
-              status: true,
-              fixed: false,
-              columnWidth: 100
-            }
-          ],
-          dateTypeList: {
-            site: '',
-            datetype: '',
-            exceptexacttime1: '',
-            exceptduration1: '',
-            exceptexacttime2: '',
-            exceptduration2: '',
-            exceptexacttime3: '',
-            exceptduration3: '',
-            exceptexacttime4: '',
-            exceptduration4: '',
-            exceptexacttime5: '',
-            exceptduration5: '',
-            exceptexacttime6: '',
-            exceptduration6: '',
-            remark: '',
-            id: '',
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6039,
+            serialNumber: '6039TableExceptduration1',
+            tableId: "6039Table",
+            tableName: "工作日类型",
+            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: 6039,
+            serialNumber: '6039TableExceptexacttime2',
+            tableId: "6039Table",
+            tableName: "工作日类型",
+            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: 6039,
+            serialNumber: '6039TableExceptduration2',
+            tableId: "6039Table",
+            tableName: "工作日类型",
+            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: 6039,
+            serialNumber: '6039TableExceptexacttime3',
+            tableId: "6039Table",
+            tableName: "工作日类型",
+            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: 6039,
+            serialNumber: '6039TableExceptduration3',
+            tableId: "6039Table",
+            tableName: "工作日类型",
+            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: 6039,
+            serialNumber: '6039TableExceptexacttime4',
+            tableId: "6039Table",
+            tableName: "工作日类型",
+            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: 6039,
+            serialNumber: '6039TableExceptduration4',
+            tableId: "6039Table",
+            tableName: "工作日类型",
+            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: 6039,
+            serialNumber: '6039TableExceptexacttime5',
+            tableId: "6039Table",
+            tableName: "工作日类型",
+            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: 6039,
+            serialNumber: '6039TableExceptduration5',
+            tableId: "6039Table",
+            tableName: "工作日类型",
+            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: 6039,
+            serialNumber: '6039TableExceptexacttime6',
+            tableId: "6039Table",
+            tableName: "工作日类型",
+            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: 6039,
+            serialNumber: '6039TableExceptduration6',
+            tableId: "6039Table",
+            tableName: "工作日类型",
+            columnProp: "exceptduration6",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "休息时长6",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6039,
+            serialNumber: '6039TableWorktime',
+            tableId: "6039Table",
+            tableName: "工作日类型",
+            columnProp: "worktime",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "累计工作时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+        ],
+        columnList2: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6039,
+            serialNumber: '6039Table2Shiftno',
+            tableId: "6039Table2",
+            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: 6039,
+            serialNumber: '6039Table2Shiftdesc',
+            tableId: "6039Table2",
+            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: 6039,
+            serialNumber: '6039Table2Startexacttime',
+            tableId: "6039Table2",
+            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: 6039,
+            serialNumber: '6039Table2Endexacttime',
+            tableId: "6039Table2",
+            tableName: "班次表",
+            columnProp: "endexacttime",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "下班时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          }
+        ],
+        dateTypeList: {
+          site: '',
+          datetype: '',
+          exceptexacttime1: '',
+          exceptduration1: '',
+          exceptexacttime2: '',
+          exceptduration2: '',
+          exceptexacttime3: '',
+          exceptduration3: '',
+          exceptexacttime4: '',
+          exceptduration4: '',
+          exceptexacttime5: '',
+          exceptduration5: '',
+          exceptexacttime6: '',
+          exceptduration6: '',
+          remark: '',
+          id: '',
         },
-      mounted() {
-        this.$nextTick(()=>{
-          this.height = window.innerHeight - 180;
+      }
+    },
+    mounted() {
+      this.$nextTick(()=>{
+        this.height = window.innerHeight - 140;
+      })
+    },
+    methods: {
+      searchList(){
+        let list = {site: this.$store.state.user.site.toString()}
+        calendarDatetypeInfo(list).then(({data}) => {
+          this.dataList = data.rows
         })
       },
-      methods: {
-        searchList(){
-          let list = {site: this.$store.state.user.site.toString()}
-          calendarDatetypeInfo(list).then(({data}) => {
-            this.dataList = data.rows
+      //新增工作日类型
+      newData(){
+        this.dateTypeList.site=this.$store.state.user.site.toString();
+        this.dateTypeList.datetype='';
+        this.dateTypeList.exceptexacttime1='';
+        this.dateTypeList.exceptduration1='';
+        this.dateTypeList.exceptexacttime2='';
+        this.dateTypeList.exceptduration2='';
+        this.dateTypeList.exceptexacttime3='';
+        this.dateTypeList.exceptduration3='';
+        this.dateTypeList.exceptexacttime4='';
+        this.dateTypeList.exceptduration4='';
+        this.dateTypeList.exceptexacttime5='';
+        this.dateTypeList.exceptduration5='';
+        this.dateTypeList.exceptexacttime6='';
+        this.dateTypeList.exceptduration6='';
+        this.dateTypeList.id=0;
+        this.newDateTypeChangeFlag=false;
+        this.newDateTypeFlag=true;
+      },
+      //保存工作日类型
+      calendarDatetypeSave(){
+        if (this.dateTypeList.exceptexacttime1=="") {
+          this.$alert('请输入休息时间点1！', '错误', {
+            confirmButtonText: '确定'
           })
-        },
-        //新增工作日类型
-        newData(){
-          this.dateTypeList.site=this.$store.state.user.site.toString();
-          this.dateTypeList.datetype='';
-          this.dateTypeList.exceptexacttime1='';
-          this.dateTypeList.exceptduration1='';
-          this.dateTypeList.exceptexacttime2='';
-          this.dateTypeList.exceptduration2='';
-          this.dateTypeList.exceptexacttime3='';
-          this.dateTypeList.exceptduration3='';
-          this.dateTypeList.exceptexacttime4='';
-          this.dateTypeList.exceptduration4='';
-          this.dateTypeList.exceptexacttime5='';
-          this.dateTypeList.exceptduration5='';
-          this.dateTypeList.exceptexacttime6='';
-          this.dateTypeList.exceptduration6='';
-          this.dateTypeList.id=0;
-          this.newDateTypeChangeFlag=false;
-          this.newDateTypeFlag=true;
-        },
-        //保存工作日类型
-        calendarDatetypeSave(){
-          if (this.dateTypeList.exceptexacttime1=="") {
-            this.$alert('请输入休息时间点1！', '错误', {
-              confirmButtonText: '确定'
-            })
-            return false;
-          }
-          if (this.dateTypeList.exceptduration1=="") {
-            this.$alert('请输入休息时长1！', '错误', {
-              confirmButtonText: '确定'
-            })
-            return false;
-          }
-          if ((this.dateTypeList.exceptexacttime2==""||this.dateTypeList.exceptexacttime2==null)^this.dateTypeList.exceptduration2=="") {
-            this.$alert('请将休息时间点2或休息时长2填完整！', '错误', {
-              confirmButtonText: '确定'
-            })
-            return false;
-          }
-          if ((this.dateTypeList.exceptexacttime3==""||this.dateTypeList.exceptexacttime3==null)^this.dateTypeList.exceptduration3=="") {
-            this.$alert('请将休息时间点3或休息时长3填完整！', '错误', {
-              confirmButtonText: '确定'
-            })
-            return false;
-          }
-          if ((this.dateTypeList.exceptexacttime4==""||this.dateTypeList.exceptexacttime4==null)^this.dateTypeList.exceptduration4=="") {
-            this.$alert('请将休息时间点4或休息时长4填完整！', '错误', {
-              confirmButtonText: '确定'
-            })
-            return false;
-          }
-          if ((this.dateTypeList.exceptexacttime5==""||this.dateTypeList.exceptexacttime5==null)^this.dateTypeList.exceptduration5=="") {
-            this.$alert('请将休息时间点5或休息时长5填完整！', '错误', {
-              confirmButtonText: '确定'
-            })
-            return false;
-          }
-          if ((this.dateTypeList.exceptexacttime6==""||this.dateTypeList.exceptexacttime6==null)^this.dateTypeList.exceptduration6=="") {
-            this.$alert('请将休息时间点6或休息时长6填完整！', '错误', {
-              confirmButtonText: '确定'
-            })
-            return false;
-          }
-          if (this.dateTypeList.datetype=="") {
-            this.$alert('请输入工作日类型！', '错误', {
-              confirmButtonText: '确定'
-            })
-            return false;
+          return false;
+        }
+        if (this.dateTypeList.exceptduration1=="") {
+          this.$alert('请输入休息时长1！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        if ((this.dateTypeList.exceptexacttime2==""||this.dateTypeList.exceptexacttime2==null)^this.dateTypeList.exceptduration2=="") {
+          this.$alert('请将休息时间点2或休息时长2填完整！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        if ((this.dateTypeList.exceptexacttime3==""||this.dateTypeList.exceptexacttime3==null)^this.dateTypeList.exceptduration3=="") {
+          this.$alert('请将休息时间点3或休息时长3填完整！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        if ((this.dateTypeList.exceptexacttime4==""||this.dateTypeList.exceptexacttime4==null)^this.dateTypeList.exceptduration4=="") {
+          this.$alert('请将休息时间点4或休息时长4填完整！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        if ((this.dateTypeList.exceptexacttime5==""||this.dateTypeList.exceptexacttime5==null)^this.dateTypeList.exceptduration5=="") {
+          this.$alert('请将休息时间点5或休息时长5填完整！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        if ((this.dateTypeList.exceptexacttime6==""||this.dateTypeList.exceptexacttime6==null)^this.dateTypeList.exceptduration6=="") {
+          this.$alert('请将休息时间点6或休息时长6填完整！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        if (this.dateTypeList.datetype=="") {
+          this.$alert('请输入工作日类型！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        //验证顺序
+        var bln = false;
+        var list = new Array();
+        list.push(this.dateTypeList.exceptexacttime1);
+        list.push(this.dateTypeList.exceptduration1);
+        list.push(this.dateTypeList.exceptexacttime2);
+        list.push(this.dateTypeList.exceptduration2);
+        list.push(this.dateTypeList.exceptexacttime3);
+        list.push(this.dateTypeList.exceptduration3);
+        list.push(this.dateTypeList.exceptexacttime4);
+        list.push(this.dateTypeList.exceptduration4);
+        list.push(this.dateTypeList.exceptexacttime5);
+        list.push(this.dateTypeList.exceptduration5);
+        list.push(this.dateTypeList.exceptexacttime6);
+        list.push(this.dateTypeList.exceptduration6);
+        for(var i = 0 ; i < list.length; i++){
+          if(list[i]!=""){
+            bln=true;
+            break;
           }
-          //验证顺序
-          var bln = false;
-          var list = new Array();
-          list.push(this.dateTypeList.exceptexacttime1);
-          list.push(this.dateTypeList.exceptduration1);
-          list.push(this.dateTypeList.exceptexacttime2);
-          list.push(this.dateTypeList.exceptduration2);
-          list.push(this.dateTypeList.exceptexacttime3);
-          list.push(this.dateTypeList.exceptduration3);
-          list.push(this.dateTypeList.exceptexacttime4);
-          list.push(this.dateTypeList.exceptduration4);
-          list.push(this.dateTypeList.exceptexacttime5);
-          list.push(this.dateTypeList.exceptduration5);
-          list.push(this.dateTypeList.exceptexacttime6);
-          list.push(this.dateTypeList.exceptduration6);
-          for(var i = 0 ; i < list.length; i++){
+        }
+        if(bln==true){
+          for(var i = 11 ; i >= 0 ; i--) {
             if(list[i]!=""){
-              bln=true;
-              break;
-            }
-          }
-          if(bln==true){
-            for(var i = 11 ; i >= 0 ; i--) {
-              if(list[i]!=""){
-                if(i!=0){
-                  if(list[i-1]==""){
-                    this.$alert('请按照顺序输入！', '错误', {
-                      confirmButtonText: '确定'
-                    })
-                    return false;
-                  }
+              if(i!=0){
+                if(list[i-1]==""){
+                  this.$alert('请按照顺序输入！', '错误', {
+                    confirmButtonText: '确定'
+                  })
+                  return false;
                 }
               }
             }
           }
-          /**
-           * 保存数据
-           */
+        }
+        /**
+         * 保存数据
+         */
 
-          saveCalendarDatetypeData(this.dateTypeList).then(({data}) => {
+        saveCalendarDatetypeData(this.dateTypeList).then(({data}) => {
+          if (data.code == 200) {
+            this.searchList();
+            this.newDateTypeFlag=false;
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+              }
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+      editData(row){
+        this.dateTypeList.site= row.site;
+        this.dateTypeList.datetype= row.datetype;
+        this.dateTypeList.exceptexacttime1 = row.exceptexacttime1;
+        this.dateTypeList.exceptduration1 = row.exceptduration1;
+        if(row.exceptduration2!=0) {
+          this.dateTypeList.exceptexacttime2 = row.exceptexacttime2;
+          this.dateTypeList.exceptduration2 = row.exceptduration2;
+        }else{
+          this.dateTypeList.exceptexacttime2 = '';
+          this.dateTypeList.exceptduration2 = '';
+        }
+        if(row.exceptduration3!=0) {
+          this.dateTypeList.exceptexacttime3 = row.exceptexacttime3;
+          this.dateTypeList.exceptduration3 = row.exceptduration3;
+        }else{
+          this.dateTypeList.exceptexacttime3 = '';
+          this.dateTypeList.exceptduration3 = '';
+        }
+        if(row.exceptduration4!=0) {
+          this.dateTypeList.exceptexacttime4 = row.exceptexacttime4;
+          this.dateTypeList.exceptduration4 = row.exceptduration4;
+        }else{
+          this.dateTypeList.exceptexacttime4 = '';
+          this.dateTypeList.exceptduration4 = '';
+        }
+        if(row.exceptduration5!=0) {
+          this.dateTypeList.exceptexacttime5 = row.exceptexacttime5;
+          this.dateTypeList.exceptduration5 = row.exceptduration5;
+        }else{
+          this.dateTypeList.exceptexacttime5 = '';
+          this.dateTypeList.exceptduration5 = '';
+        }
+        if(row.exceptduration6!=0) {
+          this.dateTypeList.exceptexacttime6 = row.exceptexacttime6;
+          this.dateTypeList.exceptduration6 = row.exceptduration6;
+        }else{
+          this.dateTypeList.exceptexacttime6 = '';
+          this.dateTypeList.exceptduration6 = '';
+        }
+        this.dateTypeList.remark= row.remark;
+        this.dateTypeList.id= 1;
+        this.newDateTypeChangeFlag=true;
+        this.newDateTypeFlag=true;
+      },
+      delData(row){
+        this.$confirm(`是否删除此条工作日类型?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+
+        }).then(() => {
+          let inData={
+            site:row.site.toString(),
+            datetype:row.datetype,
+          }
+          delCalendarType(inData).then(({data}) => {
             if (data.code == 200) {
               this.searchList();
-              this.newDateTypeFlag=false;
               this.$message({
                 message: '操作成功',
                 type: 'success',
@@ -783,273 +848,200 @@
               })
             }
           })
-        },
-        editData(row){
-          this.dateTypeList.site= row.site;
-          this.dateTypeList.datetype= row.datetype;
-          this.dateTypeList.exceptexacttime1 = row.exceptexacttime1;
-          this.dateTypeList.exceptduration1 = row.exceptduration1;
-          if(row.exceptduration2!=0) {
-            this.dateTypeList.exceptexacttime2 = row.exceptexacttime2;
-            this.dateTypeList.exceptduration2 = row.exceptduration2;
-          }else{
-            this.dateTypeList.exceptexacttime2 = '';
-            this.dateTypeList.exceptduration2 = '';
-          }
-          if(row.exceptduration3!=0) {
-            this.dateTypeList.exceptexacttime3 = row.exceptexacttime3;
-            this.dateTypeList.exceptduration3 = row.exceptduration3;
-          }else{
-            this.dateTypeList.exceptexacttime3 = '';
-            this.dateTypeList.exceptduration3 = '';
-          }
-          if(row.exceptduration4!=0) {
-            this.dateTypeList.exceptexacttime4 = row.exceptexacttime4;
-            this.dateTypeList.exceptduration4 = row.exceptduration4;
-          }else{
-            this.dateTypeList.exceptexacttime4 = '';
-            this.dateTypeList.exceptduration4 = '';
-          }
-          if(row.exceptduration5!=0) {
-            this.dateTypeList.exceptexacttime5 = row.exceptexacttime5;
-            this.dateTypeList.exceptduration5 = row.exceptduration5;
-          }else{
-            this.dateTypeList.exceptexacttime5 = '';
-            this.dateTypeList.exceptduration5 = '';
-          }
-          if(row.exceptduration6!=0) {
-            this.dateTypeList.exceptexacttime6 = row.exceptexacttime6;
-            this.dateTypeList.exceptduration6 = row.exceptduration6;
-          }else{
-            this.dateTypeList.exceptexacttime6 = '';
-            this.dateTypeList.exceptduration6 = '';
-          }
-          this.dateTypeList.remark= row.remark;
-          this.dateTypeList.id= 1;
-          this.newDateTypeChangeFlag=true;
-          this.newDateTypeFlag=true;
-        },
-        delData(row){
-          this.$confirm(`是否删除此条工作日类型?`, '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
+        })
+      },
+      shiftModal(row){
+        this.shiftFlag=true;
+        this.shiftSearchData.site=row.site;
+        this.shiftSearchData.datetype=row.datetype;
+        this.newShiftData.datetype=row.datetype;
+        this.searchShift();
+      },
+      newShift(){
+        this.newShiftFlag1 = false
+        this.newShiftData.shiftno = ''
+        this.newShiftData.shiftdesc = ''
+        this.newShiftData.startexacttime = ''
+        this.newShiftData.endexacttime = ''
+        this.newShiftData.id = 0
+        this.newShiftFlag=true;
+      },
+      searchShift(){
+        getShiftData(this.shiftSearchData).then(({data}) => {
+          this.dataList2 = data.rows
 
-          }).then(() => {
-            let inData={
-              site:row.site.toString(),
-              datetype:row.datetype,
+        })
+      },
+      editShift (row) {
+        this.newShiftData.shiftno = row.shiftno
+        this.newShiftData.shiftdesc = row.shiftdesc
+        this.newShiftData.startexacttime = row.startexacttime
+        this.newShiftData.endexacttime = row.endexacttime
+        this.newShiftData.id =2
+        this.newShiftFlag1 = true
+        this.newShiftFlag = true
+      },
+      newShiftSave () {
+        if (this.newShiftData.shiftno == '' || this.newShiftData.shiftno == null) {
+          this.$alert('请输入班次编码！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        if (this.newShiftData.shiftdesc == '' || this.newShiftData.shiftdesc == null) {
+          this.$alert('请输入班次名称！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        if (this.newShiftData.startexacttime == '') {
+          this.$alert('请输入上班时间！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        if (this.newShiftData.endexacttime == '') {
+          this.$alert('请输入下班时间！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        if(this.newShiftData.id===0) {
+          saveShift(this.newShiftData).then(({data}) => {
+            if (data && data.code == 200) {
+              this.newShiftFlag = false
+              getShiftData(this.shiftSearchData).then(({data}) => {
+                this.dataList2 = data.rows
+              })
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
             }
-            delCalendarType(inData).then(({data}) => {
-              if (data.code == 200) {
-                this.searchList();
-                this.$message({
-                  message: '操作成功',
-                  type: 'success',
-                  duration: 1500,
-                  onClose: () => {
-                  }
-                })
-              } else {
-                this.$alert(data.msg, '错误', {
-                  confirmButtonText: '确定'
-                })
-              }
-            })
           })
-        },
-        shiftModal(row){
-          this.shiftFlag=true;
-          this.shiftSearchData.site=row.site;
-          this.shiftSearchData.datetype=row.datetype;
-          this.newShiftData.datetype=row.datetype;
-          this.searchShift();
-        },
-        newShift(){
-          this.newShiftFlag1 = false
-          this.newShiftData.shiftno = ''
-          this.newShiftData.shiftdesc = ''
-          this.newShiftData.startexacttime = ''
-          this.newShiftData.endexacttime = ''
-          this.newShiftData.id = 0
-          this.newShiftFlag=true;
-        },
-        searchShift(){
-          getShiftData(this.shiftSearchData).then(({data}) => {
-            this.dataList2 = data.rows
-
+        }else{
+          updateShift(this.newShiftData).then(({data}) => {
+            if (data && data.code == 200) {
+              this.newShiftFlag = false
+              getShiftData(this.shiftSearchData).then(({data}) => {
+                this.dataList2 = data.rows
+              })
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
           })
-        },
-        editShift (row) {
-          this.newShiftData.shiftno = row.shiftno
-          this.newShiftData.shiftdesc = row.shiftdesc
-          this.newShiftData.startexacttime = row.startexacttime
-          this.newShiftData.endexacttime = row.endexacttime
-          this.newShiftData.id =2
-          this.newShiftFlag1 = true
-          this.newShiftFlag = true
-        },
-        newShiftSave () {
-          if (this.newShiftData.shiftno == '' || this.newShiftData.shiftno == null) {
-            this.$alert('请输入班次编码！', '错误', {
-              confirmButtonText: '确定'
-            })
-            return false
-          }
-          if (this.newShiftData.shiftdesc == '' || this.newShiftData.shiftdesc == null) {
-            this.$alert('请输入班次名称！', '错误', {
-              confirmButtonText: '确定'
-            })
-            return false
-          }
-          if (this.newShiftData.startexacttime == '') {
-            this.$alert('请输入上班时间！', '错误', {
-              confirmButtonText: '确定'
-            })
-            return false
-          }
-          if (this.newShiftData.endexacttime == '') {
-            this.$alert('请输入下班时间！', '错误', {
-              confirmButtonText: '确定'
-            })
-            return false
-          }
-          if(this.newShiftData.id===0) {
-            saveShift(this.newShiftData).then(({data}) => {
-              if (data && data.code == 200) {
-                this.newShiftFlag = false
-                getShiftData(this.shiftSearchData).then(({data}) => {
-                  this.dataList2 = data.rows
-                })
-                this.$message({
-                  message: '操作成功',
-                  type: 'success',
-                  duration: 1500,
-                  onClose: () => {
-                  }
-                })
-              } else {
-                this.$alert(data.msg, '错误', {
-                  confirmButtonText: '确定'
-                })
-              }
-            })
-          }else{
-            updateShift(this.newShiftData).then(({data}) => {
-              if (data && data.code == 200) {
-                this.newShiftFlag = false
-                getShiftData(this.shiftSearchData).then(({data}) => {
-                  this.dataList2 = data.rows
-                })
-                this.$message({
-                  message: '操作成功',
-                  type: 'success',
-                  duration: 1500,
-                  onClose: () => {
-                  }
-                })
-              } else {
-                this.$alert(data.msg, '错误', {
-                  confirmButtonText: '确定'
-                })
-              }
-            })
+        }
+      },
+      deleteShift (row) {
+        this.$confirm(`是否删除此条班次信息?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let inData = {
+            site:this.$store.state.user.site.toString(),
+            datetype:row.datetype,
+            shiftno:row.shiftno
           }
-        },
-        deleteShift (row) {
-          this.$confirm(`是否删除此条班次信息?`, '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            let inData = {
-              site:this.$store.state.user.site.toString(),
-              datetype:row.datetype,
-              shiftno:row.shiftno
-            }
-            delShift(inData).then(({data}) => {
-              if (data && data.code == 200) {
-                getShiftData(this.shiftSearchData).then(({data}) => {
-                  this.dataList2 = data.rows
-                })
-                this.$message({
-                  message: '操作成功',
-                  type: 'success',
-                  duration: 1500,
+          delShift(inData).then(({data}) => {
+            if (data && data.code == 200) {
+              getShiftData(this.shiftSearchData).then(({data}) => {
+                this.dataList2 = data.rows
+              })
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
 
-                  onClose: () => {
-                  }
-                })
-              } else {
-                this.$alert(data.msg, '错误', {
-                  confirmButtonText: '确定'
-                })
-              }
-            })
-          }).catch(() => {
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
           })
-        },
-        //导出excel
-        createExportData() {
+        }).catch(() => {
+        })
+      },
+      //导出excel
+      createExportData() {
 
-          return this.dataList;
+        return this.dataList;
 
-        },
-        startDownload() {
-          //  this.exportData = this.dataList
+      },
+      startDownload() {
+        //  this.exportData = this.dataList
 
-        },
-        finishDownload() {
+      },
+      finishDownload() {
 
-        },
-        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 + ")")
+      },
+      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 s
-        },
-        // 导出 end
-        //导出excel
-        createExportData2() {
+        return s
+      },
+      // 导出 end
+      //导出excel
+      createExportData2() {
 
-          return this.dataList2;
+        return this.dataList2;
 
-        },
-        startDownload2() {
-          //  this.exportData = this.dataList
+      },
+      startDownload2() {
+        //  this.exportData = this.dataList
 
-        },
-        finishDownload2() {
+      },
+      finishDownload2() {
 
-        },
-        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 + ")")
+      },
+      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 + ")")
 
-          return s
-        },
-        // 导出 end
+        return s
       },
-      created() {
-        this.searchList();
-      }
+      // 导出 end
+    },
+    created() {
+      this.searchList();
     }
+  }
 </script>
 
 <style scoped>
diff --git a/src/views/modules/base/workCenter.vue b/src/views/modules/base/workCenter.vue
new file mode 100644
index 0000000..0dec957
--- /dev/null
+++ b/src/views/modules/base/workCenter.vue
@@ -0,0 +1,1387 @@
+<template>
+  <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="modelData.workCenterNo"  readonly style="width: 130px"></el-input>
+        <el-button @click="getData()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'列表'}}</el-button>
+      </el-form-item>
+      <el-form-item :label="'名称：'">
+        <el-input v-model="modelData.workCenterDesc" readonly style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'工厂编号：'">
+        <el-input v-model="modelData.site" readonly style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'是否在用：'">
+        <el-input v-model="modelData.active" readonly style="width: 40px"></el-input>
+        <el-button @click="addModal()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'新增'}}</el-button>
+        <download-excel
+          :fields="fields()"
+          :data="exportData"
+          type="xls"
+          :name="exportName"
+          :header="exportHeader"
+          :footer="exportFooter"
+          :fetch="createExportData"
+          :before-generate="startDownload"
+          :before-finish="finishDownload"
+          worksheet="导出信息"
+          class="el-button el-button--primary el-button--medium">
+          {{ buttons.download }}
+        </download-excel>
+        <download-excel
+          :fields="fields2()"
+          :data="exportData2"
+          type="xls"
+          :name="exportName2"
+          :header="exportHeader2"
+          :footer="exportFooter2"
+          :fetch="createExportData2"
+          :before-generate="startDownload2"
+          :before-finish="finishDownload2"
+          worksheet="导出信息"
+          class="el-button el-button--primary el-button--medium">
+          {{ buttons.download }}
+        </download-excel>
+      </el-form-item>
+    </el-form>
+    <el-tabs v-model="activeName" >
+      <el-tab-pane :label="'基本信息'" name="first">
+        <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
+          <el-form-item :label="'加工中心类型：'">
+            <el-input v-model="modelData.workCenterType" readonly style="width: 130px"></el-input>
+          </el-form-item>
+          <el-form-item :label="'生产线编码：'">
+            <el-input v-model="modelData.proLineNo" readonly style="width: 130px"></el-input>
+          </el-form-item>
+          <el-form-item :label="'生产线名称：'">
+            <el-input v-model="modelData.productionLineDesc" readonly style="width: 130px"></el-input>
+          </el-form-item>
+          <el-form-item :label="'是否可以创建新卷：'">
+            <el-input v-model="modelData.canCreateNewRollFlag" readonly style="width: 40px"></el-input>
+          </el-form-item>
+        </el-form>
+        <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;">
+          <el-form-item :label="'新增日期：'">
+            <el-input v-model="modelData.createdDate" readonly style="width: 130px"></el-input>
+          </el-form-item>
+          <el-form-item :label="'备注：'">
+            <el-input v-model="modelData.remark" readonly style="width: 130px"></el-input>
+          </el-form-item>
+          <el-form-item :label="'生产是否需要调机：'">
+            <el-input v-model="modelData.needSetupFlag" readonly style="width: 40px"></el-input>
+          </el-form-item>
+        </el-form>
+      </el-tab-pane>
+      <el-tab-pane :label="'涉及产品'" name="second">
+        <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
+          <el-button @click="getPartDetail()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'物料信息'}}</el-button>
+        </el-form>
+        <el-table
+          :height="height"
+          :data="dataList"
+          border
+          @row-click="clickData"
+          highlight-current-row
+          v-loading="dataListLoading"
+          style="width: 100%;">
+          <el-table-column
+            v-for="(item,index) in columnList" :key="index"
+            :sortable="item.columnSortable"
+            :prop="item.columnProp"
+            :header-align="item.headerAlign"
+            :show-overflow-tooltip="item.showOverflowTooltip"
+            :align="item.align"
+            :fixed="item.fixed"
+            :min-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>
+      </el-tab-pane>
+      <el-tab-pane :label="'机台'" name="third">
+        <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
+          <el-button @click="jumpCalendar()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'工作日历'}}</el-button>
+          <el-button @click="addResource()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'新增'}}</el-button>
+          <el-button @click="editResource()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'编辑'}}</el-button>
+          <el-button @click="deleteCalendar()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'删除'}}</el-button>
+          <el-button @click="setResource()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'设为虚拟/常规机台'}}</el-button>
+        </el-form>
+        <el-table
+          :height="height"
+          :data="dataList2"
+          border
+          @row-click="clickData2"
+          highlight-current-row
+          v-loading="dataListLoading"
+          style="width: 100%;">
+          <el-table-column
+            v-for="(item,index) in columnList2" :key="index"
+            :sortable="item.columnSortable"
+            :prop="item.columnProp"
+            :header-align="item.headerAlign"
+            :show-overflow-tooltip="item.showOverflowTooltip"
+            :align="item.align"
+            :fixed="item.fixed"
+            :min-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>
+      </el-tab-pane>
+    </el-tabs>
+    <el-dialog title="数据表" :close-on-click-modal="false" v-drag :visible.sync="modelFlag2" width="680px" >
+      <el-table
+        height="400"
+        :data="dataList3"
+        border
+        @row-dblclick="tableHanddle"
+        v-loading="dataListLoading"
+        style="width: 100%;">
+        <el-table-column
+          header-align="center"
+          align="center"
+          width="80"
+          label="操作">
+          <template slot-scope="scope">
+            <a type="text" size="small" @click="editModel(scope.row)">修改</a>
+            <a type="text" size="small" @click="deleteData(scope.row)">删除</a>
+          </template>
+        </el-table-column>
+        <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"
+          :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>
+            <el-footer  style="height:40px;margin-top: 20px;text-align:center">
+              <el-button type="primary" @click="modelFlag2 = false">关闭</el-button>
+            </el-footer>
+    </el-dialog>
+    <el-dialog title="数据维护" :close-on-click-modal="false" v-drag :visible.sync="modelFlag" width="619px" >
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+          <el-form-item :label="'加工中心编码：'">
+            <el-input v-model="modelData2.workCenterNo"   style="width: 130px" onblur="this.value=this.value.toUpperCase()"></el-input>
+          </el-form-item>
+          <el-form-item :label="'名称：'">
+            <el-input v-model="modelData2.workCenterDesc" style="width: 130px"></el-input>
+          </el-form-item>
+          <el-form-item :label="'工厂编号：'">
+            <el-input v-model="modelData2.site" style="width: 130px"></el-input>
+          </el-form-item>
+          <el-form-item :label="'是否在用：'">
+            <el-select filterable v-model="modelData2.active" style="width: 130px">
+              <el-option label="Y" value="Y"></el-option>
+              <el-option label="N" value="N"></el-option>
+            </el-select>
+          </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item :label="'加工中心类型：'">
+          <el-select filterable v-model="modelData2.workCenterType" style="width: 130px">
+            <el-option label="内部" value="内部"></el-option>
+            <el-option label="外部" value="外部"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item >
+          <span slot="label" style="" @click="getBaseList(25)"><a herf="#">生产线编码：</a></span>
+          <el-input v-model="modelData2.proLineNo" @change="getProLineNo" style="width: 130px" onblur="this.value=this.value.toUpperCase()"></el-input>
+        </el-form-item>
+        <el-form-item :label="'生产线名称：'">
+          <el-input v-model="modelData2.productionLineDesc" disabled style="width: 130px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'是否可以创建新卷：'">
+          <el-select filterable v-model="modelData2.canCreateNewRollFlag" style="width: 130px">
+            <el-option label="Y" value="Y"></el-option>
+            <el-option label="N" value="N"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item :label="'新增日期：'">
+          <el-date-picker
+            style="width: 130px"
+            v-model="modelData2.createdDate"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item :label="'备注：'">
+          <el-input v-model="modelData2.remark" style="width: 130px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'生产是否需要调机：'">
+          <el-select filterable v-model="modelData2.needSetupFlag" style="width: 130px">
+            <el-option label="Y" value="Y"></el-option>
+            <el-option label="N" value="N"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-footer  style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="ModelSave()">保存</el-button>
+        <el-button type="primary" @click="modelFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+    <el-dialog title="机台维护" :close-on-click-modal="false" v-drag :visible.sync="modelFlag3" width="460px" >
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item :label="'加工中心编码：'">
+          <el-input v-model="modelData3.workCenterNo"  disabled style="width: 130px" ></el-input>
+        </el-form-item>
+        <el-form-item :label="'工厂编号：'">
+          <el-input v-model="modelData3.site" disabled style="width: 130px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px;">
+        <el-form-item :label="'机台编码：'">
+          <el-input v-model="modelData3.resourceID"  :disabled="model3InputFlag" style="width: 130px" onblur="this.value=this.value.toUpperCase()"></el-input>
+        </el-form-item>
+        <el-form-item :label="'机台名称：'">
+          <el-input v-model="modelData3.resourceDesc" style="width: 130px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'效率：'">
+          <el-input v-model="modelData3.efficiency" type="number" style="width: 130px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px;">
+        <el-form-item :label="'利用率：'">
+          <el-input v-model="modelData3.utilization" type="number" style="width: 130px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'是否在用：'">
+          <el-select filterable v-model="modelData3.active" style="width: 130px">
+            <el-option label="Y" value="Y"></el-option>
+            <el-option label="N" value="N"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <span slot="label" style="" @click="getBaseList(92)"><a herf="#">工作日历编码：</a></span>
+          <el-input v-model="modelData3.calendarID"  style="width: 130px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px;">
+        <el-form-item :label="'备注：'">
+          <el-input v-model="modelData3.remark" style="width: 420px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer  style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="ResourceSave()">保存</el-button>
+        <el-button type="primary" @click="modelFlag3 = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+    <el-dialog title="物料编码" :close-on-click-modal="false" v-drag :visible.sync="partFlag" width="630px" >
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item :label="'物料编码：'">
+          <el-input v-model="partData.partNo" readonly style="width: 130px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'物料名称：'">
+          <el-input v-model="partData.partDescription" readonly style="width: 260px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'工厂编号：'">
+          <el-input v-model="partData.site" readonly style="width: 130px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item :label="'新增日期：'">
+          <el-input v-model="partData.createDate" readonly style="width: 130px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'计量单位：'">
+          <el-input v-model="partData.umid" readonly style="width: 130px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'在用：'" style="margin-left: 130px">
+          <el-input v-model="partData.active" readonly style="width: 130px;"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item :label="'客户名称：'">
+          <el-input v-model="partData.configurationTemplateID" readonly style="width: 130px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'客户产品科号：'">
+          <el-input v-model="partData.remark" readonly style="width: 260px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer  style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="partFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+
+
+  </div>
+</template>
+
+<script>
+  import {
+    getWorkCenterData,
+    getWorkCenterDataDetail,
+    getProLineNoDetail,
+    saveWorkCenterData,
+    deleteWorkCenterData,
+    saveResource,
+    deleteResource,
+    setResourceFlag
+  }from "@/api/base/site.js"
+  import {
+    searchPartNoData,
+  } from "@/api/base/site.js"
+  import Chooselist from '@/views/modules/common/Chooselist'
+  export default {
+    //加工中心
+    name: "workCenter",
+    components: {
+      Chooselist
+    },
+    data() {
+      return {
+        tagNo:'',
+        currentRow:null,
+        partFlag:false,
+        partData:{
+          partNo:'',
+          partDescription:'',
+          site:'',
+          createDate:'',
+          umid:'',
+          active:'',
+          configurationTemplateID:'',
+          modelFlag:'',
+        },
+        model3InputFlag:false,
+        currentRow2:null,
+        // 导出 start
+        exportData: [],
+        exportName: "加工中心涉及产品"+this.dayjs().format('YYYYMMDDHHmmss'),
+        exportHeader: ["加工中心涉及产品"],
+        exportFooter: [],
+        // 导出 end
+        // 导出 start
+        exportData2: [],
+        exportName2: "加工中心机台"+this.dayjs().format('YYYYMMDDHHmmss'),
+        exportHeader2: ["加工中心机台"],
+        exportFooter2: [],
+        // 导出 end
+        activeName:'first',
+        height: 200,
+        modelFlag3:false,
+        modelFlag2:false,
+        modelFlag:false,
+        modelInputFlag:true,
+        selectList:[],
+        modelData: {
+          add:'',
+          workCenterNo:'',
+          workCenterDesc:'',
+          site:'',
+          active:'',
+          workCenterType:'',
+          proLineNo:'',
+          productionLineDesc:'',
+          canCreateNewRollFlag:'',
+          createdDate:'',
+          remark:'',
+          needSetupFlag:'',
+          user:this.$store.state.user.name,
+        },
+        modelData2: {
+          add:'',
+          workCenterNo:'',
+          workCenterDesc:'',
+          site:'',
+          active:'',
+          workCenterType:'',
+          proLineNo:'',
+          productionLineDesc:'',
+          canCreateNewRollFlag:'',
+          createdDate:'',
+          remark:'',
+          needSetupFlag:'',
+          user:this.$store.state.user.name,
+        },
+        modelData3:{
+          workCenterNo:'',
+          site:'',
+          resourceID:'',
+          resourceDesc:'',
+          efficiency:'',
+          utilization:'',
+          active:'',
+          calendarID:'',
+          remark:'',
+
+          add:'',
+        },
+        dataList:[],
+        dataList2:[],
+        dataList3:[],
+
+        dataListLoading: false,
+        buttons:{
+          download:'导出涉及产品',
+          download2:'导出机台',
+        },
+        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6029,
+            serialNumber: '6029TablePartNo',
+            tableId: "6029Table",
+            tableName: "加工中心涉及产品表",
+            columnProp: "partNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "产品编码",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6029,
+            serialNumber: '6029TableRevNo',
+            tableId: "6029Table",
+            tableName: "加工中心涉及产品表",
+            columnProp: "revNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "版本号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 60
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6029,
+            serialNumber: '6029TableItemNo',
+            tableId: "6029Table",
+            tableName: "加工中心涉及产品表",
+            columnProp: "itemNo",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "工序号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 60
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6029,
+            serialNumber: '6029TableOperationDesc',
+            tableId: "6029Table",
+            tableName: "加工中心涉及产品表",
+            columnProp: "operationDesc",
+            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: 6029,
+            serialNumber: '6029TableMachSetuptime',
+            tableId: "6029Table",
+            tableName: "加工中心涉及产品表",
+            columnProp: "machSetuptime",
+            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: 6029,
+            serialNumber: '6029TableMachRunFactor',
+            tableId: "6029Table",
+            tableName: "加工中心涉及产品表",
+            columnProp: "machRunFactor",
+            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: 6029,
+            serialNumber: '6029TableFactorUnit',
+            tableId: "6029Table",
+            tableName: "加工中心涉及产品表",
+            columnProp: "factorUnit",
+            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: 6029,
+            serialNumber: '6029TableCrewsize',
+            tableId: "6029Table",
+            tableName: "加工中心涉及产品表",
+            columnProp: "crewsize",
+            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: 6029,
+            serialNumber: '6029TableEfficiency',
+            tableId: "6029Table",
+            tableName: "加工中心涉及产品表",
+            columnProp: "efficiency",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "效率",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 50
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6029,
+            serialNumber: '6029TableStatus',
+            tableId: "6029Table",
+            tableName: "加工中心涉及产品表",
+            columnProp: "status",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "状态",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 50
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6029,
+            serialNumber: '6029TableRoutingType',
+            tableId: "6029Table",
+            tableName: "加工中心涉及产品表",
+            columnProp: "routingType",
+            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: 6029,
+            serialNumber: '6029TableRemark',
+            tableId: "6029Table",
+            tableName: "加工中心涉及产品表",
+            columnProp: "remark",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "备注",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 300
+          }
+        ],
+        columnList2: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6029,
+            serialNumber: '6029Table2ResourceID',
+            tableId: "6029Table2",
+            tableName: "加工中心涉及机台表",
+            columnProp: "resourceID",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "机台编码",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6029,
+            serialNumber: '6029Table2ResourceDesc',
+            tableId: "6029Table2",
+            tableName: "加工中心涉及机台表",
+            columnProp: "resourceDesc",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "机台名称",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 150
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6029,
+            serialNumber: '6029Table2Efficiency',
+            tableId: "6029Table2",
+            tableName: "加工中心涉及机台表",
+            columnProp: "efficiency",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "效率",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6029,
+            serialNumber: '6029Table2Utilization',
+            tableId: "6029Table2",
+            tableName: "加工中心涉及机台表",
+            columnProp: "utilization",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "利用率",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6029,
+            serialNumber: '6029Table2Active',
+            tableId: "6029Table2",
+            tableName: "加工中心涉及机台表",
+            columnProp: "active",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "在用",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 60
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6029,
+            serialNumber: '6029Table2CreatedDate',
+            tableId: "6029Table2",
+            tableName: "加工中心涉及机台表",
+            columnProp: "createdDate",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "新增日期",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 200
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6029,
+            serialNumber: '6029Table2Remark',
+            tableId: "6029Table2",
+            tableName: "加工中心涉及机台表",
+            columnProp: "remark",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "备注",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 400
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6029,
+            serialNumber: '6029Table2CalendarID',
+            tableId: "6029Table2",
+            tableName: "加工中心涉及机台表",
+            columnProp: "calendarID",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "工作日历编码",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6029,
+            serialNumber: '6029Table2VirturlFlag',
+            tableId: "6029Table2",
+            tableName: "加工中心涉及机台表",
+            columnProp: "virturlFlag",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "虚拟机台",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          }
+        ],
+        columnList3: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6029,
+            serialNumber: '6029Table3WorkCenterNo',
+            tableId: "6029Table3",
+            tableName: "加工中心表",
+            columnProp: "workCenterNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "加工中心编码",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6029,
+            serialNumber: '6029Table3WorkCenterDesc',
+            tableId: "6029Table3",
+            tableName: "加工中心表",
+            columnProp: "workCenterDesc",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "加工中心名称",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 200
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6029,
+            serialNumber: '6029Table3WorkCenterType',
+            tableId: "6029Table3",
+            tableName: "加工中心表",
+            columnProp: "workCenterType",
+            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: 6029,
+            serialNumber: '6029Table3Active',
+            tableId: "6029Table3",
+            tableName: "加工中心表",
+            columnProp: "active",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "在用",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 40
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6029,
+            serialNumber: '6029Table3Site',
+            tableId: "6029Table3",
+            tableName: "加工中心表",
+            columnProp: "site",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "工厂编号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          }
+        ],
+      }
+    },
+    mounted() {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 225;
+      })
+    },
+    watch: {
+      '$route' (to, from) {
+        if(localStorage.getItem('workCenterNo')!=undefined){
+          this.jump();
+        }
+      }
+    },
+    methods: {
+      editResource(){
+        if(this.currentRow2==null){
+          this.$alert("请选择机台！", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        this.modelData3={
+          workCenterNo:this.modelData.workCenterNo,
+          site:this.modelData.site,
+          resourceID:this.currentRow2.resourceID,
+          resourceDesc:this.currentRow2.resourceDesc,
+          efficiency:this.currentRow2.efficiency,
+          utilization:this.currentRow2.utilization,
+          active:this.currentRow2.active,
+          calendarID:this.currentRow2.calendarID,
+          remark:this.currentRow2.remark,
+          add:1,
+        };
+        this.model3InputFlag=true;
+        this.modelFlag3=true;
+      },
+      addResource(){
+        if(this.modelData.workCenterNo==''||this.modelData.workCenterNo==null){
+          this.$alert('请先选择加工中心！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+
+        this.modelData3={
+          workCenterNo:this.modelData.workCenterNo,
+          site:this.modelData.site,
+          resourceID:'',
+          resourceDesc:'',
+          efficiency:'',
+          utilization:'',
+          active:'Y',
+          calendarID:'',
+          remark:'',
+          add:0,
+        };
+        this.model3InputFlag=false;
+        this.modelFlag3=true;
+
+      },
+      ResourceSave(){
+        if(this.modelData3.resourceID==''||this.modelData3.resourceID==null){
+          this.$alert("请输入机台编码！",'错误',{
+            confirmButtonText:'确定'
+          })
+          return false;
+        }
+        if(this.modelData3.resourceDesc==''||this.modelData3.resourceDesc==null){
+          this.$alert("请输入机台名称！",'错误',{
+            confirmButtonText:'确定'
+          })
+          return false;
+        }
+        if(this.modelData3.efficiency==''||this.modelData3.efficiency==null){
+          this.$alert("请输入效率！",'错误',{
+            confirmButtonText:'确定'
+          })
+          return false;
+        }
+        if(this.modelData3.utilization==''||this.modelData3.utilization==null){
+          this.$alert("请输入利用率！",'错误',{
+            confirmButtonText:'确定'
+          })
+          return false;
+        }
+        if(this.modelData3.active==''||this.modelData3.active==null){
+          this.$alert("请输入是否在用！",'错误',{
+            confirmButtonText:'确定'
+          })
+          return false;
+        }
+        if(this.modelData3.calendarID==''||this.modelData3.calendarID==null){
+          this.$alert("请输入工作日编码！",'错误',{
+            confirmButtonText:'确定'
+          })
+          return false;
+        }
+        saveResource(this.modelData3).then(({data}) => {
+          if (data && data.code == 200) {
+            this.modelFlag3 = false
+            getWorkCenterDataDetail(this.modelData).then(({data}) => {
+              this.dataList2 = data.rows2;
+            })
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+              }
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+      setResource(){
+        if(this.currentRow2==null){
+          this.$alert("请选择机台！", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        let msg='是否将该机台设为虚拟机台？';
+        if(this.currentRow2.virturlFlag=='Y'){
+          msg='是否将该机台设为常规机台？';
+        }
+        this.$confirm(msg, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          setResourceFlag(this.currentRow2).then(({data}) => {
+            if (data && data.code == 200) {
+              getWorkCenterDataDetail(this.modelData).then(({data}) => {
+                this.dataList2 = data.rows2;
+              })
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        })
+      },
+      deleteCalendar(){
+        if(this.currentRow2==null){
+          this.$alert("请选择机台！", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        this.$confirm(`是否删除此机台?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteResource(this.currentRow2).then(({data}) => {
+            if (data && data.code == 200) {
+              getWorkCenterDataDetail(this.modelData).then(({data}) => {
+                this.dataList2 = data.rows2;
+              })
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        })
+      },
+      getBaseData(val){
+        if (this.tagNo === 25){
+          this.modelData2.proLineNo = val.ProLineNo
+        }
+        if (this.tagNo === 92){
+          this.modelData3.calendarID = val.CalendarID
+        }
+      },
+      // 获取基础数据列表
+      getBaseList(val){
+        this.tagNo = val
+        this.$nextTick(() => {
+          let strVal = "";
+          if (val === 25){
+            strVal = this.modelData2.proLineNo
+          }
+          if (val === 92){
+            strVal = this.modelData3.calendarID
+          }
+          this.$refs.baseList.init(val,strVal)
+        })
+      },
+      clickData2(row){
+        this.currentRow2 = JSON.parse(JSON.stringify(row));
+      },
+      jumpCalendar(){
+        if(this.currentRow2==null){
+          this.$alert("请选择机台！", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        let inData={user:this.$store.state.user.name,site:this.currentRow2.site,calendarId:this.currentRow2.calendarID};
+        localStorage.setItem('calendar', JSON.stringify(inData))
+        this.$router.replace('base-calendar')
+      },
+      getPartDetail(){
+        if(this.currentRow==null){
+          this.$alert("请选择卷！", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        let inData={
+          user:this.$store.state.user.name,
+          site:this.currentRow.site,
+          partNo:this.currentRow.partNo
+        }
+        searchPartNoData(inData).then(({data}) => {
+          if (data.rows.length==0){
+            this.$alert("该物料编码不存在", '错误', {
+              confirmButtonText: '确定'
+            })
+            return false;
+          }
+          this.partData = data.rows[0];
+          this.partFlag=true;
+        })
+
+      },
+      first(){
+        if(localStorage.getItem('workCenterNo')!=undefined){
+          this.jump();
+        }
+      },
+      getData(){
+        let inData={
+          user:this.$store.state.user.name
+        }
+        getWorkCenterData(inData).then(({data}) => {
+          this.dataList3 = data.rows;
+          this.modelFlag2=true;
+        })
+      },
+      jump(){
+        let data=JSON.parse(localStorage.getItem('workCenterNo'));
+        localStorage.removeItem('workCenterNo');
+        getWorkCenterData(data).then(({data}) => {
+          this.dataList3 = data.rows;
+          this.modelData=data.rows[0];
+          getWorkCenterDataDetail(this.modelData).then(({data}) => {
+            this.dataList2 = data.rows2;
+            this.dataList = data.rows1;
+          })
+        })
+      },
+      clickData(row){
+        this.currentRow = JSON.parse(JSON.stringify(row));
+      },
+      addModal(){
+        this.modelData2={
+          add:'',
+          workCenterNo:'',
+          workCenterDesc:'',
+          site:this.$store.state.user.site,
+          active:'',
+          workCenterType:'',
+          proLineNo:'',
+          productionLineDesc:'',
+          canCreateNewRollFlag:'',
+          createdDate:'',
+          remark:'',
+          needSetupFlag:'',
+          user:this.$store.state.user.name,
+        },
+        this.modelData2.add=0;
+        this.modelInputFlag=false;
+        this.modelData2.active='Y';
+        this.modelData2.canCreateNewRollFlag='Y';
+        this.modelData2.needSetupFlag='Y';
+        this.modelData2.workCenterType='内部',
+        this.modelData2.createdDate=new Date();
+        this.modelFlag=true;
+      },
+      editModel(row){
+        this.modelData2=JSON.parse(JSON.stringify(row));
+        this.modelData2.add=1;
+        this.modelInputFlag=true;
+        this.modelFlag=true;
+      },
+      ModelSave(){
+        if(this.modelData2.workCenterNo==''||this.modelData2.workCenterNo==null){
+          this.$alert("请输入加工中心编码！",'错误',{
+            confirmButtonText:'确定'
+          })
+          return false;
+        }
+        if(this.modelData2.workCenterDesc==''||this.modelData2.workCenterDesc==null){
+          this.$alert("请输入加工中心名称！",'错误',{
+            confirmButtonText:'确定'
+          })
+          return false;
+        }
+        if(this.modelData2.site==''||this.modelData2.site==null){
+          this.$alert("请输入工厂编码！",'错误',{
+            confirmButtonText:'确定'
+          })
+          return false;
+        }
+        if(this.modelData2.createdDate==''||this.modelData2.createdDate==null){
+          this.$alert("请选择新增日期！",'错误',{
+            confirmButtonText:'确定'
+          })
+          return false;
+        }
+
+        this.modelData2.user=this.$store.state.user.name;
+
+        saveWorkCenterData(this.modelData2).then(({data}) => {
+          if (data && data.code == 200) {
+            this.modelFlag = false
+            this.getData();
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+              }
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+      deleteData(row){
+        this.$confirm(`是否删除此加工中心?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+
+        }).then(() => {
+          let inData = {
+            workCenterNo: row.workCenterNo,
+            site:row.site
+          }
+          deleteWorkCenterData(inData).then(({data}) => {
+            if (data && data.code == 200) {
+              this.modelFlag = false
+              this.getData();
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        })
+      },
+      tableHanddle(row){
+        this.modelData=row;
+        this.modelFlag2=false;
+        getWorkCenterDataDetail(this.modelData).then(({data}) => {
+          this.dataList2 = data.rows2;
+          this.dataList = data.rows1;
+        })
+      },
+      getProLineNo(){
+        let inData={
+          site : this.$store.state.user.site,
+          proLineNo : this.modelData2.proLineNo
+        }
+        getProLineNoDetail(inData).then(({data}) => {
+          let outList = data.rows
+          if (outList.length>0){
+            this.modelData2.productionLineDesc=outList[0].proLineDesc;
+            this.modelData2=JSON.parse(JSON.stringify(this.modelData2));
+          }else {
+            this.modelData2.proLineNo='';
+            this.modelData2.productionLineDesc='';
+            this.$alert('该生产线不存在', '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+      //导出excel
+      createExportData() {
+
+        return this.dataList;
+
+      },
+      startDownload() {
+        //  this.exportData = this.dataList
+
+      },
+      finishDownload() {
+
+      },
+      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 s
+      },
+      // 导出 end
+
+      //导出excel
+      createExportData2() {
+
+        return this.dataList2;
+
+      },
+      startDownload2() {
+        //  this.exportData = this.dataList
+
+      },
+      finishDownload2() {
+
+      },
+      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 + ")")
+
+        return s
+      },
+      // 导出 end
+    },
+    created() {
+      this.first();
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/modules/common/Chooselist.vue b/src/views/modules/common/Chooselist.vue
new file mode 100644
index 0000000..43e7e9a
--- /dev/null
+++ b/src/views/modules/common/Chooselist.vue
@@ -0,0 +1,198 @@
+<template>
+  <el-dialog :title="baseListData.description" center
+             :close-on-click-modal="false" :show-close="false" :close-on-press-escape="false"
+             :visible.sync="visible"
+             width="685px" v-drag>
+    <el-form label-position="top"
+             inline="inline"
+             size="mini"
+             label-width="120px">
+      <el-form-item  :label="baseListData.caption1" v-if="baseListData.caption1!='' && baseListData.caption1!=null">
+        <el-input v-model="param1"></el-input>
+      </el-form-item>
+      <el-form-item :label="baseListData.caption2" v-if="baseListData.caption2!='' && baseListData.caption2!=null">
+        <el-input v-model="param2"></el-input>
+      </el-form-item>
+      <el-form-item :label="baseListData.caption4" v-if="baseListData.caption4!='' && baseListData.caption4!=null">
+
+        <el-input v-model="param4" style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="baseListData.caption3" v-if="baseListData.caption3!='' && baseListData.caption3!=null">
+        <el-select v-model="param3" style="width: 120px">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="在用" value="Y"></el-option>
+          <el-option label="不在用" value="N"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-button style="margin-top: 18px" type="primary" @click="getDataList(false)">查询
+      </el-button>
+    </el-form>
+
+    <el-table
+      :height="height"
+      :data="dataList"
+      border
+      @row-dblclick="getRowData"
+      v-loading="dataListLoading"
+      style="width: 100%;">
+      <el-table-column
+        v-for="(item,index) in columnList" :key="index"
+        :sortable="item.columnSortable"
+        :prop="item.columnProp"
+        :header-align="item.headerAlign"
+        :show-overflow-tooltip="item.showOverflowTooltip"
+        :align="item.align"
+        :fixed="item.fixed"
+        :min-width="item.columnWidth"
+        :label="item.columnLabel">
+        <template slot-scope="scope">
+          {{ scope.row[item.columnProp] }}
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">关闭</el-button>
+    </span>
+  </el-dialog>
+
+</template>
+
+<script>
+
+
+import {
+  getChooselist,
+  getChooselistData
+} from "@/api/chooselist/chooselist.js"
+
+export default {
+  data() {
+    return {
+      height: 200,
+      title: '列表',
+      columnList: [],
+      queryTable: {},
+      visible: false,
+      dataListLoading: true,
+      fullscreenLoading: false,
+      param1: '',
+      param2: '',
+      param3: '',
+      param: '',
+      param4: this.$store.state.user.site,
+      dataList: [],
+      baseListData: {
+        caption1: '',
+        caption2: '',
+        caption3: '',
+        caption4: '',
+        description: '',
+        fieldname1: '',
+        fieldname2: '',
+        sqlcode: '',
+        tagno: '',
+      },
+      defaultParam: false
+    }
+  },
+  methods: {
+
+    // 获取 用户的配置
+    init(tagNo,param) {
+      this.visible = true;
+      this.param = param
+      // 根据 tagNo 获取列表
+      getChooselist({"tagNo": tagNo}).then(({data}) => {
+        this.columnList = []
+        this.baseListData = data.data
+        let start = data.data.sqlcode.indexOf("Select")
+        let end = data.data.sqlcode.indexOf("from")
+        let length = end - start
+        let columns = data.data.sqlcode.trim().substring(start + 6, length).trim()
+        let props = columns.split(",")
+
+        props.forEach((item, index) => {
+          let name = '信息列'
+          switch (index) {
+            case 0:
+              name = this.baseListData.caption1
+              break;
+            case 1:
+              name = this.baseListData.caption2
+              break;
+            case 2:
+              name = this.baseListData.caption3
+              break;
+            case 3:
+              name = this.baseListData.caption4
+              break;
+          }
+          let index1 = item.indexOf(" as ");
+          let index2 = item.indexOf(".");
+          let l = item.length
+          let prop = item
+          if (index1> 0){
+            prop = item.substring(index1+3,l).trim()
+          }
+          if (index1<0 && index2>0){
+            prop = item.substring(index2+1,l)
+          }
+          let column = {
+            "columnProp":prop,
+            "columnLabel": name,
+            "columnHidden": false,
+            "columnImage": false,
+            "columnSortable": false,
+            "columnWidth": null,
+            "format": null,
+            "sortLv": index,
+            "status": true,
+            "fixed": false,
+            "serialNumber": null,
+            "columnType": null,
+            "align": null
+          }
+          this.columnList.push(column)
+        })
+        this.getDataList(true)
+      })
+      this.dataListLoading = false
+
+    },
+    getDataList(bool) {
+      let sql = this.baseListData.sqlcode
+      if (bool){
+        sql += " and  (" + this.baseListData.fieldname1 + " like '%" + this.param + "%' OR "+this.baseListData.fieldname2 + " like '%" + this.param + "%'" +" ) "
+      }
+      if (this.param1) {
+        sql += " and " + this.baseListData.fieldname1 + " like '%" + this.param1 + "%'"
+      }
+      if (this.param2) {
+        sql += " and " + this.baseListData.fieldname2 + " like '%" + this.param2 + "%'"
+      }
+      if (this.param3) {
+        sql += " and active like '%" + this.param3 + "%'"
+      }
+      if (this.baseListData.caption4) {
+        sql += " and site=" + this.param4
+      }
+      getChooselistData({"sqlcode": sql}).then(({data}) => {
+        if (data.code == 0) {
+          this.dataList = data.baseListData;
+        } else {
+          this.$message.error(data.msg)
+        }
+      })
+    },
+    getRowData(row) {
+      this.visible = false
+      this.$emit('getBaseData',row)
+    }
+  }
+}
+</script>
+<style>
+
+
+</style>