From 5e1b6f3620e30b28b1c8af71c187e1589268d5cb Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Tue, 21 Feb 2023 16:16:05 +0800
Subject: [PATCH] 1

---
 src/api/eam/eam.js                        |  41 ++
 src/views/modules/eam/eamAdmin.vue        |  17 +-
 src/views/modules/eam/eamAdminLevel.vue   | 362 ++++++++++++++++
 src/views/modules/eam/eamFamily.vue       |  21 +-
 src/views/modules/eam/eamGroup.vue        | 362 ++++++++++++++++
 src/views/modules/eam/eamLocation.vue     | 362 ++++++++++++++++
 src/views/modules/eam/eamManufacturer.vue | 488 ++++++++++++++++++++++
 src/views/modules/eam/eamSupplier.vue     | 488 ++++++++++++++++++++++
 8 files changed, 2128 insertions(+), 13 deletions(-)
 create mode 100644 src/views/modules/eam/eamAdminLevel.vue
 create mode 100644 src/views/modules/eam/eamGroup.vue
 create mode 100644 src/views/modules/eam/eamLocation.vue
 create mode 100644 src/views/modules/eam/eamManufacturer.vue
 create mode 100644 src/views/modules/eam/eamSupplier.vue

diff --git a/src/api/eam/eam.js b/src/api/eam/eam.js
index 784ffd9..b173eb8 100644
--- a/src/api/eam/eam.js
+++ b/src/api/eam/eam.js
@@ -21,3 +21,44 @@ export const eamFamilySave = data => createAPI(`api/pms/eam/eamFamilySave`,'post
 export const eamFamilyEdit = data => createAPI(`api/pms/eam/eamFamilyEdit`,'post',data)
 
 export const eamFamilyDelete = data => createAPI(`api/pms/eam/eamFamilyDelete`,'post',data)
+//---------------设备分组-------------------
+export const eamGroupSearch = data => createAPI(`api/pms/eam/eamGroupSearch`,'post',data)
+
+export const eamGroupSave = data => createAPI(`api/pms/eam/eamGroupSave`,'post',data)
+
+export const eamGroupEdit = data => createAPI(`api/pms/eam/eamGroupEdit`,'post',data)
+
+export const eamGroupDelete = data => createAPI(`api/pms/eam/eamGroupDelete`,'post',data)
+
+//---------------设备区域-------------------
+export const eamLocationSearch = data => createAPI(`api/pms/eam/eamLocationSearch`,'post',data)
+
+export const eamLocationSave = data => createAPI(`api/pms/eam/eamLocationSave`,'post',data)
+
+export const eamLocationEdit = data => createAPI(`api/pms/eam/eamLocationEdit`,'post',data)
+
+export const eamLocationDelete = data => createAPI(`api/pms/eam/eamLocationDelete`,'post',data)
+//---------------设备供应商-------------------
+export const eamSupplierSearch = data => createAPI(`api/pms/eam/eamSupplierSearch`,'post',data)
+
+export const eamSupplierSave = data => createAPI(`api/pms/eam/eamSupplierSave`,'post',data)
+
+export const eamSupplierEdit = data => createAPI(`api/pms/eam/eamSupplierEdit`,'post',data)
+
+export const eamSupplierDelete = data => createAPI(`api/pms/eam/eamSupplierDelete`,'post',data)
+//---------------设备制造商-------------------
+export const eamManufacturerSearch = data => createAPI(`api/pms/eam/eamManufacturerSearch`,'post',data)
+
+export const eamManufacturerSave = data => createAPI(`api/pms/eam/eamManufacturerSave`,'post',data)
+
+export const eamManufacturerEdit = data => createAPI(`api/pms/eam/eamManufacturerEdit`,'post',data)
+
+export const eamManufacturerDelete = data => createAPI(`api/pms/eam/eamManufacturerDelete`,'post',data)
+//---------------设备人员等级-------------------
+export const eamAdminLevelSearch = data => createAPI(`api/pms/eam/eamAdminLevelSearch`,'post',data)
+
+export const eamAdminLevelSave = data => createAPI(`api/pms/eam/eamAdminLevelSave`,'post',data)
+
+export const eamAdminLevelEdit = data => createAPI(`api/pms/eam/eamAdminLevelEdit`,'post',data)
+
+export const eamAdminLevelDelete = data => createAPI(`api/pms/eam/eamAdminLevelDelete`,'post',data)
diff --git a/src/views/modules/eam/eamAdmin.vue b/src/views/modules/eam/eamAdmin.vue
index 6597f37..51b5259 100644
--- a/src/views/modules/eam/eamAdmin.vue
+++ b/src/views/modules/eam/eamAdmin.vue
@@ -24,6 +24,7 @@
       </el-form-item>
     </el-form>
     <el-table
+      :height="height"
       :data="dataList"
       border
       v-loading="dataListLoading"
@@ -67,7 +68,7 @@
       @size-change="sizeChangeHandle"
       @current-change="currentChangeHandle"
       :current-page="pageIndex"
-      :page-sizes="[10, 20, 50, 100]"
+      :page-sizes="[20, 50, 100, 1000]"
       :page-size="pageSize"
       :total="totalPage"
       layout="total, sizes, prev, pager, next, jumper">
@@ -153,7 +154,7 @@
         pageIndex: 1,
         pageSize: 100,
         totalPage: 0,
-
+        height: 200,
         dataList: [],
         dataListLoading: false,
         dataListSelections: [],
@@ -361,7 +362,11 @@
 
       }
     },
-
+    mounted () {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 210
+      })
+    },
     created () {
       this.getDataList()
     },
@@ -382,13 +387,13 @@
       },
       // 每页数
       sizeChangeHandle (val) {
-        this.searchData.limit = val
-        this.searchData.page = 1
+        this.pageSize = val
+        this.pageIndex = 1
         this.getDataList()
       },
       // 当前页
       currentChangeHandle (val) {
-        this.searchData.page = val
+        this.pageIndex = val
         this.getDataList()
       },
       // 多选
diff --git a/src/views/modules/eam/eamAdminLevel.vue b/src/views/modules/eam/eamAdminLevel.vue
new file mode 100644
index 0000000..9295f22
--- /dev/null
+++ b/src/views/modules/eam/eamAdminLevel.vue
@@ -0,0 +1,362 @@
+<template>
+  <div class="mod-config">
+    <el-form :inline="true"  label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
+      <el-form-item :label="'工厂编码'">
+        <el-input v-model="searchData.site"  style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'机修人员等级编码'">
+        <el-input v-model="searchData.adminLevelID"  style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'机修人员等级名称'">
+        <el-input v-model="searchData.adminLevelDesc"  style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'在用'">
+        <el-select filterable v-model="searchData.active" style="width: 130px">
+          <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-form-item  :label="' '">
+        <el-button @click="getDataList()">查询</el-button>
+        <el-button  type="primary" @click="addModal()">新增</el-button>
+        <!--        <el-button  type="danger" @click="deleteAdminLevel()" :disabled="dataListSelections.length <= 0">批量删除</el-button>-->
+      </el-form-item>
+    </el-form>
+    <el-table
+      :height="height"
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+
+      style="width: 100%;">
+      <!--      <el-table-column-->
+      <!--        type="selection"-->
+      <!--        header-align="center"-->
+      <!--        align="center"-->
+      <!--        width="50">-->
+      <!--      </el-table-column>-->
+      <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==''?false: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-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="100"
+        label="操作">
+        <template slot-scope="scope">
+          <a type="text" size="small" @click="updateModal(scope.row)">修改</a>
+          <a type="text" size="small" @click="deleteAdminLevel(scope.row)">删除</a>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[20, 50, 100, 1000]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+    <el-dialog title="机修人员等级" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="430px">
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="机修人员等级编码:">
+          <el-input v-model="modalData.adminLevelID" :disabled="modalDisableFlag" style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="机修人员等级名称:">
+          <el-input v-model="modalData.adminLevelDesc"  style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="是否在用:">
+          <el-select filterable v-model="modalData.active" style="width: 120px">
+            <el-option label="是" value="Y"></el-option>
+            <el-option label="否" 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="saveData()">保存</el-button>
+        <el-button type="primary" @click="modalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import {
+    eamAdminLevelSearch,
+    eamAdminLevelSave,
+    eamAdminLevelEdit,
+    eamAdminLevelDelete,
+  } from "@/api/eam/eam.js"
+  export default {
+
+    data () {
+      return {
+
+        searchData: {
+          site: this.$store.state.user.site,
+          adminLevelID: '',
+          adminLevelDesc: '',
+          active: 'Y',
+          page: 1,
+          limit: 10,
+        },
+        height: 200,
+        pageIndex: 1,
+        pageSize: 100,
+        totalPage: 0,
+
+        dataList: [],
+        dataListLoading: false,
+        dataListSelections: [],
+        modalFlag:false,
+        modalDisableFlag:false,
+        modalData:{
+          flag:'',
+          site: this.$store.state.user.site,
+          adminLevelID:'',
+          adminLevelDesc:'',
+          active:'',
+        },
+        departmentList:[],
+        // 展示列集
+        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101001,
+            serialNumber: '101001TableSite',
+            tableId: "101001Table",
+            tableName: "common",
+            columnProp: 'site',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '工厂编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101001,
+            serialNumber: '101001TableAdminLevelID',
+            tableId: "101001Table",
+            tableName: "common",
+            columnProp: 'adminLevelID',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '机修人员等级编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101001,
+            serialNumber: '101001TableAdminLevelDesc',
+            tableId: "101001Table",
+            tableName: "common",
+            columnProp: 'adminLevelDesc',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '机修人员等级名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 140,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101001,
+            serialNumber: '101001TableActive',
+            tableId: "101001Table",
+            tableName: "common",
+            columnProp: 'active',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '在用',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 40,
+          },
+        ],
+        levelList:[],
+
+      }
+    },
+    mounted () {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 210
+      })
+    },
+    created () {
+      this.getDataList()
+    },
+    methods: {
+      // 获取数据列表
+      getDataList () {
+        this.searchData.limit = this.pageSize
+        this.searchData.page = this.pageIndex
+        eamAdminLevelSearch(this.searchData).then(({data}) => {
+          if (data.code == 0) {
+            this.dataList = data.page.list
+            this.pageIndex = data.page.currPage
+            this.pageSize = data.page.pageSize
+            this.totalPage = data.page.totalCount
+          }
+          this.dataListLoading = false
+        })
+      },
+      // 每页数
+      sizeChangeHandle (val) {
+        this.pageSize = val
+        this.pageIndex = 1
+        this.getDataList()
+      },
+      // 当前页
+      currentChangeHandle (val) {
+        this.pageIndex = val
+        this.getDataList()
+      },
+      // 多选
+      selectionChangeHandle (val) {
+        this.dataListSelections = val
+      },
+      addModal(){
+        this.modalData={
+          flag:'1',
+          site: this.$store.state.user.site,
+          adminLevelID:'',
+          adminLevelDesc:'',
+          active:'',
+        };
+        this.modalDisableFlag=false;
+        this.modalFlag=true;
+      },
+      updateModal(row){
+        this.modalData={
+          flag:'2',
+          site: row.site,
+          adminLevelID:row.adminLevelID,
+          adminLevelDesc:row.adminLevelDesc,
+          active:row.active,
+        };
+        this.modalDisableFlag=true;
+        this.modalFlag=true;
+      },
+      // 删除
+      deleteAdminLevel (row) {
+        this.$confirm(`是否删除这个机修人员等级?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+
+        }).then(() => {
+          eamAdminLevelDelete(row).then(({data}) => {
+            if (data && data.code === '0') {
+              this.getDataList()
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }).catch(() => {
+        })
+      },
+      saveData(){
+        if (this.modalData.adminLevelID == '' || this.modalData.adminLevelID == null) {
+          this.$alert('请输入机修人员等级编码！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        if (this.modalData.adminLevelDesc == '' || this.modalData.adminLevelDesc == null) {
+          this.$alert('请输入机修人员等级名称！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        if (this.modalData.active == '' || this.modalData.active == null) {
+          this.$alert('选择是否在用！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        if(this.modalData.flag=='1'){
+          eamAdminLevelSave(this.modalData).then(({data}) => {
+            if (data && data.code === '0') {
+              this.getDataList()
+              this.modalFlag=false
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }else {
+          eamAdminLevelEdit(this.modalData).then(({data}) => {
+            if (data && data.code === '0') {
+              this.getDataList()
+              this.modalFlag=false
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }
+      },
+    }
+  }
+</script>
diff --git a/src/views/modules/eam/eamFamily.vue b/src/views/modules/eam/eamFamily.vue
index 7b79b30..bd1b1a6 100644
--- a/src/views/modules/eam/eamFamily.vue
+++ b/src/views/modules/eam/eamFamily.vue
@@ -24,6 +24,7 @@
       </el-form-item>
     </el-form>
     <el-table
+      :height="height"
       :data="dataList"
       border
       v-loading="dataListLoading"
@@ -67,7 +68,7 @@
       @size-change="sizeChangeHandle"
       @current-change="currentChangeHandle"
       :current-page="pageIndex"
-      :page-sizes="[10, 20, 50, 100]"
+      :page-sizes="[20, 50, 100, 1000]"
       :page-size="pageSize"
       :total="totalPage"
       layout="total, sizes, prev, pager, next, jumper">
@@ -77,7 +78,7 @@
         <el-form-item label="分类编码:">
           <el-input v-model="modalData.familyID" :disabled="modalDisableFlag" style="width: 120px"></el-input>
         </el-form-item>
-        <el-form-item label="分类姓名:">
+        <el-form-item label="分类名称:">
           <el-input v-model="modalData.familyDesc"  style="width: 120px"></el-input>
         </el-form-item>
         <el-form-item label="是否在用:">
@@ -103,6 +104,7 @@
     eamFamilyDelete,
   } from "@/api/eam/eam.js"
   export default {
+
     data () {
       return {
 
@@ -114,6 +116,7 @@
           page: 1,
           limit: 10,
         },
+        height: 200,
         pageIndex: 1,
         pageSize: 100,
         totalPage: 0,
@@ -210,7 +213,11 @@
 
       }
     },
-
+    mounted () {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 210
+      })
+    },
     created () {
       this.getDataList()
     },
@@ -231,13 +238,13 @@
       },
       // 每页数
       sizeChangeHandle (val) {
-        this.searchData.limit = val
-        this.searchData.page = 1
+        this.pageSize = val
+        this.pageIndex = 1
         this.getDataList()
       },
       // 当前页
       currentChangeHandle (val) {
-        this.searchData.page = val
+        this.pageIndex = val
         this.getDataList()
       },
       // 多选
@@ -301,7 +308,7 @@
           return false
         }
         if (this.modalData.familyDesc == '' || this.modalData.familyDesc == null) {
-          this.$alert('请输入分类姓名！', '错误', {
+          this.$alert('请输入分类名称！', '错误', {
             confirmButtonText: '确定'
           })
           return false
diff --git a/src/views/modules/eam/eamGroup.vue b/src/views/modules/eam/eamGroup.vue
new file mode 100644
index 0000000..a14d6e9
--- /dev/null
+++ b/src/views/modules/eam/eamGroup.vue
@@ -0,0 +1,362 @@
+<template>
+  <div class="mod-config">
+    <el-form :inline="true"  label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
+      <el-form-item :label="'工厂编码'">
+        <el-input v-model="searchData.site"  style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'分组编码'">
+        <el-input v-model="searchData.groupID"  style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'分组名称'">
+        <el-input v-model="searchData.groupDesc"  style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'在用'">
+        <el-select filterable v-model="searchData.active" style="width: 130px">
+          <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-form-item  :label="' '">
+        <el-button @click="getDataList()">查询</el-button>
+        <el-button  type="primary" @click="addModal()">新增</el-button>
+        <!--        <el-button  type="danger" @click="deleteGroup()" :disabled="dataListSelections.length <= 0">批量删除</el-button>-->
+      </el-form-item>
+    </el-form>
+    <el-table
+      :height="height"
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+
+      style="width: 100%;">
+      <!--      <el-table-column-->
+      <!--        type="selection"-->
+      <!--        header-align="center"-->
+      <!--        align="center"-->
+      <!--        width="50">-->
+      <!--      </el-table-column>-->
+      <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==''?false: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-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="100"
+        label="操作">
+        <template slot-scope="scope">
+          <a type="text" size="small" @click="updateModal(scope.row)">修改</a>
+          <a type="text" size="small" @click="deleteGroup(scope.row)">删除</a>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[20, 50, 100, 1000]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+    <el-dialog title="分组" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="430px">
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="分组编码:">
+          <el-input v-model="modalData.groupID" :disabled="modalDisableFlag" style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="分组名称:">
+          <el-input v-model="modalData.groupDesc"  style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="是否在用:">
+          <el-select filterable v-model="modalData.active" style="width: 120px">
+            <el-option label="是" value="Y"></el-option>
+            <el-option label="否" 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="saveData()">保存</el-button>
+        <el-button type="primary" @click="modalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import {
+    eamGroupSearch,
+    eamGroupSave,
+    eamGroupEdit,
+    eamGroupDelete,
+  } from "@/api/eam/eam.js"
+  export default {
+
+    data () {
+      return {
+
+        searchData: {
+          site: this.$store.state.user.site,
+          groupID: '',
+          groupDesc: '',
+          active: 'Y',
+          page: 1,
+          limit: 10,
+        },
+        height: 200,
+        pageIndex: 1,
+        pageSize: 100,
+        totalPage: 0,
+
+        dataList: [],
+        dataListLoading: false,
+        dataListSelections: [],
+        modalFlag:false,
+        modalDisableFlag:false,
+        modalData:{
+          flag:'',
+          site: this.$store.state.user.site,
+          groupID:'',
+          groupDesc:'',
+          active:'',
+        },
+        departmentList:[],
+        // 展示列集
+        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101002,
+            serialNumber: '101002TableSite',
+            tableId: "101002Table",
+            tableName: "common",
+            columnProp: 'site',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '工厂编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101002,
+            serialNumber: '101002TableGroupID',
+            tableId: "101002Table",
+            tableName: "common",
+            columnProp: 'groupID',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '分组编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101002,
+            serialNumber: '101002TableGroupDesc',
+            tableId: "101002Table",
+            tableName: "common",
+            columnProp: 'groupDesc',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '分组名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 140,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101002,
+            serialNumber: '101002TableActive',
+            tableId: "101002Table",
+            tableName: "common",
+            columnProp: 'active',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '在用',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 40,
+          },
+        ],
+        levelList:[],
+
+      }
+    },
+    mounted () {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 210
+      })
+    },
+    created () {
+      this.getDataList()
+    },
+    methods: {
+      // 获取数据列表
+      getDataList () {
+        this.searchData.limit = this.pageSize
+        this.searchData.page = this.pageIndex
+        eamGroupSearch(this.searchData).then(({data}) => {
+          if (data.code == 0) {
+            this.dataList = data.page.list
+            this.pageIndex = data.page.currPage
+            this.pageSize = data.page.pageSize
+            this.totalPage = data.page.totalCount
+          }
+          this.dataListLoading = false
+        })
+      },
+      // 每页数
+      sizeChangeHandle (val) {
+        this.pageSize = val
+        this.pageIndex = 1
+        this.getDataList()
+      },
+      // 当前页
+      currentChangeHandle (val) {
+        this.pageIndex = val
+        this.getDataList()
+      },
+      // 多选
+      selectionChangeHandle (val) {
+        this.dataListSelections = val
+      },
+      addModal(){
+        this.modalData={
+          flag:'1',
+          site: this.$store.state.user.site,
+          groupID:'',
+          groupDesc:'',
+          active:'',
+        };
+        this.modalDisableFlag=false;
+        this.modalFlag=true;
+      },
+      updateModal(row){
+        this.modalData={
+          flag:'2',
+          site: row.site,
+          groupID:row.groupID,
+          groupDesc:row.groupDesc,
+          active:row.active,
+        };
+        this.modalDisableFlag=true;
+        this.modalFlag=true;
+      },
+      // 删除
+      deleteGroup (row) {
+        this.$confirm(`是否删除这个分组?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+
+        }).then(() => {
+          eamGroupDelete(row).then(({data}) => {
+            if (data && data.code === '0') {
+              this.getDataList()
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }).catch(() => {
+        })
+      },
+      saveData(){
+        if (this.modalData.groupID == '' || this.modalData.groupID == null) {
+          this.$alert('请输入分组编码！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        if (this.modalData.groupDesc == '' || this.modalData.groupDesc == null) {
+          this.$alert('请输入分组名称！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        if (this.modalData.active == '' || this.modalData.active == null) {
+          this.$alert('选择是否在用！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        if(this.modalData.flag=='1'){
+          eamGroupSave(this.modalData).then(({data}) => {
+            if (data && data.code === '0') {
+              this.getDataList()
+              this.modalFlag=false
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }else {
+          eamGroupEdit(this.modalData).then(({data}) => {
+            if (data && data.code === '0') {
+              this.getDataList()
+              this.modalFlag=false
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }
+      },
+    }
+  }
+</script>
diff --git a/src/views/modules/eam/eamLocation.vue b/src/views/modules/eam/eamLocation.vue
new file mode 100644
index 0000000..d9b9771
--- /dev/null
+++ b/src/views/modules/eam/eamLocation.vue
@@ -0,0 +1,362 @@
+<template>
+  <div class="mod-config">
+    <el-form :inline="true"  label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
+      <el-form-item :label="'工厂编码'">
+        <el-input v-model="searchData.site"  style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'位置编码'">
+        <el-input v-model="searchData.locationID"  style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'位置名称'">
+        <el-input v-model="searchData.locationName"  style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'在用'">
+        <el-select filterable v-model="searchData.active" style="width: 130px">
+          <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-form-item  :label="' '">
+        <el-button @click="getDataList()">查询</el-button>
+        <el-button  type="primary" @click="addModal()">新增</el-button>
+        <!--        <el-button  type="danger" @click="deleteLocation()" :disabled="dataListSelections.length <= 0">批量删除</el-button>-->
+      </el-form-item>
+    </el-form>
+    <el-table
+      :height="height"
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+
+      style="width: 100%;">
+      <!--      <el-table-column-->
+      <!--        type="selection"-->
+      <!--        header-align="center"-->
+      <!--        align="center"-->
+      <!--        width="50">-->
+      <!--      </el-table-column>-->
+      <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==''?false: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-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="100"
+        label="操作">
+        <template slot-scope="scope">
+          <a type="text" size="small" @click="updateModal(scope.row)">修改</a>
+          <a type="text" size="small" @click="deleteLocation(scope.row)">删除</a>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[20, 50, 100, 1000]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+    <el-dialog title="位置" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="430px">
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="位置编码:">
+          <el-input v-model="modalData.locationID" :disabled="modalDisableFlag" style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="位置名称:">
+          <el-input v-model="modalData.locationName"  style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="是否在用:">
+          <el-select filterable v-model="modalData.active" style="width: 120px">
+            <el-option label="是" value="Y"></el-option>
+            <el-option label="否" 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="saveData()">保存</el-button>
+        <el-button type="primary" @click="modalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import {
+    eamLocationSearch,
+    eamLocationSave,
+    eamLocationEdit,
+    eamLocationDelete,
+  } from "@/api/eam/eam.js"
+  export default {
+
+    data () {
+      return {
+
+        searchData: {
+          site: this.$store.state.user.site,
+          locationID: '',
+          locationName: '',
+          active: 'Y',
+          page: 1,
+          limit: 10,
+        },
+        height: 200,
+        pageIndex: 1,
+        pageSize: 100,
+        totalPage: 0,
+
+        dataList: [],
+        dataListLoading: false,
+        dataListSelections: [],
+        modalFlag:false,
+        modalDisableFlag:false,
+        modalData:{
+          flag:'',
+          site: this.$store.state.user.site,
+          locationID:'',
+          locationName:'',
+          active:'',
+        },
+        departmentList:[],
+        // 展示列集
+        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101003,
+            serialNumber: '101003TableSite',
+            tableId: "101003Table",
+            tableName: "common",
+            columnProp: 'site',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '工厂编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101003,
+            serialNumber: '101003TableLocationID',
+            tableId: "101003Table",
+            tableName: "common",
+            columnProp: 'locationID',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '位置编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101003,
+            serialNumber: '101003TableLocationName',
+            tableId: "101003Table",
+            tableName: "common",
+            columnProp: 'locationName',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '位置名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 140,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101003,
+            serialNumber: '101003TableActive',
+            tableId: "101003Table",
+            tableName: "common",
+            columnProp: 'active',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '在用',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 40,
+          },
+        ],
+        levelList:[],
+
+      }
+    },
+    mounted () {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 210
+      })
+    },
+    created () {
+      this.getDataList()
+    },
+    methods: {
+      // 获取数据列表
+      getDataList () {
+        this.searchData.limit = this.pageSize
+        this.searchData.page = this.pageIndex
+        eamLocationSearch(this.searchData).then(({data}) => {
+          if (data.code == 0) {
+            this.dataList = data.page.list
+            this.pageIndex = data.page.currPage
+            this.pageSize = data.page.pageSize
+            this.totalPage = data.page.totalCount
+          }
+          this.dataListLoading = false
+        })
+      },
+      // 每页数
+      sizeChangeHandle (val) {
+        this.pageSize = val
+        this.pageIndex = 1
+        this.getDataList()
+      },
+      // 当前页
+      currentChangeHandle (val) {
+        this.pageIndex = val
+        this.getDataList()
+      },
+      // 多选
+      selectionChangeHandle (val) {
+        this.dataListSelections = val
+      },
+      addModal(){
+        this.modalData={
+          flag:'1',
+          site: this.$store.state.user.site,
+          locationID:'',
+          locationName:'',
+          active:'',
+        };
+        this.modalDisableFlag=false;
+        this.modalFlag=true;
+      },
+      updateModal(row){
+        this.modalData={
+          flag:'2',
+          site: row.site,
+          locationID:row.locationID,
+          locationName:row.locationName,
+          active:row.active,
+        };
+        this.modalDisableFlag=true;
+        this.modalFlag=true;
+      },
+      // 删除
+      deleteLocation (row) {
+        this.$confirm(`是否删除这个位置?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+
+        }).then(() => {
+          eamLocationDelete(row).then(({data}) => {
+            if (data && data.code === '0') {
+              this.getDataList()
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }).catch(() => {
+        })
+      },
+      saveData(){
+        if (this.modalData.locationID == '' || this.modalData.locationID == null) {
+          this.$alert('请输入位置编码！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        if (this.modalData.locationName == '' || this.modalData.locationName == null) {
+          this.$alert('请输入位置名称！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        if (this.modalData.active == '' || this.modalData.active == null) {
+          this.$alert('选择是否在用！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        if(this.modalData.flag=='1'){
+          eamLocationSave(this.modalData).then(({data}) => {
+            if (data && data.code === '0') {
+              this.getDataList()
+              this.modalFlag=false
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }else {
+          eamLocationEdit(this.modalData).then(({data}) => {
+            if (data && data.code === '0') {
+              this.getDataList()
+              this.modalFlag=false
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }
+      },
+    }
+  }
+</script>
diff --git a/src/views/modules/eam/eamManufacturer.vue b/src/views/modules/eam/eamManufacturer.vue
new file mode 100644
index 0000000..45811d4
--- /dev/null
+++ b/src/views/modules/eam/eamManufacturer.vue
@@ -0,0 +1,488 @@
+<template>
+  <div class="mod-config">
+    <el-form :inline="true"  label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
+      <el-form-item :label="'工厂编码'">
+        <el-input v-model="searchData.site"  style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'制造商编码'">
+        <el-input v-model="searchData.manufacturerID"  style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'制造商名称'">
+        <el-input v-model="searchData.manufacturerName"  style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'在用'">
+        <el-select filterable v-model="searchData.active" style="width: 130px">
+          <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-form-item  :label="' '">
+        <el-button @click="getDataList()">查询</el-button>
+        <el-button  type="primary" @click="addModal()">新增</el-button>
+        <!--        <el-button  type="danger" @click="deleteManufacturer()" :disabled="dataListSelections.length <= 0">批量删除</el-button>-->
+      </el-form-item>
+    </el-form>
+    <el-table
+      :height="height"
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+
+      style="width: 100%;">
+      <!--      <el-table-column-->
+      <!--        type="selection"-->
+      <!--        header-align="center"-->
+      <!--        align="center"-->
+      <!--        width="50">-->
+      <!--      </el-table-column>-->
+      <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==''?false: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-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="100"
+        label="操作">
+        <template slot-scope="scope">
+          <a type="text" size="small" @click="updateModal(scope.row)">修改</a>
+          <a type="text" size="small" @click="deleteManufacturer(scope.row)">删除</a>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[20, 50, 100, 1000]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+    <el-dialog title="制造商" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="430px">
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="制造商编码:">
+          <el-input v-model="modalData.manufacturerID" :disabled="modalDisableFlag" style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="制造商名称:">
+          <el-input v-model="modalData.manufacturerName"  style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="是否在用:">
+          <el-select filterable v-model="modalData.active" style="width: 120px">
+            <el-option label="是" value="Y"></el-option>
+            <el-option label="否" value="N"></el-option>
+          </el-select>
+        </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="modalData.contact"  style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="电话:">
+          <el-input v-model="modalData.phone"  style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="邮箱:">
+          <el-input v-model="modalData.email"  style="width: 120px"></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="modalData.address"  style="width: 375px"></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="modalData.remark"  style="width: 375px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="saveData()">保存</el-button>
+        <el-button type="primary" @click="modalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import {
+    eamManufacturerSearch,
+    eamManufacturerSave,
+    eamManufacturerEdit,
+    eamManufacturerDelete,
+  } from "@/api/eam/eam.js"
+  export default {
+
+    data () {
+      return {
+
+        searchData: {
+          site: this.$store.state.user.site,
+          manufacturerID: '',
+          manufacturerName: '',
+          active: 'Y',
+          page: 1,
+          limit: 10,
+        },
+        height: 200,
+        pageIndex: 1,
+        pageSize: 100,
+        totalPage: 0,
+
+        dataList: [],
+        dataListLoading: false,
+        dataListSelections: [],
+        modalFlag:false,
+        modalDisableFlag:false,
+        modalData:{
+          flag:'',
+          site: this.$store.state.user.site,
+          manufacturerID:'',
+          manufacturerName:'',
+          active:'',
+          contact:'',
+          phone:'',
+          address:'',
+          email:'',
+          remark:'',
+        },
+        departmentList:[],
+        // 展示列集
+        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101005,
+            serialNumber: '101005TableSite',
+            tableId: "101005Table",
+            tableName: "common",
+            columnProp: 'site',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '工厂编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101005,
+            serialNumber: '101005TableManufacturerID',
+            tableId: "101005Table",
+            tableName: "common",
+            columnProp: 'manufacturerID',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '制造商编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101005,
+            serialNumber: '101005TableManufacturerName',
+            tableId: "101005Table",
+            tableName: "common",
+            columnProp: 'manufacturerName',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '制造商名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 140,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101005,
+            serialNumber: '101005TableActive',
+            tableId: "101005Table",
+            tableName: "common",
+            columnProp: 'active',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '在用',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 40,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101005,
+            serialNumber: '101005TableContact',
+            tableId: "101005Table",
+            tableName: "common",
+            columnProp: 'contact',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '联系人',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 60,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101005,
+            serialNumber: '101005TablePhone',
+            tableId: "101005Table",
+            tableName: "common",
+            columnProp: 'phone',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '电话',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101005,
+            serialNumber: '101005TableAddress',
+            tableId: "101005Table",
+            tableName: "common",
+            columnProp: 'address',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '地址',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 250,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101005,
+            serialNumber: '101005TableEmail',
+            tableId: "101005Table",
+            tableName: "common",
+            columnProp: 'email',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '邮箱',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101005,
+            serialNumber: '101005TableRemark',
+            tableId: "101005Table",
+            tableName: "common",
+            columnProp: 'remark',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '备注',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 150,
+          },
+        ],
+        levelList:[],
+
+      }
+    },
+    mounted () {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 210
+      })
+    },
+    created () {
+      this.getDataList()
+    },
+    methods: {
+      // 获取数据列表
+      getDataList () {
+        this.searchData.limit = this.pageSize
+        this.searchData.page = this.pageIndex
+        eamManufacturerSearch(this.searchData).then(({data}) => {
+          if (data.code == 0) {
+            this.dataList = data.page.list
+            this.pageIndex = data.page.currPage
+            this.pageSize = data.page.pageSize
+            this.totalPage = data.page.totalCount
+          }
+          this.dataListLoading = false
+        })
+      },
+      // 每页数
+      sizeChangeHandle (val) {
+        this.pageSize = val
+        this.pageIndex = 1
+        this.getDataList()
+      },
+      // 当前页
+      currentChangeHandle (val) {
+        this.pageIndex = val
+        this.getDataList()
+      },
+      // 多选
+      selectionChangeHandle (val) {
+        this.dataListSelections = val
+      },
+      addModal(){
+        this.modalData={
+          flag:'1',
+          site: this.$store.state.user.site,
+          manufacturerID:'',
+          manufacturerName:'',
+          active:'',
+          contact:'',
+          phone:'',
+          address:'',
+          email:'',
+          remark:'',
+        };
+        this.modalDisableFlag=false;
+        this.modalFlag=true;
+      },
+      updateModal(row){
+        this.modalData={
+          flag:'2',
+          site: row.site,
+          manufacturerID:row.manufacturerID,
+          manufacturerName:row.manufacturerName,
+          active:row.active,
+          contact:row.contact,
+          phone:row.phone,
+          address:row.address,
+          email:row.email,
+          remark:row.remark,
+        };
+        this.modalDisableFlag=true;
+        this.modalFlag=true;
+      },
+      // 删除
+      deleteManufacturer (row) {
+        this.$confirm(`是否删除这个制造商?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+
+        }).then(() => {
+          eamManufacturerDelete(row).then(({data}) => {
+            if (data && data.code === '0') {
+              this.getDataList()
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }).catch(() => {
+        })
+      },
+      saveData(){
+        if (this.modalData.manufacturerID == '' || this.modalData.manufacturerID == null) {
+          this.$alert('请输入制造商编码！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        if (this.modalData.manufacturerName == '' || this.modalData.manufacturerName == null) {
+          this.$alert('请输入制造商名称！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        if (this.modalData.active == '' || this.modalData.active == null) {
+          this.$alert('选择是否在用！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        if(this.modalData.flag=='1'){
+          eamManufacturerSave(this.modalData).then(({data}) => {
+            if (data && data.code === '0') {
+              this.getDataList()
+              this.modalFlag=false
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }else {
+          eamManufacturerEdit(this.modalData).then(({data}) => {
+            if (data && data.code === '0') {
+              this.getDataList()
+              this.modalFlag=false
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }
+      },
+    }
+  }
+</script>
diff --git a/src/views/modules/eam/eamSupplier.vue b/src/views/modules/eam/eamSupplier.vue
new file mode 100644
index 0000000..5c4c23e
--- /dev/null
+++ b/src/views/modules/eam/eamSupplier.vue
@@ -0,0 +1,488 @@
+<template>
+  <div class="mod-config">
+    <el-form :inline="true"  label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
+      <el-form-item :label="'工厂编码'">
+        <el-input v-model="searchData.site"  style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'供应商编码'">
+        <el-input v-model="searchData.supplierID"  style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'供应商名称'">
+        <el-input v-model="searchData.supplierName"  style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'在用'">
+        <el-select filterable v-model="searchData.active" style="width: 130px">
+          <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-form-item  :label="' '">
+        <el-button @click="getDataList()">查询</el-button>
+        <el-button  type="primary" @click="addModal()">新增</el-button>
+        <!--        <el-button  type="danger" @click="deleteSupplier()" :disabled="dataListSelections.length <= 0">批量删除</el-button>-->
+      </el-form-item>
+    </el-form>
+    <el-table
+      :height="height"
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+
+      style="width: 100%;">
+      <!--      <el-table-column-->
+      <!--        type="selection"-->
+      <!--        header-align="center"-->
+      <!--        align="center"-->
+      <!--        width="50">-->
+      <!--      </el-table-column>-->
+      <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==''?false: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-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="100"
+        label="操作">
+        <template slot-scope="scope">
+          <a type="text" size="small" @click="updateModal(scope.row)">修改</a>
+          <a type="text" size="small" @click="deleteSupplier(scope.row)">删除</a>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[20, 50, 100, 1000]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+    <el-dialog title="供应商" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="430px">
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="供应商编码:">
+          <el-input v-model="modalData.supplierID" :disabled="modalDisableFlag" style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="供应商名称:">
+          <el-input v-model="modalData.supplierName"  style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="是否在用:">
+          <el-select filterable v-model="modalData.active" style="width: 120px">
+            <el-option label="是" value="Y"></el-option>
+            <el-option label="否" value="N"></el-option>
+          </el-select>
+        </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="modalData.contact"  style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="电话:">
+          <el-input v-model="modalData.phone"  style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="邮箱:">
+          <el-input v-model="modalData.email"  style="width: 120px"></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="modalData.address"  style="width: 375px"></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="modalData.remark"  style="width: 375px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="saveData()">保存</el-button>
+        <el-button type="primary" @click="modalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import {
+    eamSupplierSearch,
+    eamSupplierSave,
+    eamSupplierEdit,
+    eamSupplierDelete,
+  } from "@/api/eam/eam.js"
+  export default {
+
+    data () {
+      return {
+
+        searchData: {
+          site: this.$store.state.user.site,
+          supplierID: '',
+          supplierName: '',
+          active: 'Y',
+          page: 1,
+          limit: 10,
+        },
+        height: 200,
+        pageIndex: 1,
+        pageSize: 100,
+        totalPage: 0,
+
+        dataList: [],
+        dataListLoading: false,
+        dataListSelections: [],
+        modalFlag:false,
+        modalDisableFlag:false,
+        modalData:{
+          flag:'',
+          site: this.$store.state.user.site,
+          supplierID:'',
+          supplierName:'',
+          active:'',
+          contact:'',
+          phone:'',
+          address:'',
+          email:'',
+          remark:'',
+        },
+        departmentList:[],
+        // 展示列集
+        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101005,
+            serialNumber: '101005TableSite',
+            tableId: "101005Table",
+            tableName: "common",
+            columnProp: 'site',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '工厂编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101005,
+            serialNumber: '101005TableSupplierID',
+            tableId: "101005Table",
+            tableName: "common",
+            columnProp: 'supplierID',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '供应商编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101005,
+            serialNumber: '101005TableSupplierName',
+            tableId: "101005Table",
+            tableName: "common",
+            columnProp: 'supplierName',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '供应商名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 140,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101005,
+            serialNumber: '101005TableActive',
+            tableId: "101005Table",
+            tableName: "common",
+            columnProp: 'active',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '在用',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 40,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101005,
+            serialNumber: '101005TableContact',
+            tableId: "101005Table",
+            tableName: "common",
+            columnProp: 'contact',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '联系人',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 60,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101005,
+            serialNumber: '101005TablePhone',
+            tableId: "101005Table",
+            tableName: "common",
+            columnProp: 'phone',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '电话',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101005,
+            serialNumber: '101005TableAddress',
+            tableId: "101005Table",
+            tableName: "common",
+            columnProp: 'address',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '地址',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 250,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101005,
+            serialNumber: '101005TableEmail',
+            tableId: "101005Table",
+            tableName: "common",
+            columnProp: 'email',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '邮箱',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101005,
+            serialNumber: '101005TableRemark',
+            tableId: "101005Table",
+            tableName: "common",
+            columnProp: 'remark',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '备注',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 150,
+          },
+        ],
+        levelList:[],
+
+      }
+    },
+    mounted () {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 210
+      })
+    },
+    created () {
+      this.getDataList()
+    },
+    methods: {
+      // 获取数据列表
+      getDataList () {
+        this.searchData.limit = this.pageSize
+        this.searchData.page = this.pageIndex
+        eamSupplierSearch(this.searchData).then(({data}) => {
+          if (data.code == 0) {
+            this.dataList = data.page.list
+            this.pageIndex = data.page.currPage
+            this.pageSize = data.page.pageSize
+            this.totalPage = data.page.totalCount
+          }
+          this.dataListLoading = false
+        })
+      },
+      // 每页数
+      sizeChangeHandle (val) {
+        this.pageSize = val
+        this.pageIndex = 1
+        this.getDataList()
+      },
+      // 当前页
+      currentChangeHandle (val) {
+        this.pageIndex = val
+        this.getDataList()
+      },
+      // 多选
+      selectionChangeHandle (val) {
+        this.dataListSelections = val
+      },
+      addModal(){
+        this.modalData={
+          flag:'1',
+          site: this.$store.state.user.site,
+          supplierID:'',
+          supplierName:'',
+          active:'',
+          contact:'',
+          phone:'',
+          address:'',
+          email:'',
+          remark:'',
+        };
+        this.modalDisableFlag=false;
+        this.modalFlag=true;
+      },
+      updateModal(row){
+        this.modalData={
+          flag:'2',
+          site: row.site,
+          supplierID:row.supplierID,
+          supplierName:row.supplierName,
+          active:row.active,
+          contact:row.contact,
+          phone:row.phone,
+          address:row.address,
+          email:row.email,
+          remark:row.remark,
+        };
+        this.modalDisableFlag=true;
+        this.modalFlag=true;
+      },
+      // 删除
+      deleteSupplier (row) {
+        this.$confirm(`是否删除这个供应商?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+
+        }).then(() => {
+          eamSupplierDelete(row).then(({data}) => {
+            if (data && data.code === '0') {
+              this.getDataList()
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }).catch(() => {
+        })
+      },
+      saveData(){
+        if (this.modalData.supplierID == '' || this.modalData.supplierID == null) {
+          this.$alert('请输入供应商编码！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        if (this.modalData.supplierName == '' || this.modalData.supplierName == null) {
+          this.$alert('请输入供应商名称！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        if (this.modalData.active == '' || this.modalData.active == null) {
+          this.$alert('选择是否在用！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        if(this.modalData.flag=='1'){
+          eamSupplierSave(this.modalData).then(({data}) => {
+            if (data && data.code === '0') {
+              this.getDataList()
+              this.modalFlag=false
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }else {
+          eamSupplierEdit(this.modalData).then(({data}) => {
+            if (data && data.code === '0') {
+              this.getDataList()
+              this.modalFlag=false
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }
+      },
+    }
+  }
+</script>