From fa6968973863a7d3d65dbe914cbdd1f29e2f2774 Mon Sep 17 00:00:00 2001
From: xielue <gd_star@163.com>
Date: Fri, 2 Jun 2023 10:15:56 +0800
Subject: [PATCH] =?UTF-8?q?MES=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   1 +
 src/application/mk/basic-pages/edit.vue       |  81 ++++--
 src/application/mk/basic-pages/list.vue       | 231 +++++++++++++++++-
 src/application/mk/index.js                   |   8 +-
 src/application/mk/libs/function/form.js      |  83 ++++---
 src/layouts/tabs/TabsView.vue                 | 161 +++++++-----
 .../BaseDepartment/BaseDepartment/List.vue    |   3 +-
 src/pages/Middle/Mes/MesBom/MesBom/List.vue   |  77 +++---
 .../Middle/Mes/MesEnum/MesEnum/index.vue      |   6 +
 .../Mes/MesMaterials/MesMaterials/index.vue   |  36 ++-
 .../Mes/MesProcesses/MesProcesses/Edit.vue    |  77 +++++-
 .../Mes/MesProcesses/MesProcesses/List.vue    | 192 +++++++++------
 .../Middle/Mes/MesStaff/MesStaff/Edit.vue     |  41 +++-
 .../Middle/Mes/MesStaff/MesStaff/List.vue     |   3 +
 yarn.lock                                     |   5 +
 15 files changed, 748 insertions(+), 257 deletions(-)

diff --git a/package.json b/package.json
index 8ecb1db..4aa5235 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
     "core-js": "^3.6.5",
     "date-fns": "^2.14.0",
     "enquire.js": "^2.1.6",
+    "file-saver": "^2.0.5",
     "hevue-img-preview": "^6.1.0",
     "highlight.js": "^10.2.1",
     "js-cookie": "^2.2.1",
diff --git a/src/application/mk/basic-pages/edit.vue b/src/application/mk/basic-pages/edit.vue
index 079ac79..f9b7cbb 100644
--- a/src/application/mk/basic-pages/edit.vue
+++ b/src/application/mk/basic-pages/edit.vue
@@ -1,16 +1,20 @@
-<template> 
-    <div class="page-body">
+<template>
+  <div class="page-body">
 
-      <vxe-form :data="options.formOptions.data" ref="xForm" :title-width="options.formOptions.titleWidth"
-        :title-align="options.formOptions.titleAlign" :rules="options.formOptions.rules" :items="options.formOptions.items" titleColon> 
-      </vxe-form>
- 
-      <div class="footerbar">
-        <a-button type="primary" @click="ok">确定</a-button>
-        <a-button @click="cancel">取消</a-button>
-      </div>
+    <vxe-form :data="options.formOptions.data" ref="xForm" :title-width="options.formOptions.titleWidth"
+      :title-align="options.formOptions.titleAlign" :rules="options.formOptions.rules" :items="options.formOptions.items"
+      titleColon>
+    </vxe-form>
 
-    </div> 
+    <div class="footerbar">
+      <a-button type="primary" @click="save">确定</a-button>
+      <a-button @click="cancel">取消</a-button>
+    </div>
+
+
+
+
+  </div>
 </template>
 
 <script>
@@ -18,12 +22,12 @@
 
 export default {
 
-  name: 'BasicPageEdit', 
-  components: {  }, 
+  name: 'BasicPageEdit',
+  components: {},
   props: {
     options: {
       type: Object
-    }, 
+    },
     dataId: {
     }
 
@@ -33,23 +37,24 @@ export default {
   data() {
 
     return {
-      isEdit:false
+      isEdit: false,
+      defaultFormData: {}
 
     };
   },
 
-  computed: { 
+  computed: {
   },
 
 
   created() {
 
-    
+    this.defaultFormData = JSON.parse(JSON.stringify(this.options.formOptions.data || {}))
 
   },
   // 函数
   methods: {
- 
+
 
     // 返回
     back() {
@@ -59,7 +64,7 @@ export default {
         this.$closePage({
           closeRoute: this.options.addPageUrl
         });
-      } else { 
+      } else {
         this.$closePage({
           closeRoute: this.options.editPageUrl
         });
@@ -69,8 +74,10 @@ export default {
     },
 
     // 保存
-    ok() {
+    save({ afterSave }) {
 
+
+      let _this = this;
       let save = () => {
 
         this.isEdit = this.options.isEdit;
@@ -78,9 +85,9 @@ export default {
         // 如果是新增模式，提交新增接口 如果是编辑模式，提交编辑接口
         let action = !this.isEdit ? this.options.actions.create : this.options.actions.update;
 
-     
+
         // 如果是新增模式，提交的数据中加入id 如果是编辑模式，提交的数据中不加入id
-        let postdata = Object.assign({}, this.options.formOptions.data); 
+        let postdata = Object.assign({}, this.options.formOptions.data);
         // 如果是编辑模式
         if (this.isEdit) {
           // postdata = { MesUnit: postdata }
@@ -96,10 +103,34 @@ export default {
           data: postdata,
           useBigInt: true,
         }).then(() => { // 成功回调
-          this.$mk.success("保存成功");
-          if (!this.isEdit) { // 如果是新增模式，关闭当前页面
-            this.back();
+          if (afterSave) {
+            afterSave();
+          } else {
+            this.$mk.success("保存成功");
+
+            this.$emit("afterSave", { data: postdata });
+            if (!this.isEdit) { // 如果是新增模式，关闭当前页面
+
+              if (this.options.action_afterSave == "confirm") {
+                this.$confirm({
+                  title: '提示',
+                  content: '新增成功，是否继续',
+                  okText: '确认',
+                  cancelText: '返回',
+                  onOk() {
+                    _this.options.formOptions.data = _this.defaultFormData;
+                  },
+                  onCancel() {
+                    _this.back();
+                  },
+                });
+              } else {
+                this.back();
+              }
+
+            }
           }
+
         }).catch((a) => { // 失败回调
           this.$mk.error(a.data.msg); // 显示错误信息
         });
diff --git a/src/application/mk/basic-pages/list.vue b/src/application/mk/basic-pages/list.vue
index b284751..fbd6fbf 100644
--- a/src/application/mk/basic-pages/list.vue
+++ b/src/application/mk/basic-pages/list.vue
@@ -22,6 +22,12 @@
     <vxe-toolbar ref="xToolbar" custom>
       <template #buttons>
         <a-button type="primary" icon="delete" @click="pageDelete()">批量删除</a-button>
+        <a-button type="primary" style="margin-left: 5px;" icon="export" v-if="options.enabledExport"
+          @click="pageExport()">导出</a-button>
+        <a-button type="primary" style="margin-left: 5px;" icon="import" v-if="options.enabledImport"
+          @click="pageImport()">导入</a-button>
+        <a-button type="default" style="margin-left: 5px;" v-if="options.enabledImportTemplate"
+          @click="pageImportTemplate()">下载导入模板</a-button>
       </template>
     </vxe-toolbar>
     <!-- 表格区 -->
@@ -38,11 +44,26 @@
     </div>
 
 
+    <vxe-modal v-model="showSheetNameSelector" width="500" height="400" title="选择表名">
+      <template #default>
+        <div>
+          <vxe-select v-model="excelSheetName" placeholder="选择表名" style="width:100%">
+            <vxe-option v-for="n in excelSheetNames" :key="n" :value="n" :label="n"></vxe-option>
+          </vxe-select>
+        </div>
+        <div style="margin-top:10px;">
+          <vxe-button status="primary" content="确定" @click="importOk"></vxe-button>
+        </div>
+      </template>
+    </vxe-modal>
   </div>
 </template>
 
 <script>
 
+import FileSaver from 'file-saver'
+import * as XLSX from 'xlsx'
+import { read, utils } from "xlsx"; // 注意处理方法引入方式
 
 
 export default {
@@ -55,7 +76,7 @@ export default {
   data() {
 
     return {
-
+      showSheetNameSelector: false, excelSheetName: '', excelSheetNames: [],
       bindSearchData: null
     };
 
@@ -117,11 +138,120 @@ export default {
   // 动作
   methods: {
 
+    pageExport() {
+      let jsonRows = [];
+      let headerCells = [];
 
-    // =============================== 基于status进行开关 自动生成 Start ===============================
+      for (let i = 0; i < this.options.exportColumns.length; i++) {
+        let item = this.options.exportColumns[i];
+        headerCells.push(item.title);
+      }
 
-    // =============================== 基于status进行开关 自动生成 End ===============================
+      
+      let details = JSON.parse(JSON.stringify(this.$refs.xGrid.getTableData().fullData));
+ 
 
+      details.forEach(row => {
+        let jsonRow = {
+        };
+        for (let i = 0; i < this.options.exportColumns.length; i++) {
+          let item = this.options.exportColumns[i];
+          jsonRow[item.title] = row[item.field] || '';
+        }
+        jsonRows.push(jsonRow);
+      });
+      var worksheet = XLSX.utils.json_to_sheet(jsonRows, { header: headerCells, skipHeader: false });
+
+      const workbook = XLSX.utils.book_new();
+      XLSX.utils.book_append_sheet(workbook, worksheet, "Sheet1");
+
+      /* get binary string as output */
+      var wbout = XLSX.write(workbook, { bookType: 'xlsx', bookSST: true, type: 'array' })
+      try {
+        FileSaver.saveAs(new Blob([wbout], { type: 'application/octet-stream' }), (this.options.exportFileTitle ||  '导出数据' )+ '.xlsx')
+      } catch (e) {
+        if (typeof console !== 'undefined') {
+          console.log(e, wbout)
+        }
+      }
+    },
+    pageImportTemplate() {
+      let jsonRows = [];
+      let headerCells = [];
+
+      for (let i = 0; i < this.options.exportColumns.length; i++) {
+        let item = this.options.exportColumns[i];
+        headerCells.push(item.title);
+      }
+      var worksheet = XLSX.utils.json_to_sheet(jsonRows, { header: headerCells, skipHeader: false });
+
+      const workbook = XLSX.utils.book_new();
+      XLSX.utils.book_append_sheet(workbook, worksheet, "Sheet1");
+      /* get binary string as output */
+      var wbout = XLSX.write(workbook, { bookType: 'xlsx', bookSST: true, type: 'array' })
+      try {
+        FileSaver.saveAs(new Blob([wbout], { type: 'application/octet-stream' }), '导入模板.xlsx')
+      } catch (e) {
+        if (typeof console !== 'undefined') {
+          console.log(e, wbout)
+        }
+      }
+    },
+    pageImport() {
+      let fileForm = document.createElement('form');
+      let fileInput = document.createElement('input');
+      fileForm.className = 'vxe-table--file-form';
+      fileInput.name = 'file';
+      fileInput.type = 'file';
+      fileForm.appendChild(fileInput);
+      document.body.appendChild(fileForm);
+
+      fileInput.multiple = false;
+      fileInput.accept = '';
+
+      fileInput.onchange = (evnt) => {
+        var files = evnt.target.files;
+        var file = files[0];
+        this.readExcel(file)
+      };
+
+      fileForm.reset();
+      fileInput.click();
+    },
+    readExcel(file) {
+      const fileReader = new FileReader();
+      this.$mk.loading("读取中...");
+      fileReader.onload = ev => {
+        try {
+          const data = ev.target.result;
+          const workbook = read(data, { type: "binary" });
+          this.workbook = workbook;
+          this.excelSheetNames = workbook.SheetNames;
+          this.showSheetNameSelector = true;
+          this.$mk.hideLoading();
+
+
+
+        } catch (e) {
+          console.log("error:" + e);
+          return false;
+        }
+      }
+      fileReader.readAsBinaryString(file);
+    },
+
+    importOk() {
+      this.showSheetNameSelector = false;
+
+      const { workbook, excelSheetName } = this;
+      if (!excelSheetName) {
+        return;
+      }
+      let tableData = utils.sheet_to_json(workbook.Sheets[excelSheetName]);
+
+      this.$emit("importData", { data: tableData });
+
+    },
     // 修改日期
     onDateChange(date) { // 日期选择器事件
       if (date && date.length) { // 如果有值
@@ -149,6 +279,9 @@ export default {
           if (mode == "like") { // 如果是模糊搜索
             value = "%" + value + "%"; // 如果是模糊搜索就在两边加上%
           }
+          if(typeof(value) == "object" && value.id){
+            value = value.id;
+          }
           rules.push({ // 添加搜索参数
             column: key, // 字段名
             mode: mode, // 搜索模式
@@ -204,13 +337,103 @@ export default {
       }
     },
 
+    getPageList() {
+
+      let target = [];
+
+      let find = (component) => {
+
+        if (component && component.pageList) {
+          target = component.pageList;
+        }
+        if (component.$parent) {
+          find(component.$parent)
+        }
+      }
+
+      find(this.$parent);
+
+
+      return target;
+    },
+    isEditPageOpen() {
+      let pageList = this.getPageList();
+      if (pageList.filter(a => a.keyPath && a.keyPath.indexOf(this.options.editPageUrl) == 0).length) {
+        return true;
+      }
+      return false;
+    },
+
+    getTabsViewPageComponent() {
+
+      let target = null;
+
+      let find = (component) => {
+
+        if (component && component.pageList) {
+          target = component;
+        }
+        if (component.$parent) {
+          find(component.$parent)
+        }
+      }
+
+      find(this.$parent);
+
+
+      return target;
+    },
+    //找到定义了beforeTabClose方法 的页面组件
+    findEditPageComponent(key) {
+      if (!key) {
+        return null;
+      }
+      let target = null;
+
+
+      let find = (children) => {
+        children.forEach(item => {
+          if (item.beforeTabClose && item.pageKeys && item.pageKeys.filter(a => key.indexOf(a) == 0).length) {
+            target = item;
+            return;
+          }
+          if (item.$children && item.$children.length) {
+            find(item.$children)
+          }
+        })
+      }
+      let tabsview = this.getTabsViewPageComponent();
+      if (tabsview == null) {
+        return null;
+      }
+      find(tabsview.$children);
+
+
+      return target;
+    },
     // 编辑
     pageEdit(row) {
       if (!row) { // 如果没有选中行
         this.$mk.msg("请选择行"); // 提示
         return; // 返回
       }
-      this.$openPage(this.options.editPageUrl + row[this.options.keyName]); // 打开页面
+      if (this.isEditPageOpen()) {
+        let editPage = this.findEditPageComponent(this.options.editPageUrl);
+        if (editPage != null) {
+          editPage.beforeTabClose().then(() => {
+            this.$closePage(this.options.editPageUrl);
+            this.$openPage(this.options.editPageUrl + row[this.options.keyName]); // 打开页面
+          });
+        } else {
+          this.$openPage(this.options.editPageUrl + row[this.options.keyName]); // 打开页面
+        }
+
+      } else {
+        this.$openPage(this.options.editPageUrl + row[this.options.keyName]); // 打开页面
+      }
+
+
+
     },
 
     // 删除
diff --git a/src/application/mk/index.js b/src/application/mk/index.js
index 23a742a..0cad340 100644
--- a/src/application/mk/index.js
+++ b/src/application/mk/index.js
@@ -87,8 +87,12 @@ VXETable.formats.mixin({
         return cellValue ? '是' : '否'
     },
     formatRef({ cellValue,column }) { // 格式化参照
-
-        if(column && column.params && column.params.dataType == "object" && column.params.textField && typeof(cellValue) == "object"){
+ 
+        if(column && column.params 
+            && column.params.dataType == "object"
+            && column.params.textField && typeof(cellValue) == "object"
+        
+        ){
             return cellValue[column.params.textField];
         }
         return cellValue && cellValue[1] ? cellValue[1] : ''
diff --git a/src/application/mk/libs/function/form.js b/src/application/mk/libs/function/form.js
index 0a506b2..69843d8 100644
--- a/src/application/mk/libs/function/form.js
+++ b/src/application/mk/libs/function/form.js
@@ -3,44 +3,53 @@ export default {
     // 格式化表单数据
     formatFormData: function ({ data, rules }) { // 格式化表单数据
 
-        rules.forEach(rule => { // 循环规则
-            if (!rule.dataRule){
-                return;
-            }
-            if (rule.field in data) { // 如果字段在数据中
-                let value = data[rule.field]; // 获取值  
-                if (rule.dataRule.fromField) { 
-                   value = value[rule.dataRule.fromField];
+
+        let feachRules = (rules)=>{
+
+            rules.forEach(rule => { // 循环规则
+                if(rule.children && rule.children.length){
+                    feachRules(rule.children);
+                }
+                if (!rule.dataRule){
+                    return;
+                }
+                if (rule.field in data) { // 如果字段在数据中
+                    let value = data[rule.field]; // 获取值  
+                    if (rule.dataRule.fromField) { 
+                       value = value[rule.dataRule.fromField];
+                    } 
+                    let saveField = rule.field;
+                    if(rule.dataRule.saveField){
+                        saveField = rule.dataRule.saveField;
+                    }
+                    if (rule.dataRule.type == "integer") { // 如果是整数
+                        data[saveField] = parseInt(value); // 转换为整数
+                    }
+                    else if (rule.dataRule.type == "number") { // 如果是整数
+                        data[saveField] = parseFloat(value); // 转换为整数
+                    }
+                    else if (rule.dataRule.type == "timestamp") { // 如果是时间戳
+                        data[saveField] = parseInt(new Date(value).getTime() / 1000); // 转换为时间戳
+                    }
+                    else if (rule.dataRule.type == "string") { // 如果是字符串
+                        if(data[saveField] === true){ 
+                            data[saveField] = "true";
+                        }
+                        else if(data[saveField] === false){
+                            data[saveField] = "false";
+                        }
+                        else if(data[saveField]){
+                            data[saveField] = value + "";
+                        }
+                    }
+                    else {
+                        data[saveField] =value ;
+                    } 
                 } 
-                let saveField = rule.field;
-                if(rule.dataRule.saveField){
-                    saveField = rule.dataRule.saveField;
-                }
-                if (rule.dataRule.type == "integer") { // 如果是整数
-                    data[saveField] = parseInt(value); // 转换为整数
-                }
-                else if (rule.dataRule.type == "number") { // 如果是整数
-                    data[saveField] = parseFloat(value); // 转换为整数
-                }
-                else if (rule.dataRule.type == "timestamp") { // 如果是时间戳
-                    data[saveField] = parseInt(new Date(value).getTime() / 1000); // 转换为时间戳
-                }
-                else if (rule.dataRule.type == "string") { // 如果是字符串
-                    if(data[saveField] === true){ 
-                        data[saveField] = "true";
-                    }
-                    else if(data[saveField] === false){
-                        data[saveField] = "false";
-                    }
-                    else if(data[saveField]){
-                        data[saveField] = value + "";
-                    }
-                }
-                else {
-                    data[saveField] =value ;
-                } 
-            } 
-        });
+            });
+        };
+        feachRules(rules);
+       
 
     },
 
diff --git a/src/layouts/tabs/TabsView.vue b/src/layouts/tabs/TabsView.vue
index 0ab89c0..cff74f0 100644
--- a/src/layouts/tabs/TabsView.vue
+++ b/src/layouts/tabs/TabsView.vue
@@ -1,15 +1,8 @@
 <template>
   <admin-layout>
     <contextmenu :itemList="menuItemList" :visible.sync="menuVisible" @select="onMenuSelect" />
-    <tabs-head
-        v-if="multiPage"
-        :active="activePage"
-        :page-list="pageList"
-        @change="changePage"
-        @close="remove"
-        @refresh="refresh"
-        @contextmenu="onContextmenu"
-    />
+    <tabs-head v-if="multiPage" :active="activePage" :page-list="pageList" @change="changePage" @close="remove"
+      @refresh="refresh" @contextmenu="onContextmenu" />
     <div :class="['tabs-view-content', layout, pageWidth]" :style="`margin-top: ${multiPage ? -24 : 0}px`">
       <page-toggle-transition :disabled="animate.disabled" :animate="animate.name" :direction="animate.direction">
         <a-keep-alive :exclude-keys="excludeKeys" v-if="multiPage && cachePage" v-model="clearCaches">
@@ -25,17 +18,17 @@
 import AdminLayout from '@/layouts/AdminLayout' // 加载布局组件 管理布局
 import Contextmenu from '@/components/menu/Contextmenu' // 加载菜单组件 上下文菜单
 import PageToggleTransition from '@/components/transition/PageToggleTransition' // 加载页面切换动画组件
-import {mapState, mapMutations} from 'vuex' // 加载vuex mapState、mapMutations
-import {getI18nKey} from '@/utils/routerUtil' // 加载路由工具 getI18nKey 获取国际化key
+import { mapState, mapMutations } from 'vuex' // 加载vuex mapState、mapMutations
+import { getI18nKey } from '@/utils/routerUtil' // 加载路由工具 getI18nKey 获取国际化key
 import AKeepAlive from '@/components/cache/AKeepAlive' // 加载缓存组件 AKeepAlive
 import TabsHead from '@/layouts/tabs/TabsHead' // 加载页签组件 TabsHead
 
 export default {
   name: 'TabsView', // 组件名称 页签视图
   i18n: require('./i18n'), // 国际化 国际化配置
-  components: {TabsHead, PageToggleTransition, Contextmenu, AdminLayout , AKeepAlive }, 
+  components: { TabsHead, PageToggleTransition, Contextmenu, AdminLayout, AKeepAlive },
   // 注册组件 页签头、页面切换动画组件、上下文菜单、管理布局、AKeepAlive
-  data () {
+  data() {
     return {
       clearCaches: [], // 清除缓存
       pageList: [], // 页签列表
@@ -46,7 +39,7 @@ export default {
     }
   },
   computed: {
-    ...mapState('setting', ['multiPage', 'cachePage', 'animate', 'layout', 'pageWidth']), 
+    ...mapState('setting', ['multiPage', 'cachePage', 'animate', 'layout', 'pageWidth']),
     // 获取vuex数据 获取多页签、缓存页签、动画、布局、页面宽度
     menuItemList() { // 菜单项列表
       return [
@@ -60,7 +53,7 @@ export default {
       return this.multiPage ? 24 : 0 // 如果多页签 返回24 否则返回0
     }
   },
-  created () { // 创建
+  created() { // 创建
     this.loadCacheConfig(this.$router?.options?.routes) // 加载缓存配置
     this.loadCachedTabs() // 加载缓存页签
     const route = this.$route // 获取路由
@@ -71,11 +64,11 @@ export default {
     if (this.multiPage) { // 如果多页签
       this.$nextTick(() => { // 下一次更新
         this.setCachedKey(route) // 设置缓存键
-      }) 
+      })
       this.addListener() // 添加监听
     }
   },
-  mounted () { // 挂载
+  mounted() { // 挂载
     this.correctPageMinHeight(-this.tabsOffset) // 修正页面最小高度
   },
   beforeDestroy() { // 销毁前
@@ -116,27 +109,72 @@ export default {
     }
   },
   methods: {
-    changePage (key) { // 切换页签
+    changePage(key) { // 切换页签
       this.activePage = key // 激活页签为key 
       const page = this.pageList.find(item => item.path === key) // 获取页签
       this.$router.push(page.fullPath)  // 跳转到页签的fullPath
     },
-    remove (key, next) { // 移除页签
+
+    //找到定义了beforeTabClose方法 的页面组件
+    findPageComponent(component , key ) {
+      if(!key){
+        return null;
+      }
+      let target = null;
+
+      let find = (children) => {
+        children.forEach(item => {
+          if (item.beforeTabClose && item.pageKeys && item.pageKeys.filter(a=> key.indexOf(a) == 0).length) {
+            target = item;
+            return;
+          }
+          if (item.$children && item.$children.length) {
+            find(item.$children)
+          }
+        })
+      }
+
+      find(component.$children);
+
+
+      return target;
+    },
+
+    remove(key, next,noCheck) { // 移除页签 
       if (this.pageList.length === 1) { // 如果页签列表长度为1 只有一个页签
         return this.$message.warning(this.$t('warn')) // 提示警告 不能关闭最后一个页签
       }
-      //清除缓存
-      let index = this.pageList.findIndex(item => item.path === key) // 获取页签索引
-      this.clearCaches = this.pageList.splice(index, 1).map(page => page.cachedKey) // 清除缓存为页签的cachedKey
-      if (next) { // 如果next为true
-        this.$router.push(next) // 跳转到next
-      } else if (key === this.activePage) { // 如果key等于激活页签
-        index = index >= this.pageList.length ? this.pageList.length - 1 : index // 如果索引大于等于页签列表长度 则索引为页签列表长度-1 否则为索引
-        this.activePage = this.pageList[index].path // 激活页签为页签列表索引的path
-        this.$router.push(this.activePage) // 跳转到激活页签
+      let doRemove = () => {
+        //清除缓存
+        let index = this.pageList.findIndex(item => item.path === key) // 获取页签索引
+        this.clearCaches = this.pageList.splice(index, 1).map(page => page.cachedKey) // 清除缓存为页签的cachedKey
+        if (next) { // 如果next为true
+          this.$router.push(next) // 跳转到next
+        } else if (key === this.activePage) { // 如果key等于激活页签
+          index = index >= this.pageList.length ? this.pageList.length - 1 : index // 如果索引大于等于页签列表长度 则索引为页签列表长度-1 否则为索引
+          this.activePage = this.pageList[index].path // 激活页签为页签列表索引的path
+          this.$router.push(this.activePage) // 跳转到激活页签
+        }
+      };
+      if(noCheck){
+        doRemove();
+        return;
       }
+      let pageComponent = this.findPageComponent(this,key);
+     
+      if (pageComponent) {
+
+        pageComponent.beforeTabClose().then(()=>{
+          doRemove(); //通过了才调用关闭
+        });
+        return;
+      }
+    
+      doRemove();
+
+
     },
-    refresh (key, page) { // 刷新页签
+    refresh(key, page) { // 刷新页签
       page = page || this.pageList.find(item => item.path === key) // 获取页签
       page.loading = true // 页签的loading为true
       this.clearCache(page) // 清除缓存
@@ -154,7 +192,7 @@ export default {
         this.menuVisible = true // 菜单可见为true
       }
     },
-    onMenuSelect (key, target, pageKey) { // 菜单选择
+    onMenuSelect(key, target, pageKey) { // 菜单选择
       switch (key) { // switch key
         case '1': this.closeLeft(pageKey); break // 关闭左侧页签
         case '2': this.closeRight(pageKey); break // 关闭右侧页签
@@ -163,9 +201,9 @@ export default {
         default: break  // 默认
       }
     },
-    closeOthers (pageKey) { // 关闭其他页签 pageKey为页签key
+    closeOthers(pageKey) { // 关闭其他页签 pageKey为页签key
       // 清除缓存
-      const clearPages = this.pageList.filter(item => item.path !== pageKey && !item.unclose) 
+      const clearPages = this.pageList.filter(item => item.path !== pageKey && !item.unclose)
       // 清除页签为页签列表过滤出不等于页签key并且unclose为false的页签
       this.clearCaches = clearPages.map(item => item.cachedKey) // 清除缓存为清除页签的cachedKey
       this.pageList = this.pageList.filter(item => !clearPages.includes(item)) // 页签列表为页签列表过滤出不包含清除页签的页签
@@ -175,11 +213,11 @@ export default {
         this.$router.push(this.activePage) // 跳转到激活页签
       }
     },
-    closeLeft (pageKey) { // 关闭左侧页签 pageKey为页签key
+    closeLeft(pageKey) { // 关闭左侧页签 pageKey为页签key
       const index = this.pageList.findIndex(item => item.path === pageKey) // 获取页签索引
       // 清除缓存
       const clearPages = this.pageList.filter((item, i) => i < index && !item.unclose) // 清除页签为页签列表过滤出索引小于页签索引并且unclose为false的页签
-       // 清除页签为页签列表过滤出索引小于页签索引并且unclose为false的页签
+      // 清除页签为页签列表过滤出索引小于页签索引并且unclose为false的页签
       this.clearCaches = clearPages.map(item => item.cachedKey) // 清除缓存为清除页签的cachedKey
       this.pageList = this.pageList.filter(item => !clearPages.includes(item)) // 页签列表为页签列表过滤出不包含清除页签的页签
       // 判断跳转
@@ -188,10 +226,10 @@ export default {
         this.$router.push(this.activePage) // 跳转到激活页签
       }
     },
-    closeRight (pageKey) { // 关闭右侧页签 pageKey为页签key
+    closeRight(pageKey) { // 关闭右侧页签 pageKey为页签key
       // 清除缓存
       const index = this.pageList.findIndex(item => item.path === pageKey) // 页签索引为页签列表找到页签key的索引
-      const clearPages = this.pageList.filter((item, i) => i > index && !item.unclose)  
+      const clearPages = this.pageList.filter((item, i) => i > index && !item.unclose)
       // 清除页签为页签列表过滤出索引大于页签索引并且unclose为false的页签
       this.clearCaches = clearPages.map(item => item.cachedKey) // 清除缓存为清除页签的cachedKey
       this.pageList = this.pageList.filter(item => !clearPages.includes(item)) // 页签列表为页签列表过滤出不包含清除页签的页签
@@ -224,7 +262,7 @@ export default {
      * 添加监听器
      */
     addListener() { // 添加监听器
-      window.addEventListener('page:closeOthers', this.closeOthersListener) 
+      window.addEventListener('page:closeOthers', this.closeOthersListener)
       window.addEventListener('page:close', this.closePageListener) // 添加关闭页签监听器
       window.addEventListener('page:refresh', this.refreshPageListener) // 添加刷新页签监听器
       window.addEventListener('unload', this.unloadListener) // 添加卸载监听器
@@ -233,33 +271,37 @@ export default {
      * 移出监听器
      */
     removeListener() { // 移出监听器
-      
-      window.removeEventListener('page:closeOthers', this.closeOthersListener) 
+
+      window.removeEventListener('page:closeOthers', this.closeOthersListener)
       window.removeEventListener('page:close', this.closePageListener) // 移出关闭页签监听器
       window.removeEventListener('page:refresh', this.refreshPageListener) // 移出刷新页签监听器
       window.removeEventListener('unload', this.unloadListener) // 移出卸载监听器
     },
 
-    closeOthersListener(event) {   
-      this.closeOthers( event.detail) // 移出页签
+    closeOthersListener(event) {
+      this.closeOthers(event.detail) // 移出页签
     },
     /**
      * 页签关闭事件监听
      * @param event 页签关闭事件
      */
     closePageListener(event) { // 页签关闭事件监听 event为页签关闭事件
-      const {closeRoute, nextRoute} = event.detail // 页签关闭路由为页签关闭事件的detail的closeRoute，下一个路由为页签关闭事件的detail的nextRoute
-      const closePath = typeof closeRoute === 'string' ? closeRoute : closeRoute.path 
+      const { closeRoute, nextRoute } = event.detail // 页签关闭路由为页签关闭事件的detail的closeRoute，下一个路由为页签关闭事件的detail的nextRoute
+      const closePath = typeof closeRoute === 'string' ? closeRoute : (closeRoute.path || closeRoute.closeRoute)
+ 
+
+
       // 页签关闭路径为页签关闭路由为字符串时为页签关闭路由，否则为页签关闭路由的path
       const path = closePath && closePath.split('?')[0] // 路径等于为页签关闭路径并且以？分割的第一个
-      this.remove(path, nextRoute) // 移出页签
+ 
+      this.remove(path, nextRoute, true) // 移出页签
     },
     /**
      * 页面刷新事件监听
      * @param event 页签关闭事件
      */
     refreshPageListener(event) { // 页面刷新事件监听 event为页签关闭事件
-      const {pageKey} = event.detail // 页签key为页签关闭事件的detail的pageKey
+      const { pageKey } = event.detail // 页签key为页签关闭事件的detail的pageKey
       const path = pageKey && pageKey.split('?')[0] // 路径等于为页签key并且以？分割的第一个
       this.refresh(path) // 刷新页签
     },
@@ -267,7 +309,7 @@ export default {
      * 页面 unload 事件监听器，添加页签到 session 缓存，用于刷新时保留页签
      */
     unloadListener() { // 页面 unload 事件监听器
-      const tabs = this.pageList.map(item => ({...item, _init_: false})) 
+      const tabs = this.pageList.map(item => ({ ...item, _init_: false }))
       // 页签列表为页签列表的map，map的参数为页签列表的每一项，返回值为页签列表的每一项的副本，初始化为false
       sessionStorage.setItem(process.env.VUE_APP_TBAS_KEY, JSON.stringify(tabs)) // 添加页签到session缓存
     },
@@ -285,7 +327,7 @@ export default {
      * @param route 页面对应的路由
      */
     setCachedKey(route) { // 设置页面缓存的key route为路由
-      const page = this.pageList.find(item => item.path === route.path) 
+      const page = this.pageList.find(item => item.path === route.path)
       // 页签为页签列表的find，find的参数为页签列表的每一项，返回值为页签列表的每一项的路径等于路由的路径
       page.unclose = route.meta && route.meta.page && (route.meta.page.closable === false) // 不可关闭为路由的元数据的页签的可关闭为false
       if (!page._init_) { // 如果页签初始化为false
@@ -329,17 +371,20 @@ export default {
 </script>
 
 <style scoped lang="less">
-  .tabs-view{
-    margin: -16px auto 8px;
-    &.head.fixed{
-      max-width: 1400px;
-    }
+.tabs-view {
+  margin: -16px auto 8px;
+
+  &.head.fixed {
+    max-width: 1400px;
   }
-  .tabs-view-content{
-    position: relative;
-    &.head.fixed{
-      width: 1400px;
-      margin: 0 auto;
-    }
+}
+
+.tabs-view-content {
+  position: relative;
+
+  &.head.fixed {
+    width: 1400px;
+    margin: 0 auto;
   }
+}
 </style>
diff --git a/src/pages/Middle/Mes/BaseDepartment/BaseDepartment/List.vue b/src/pages/Middle/Mes/BaseDepartment/BaseDepartment/List.vue
index 1263467..e903cd1 100644
--- a/src/pages/Middle/Mes/BaseDepartment/BaseDepartment/List.vue
+++ b/src/pages/Middle/Mes/BaseDepartment/BaseDepartment/List.vue
@@ -86,8 +86,7 @@ export default {
             { type: 'checkbox', width: 50 }, // 多选框  
             { title: '操作', slots: { default: 'op' }, width: 120 },
 
-            { field: 'code', sortable: true, title: '编码', width: 250 }, // 编码
-           // { field: 'title', sortable: true, title: '部门名称', width: 250 }, // 部门名称
+            { field: 'code', sortable: true, title: '编码', width: 250 }, // 编码 
             { field: 'name', sortable: true, title: '部门名称', width: 250 }, // 部门英文名称 
             { field: 'create_time', formatter: 'formatDate', width: 160, sortable: true, title: '创建时间', showHeaderOverflow: true }, // 创建时间
             { field: 'update_time', formatter: 'formatDate', width: 160, sortable: true, title: '更新时间', showHeaderOverflow: true }, // 更新时间 
diff --git a/src/pages/Middle/Mes/MesBom/MesBom/List.vue b/src/pages/Middle/Mes/MesBom/MesBom/List.vue
index d93f9f9..2aacd8f 100644
--- a/src/pages/Middle/Mes/MesBom/MesBom/List.vue
+++ b/src/pages/Middle/Mes/MesBom/MesBom/List.vue
@@ -6,8 +6,8 @@
 import BASE_URL from '@/services/mes/api.js';
 
 
-export default { 
-  i18n: require("./i18n"), 
+export default {
+  i18n: require("./i18n"),
   props: {
 
   },
@@ -37,14 +37,14 @@ export default {
       var pageData = { // 页面数据变量
 
         keyName: 'id', // 主键字段名 
-        listFieldName: 'MesBom', 
+        listFieldName: 'MesBom',
         addPageUrl: "/MesBom/MesBomAdd",
-        editPageUrl: "/MesBom/MesBomUpdate/", 
-      // 接口动作
-      actions: { // Api 接口地址 
-					MesBomList: `${BASE_URL.BASE_URL}/MesBom/v1/mes/bom/list`,   
-					MesBomBatchDelete: `${BASE_URL.BASE_URL}/MesBom/v1/mes/bom/batchDelete` 
-      },
+        editPageUrl: "/MesBom/MesBomUpdate/",
+        // 接口动作
+        actions: { // Api 接口地址 
+          MesBomList: `${BASE_URL.BASE_URL}/MesBom/v1/mes/bom/list`,
+          MesBomBatchDelete: `${BASE_URL.BASE_URL}/MesBom/v1/mes/bom/batchDelete`
+        },
 
         start_time: 0, // 开始时间
         end_time: 0, // 结束时间
@@ -57,14 +57,29 @@ export default {
         },
         // 搜索区配置
         searchRules: [
-          { key: "title", mode: "like" },
-          { key: "desc", mode: "like" }
+          { key: "title", mode: "equal" },
+          { key: "version", mode: "like" }
         ],
         //搜索区
         searchFormItems: [ // 子项
-          { field: 'title', title: '标题', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入标题' } } },
-          { field: 'desc', title: '描述', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入描述' } } },
-          { span: 8, slots: { default: 'date' } },  // 自定义列
+
+          {
+            title: '父件', span: 6,
+            field: 'material_id', 
+            itemRender: {
+              name: 'MkFormDataSelector', props: {
+                params: {
+                  dataType: "object",
+                  valueField: "id",
+                  textField: "name",
+                  listdataFieldName: 'MesMaterials',
+                  dataUrl: `${BASE_URL.BASE_URL}/MesMaterials/v1/mes/materials/list`
+                }
+              }
+            }
+          },
+          { field: 'version', title: '版本号', span: 6, itemRender: { name: '$input', props: { placeholder: '请输入版本号' } } },
+
           {
             align: 'right', span: 4, itemRender: {  // 按钮列
               name: '$buttons', children: [{ props: { type: 'submit', content: '搜索', status: 'primary' } },  // 搜索按钮
@@ -80,31 +95,31 @@ export default {
           stripe: true, // 启用斑马纹
           id: 'datagrid_1', // 表格唯一标识
 
-        // 表格列配置
-        columns: [
-          { type: 'checkbox', width: 50 }, // 多选框
-          { type: 'seq', width: 30 }, // 序号
+          // 表格列配置
+          columns: [
+            { type: 'checkbox', width: 50 }, // 多选框
+            { type: 'seq', width: 30 }, // 序号
 
-          { title: '操作', slots: { default: 'op' }, width: 120 },
+            { title: '操作', slots: { default: 'op' }, width: 120 },
 
-          // =============================== 表格列 自动生成 Start ===============================
- 
-					{ field: 'version', sortable: true, title: 'BOM版本', width: 250 }, // BOM姓名 
- 
-					{ field: 'create_time', formatter: 'formatDate', width: 160, sortable: true, title: '创建时间', showHeaderOverflow: true }, // 创建时间
-					{ field: 'update_time', formatter: 'formatDate', width: 160, sortable: true, title: '更新时间', showHeaderOverflow: true }, // 更新时间
+            { field: 'mes_materials', formatter: 'formatRef', params: { dataType: "object", textField: "name" }, title: '父件', width: 250 },
 
-          // =============================== 表格列 自动生成 Start ===============================
+            { field: 'version', sortable: true, title: 'BOM版本', width: 250 },
+
+            { field: 'create_time', formatter: 'formatDate', width: 160, sortable: true, title: '创建时间', showHeaderOverflow: true }, // 创建时间
+            { field: 'update_time', formatter: 'formatDate', width: 160, sortable: true, title: '更新时间', showHeaderOverflow: true }, // 更新时间
+
+            // =============================== 表格列 自动生成 Start ===============================
 
 
-        ]
-      }
+          ]
+        }
 
       };
 
-    pageData.actions.getList = pageData.actions.MesBomList;
-    pageData.actions.delete = pageData.actions.MesBomBatchDelete;
-    pageData.gridOptions = Object.assign({}, this.$mk.config.defaults.gridOptions, pageData.gridOptions); // 合并表格数据
+      pageData.actions.getList = pageData.actions.MesBomList;
+      pageData.actions.delete = pageData.actions.MesBomBatchDelete;
+      pageData.gridOptions = Object.assign({}, this.$mk.config.defaults.gridOptions, pageData.gridOptions); // 合并表格数据
 
 
       this.pageOptions = pageData;
diff --git a/src/pages/Middle/Mes/MesEnum/MesEnum/index.vue b/src/pages/Middle/Mes/MesEnum/MesEnum/index.vue
index c6fecb3..fafe325 100644
--- a/src/pages/Middle/Mes/MesEnum/MesEnum/index.vue
+++ b/src/pages/Middle/Mes/MesEnum/MesEnum/index.vue
@@ -349,10 +349,16 @@ export default {
 
       let save = () => {
 
+        
+
         if (!this.selectedKey || this.selectedKey == "root") {
           this.$mk.error("请先选择枚举分类");
           return;
         }
+
+        
+        this.$refs.xTable.clearEdit();
+        
         let node = this.findTreeNode(this.selectedKey);
 
         let ds = JSON.parse(JSON.stringify(this.detailsData));
diff --git a/src/pages/Middle/Mes/MesMaterials/MesMaterials/index.vue b/src/pages/Middle/Mes/MesMaterials/MesMaterials/index.vue
index 965a046..c6132ac 100644
--- a/src/pages/Middle/Mes/MesMaterials/MesMaterials/index.vue
+++ b/src/pages/Middle/Mes/MesMaterials/MesMaterials/index.vue
@@ -2,9 +2,8 @@
   <div class="page-body">
 
 
-    <a-row type="flex">
-      <a-col flex="200px">
-
+    <div class="wrapper">
+      <div class="left">
         <div class="treepanel" :style="'height:' + tableHeight + 'px'">
           <div class="treepanel-header">
             <a @click.stop="treeAdd(row)" title="新增">
@@ -24,15 +23,22 @@
             </a-tree>
           </div>
         </div>
-      </a-col>
-      <a-col flex="auto">
-
+ 
+      </div>
+      <div class="right">
 
         <basic-page-list ref="listPage" :options="pageOptions"></basic-page-list>
 
+      </div>
+    </div>
 
-      </a-col>
-    </a-row>
+       
+  
+
+
+
+
+   
 
 
 
@@ -505,9 +511,23 @@ export default {
   padding: 8px;
 }
 
+ /* 左侧固定宽度 200px，右侧自适应 */
+ .wrapper {
+        display: flex;
+  }
+  .left {
+    width: 200px;
+    height: 100%; 
+  }
+  .right {
+    flex-grow: 1;
+    height: 100%; 
+  }
+
 .treepanel {
   width: calc(100% - 10px);
 
+  background: white;
   margin-right: 10px;
   border: 1px solid #ccc;
 }
diff --git a/src/pages/Middle/Mes/MesProcesses/MesProcesses/Edit.vue b/src/pages/Middle/Mes/MesProcesses/MesProcesses/Edit.vue
index 72a3acd..9845e82 100644
--- a/src/pages/Middle/Mes/MesProcesses/MesProcesses/Edit.vue
+++ b/src/pages/Middle/Mes/MesProcesses/MesProcesses/Edit.vue
@@ -1,5 +1,6 @@
 <template>
-  <basic-page-edit :desc="desc" :dataId="getDataId()" :options="pageOptions"></basic-page-edit>
+  <basic-page-edit :desc="desc" :dataId="getDataId()" ref="editpage" @afterSave="afterSave"
+    :options="pageOptions"></basic-page-edit>
 </template>
 
 <script>
@@ -23,7 +24,11 @@ export default {
   data() {
 
     return {
-      pageOptions: {}
+
+      pageKeys: ['/MesProcesses/MesProcessesUpdate/', '/MesProcesses/MesProcessesAdd'],
+      preventTabClose: true,
+      pageOptions: {},
+      lastFormDataJson: ""
     };
   },
 
@@ -39,6 +44,10 @@ export default {
     this.optionsInit();
     this.dataInit();
 
+    setTimeout(() => {
+      console.log(this)
+    }, 1000);
+
   },
   // 函数
   methods: {
@@ -53,6 +62,9 @@ export default {
         // 当前项目ID
         currentBeid: 0,
 
+        //保存后提示
+        action_afterSave: "confirm",
+
         addPageUrl: "/MesProcesses/MesProcessesAdd",
         editPageUrl: "/MesProcesses/MesProcessesUpdate/",
         listPageUrl: "/MesProcesses/MesProcessesList",
@@ -118,7 +130,7 @@ export default {
             is_quality_inspection: 0,
             quality_inspection_scheme_id: 0,
             raw_material_type_id: 0,
-            status: 0,
+            status: 1,
             create_uid: 0,
             update_uid: 0,
             create_time: new Date(2100, 1, 1).getTime() / 10000,
@@ -145,14 +157,14 @@ export default {
           // 表单项
           items: [
             { field: 'name', title: '工序名称', span: 12, itemRender: { name: '$input' } },
-           // { field: 'title', title: '工序名称', span: 12, itemRender: { name: '$input' } },
+            // { field: 'title', title: '工序名称', span: 12, itemRender: { name: '$input' } },
             { field: 'code', title: '工序编码', span: 12, itemRender: { name: '$input' } },
             { field: 'desc', title: '工序描述', span: 12, itemRender: { name: '$input' } },
-            { field: 'remark', title: '工序备注', span: 12, itemRender: { name: '$input' } }, 
-            
-					{ field: 'work_type', title: '计工方式', span: 12, itemRender: { name: '$select',props:{options:settings.options_work_type} } },
-            { field: 'car_limit', title: '领车限制数', span: 12, itemRender: { name: '$input',props:{type:'number'} } }, 
-					{ field: 'is_quality_inspection', title: '是否质检工序', span: 12, itemRender: { name: '$select',props:{options:settings.options_yesorno} } },
+            { field: 'remark', title: '工序备注', span: 12, itemRender: { name: '$input' } },
+
+            { field: 'work_type', title: '计工方式', span: 12, itemRender: { name: '$select', props: { options: settings.options_work_type } } },
+            { field: 'car_limit', title: '领车限制数', span: 12, itemRender: { name: '$input', props: { type: 'number' } } },
+            { field: 'is_quality_inspection', title: '是否质检工序', span: 12, itemRender: { name: '$select', props: { options: settings.options_yesorno } } },
             { field: 'status', title: '状态', span: 12, itemRender: { name: '$select', props: { options: settings.options_status_process } } },
           ]
         },
@@ -198,7 +210,7 @@ export default {
           }
 
           this.pageOptions.formOptions.data = a.data[detailDataFieldName];
-
+          this.lastFormDataJson = JSON.stringify(this.pageOptions.formOptions.data);
           this.$forceUpdate()
         }).catch((a) => {
           this.$mk.error(a.data.msg);
@@ -213,6 +225,8 @@ export default {
           this.pageOptions.formOptions.items.push(item);
         })
 
+        this.lastFormDataJson = JSON.stringify(this.pageOptions.formOptions.data);
+
       }
     },
 
@@ -226,7 +240,48 @@ export default {
         dataId = 0;
       }
       return dataId;
-    }
+    },
+
+    afterSave({ data }) {
+
+      this.lastFormDataJson = JSON.stringify(data);
+    },
+    isDataChanged() {
+
+      return this.lastFormDataJson != JSON.stringify(this.pageOptions.formOptions.data);
+    },
+    beforeTabClose() {
+
+      let _this = this;
+      return new Promise((resolve) => {
+
+        if (_this.isDataChanged()) {
+          _this.$confirm({
+            title: '提示',
+            content: '当前内容未保存，是否保存',
+            okText: '保存',
+            cancelText: '取消',
+            onOk() {
+              _this.$refs.editpage.save({
+                afterSave: () => {
+
+                  resolve();
+                }
+              })
+
+            },
+            onCancel() {
+              resolve();
+            },
+          });
+        } else {
+          resolve();
+        }
+
+
+      });
+
+    },
   },
   // 监听属性
   watch: {
diff --git a/src/pages/Middle/Mes/MesProcesses/MesProcesses/List.vue b/src/pages/Middle/Mes/MesProcesses/MesProcesses/List.vue
index d0a5370..2a9f961 100644
--- a/src/pages/Middle/Mes/MesProcesses/MesProcesses/List.vue
+++ b/src/pages/Middle/Mes/MesProcesses/MesProcesses/List.vue
@@ -1,5 +1,5 @@
 <template>
-  <basic-page-list :desc="desc" :options="pageOptions"></basic-page-list>
+  <basic-page-list :desc="desc" @importData="pageImport" :options="pageOptions"></basic-page-list>
 </template>
 
 <script>
@@ -7,8 +7,8 @@ import BASE_URL from '@/services/mes/api.js';
 
 const settings = require('../../basic/settings.js');
 
-export default { 
-  i18n: require("./i18n"), 
+export default {
+  i18n: require("./i18n"),
   props: {
 
   },
@@ -33,6 +33,44 @@ export default {
   // 动作
   methods: {
 
+    pageImport({ data }) {
+      let rows = []; 
+      data.forEach(item => { 
+        let row = {};
+        this.pageOptions.exportColumns.forEach(col => {
+
+          if (col.title in item) {
+            let v = item[col.title];
+            if(col.options){
+              col.options.forEach(op=>{
+                if(op.label == v){
+                  row[col.field] = op.value;
+                } 
+              })
+            }else{
+              row[col.field] = v;
+            } 
+          }
+        })
+        rows.push(row); 
+      });
+
+      this.$mk.post({
+        url: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/batchCreate`,
+        loading: "导入中...",
+        data: {
+          "list": rows
+        },
+        useBigInt: true
+      }).then((a) => { // 成功 
+
+        this.$mk.success(a.data.msg || "导入成功"); // 提示成功
+        this.$refs.xGrid.commitProxy('query') // 提交搜索
+
+      }).catch((a) => { // 失败
+        this.$mk.error(a.data.msg); // 提示错误信息
+      });
+    },
     optionsInit() {
       // 页面数据
       var pageData = { // 页面数据变量
@@ -40,49 +78,59 @@ export default {
         keyName: 'id', // 主键字段名 
         listFieldName: 'MesProcesses',
 
+        exportFileTitle :"工序",
+        enabledExport: true,
+        enabledImport: true,
+        enabledImportTemplate: true,
+        exportColumns: [
+          { title: '编码',field:"code" },
+          { title: '工序名称',field:"name" },
+          { title: '工序描述',field:"desc" },
+          { title: '计工方式',field:"work_type",options:settings.options_work_type }
+        ],
         addPageUrl: "/MesProcesses/MesProcessesAdd",
         editPageUrl: "/MesProcesses/MesProcessesUpdate/",
 
-      // 接口动作
-      actions: { // Api 接口地址
-        // =============================== 接口地址 自动生成 Start ===============================
-					MesProcessesList: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/list`, // 工序列表
-					MesProcessesDetail: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/detail`, // 工序详情
-					MesProcessesCreate: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/create`, // 创建工序
-					MesProcessesUpdate: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/update`, // 更新工序
-					MesProcessesDelete: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/detele`, // 删除工序
-					MesProcessesBatchDelete: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/batchDelete`, // 批量删除工序
-					MesProcessesBatchUpdate: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/batchUpdate`, // 批量更新工序
-					MesProcessesBatchCreate: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/batchCreate`, // 批量创建工序
-					MesProcessesExportExcel: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/export/excel`, // 导出工序数据到EXCEL
-					MesProcessesImportExcel: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/import/excel`, // 批量导入EXCEL工序数据
-					MesProcessesOpen: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/open`, // 打开工序
-					MesProcessesClose: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/close`, // 关闭工序
-					ProcessProgrammeList: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/list`, // 工序方案列表
-					ProcessProgrammeDetail: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/detail`, // 工序方案详情
-					ProcessProgrammeCreate: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/create`, // 创建工序方案
-					ProcessProgrammeUpdate: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/update`, // 更新工序方案
-					ProcessProgrammeDelete: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/detele`, // 删除工序方案
-					ProcessProgrammeBatchDelete: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/batchDelete`, // 批量删除工序方案
-					ProcessProgrammeBatchUpdate: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/batchUpdate`, // 批量更新工序方案
-					ProcessProgrammeBatchCreate: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/batchCreate`, // 批量创建工序方案
-					ProcessProgrammeExportExcel: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/export/excel`, // 导出工序方案数据到EXCEL
-					ProcessProgrammeImportExcel: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/import/excel`, // 批量导入EXCEL工序方案数据
-					ProgrammeItemList: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/list`, // 工序方案工序ID列表
-					ProgrammeItemDetail: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/detail`, // 工序方案工序ID详情
-					ProgrammeItemCreate: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/create`, // 创建工序方案工序ID
-					ProgrammeItemUpdate: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/update`, // 更新工序方案工序ID
-					ProgrammeItemDelete: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/detele`, // 删除工序方案工序ID
-					ProgrammeItemBatchDelete: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/batchDelete`, // 批量删除工序方案工序ID
-					ProgrammeItemBatchUpdate: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/batchUpdate`, // 批量更新工序方案工序ID
-					ProgrammeItemBatchCreate: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/batchCreate`, // 批量创建工序方案工序ID
-					ProgrammeItemExportExcel: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/export/excel`, // 导出工序方案工序ID数据到EXCEL
-					ProgrammeItemImportExcel: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/import/excel`, // 批量导入EXCEL工序方案工序ID数据
+        // 接口动作
+        actions: { // Api 接口地址
+          // =============================== 接口地址 自动生成 Start ===============================
+          MesProcessesList: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/list`, // 工序列表
+          MesProcessesDetail: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/detail`, // 工序详情
+          MesProcessesCreate: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/create`, // 创建工序
+          MesProcessesUpdate: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/update`, // 更新工序
+          MesProcessesDelete: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/detele`, // 删除工序
+          MesProcessesBatchDelete: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/batchDelete`, // 批量删除工序
+          MesProcessesBatchUpdate: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/batchUpdate`, // 批量更新工序
+          MesProcessesBatchCreate: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/batchCreate`, // 批量创建工序
+          MesProcessesExportExcel: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/export/excel`, // 导出工序数据到EXCEL
+          MesProcessesImportExcel: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/import/excel`, // 批量导入EXCEL工序数据
+          MesProcessesOpen: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/open`, // 打开工序
+          MesProcessesClose: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/close`, // 关闭工序
+          ProcessProgrammeList: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/list`, // 工序方案列表
+          ProcessProgrammeDetail: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/detail`, // 工序方案详情
+          ProcessProgrammeCreate: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/create`, // 创建工序方案
+          ProcessProgrammeUpdate: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/update`, // 更新工序方案
+          ProcessProgrammeDelete: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/detele`, // 删除工序方案
+          ProcessProgrammeBatchDelete: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/batchDelete`, // 批量删除工序方案
+          ProcessProgrammeBatchUpdate: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/batchUpdate`, // 批量更新工序方案
+          ProcessProgrammeBatchCreate: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/batchCreate`, // 批量创建工序方案
+          ProcessProgrammeExportExcel: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/export/excel`, // 导出工序方案数据到EXCEL
+          ProcessProgrammeImportExcel: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/import/excel`, // 批量导入EXCEL工序方案数据
+          ProgrammeItemList: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/list`, // 工序方案工序ID列表
+          ProgrammeItemDetail: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/detail`, // 工序方案工序ID详情
+          ProgrammeItemCreate: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/create`, // 创建工序方案工序ID
+          ProgrammeItemUpdate: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/update`, // 更新工序方案工序ID
+          ProgrammeItemDelete: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/detele`, // 删除工序方案工序ID
+          ProgrammeItemBatchDelete: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/batchDelete`, // 批量删除工序方案工序ID
+          ProgrammeItemBatchUpdate: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/batchUpdate`, // 批量更新工序方案工序ID
+          ProgrammeItemBatchCreate: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/batchCreate`, // 批量创建工序方案工序ID
+          ProgrammeItemExportExcel: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/export/excel`, // 导出工序方案工序ID数据到EXCEL
+          ProgrammeItemImportExcel: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/import/excel`, // 批量导入EXCEL工序方案工序ID数据
 
-        // =============================== 接口地址 自动生成 End ===============================
-      },
+          // =============================== 接口地址 自动生成 End ===============================
+        },
 
-      start_time: 0, // 开始时间
+        start_time: 0, // 开始时间
         end_time: 0, // 结束时间
 
 
@@ -93,13 +141,13 @@ export default {
         },
         // 搜索区配置
         searchRules: [
-          { key: "title", mode: "like" },
-          { key: "desc", mode: "like" }
+          { key: "name", mode: "like" },
+          { key: "code", mode: "like" }
         ],
         //搜索区
         searchFormItems: [ // 子项
-          { field: 'title', title: '标题', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入标题' } } },
-          { field: 'desc', title: '描述', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入描述' } } },
+          { field: 'name', title: '工序名称', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入工序名称' } } },
+          { field: 'code', title: '编码', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入编码' } } },
           { span: 8, slots: { default: 'date' } },  // 自定义列
           {
             align: 'right', span: 4, itemRender: {  // 按钮列
@@ -116,43 +164,43 @@ export default {
           stripe: true, // 启用斑马纹
           id: 'datagrid_1', // 表格唯一标识
 
-        // 表格列配置
-        columns: [
-          { type: 'checkbox', width: 50 }, // 多选框
-          { type: 'seq', width: 30 }, // 序号
+          // 表格列配置
+          columns: [
+            { type: 'checkbox', width: 50 }, // 多选框
+            { type: 'seq', width: 30 }, // 序号
 
-          { title: '操作', slots: { default: 'op' }, width: 120 },
+            { title: '操作', slots: { default: 'op' }, width: 120 },
 
-          // =============================== 表格列 自动生成 Start ===============================
- 
-					//{ field: 'process_segment_id', sortable: true, title: '工序段id', width: 250 }, // 工序段id
-					//{ field: 'title', sortable: true, title: '工序名称', width: 250 }, // 工序名称
-					{ field: 'code', sortable: true, title: '工序编码', width: 250 }, // 工序编码
-					{ field: 'name', sortable: true, title: '工序名称', width: 250 }, // 工序英文名称
-					{ field: 'desc', sortable: true, title: '工序描述', width: 250 }, // 工序描述
-					{ field: 'remark', sortable: true, title: '工序备注', width: 250 }, // 工序备注 
+            // =============================== 表格列 自动生成 Start ===============================
 
-          { field: 'work_type',params:settings.options_work_type,   formatter: 'formatEnum', sortable: true, title: '计工方式', width: 250 },
+            //{ field: 'process_segment_id', sortable: true, title: '工序段id', width: 250 }, // 工序段id
+            //{ field: 'title', sortable: true, title: '工序名称', width: 250 }, // 工序名称
+            { field: 'code', sortable: true, title: '工序编码', width: 250 }, // 工序编码
+            { field: 'name', sortable: true, title: '工序名称', width: 250 }, // 工序英文名称
+            { field: 'desc', sortable: true, title: '工序描述', width: 250 }, // 工序描述
+            { field: 'remark', sortable: true, title: '工序备注', width: 250 }, // 工序备注 
 
-					{ field: 'car_limit', sortable: true, title: '领车限制数', width: 250 }, // 领车限制数
-					{ field: 'is_quality_inspection', sortable: true, title: '是否质检工序', width: 250 }, // 是否质检工序
-					//{ field: 'quality_inspection_scheme_id', sortable: true, title: '质检方案id', width: 250 }, // 质检方案id
-					//{ field: 'raw_material_type_id', sortable: true, title: '坯体类型ID', width: 250 }, // 坯体类型ID
-					{ field: 'status', slots: { default: 'status' }, width: 80, sortable: true, title: '状态', showHeaderOverflow: true }, // 状态
- 
-					{ field: 'create_time', formatter: 'formatDate', width: 160, sortable: true, title: '创建时间', showHeaderOverflow: true }, // 创建时间
-					{ field: 'update_time', formatter: 'formatDate', width: 160, sortable: true, title: '更新时间', showHeaderOverflow: true }, // 更新时间
+            { field: 'work_type', params: settings.options_work_type, formatter: 'formatEnum', sortable: true, title: '计工方式', width: 250 },
 
-          // =============================== 表格列 自动生成 Start ===============================
+            { field: 'car_limit', sortable: true, title: '领车限制数', width: 250 }, // 领车限制数
+            { field: 'is_quality_inspection', sortable: true, title: '是否质检工序', width: 250 }, // 是否质检工序
+            //{ field: 'quality_inspection_scheme_id', sortable: true, title: '质检方案id', width: 250 }, // 质检方案id
+            //{ field: 'raw_material_type_id', sortable: true, title: '坯体类型ID', width: 250 }, // 坯体类型ID
+            { field: 'status', slots: { default: 'status' }, width: 80, sortable: true, title: '状态', showHeaderOverflow: true }, // 状态
+
+            { field: 'create_time', formatter: 'formatDate', width: 160, sortable: true, title: '创建时间', showHeaderOverflow: true }, // 创建时间
+            { field: 'update_time', formatter: 'formatDate', width: 160, sortable: true, title: '更新时间', showHeaderOverflow: true }, // 更新时间
+
+            // =============================== 表格列 自动生成 Start ===============================
 
 
-        ]
+          ]
         }
 
       };
-    pageData.actions.getList = pageData.actions.MesProcessesList;
-    pageData.actions.delete = pageData.actions.MesProcessesBatchDelete;
-    pageData.gridOptions = Object.assign({}, this.$mk.config.defaults.gridOptions, pageData.gridOptions); // 合并表格数据
+      pageData.actions.getList = pageData.actions.MesProcessesList;
+      pageData.actions.delete = pageData.actions.MesProcessesBatchDelete;
+      pageData.gridOptions = Object.assign({}, this.$mk.config.defaults.gridOptions, pageData.gridOptions); // 合并表格数据
 
 
       this.pageOptions = pageData;
diff --git a/src/pages/Middle/Mes/MesStaff/MesStaff/Edit.vue b/src/pages/Middle/Mes/MesStaff/MesStaff/Edit.vue
index 2f98764..f676a68 100644
--- a/src/pages/Middle/Mes/MesStaff/MesStaff/Edit.vue
+++ b/src/pages/Middle/Mes/MesStaff/MesStaff/Edit.vue
@@ -45,6 +45,13 @@ export default {
 
 
     optionsInit() {
+
+
+      let date = new Date();
+      let year = date.getFullYear();
+      let month = (date.getMonth() + 1).toString().padStart(2, '0');
+      let day = date.getDate().toString().padStart(2, '0');
+      let dateString = `${year}-${month}-${day}`;
       // 页面数据变量
       var pageData = {
         // 当前项目名称
@@ -130,11 +137,11 @@ export default {
             department_id: 0,
             process_id: 0,
             process_scheme_id: 0,
-            entry_date: new Date(2100, 1, 1).getTime() / 10000,
-            departure_date: new Date(2100, 1, 1).getTime() / 10000,
+            entry_date: dateString,
+            departure_date: "",
             is_piecework: 0,
             remark: "",
-            status: 0,
+            status: 1,
             create_uid: 0,
             update_uid: 0,
             create_time: new Date(2100, 1, 1).getTime() / 10000,
@@ -167,6 +174,26 @@ export default {
               children: [
                 { field: 'name', title: '员工姓名', span: 12, itemRender: { name: '$input' } },
                 { field: 'code', title: '员工工号', span: 12, itemRender: { name: '$input' } },
+
+                {
+                  title: '部门', span: 12,
+                  field: 'base_department',
+                  dataRule: {
+                    fromField: "id",
+                    saveField: "department_id" // 如果表单项存储的是对象，将从fromField中取得值保存到saveField
+                  },
+                  itemRender: {
+                    name: 'MkFormDataSelector', props: {
+                      params: {
+                        dataType: "object",
+                        valueField: "id",
+                        textField: "name",
+                        listdataFieldName: 'BaseDepartment',
+                        dataUrl: `${BASE_URL.BASE_URL}/BaseDepartment/v1/base/department/list`
+                      }
+                    }
+                  }
+                },
                 { field: 'phone', title: '员工电话', span: 12, itemRender: { name: '$input' } },
                 { field: 'email', title: '员工邮箱', span: 12, itemRender: { name: '$input' } },
                 //{ field: 'password', title: '员工密码', span: 12, itemRender: { name: '$input' } },
@@ -233,16 +260,16 @@ export default {
 
           let detailDataFieldName = this.pageOptions.detailDataFieldName;
 
-          if (a.data[detailDataFieldName].entry_date) {
+          if (a.data[detailDataFieldName].entry_date > 0) {
             a.data[detailDataFieldName].entry_date = new Date(a.data[detailDataFieldName].entry_date * 1000);
           }
-          if (a.data[detailDataFieldName].departure_date) {
+          if (a.data[detailDataFieldName].departure_date > 0) {
             a.data[detailDataFieldName].departure_date = new Date(a.data[detailDataFieldName].departure_date * 1000);
           }
-          if (a.data[detailDataFieldName].create_time) {
+          if (a.data[detailDataFieldName].create_time > 0) {
             a.data[detailDataFieldName].create_time = new Date(a.data[detailDataFieldName].create_time * 1000);
           }
-          if (a.data[detailDataFieldName].update_time) {
+          if (a.data[detailDataFieldName].update_time > 0) {
             a.data[detailDataFieldName].update_time = new Date(a.data[detailDataFieldName].update_time * 1000);
           }
 
diff --git a/src/pages/Middle/Mes/MesStaff/MesStaff/List.vue b/src/pages/Middle/Mes/MesStaff/MesStaff/List.vue
index 2863948..ecbde0f 100644
--- a/src/pages/Middle/Mes/MesStaff/MesStaff/List.vue
+++ b/src/pages/Middle/Mes/MesStaff/MesStaff/List.vue
@@ -109,6 +109,8 @@ export default {
         searchFormItems: [ // 子项
           { field: 'title', title: '标题', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入标题' } } },
           { field: 'desc', title: '描述', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入描述' } } },
+          
+
           { span: 8, slots: { default: 'date' } },  // 自定义列
           {
             align: 'right', span: 4, itemRender: {  // 按钮列
@@ -136,6 +138,7 @@ export default {
  
 					{ field: 'name', sortable: true, title: '员工姓名', width: 250 }, // 员工姓名
 					{ field: 'code', sortable: true, title: '员工工号', width: 250 }, // 员工工号
+          { field: 'base_department', formatter: 'formatRef', params: { dataType: "object", textField: "name" }, title: '部门', width: 250 },
 					{ field: 'phone', sortable: true, title: '员工电话', width: 250 }, // 员工电话
 					{ field: 'email', sortable: true, title: '员工邮箱', width: 250 }, // 员工邮箱
 					//{ field: 'password', sortable: true, title: '员工密码', width: 250 }, // 员工密码
diff --git a/yarn.lock b/yarn.lock
index dfcaf7e..088bc77 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4883,6 +4883,11 @@
     "loader-utils" "^1.0.2"
     "schema-utils" "^1.0.0"
 
+"file-saver@^2.0.5":
+  "integrity" "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="
+  "resolved" "https://registry.npmmirror.com/file-saver/-/file-saver-2.0.5.tgz"
+  "version" "2.0.5"
+
 "file-uri-to-path@2":
   "integrity" "sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg=="
   "resolved" "https://registry.npmmirror.com/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz"