diff --git a/src/views/modules/eam/com_eam_object_add_update.vue b/src/views/modules/eam/com_eam_object_add_update.vue
index a2118d1..9e18730 100644
--- a/src/views/modules/eam/com_eam_object_add_update.vue
+++ b/src/views/modules/eam/com_eam_object_add_update.vue
@@ -1,47 +1,46 @@
 <template>
   <div class="customer-css">
     <el-dialog :title="titleCon" :close-on-click-modal="false" :visible.sync="visible" width="360px" style="height: 520px;" class="customer-dialog">
-      <el-form :inline="true" label-position="top" label-width="80px">
-        <!--  -->
+      <el-form :inline="true" label-position="top" label-width="80px" :rules="rules">
         <el-row>
           <el-col :span="12">
-            <el-form-item class="customer-item"  label="设备编码:" >
-              <el-input  v-model="pageData.objectID"  :disabled="readOnlyFlag" style="width: 120px;" >
-              </el-input >
+            <el-form-item class="customer-item" label="设备编码:" prop="sellType" :rules="rules.sellType">
+              <el-input v-model="pageData.objectID" :disabled="readOnlyFlag" style="width: 120px;" >
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item class="customer-item" label="设备名称" >
-              <el-input v-model="pageData.objectDesc" style="width: 120px;" ></el-input>
+            <el-form-item class="customer-item" label="设备名称" prop="sellType" :rules="rules.sellType">
+              <el-input v-model="pageData.objectDesc" style="width: 120px;"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item class="customer-item" label="在用" >
-              <el-select v-model="pageData.active" style="width: 120px;" >
+            <el-form-item class="customer-item" label="在用">
+              <el-select v-model="pageData.active" style="width: 120px;">
                 <el-option label="是" value="Y"></el-option>
                 <el-option label="否" value="N"></el-option>
               </el-select >
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item class="customer-item">
+            <el-form-item class="customer-item" prop="sellType" :rules="rules.sellType">
               <span slot="label" style="" @click="getBaseList(1026)"><a herf="#">区域:</a></span>
-              <el-input  v-model="pageData.locationName"  style="width: 120px;" >
+              <el-input v-model="pageData.locationName" style="width: 120px;">
               </el-input >
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item class="customer-item">
+            <el-form-item class="customer-item" prop="sellType" :rules="rules.sellType">
               <span slot="label" style="" @click="getBaseList(1027)"><a herf="#">分类:</a></span>
               <el-input v-model="pageData.familyDesc" style="width: 120px;" ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item class="customer-item">
+            <el-form-item class="customer-item" prop="sellType" :rules="rules.sellType">
               <span slot="label" style="" @click="getBaseList(1028)"><a herf="#">分组:</a></span>
               <el-input v-model="pageData.groupDesc" style="width: 120px;" ></el-input>
             </el-form-item>
@@ -51,7 +50,7 @@
           <el-col :span="12">
             <el-form-item class="customer-item">
               <span slot="label" style="" @click="getBaseList(1029)"><a herf="#">供应商:</a></span>
-              <el-input  v-model="pageData.supplierName"  style="width: 120px;" >
+              <el-input  v-model="pageData.supplierName" style="width: 120px;" >
               </el-input >
             </el-form-item>
           </el-col>
@@ -64,28 +63,26 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item class="customer-item" label="序列号:" >
-              <el-input v-model="pageData.seqNo" style="width: 120px;" ></el-input>
+            <el-form-item class="customer-item" label="序列号:">
+              <el-input v-model="pageData.seqNo" style="width: 120px;"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item class="customer-item"  label="购入日期:" >
-              <el-date-picker class="el-time-width" style="width: 120px;"
-                              v-model="pageData.purchessDate"
-                              value-format="yyyy-MM-dd hh:mm:ss">
+            <el-form-item class="customer-item" label="购入日期:">
+              <el-date-picker class="el-time-width" style="width: 120px;" v-model="pageData.purchessDate" value-format="yyyy-MM-dd hh:mm:ss">
               </el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item class="customer-item" >
+            <el-form-item class="customer-item" prop="sellType" :rules="rules.sellType">
               <span slot="label" style="" @click="getBaseList(203)"><a herf="#">机台编号:</a></span>
               <el-input v-model="pageData.resourceDesc" style="width: 120px;" ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item class="customer-item" >
+            <el-form-item class="customer-item" prop="sellType" :rules="rules.sellType">
               <span slot="label" style="" @click="getBaseList(1044)"><a herf="#">所属部门:</a></span>
               <el-input v-model="pageData.deptID" style="width: 120px"></el-input>
             </el-form-item>
@@ -159,6 +156,15 @@ export default {
       },
       readOnlyFlag: false,
       dataListLoading: false,
+      rules:{
+        sellType:[
+          {
+            required: true,
+            message: '区域不能为空',
+            trigger: 'change'
+          }
+        ]
+      }
     }
   },
   methods: {
@@ -195,26 +201,22 @@ export default {
         this.$message.success("设备编码不能为空!");
         return false;
       }
-      // if(this.pageData.locationID == null || this.pageData.locationID === ''){
-      //   this.$message.success("区域不能为空!");
-      //   return false;
-      // }
-      // if(this.pageData.groupID == null || this.pageData.groupID === ''){
-      //   this.$message.success("分组不能为空!");
-      //   return false;
-      // }
-      // if(this.pageData.familyID == null || this.pageData.familyID === ''){
-      //   this.$message.success("分类不能为空!");
-      //   return false;
-      // }
-      // if(this.pageData.supplierID == null || this.pageData.supplierID === ''){
-      //   this.$message.success("供应商不能为空!");
-      //   return false;
-      // }
-      // if(this.pageData.manufacturerID == null || this.pageData.manufacturerID === ''){
-      //   this.$message.success("制造商不能为空!");
-      //   return false;
-      // }
+      if(this.pageData.objectDesc == null || this.pageData.objectDesc === ''){
+        this.$message.success("设备名称不能为空!");
+        return false;
+      }
+      if(this.pageData.locationID == null || this.pageData.locationID === ''){
+        this.$message.success("区域不能为空!");
+        return false;
+      }
+      if(this.pageData.groupID == null || this.pageData.groupID === ''){
+        this.$message.success("分组不能为空!");
+        return false;
+      }
+      if(this.pageData.familyID == null || this.pageData.familyID === ''){
+        this.$message.success("分类不能为空!");
+        return false;
+      }
       if(this.pageData.resourceID == null || this.pageData.resourceID === ''){
         this.$message.success("机台不能为空!");
         return false;
diff --git a/src/views/modules/eam/eamAdmin.vue b/src/views/modules/eam/eamAdmin.vue
index fd03d34..ace18b3 100644
--- a/src/views/modules/eam/eamAdmin.vue
+++ b/src/views/modules/eam/eamAdmin.vue
@@ -48,7 +48,8 @@
         prop="adminID"
         header-align="center"
         align="center"
-        label="机修人员编码">
+        label="机修人员编码"
+        :width="flexColumnWidth('机修人员编码','adminID')">
       </el-table-column>
       <el-table-column
         prop="adminName"
@@ -65,11 +66,11 @@
         :width="flexColumnWidth('在用','active')">
       </el-table-column>
       <el-table-column
-        prop="department"
+        prop="departmentName"
         header-align="center"
         align="left"
         label="部门"
-        :width="flexColumnWidth('部门','department')">
+        :width="flexColumnWidth('部门','departmentName')">
       </el-table-column>
       <el-table-column
         v-for="(item,index) in columnList" :key="index"
@@ -128,19 +129,19 @@
           <el-input v-model="modalData.departmentName" style="width: 120px"></el-input>
         </el-form-item>
         <el-form-item label="手机号码:">
-          <el-input v-model="modalData.phone"  style="width: 120px"></el-input>
+          <el-input v-model="modalData.phone" style="width: 120px"></el-input>
         </el-form-item>
         <el-form-item label="公司座机:">
-          <el-input v-model="modalData.tel"  style="width: 120px"></el-input>
+          <el-input v-model="modalData.tel" style="width: 120px"></el-input>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="邮箱:">
-          <el-input v-model="modalData.email"  style="width: 120px"></el-input>
+          <el-input v-model="modalData.email" style="width: 120px"></el-input>
         </el-form-item>
         <el-form-item >
           <span slot="label" style="" @click="getBaseList(202)"><a herf="#">工种</a></span>
-          <el-input v-model="modalData.levelDesc"  style="width: 120px"></el-input>
+          <el-input v-model="modalData.levelDesc" style="width: 120px"></el-input>
         </el-form-item>
         <el-form-item label="MES账号:">
           <el-select v-model="modalData.mesUser" placeholder="请选择" style="width: 120px">
@@ -179,6 +180,7 @@
           ref="departmentTable"
           @row-click="departmentClickRow"
           @selection-change="selectionDepartment"
+          :row-key="getRowKeys"
           border
           v-loading="dataListLoading"
           style="width: 100%;">
@@ -186,7 +188,7 @@
             type="selection"
             header-align="center"
             align="center"
-            :selectable="selectFlag"
+            :reserve-selection="true"
             width="50">
           </el-table-column>
           <el-table-column
@@ -543,6 +545,10 @@
       selectionDepartment (val) {
         this.departmentListSelections = val
       },
+      getRowKeys(row) {
+        //唯一值，一般都未id
+        return row.deptId;
+      },
       selectFlag(){
         return true;
       },
@@ -555,6 +561,8 @@
           })
           return false
         }
+        this.modalData.department = ''
+        this.modalData.departmentName = ''
         for (let i = 0; i < this.departmentListSelections.length; i++) {
           this.modalData.department = this.modalData.department + ";" + this.departmentListSelections[i].deptId
           this.modalData.departmentName = this.modalData.departmentName + ";" + this.departmentListSelections[i].deptName
@@ -656,31 +664,28 @@
           adminID:'',
           adminName:'',
           active:'',
+          departmentName: '',
           department:'',
           phone:'',
           tel:'',
           email:'',
           levelID:'',
+          levelDesc:'',
           mesUser:'',
           createdBy: this.$store.state.user.name,
           updateBy: this.$store.state.user.name,
         };
         let inData = {
-        site: this.$store.state.user.site,
+          site: this.$store.state.user.site,
         }
         getMesList(inData).then(({data}) => {
-              this.mesList = data.rows
+          this.mesList = data.rows
         })
-          // initAdminLevel(inData).then(({data}) => {
-          //   this.levelList=data.rows
-          // })
-          // getEmpyDeptList(inData).then(({data}) => {
-          //   this.departmentList = data.rows
-          // })
         this.modalDisableFlag = false;
         this.modalFlag = true;
       },
       updateModal(row){
+        console.log(row)
         this.modalData = {
           flag: '2',
           site: row.site,
@@ -688,28 +693,22 @@
           adminName: row.adminName,
           active: row.active,
           department: row.department,
+          departmentName: row.departmentName,
           phone: row.phone,
           tel: row.tel,
           email: row.email,
           levelID: row.levelID,
+          levelDesc: row.adminLevelDesc,
           mesUser: row.mesUser,
           updateBy: this.$store.state.user.name,
         };
+        console.log(this.modalData)
         let inData = {
           site: this.$store.state.user.site,
         }
         getMesList(inData).then(({data}) => {
           this.mesList = data.rows
         })
-        // let inData = {
-        //   site: this.$store.state.user.site,
-        // }
-        // initAdminLevel(inData).then(({data}) => {
-        //   this.levelList = data.rows
-        // })
-        // getEmpyDeptList(inData).then(({data}) => {
-        //   this.departmentList = data.rows
-        // })
         this.modalDisableFlag = true;
         this.modalFlag = true;
       },
@@ -775,7 +774,7 @@
           eamAdminSave(this.modalData).then(({data}) => {
             if (data && data.code === '0') {
               this.getDataList()
-              this.modalFlag=false
+              this.modalFlag = false
               this.$message({
                 message: '操作成功',
                 type: 'success',
@@ -812,11 +811,20 @@
 
       // 获取部门列表
       getDepartmentList(){
+        // 先清空缓存选中
+        this.$nextTick(() => this.$refs.departmentTable.clearSelection())
+        // 拿到选中的部门编号
+        let tempDataList = this.modalData.department.split(';')
+        // 查询所有部门
         getEmpyDeptList(this.departmentData).then(({data}) => {
           if (data && data.code === 0) {
             this.departmentList = data.rows
-            this.modalData.department = ''
-            this.modalData.departmentName = ''
+            this.departmentList.forEach(val => {
+              // 回显选中的部门
+              if (tempDataList.includes(val.deptId)) {
+                this.$nextTick(() => this.$refs.departmentTable.toggleRowSelection(val, true))
+              }
+            })
             this.departmentModelFlag = true;
           }else {
             this.$alert(data.msg, '错误', {
diff --git a/src/views/modules/sys/user-add-or-update.vue b/src/views/modules/sys/user-add-or-update.vue
index 41b71a0..242e344 100644
--- a/src/views/modules/sys/user-add-or-update.vue
+++ b/src/views/modules/sys/user-add-or-update.vue
@@ -203,6 +203,10 @@ export default {
     },
     // 表单提交
     dataFormSubmit() {
+      if(this.dataForm.site == null || this.dataForm.site == ''){
+        this.$message.success("工厂不能为空!");
+        return false;
+      }
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           this.$http({