diff --git a/src/views/modules/eam/com_eam_knowledge_base_upload_file.vue b/src/views/modules/eam/com_eam_knowledge_base_upload_file.vue
index b8854a5..0b75dd1 100644
--- a/src/views/modules/eam/com_eam_knowledge_base_upload_file.vue
+++ b/src/views/modules/eam/com_eam_knowledge_base_upload_file.vue
@@ -111,9 +111,8 @@ export default {
     /*保修当前的数据*/
     saveUploadFile(){
       let remark = this.pageData.fileRemark;
-      if(null === remark || '' === remark){
-        this.$message.error("请输入文件备注!");
-        return false;
+      if(null == remark || '' == remark){
+        remark = ''
       }
       /*判断文件是否上传*/
       if(null == this.fileList || 0 == this.fileList.length){
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 3142aaa..e3c57ae 100644
--- a/src/views/modules/eam/com_eam_object_add_update.vue
+++ b/src/views/modules/eam/com_eam_object_add_update.vue
@@ -84,6 +84,12 @@
               <el-input v-model="pageData.resourceID" style="width: 120px;" ></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item class="customer-item" >
+              <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>
+          </el-col>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -128,7 +134,8 @@ export default {
         active: 'Y',
         addFlag: 'Y',
         checkFlag: 'Y',
-        updateBy:''
+        updateBy:'',
+        deptID: ''
       },
       readOnlyFlag: false,
       dataListLoading: false,
@@ -155,38 +162,47 @@ export default {
 
     /*保存标签自定义的信息*/
     saveEamObject(){
-      console.log(this.pageData)
       //判断标签内容是否为空
-      let objectID = this.pageData.objectID.trim();
-      let locationID = this.pageData.locationID.trim();
-      let familyID = this.pageData.familyID.trim();
-      let groupID = this.pageData.groupID.trim();
-      let supplierID = this.pageData.supplierID.trim();
-      let manufacturerID = this.pageData.manufacturerID.trim();
-      if(objectID == null || objectID === ''){
+      // let objectID = this.pageData.objectID.trim();
+      // let locationID = this.pageData.locationID.trim();
+      // let familyID = this.pageData.familyID.trim();
+      // let groupID = this.pageData.groupID.trim();
+      // let supplierID = this.pageData.supplierID.trim();
+      // let manufacturerID = this.pageData.manufacturerID.trim();
+      // let resourceID = this.pageData.resourceID.trim();
+      // let deptID = this.pageData.deptID.trim();
+      if(this.pageData.objectID == null || this.pageData.objectID === ''){
         this.$message.success("设备编码不能为空!");
         return false;
       }
-      if(locationID == null || locationID === ''){
+      if(this.pageData.locationID == null || this.pageData.locationID === ''){
         this.$message.success("区域不能为空!");
         return false;
       }
-      if(groupID == null || groupID === ''){
+      if(this.pageData.groupID == null || this.pageData.groupID === ''){
         this.$message.success("分组不能为空!");
         return false;
       }
-      if(familyID == null || familyID === ''){
+      if(this.pageData.familyID == null || this.pageData.familyID === ''){
         this.$message.success("分类不能为空!");
         return false;
       }
-      if(supplierID == null || supplierID === ''){
+      if(this.pageData.supplierID == null || this.pageData.supplierID === ''){
         this.$message.success("供应商不能为空!");
         return false;
       }
-      if(manufacturerID == null || manufacturerID === ''){
+      if(this.pageData.manufacturerID == null || this.pageData.manufacturerID === ''){
         this.$message.success("制造商不能为空!");
         return false;
       }
+      if(this.pageData.resourceID == null || this.pageData.resourceID === ''){
+        this.$message.success("机台不能为空!");
+        return false;
+      }
+      if(this.pageData.deptID == null || this.pageData.deptID === ''){
+        this.$message.success("所属部门不能为空!");
+        return false;
+      }
       //判断是否是新增标签自定义
       if(this.pageData.addFlag === 'Y'){
         this.insertEamObjectData();
@@ -247,6 +263,9 @@ export default {
       }else if (this.tagNo === 203) {
         //设置参数
         this.pageData.resourceID = val.Resource_id;
+      }else if (this.tagNo === 1044) {
+        //设置参数
+        this.pageData.deptID = val.Dept_id;
       }
     },
 
@@ -267,6 +286,8 @@ export default {
           strVal = this.pageData.manufacturerID;
         }else  if (val === 203) {
           strVal = this.pageData.resourceID;
+        }else  if (val === 1044) {
+          strVal = this.pageData.deptID;
         }
         this.$refs.baseList.init(val, strVal)
       })
diff --git a/src/views/modules/eam/eamAdmin.vue b/src/views/modules/eam/eamAdmin.vue
index bf7b47d..1a3f152 100644
--- a/src/views/modules/eam/eamAdmin.vue
+++ b/src/views/modules/eam/eamAdmin.vue
@@ -117,7 +117,7 @@
 
 <!--            </el-option>-->
 <!--          </el-select>-->
-          <el-input v-model="modalData.department"  style="width: 120px"></el-input>
+          <el-input v-model="modalData.department" style="width: 120px"></el-input>
         </el-form-item>
         <el-form-item label="手机号码:">
           <el-input v-model="modalData.phone"  style="width: 120px"></el-input>
diff --git a/src/views/modules/eam/eamWorkPlanForCheck.vue b/src/views/modules/eam/eamWorkPlanForCheck.vue
index 304672e..3e8e58c 100644
--- a/src/views/modules/eam/eamWorkPlanForCheck.vue
+++ b/src/views/modules/eam/eamWorkPlanForCheck.vue
@@ -516,6 +516,8 @@
         <el-table
           :height="300"
           :data="operatorList"
+          ref="operatorTable"
+          @row-click="operatorClickRow"
           @selection-change="selectionChangeHandle2"
           border
           v-loading="dataListLoading"
@@ -567,6 +569,8 @@
         <el-table
           :height="300"
           :data="checkerList"
+          ref="checkerTable"
+          @row-click="checkerClickRow"
           @selection-change="selectionChangeHandle3"
           border
           v-loading="dataListLoading"
@@ -1531,6 +1535,13 @@
       this.getDataList()
     },
     methods: {
+      // 点击行选中复选框
+      operatorClickRow(row){
+        this.$refs.operatorTable.toggleRowSelection(row);
+      },
+      checkerClickRow(row){
+        this.$refs.checkerTable.toggleRowSelection(row);
+      },
       // 设备名内容改变事件
       objectChange(){
         searchPlanItems(this.detailData).then(({data}) => {
diff --git a/src/views/modules/eam/eamWorkPlanForMaintenance.vue b/src/views/modules/eam/eamWorkPlanForMaintenance.vue
index 010ba20..4f45d67 100644
--- a/src/views/modules/eam/eamWorkPlanForMaintenance.vue
+++ b/src/views/modules/eam/eamWorkPlanForMaintenance.vue
@@ -505,6 +505,8 @@
         <el-table
           :height="300"
           :data="operatorList"
+          ref="operatorTable"
+          @row-click="operatorClickRow"
           @selection-change="selectionChangeHandle2"
           border
           v-loading="dataListLoading"
@@ -556,6 +558,8 @@
         <el-table
           :height="300"
           :data="checkerList"
+          ref="checkerTable"
+          @row-click="checkerClickRow"
           @selection-change="selectionChangeHandle3"
           border
           v-loading="dataListLoading"
@@ -1507,6 +1511,13 @@
       this.getDataList()
     },
     methods: {
+      // 点击行选中复选框
+      operatorClickRow(row){
+        this.$refs.operatorTable.toggleRowSelection(row);
+      },
+      checkerClickRow(row){
+        this.$refs.checkerTable.toggleRowSelection(row);
+      },
       // 获取机修人员列表
       getOperatorList(){
         getOperatorList(this.operatorData).then(({data}) => {
diff --git a/src/views/modules/eam/eam_device_list.vue b/src/views/modules/eam/eam_device_list.vue
index 5d1f0cc..78231be 100644
--- a/src/views/modules/eam/eam_device_list.vue
+++ b/src/views/modules/eam/eam_device_list.vue
@@ -13,10 +13,10 @@
         <el-input v-model="searchData.objectDesc"  style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'区域:'">
-        <el-input v-model="searchData.locationID"  style="width: 120px"></el-input>
+        <el-input v-model="searchData.locationName"  style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'分类:'">
-        <el-input v-model="searchData.familyID"  style="width: 120px"></el-input>
+        <el-input v-model="searchData.familyDesc"  style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'在用'">
         <el-select filterable v-model="searchData.active" style="width: 130px">
@@ -964,7 +964,9 @@
           objectID: '',
           objectDesc: '',
           locationID: '',
+          locationName: '',
           familyID: '',
+          familyDesc: '',
           active: 'Y',
           page: 1,
           limit: 10
@@ -2284,19 +2286,6 @@
         departmentList: [],
         // 展示列集
         columnList: [
-          // {
-          //   columnProp: 'site',
-          //   headeralign: 'left',
-          //   align: 'left',
-          //   columnLabel: '工厂编码',
-          //   columnHidden: false,
-          //   columnImage: false,
-          //   columnSortable: false,
-          //   sortLv: 0,
-          //   status: true,
-          //   fixed: '',
-          //   columnWidth: 80
-          // },
           {
             columnProp: 'objectID',
             headeralign: 'left',
@@ -2308,8 +2297,8 @@
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 120
-          }, {
+          },
+          {
             columnProp: 'objectDesc',
             headeralign: 'left',
             align: 'left',
@@ -2320,9 +2309,9 @@
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 140
-          }, {
-            columnProp: 'locationID',
+          },
+          {
+            columnProp: 'locationName',
             headeralign: 'left',
             align: 'left',
             columnLabel: '区域',
@@ -2332,9 +2321,9 @@
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 40
-          }, {
-            columnProp: 'familyID',
+          },
+          {
+            columnProp: 'familyDesc',
             headeralign: 'left',
             align: 'left',
             columnLabel: '分类',
@@ -2344,9 +2333,9 @@
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 80
-          }, {
-            columnProp: 'supplierID',
+          },
+          {
+            columnProp: 'supplierName',
             headeralign: 'left',
             align: 'left',
             columnLabel: '供应商',
@@ -2356,9 +2345,9 @@
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 140
-          }, {
-            columnProp: 'groupID',
+          },
+          {
+            columnProp: 'groupDesc',
             headeralign: 'left',
             align: 'left',
             columnLabel: '分组',
@@ -2368,8 +2357,8 @@
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 140
-          }, {
+          },
+          {
             columnProp: 'seqNo',
             headeralign: 'left',
             align: 'left',
@@ -2380,8 +2369,8 @@
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 140
-          }, {
+          },
+          {
             columnProp: 'purchessDate',
             headeralign: 'left',
             align: 'left',
@@ -2392,8 +2381,8 @@
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 80
-          }, {
+          },
+          {
             columnProp: 'active',
             headeralign: 'left',
             align: 'left',
@@ -2404,8 +2393,8 @@
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 40
-          }, {
+          },
+          {
             columnProp: 'nextMDate',
             headeralign: 'left',
             align: 'left',
@@ -2416,8 +2405,8 @@
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 100
-          }, {
+          },
+          {
             columnProp: 'nextCDate',
             headeralign: 'left',
             align: 'left',
@@ -2428,8 +2417,8 @@
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 100
-          }, {
+          },
+          {
             columnProp: 'closedDate',
             headeralign: 'left',
             align: 'left',
@@ -2440,19 +2429,30 @@
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 100
-          }, {
-            columnProp: 'resourceID',
+          },
+          {
+            columnProp: 'resourceDesc',
+            headeralign: 'left',
+            align: 'left',
+            columnLabel: 'MES设备',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            columnProp: 'deptID',
             headeralign: 'left',
             align: 'left',
-            columnLabel: 'MES设备编码',
+            columnLabel: '所属部门',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 70
           },
           {
             columnProp: 'createDate',
@@ -2465,7 +2465,6 @@
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 70
           },
           {
             columnProp: 'createBy',
@@ -2478,7 +2477,6 @@
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 70
           },
           {
             columnProp: 'updateDate',
@@ -2491,7 +2489,6 @@
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 70
           },
           {
             columnProp: 'updateBy',
@@ -2504,7 +2501,6 @@
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 70
           },
         ],
         levelList: [],
@@ -3456,7 +3452,8 @@
           seqNo: '',
           purchessDate: '',
           active: 'Y',
-          addFlag: 'Y'
+          addFlag: 'Y',
+          deptID: ''
         };
         //打开组件 去做新增业务
         this.$nextTick(() => {
diff --git a/src/views/modules/eam/eam_knowledge_base.vue b/src/views/modules/eam/eam_knowledge_base.vue
index f16a54e..4e490c4 100644
--- a/src/views/modules/eam/eam_knowledge_base.vue
+++ b/src/views/modules/eam/eam_knowledge_base.vue
@@ -39,7 +39,7 @@
       <el-form-item :label="' '">
         <el-button type="primary" @click="getDataList()">查询</el-button>
         <el-button type="primary" @click="addModal()">新增</el-button>
-        <el-button type="primary" @click="deleteSome()">批量删除</el-button>
+        <el-button type="primary" @click="deleteSome()">删除</el-button>
         <download-excel
           :fields="fields()"
           :data="exportData"
@@ -247,8 +247,8 @@
         favorite: false,
         // 导出 start
         exportData: [],
-        exportName: "设备清单" + this.dayjs().format('YYYYMMDDHHmmss'),
-        exportHeader: ["设备清单"],
+        exportName: "设备知识库" + this.dayjs().format('YYYYMMDDHHmmss'),
+        exportHeader: ["设备知识库"],
         exportFooter: [],
         exportList:[],
         // 导出 end
@@ -479,12 +479,10 @@
         dataListSelections: [],
       }
     },
-
     components: {
       comEamKnowledgeBaseUploadFile,/*文件上传的组件*/
       Chooselist,
     },
-
     mounted () {
       this.$nextTick(() => {
         this.height = window.innerHeight / 2 - 30;
diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue
index f3d3077..1e15a26 100644
--- a/src/views/modules/qc/FAIResultEntry.vue
+++ b/src/views/modules/qc/FAIResultEntry.vue
@@ -74,7 +74,7 @@
         align="left"
         label="状态">
         <template slot-scope="scope">
-          <div :style="{ color: scope.row.state =='待检验' ? 'red' : scope.row.state =='待审核' ? 'orange' : scope.row.state =='已完成' ? 'green' : ''}">
+          <div :style="{fontWeight:'bold', color: scope.row.state =='待检验' ? 'red' : scope.row.state =='待审核' ? '#ffa500e0' : scope.row.state =='已完成' ? '#3ac252' : ''}">
             {{ scope.row.state }}
           </div>
         </template>
@@ -435,18 +435,6 @@
             status: true,
             fixed: '',
           },
-          // {
-          //   columnProp: 'state',
-          //   headerAlign: "center",
-          //   align: "left",
-          //   columnLabel: '状态',
-          //   columnHidden: false,
-          //   columnImage: false,
-          //   columnSortable: false,
-          //   sortLv: 0,
-          //   status: true,
-          //   fixed: '',
-          // },
           {
             columnProp: 'inspectionResult',
             headerAlign: "center",
@@ -459,6 +447,18 @@
             status: true,
             fixed: '',
           },
+          {
+            columnProp: 'disposalMeasures',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '处置措施',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
           {
             columnProp: 'taskDate',
             headerAlign: "center",
@@ -568,10 +568,10 @@
             fixed: '',
           },
           {
-            columnProp: 'disposalMeasures',
+            columnProp: 'inspectionRemark',
             headerAlign: "center",
             align: "left",
-            columnLabel: '处置措施',
+            columnLabel: '质检备注',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -615,18 +615,6 @@
             status: true,
             fixed: '',
           },
-          {
-            columnProp: 'inspectionRemark',
-            headerAlign: "center",
-            align: "left",
-            columnLabel: '质检备注',
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-          },
         ],
         //项目清单
         detailData:{
diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index 72e0618..bfbf43a 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -82,7 +82,7 @@
         align="left"
         label="状态">
         <template slot-scope="scope">
-          <div :style="{ color: scope.row.state =='待检验' ? 'red' : scope.row.state =='待审核' ? 'orange' : scope.row.state =='已完成' ? 'green' : ''}">
+          <div :style="{fontWeight:'bold', color: scope.row.state =='待检验' ? 'red' : scope.row.state =='待审核' ? '#ffa500e0' : scope.row.state =='已完成' ? '#3ac252' : ''}">
             {{ scope.row.state }}
           </div>
         </template>
@@ -503,18 +503,6 @@
             status: true,
             fixed: '',
           },
-          // {
-          //   columnProp: 'state',
-          //   headerAlign: "center",
-          //   align: "left",
-          //   columnLabel: '状态',
-          //   columnHidden: false,
-          //   columnImage: false,
-          //   columnSortable: false,
-          //   sortLv: 0,
-          //   status: true,
-          //   fixed: '',
-          // },
           {
             columnProp: 'inspectionResult',
             headerAlign: "center",
@@ -527,6 +515,18 @@
             status: true,
             fixed: '',
           },
+          {
+            columnProp: 'disposalMeasures',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '处置措施',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
           {
             columnProp: 'checkType',
             headerAlign: "center",
@@ -648,10 +648,10 @@
             fixed: '',
           },
           {
-            columnProp: 'disposalMeasures',
+            columnProp: 'inspectionRemark',
             headerAlign: "center",
             align: "left",
-            columnLabel: '处置措施',
+            columnLabel: '质检备注',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -695,18 +695,6 @@
             status: true,
             fixed: '',
           },
-          {
-            columnProp: 'inspectionRemark',
-            headerAlign: "center",
-            align: "left",
-            columnLabel: '质检备注',
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-          },
         ],
         //项目清单
         detailData:{
diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue
index 7423de0..ba15397 100644
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@@ -74,7 +74,7 @@
         align="left"
         label="状态">
         <template slot-scope="scope">
-          <div :style="{ color: scope.row.state =='待检验' ? 'red' : scope.row.state =='待审核' ? 'orange' : scope.row.state =='已完成' ? 'green' : ''}">
+          <div :style="{fontWeight:'bold', color: scope.row.state =='待检验' ? 'red' : scope.row.state =='待审核' ? '#ffa500e0' : scope.row.state =='已完成' ? '#3ac252' : ''}">
             {{ scope.row.state }}
           </div>
         </template>
@@ -440,18 +440,6 @@
             status: true,
             fixed: '',
           },
-          // {
-          //   columnProp: 'state',
-          //   headerAlign: "center",
-          //   align: "left",
-          //   columnLabel: '状态',
-          //   columnHidden: false,
-          //   columnImage: false,
-          //   columnSortable: false,
-          //   sortLv: 0,
-          //   status: true,
-          //   fixed: '',
-          // },
           {
             columnProp: 'inspectionResult',
             headerAlign: "center",
@@ -464,6 +452,18 @@
             status: true,
             fixed: '',
           },
+          {
+            columnProp: 'disposalMeasures',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '处置措施',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
           {
             columnProp: 'taskDate',
             headerAlign: "center",
@@ -561,10 +561,10 @@
             fixed: '',
           },
           {
-            columnProp: 'disposalMeasures',
+            columnProp: 'inspectionRemark',
             headerAlign: "center",
             align: "left",
-            columnLabel: '处置措施',
+            columnLabel: '质检备注',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -608,18 +608,6 @@
             status: true,
             fixed: '',
           },
-          {
-            columnProp: 'inspectionRemark',
-            headerAlign: "center",
-            align: "left",
-            columnLabel: '质检备注',
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-          },
         ],
         detailColumnList: [
           {
diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder.vue b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
index 9a63f76..61fd3f4 100644
--- a/src/views/modules/reportWorkOrder/reportDefectOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
@@ -283,6 +283,7 @@
         // 导出 end
         searchData: {
           site: this.$store.state.user.site,
+          username: this.$store.state.user.name,
           orderNo: '',
           planID: '',
           objectID: '',