2025-06-23

src/api/eam/eam.js

@@ -193,8 +193,6 @@ export const refreshItem= data => createAPI(`/pms/eam/refreshItem`,'post',data)
 export const reach= data => createAPI(`/pms/eam/reach`,'post',data)
 export const searchItemFileUrl= data => createAPI(`/pms/eam/searchItemFileUrl`,'post',data)
 
-
-
 //---------------树形结构-------------------
 export const getFamilyTree= data => createAPI(`/pms/eam/getFamilyTree`,'post',data)
 export const getDetail= data => createAPI(`/pms/eam/getDetail`,'post',data)
@@ -205,54 +203,26 @@ export const getSiteAndBuByUserName= data => createAPI(`/pms/eam/getSiteAndBuByU
 export const eamCheckRecordSearch= data => createAPI(`/pms/eam/eamCheckRecordSearch`,'post',data)
 export const eamDefectRecordSearch= data => createAPI(`/pms/eam/eamDefectRecordSearch`,'post',data)
 
-/**
- * 获取用户角色列表
- * @param data
- * @returns {*}
- */
+// 获取用户角色列表
 export const getUserRoleList= data => createAPI(`/pms/eam/getUserRoleList`,'post',data)
-/**
- * 获取故障图片
- * @param data
- * @returns {*}
- */
+// 获取故障图片
 export const getFeedBackImages= data => createAPI(`/pms/eam/getFeedBackImages`,'post',data)
-
-/**
- * 获取领用出库信息
- * @param data
- * @returns {*}
- */
+// 获取领用出库信息
 export const getInventoryStockList= data => createAPI(`/pms/eam/getInventoryStockList`,'post',data)
-
-/**
- * 维修出库
- * @param data
- * @returns {*}
- */
+// 维修出库
 export const saveTrans= data => createAPI(`/pms/eam/saveTrans`,'post',data)
-
 export const saveCoreComponent= data => createAPI(`/pms/eam/saveCoreComponent`,'post',data)
-
 export const confirmDefectOrder= data => createAPI(`/pms/eam/confirmDefectOrder`,'post',data)
-
 export const getSparPartImages= data => createAPI(`/pms/eam/getSparPartImages`,'post',data)
-
 export const getRoleByUserName= data => createAPI(`/pms/eam/getRoleByUserName`,'post',data)
-
 export const eamWorkOrderSearch2 = data => createAPI(`/pms/eam/eamWorkOrderSearch2`,'post',data)
-
 export const searchFeedMatterRecord = data => createAPI(`/pms/eam/searchFeedMatterRecord`,'post',data)
-
 export const saveFeedMatter = data => createAPI(`/pms/eam/saveFeedMatter`,'post',data)
-
 export const updateFeedMatter = data => createAPI(`/pms/eam/updateFeedMatter`,'post',data)
-
 export const deleteFeedMatter = data => createAPI(`/pms/eam/deleteFeedMatter`,'post',data)
-
 export const getOperatorListByOrder = data => createAPI(`/pms/eam/getOperatorListByOrder`,'post',data)
-
 export const checkWorkOrders = data => createAPI(`/pms/eam/checkWorkOrders`,'post',data)
+export const exportEmployeeAttendanceSearch = data => createAPI(`/pms/eam/exportEmployeeAttendanceSearch`,'post',data)
 
 // 换线专家组维修执行 转单
 export const updateRepairTypes = data => createAPI(`/pms/eam/updateRepairTypes`,'post',data)

src/api/factory/site.js

@@ -53,3 +53,7 @@ export const getResponsibleDepartment = data => createAPI(`/site/getResponsibleD
 
 export const getEamWorkShop = data => createAPI(`/site/getEamWorkShop`,'post',data)
 
+export const getEmpyDeptList = data => createAPI(`/site/getEmpyDeptList`,'post',data)
+
+export const getSite2 = data => createAPI(`/site/getSite2`,'post',data)
+

src/views/modules/eam/eamFeedBack.vue

@@ -1008,7 +1008,7 @@
             columnProp: 'actualOrderCount',
             headerAlign: "center",
             align: "right",
-            columnLabel: '实际维修工单数',
+            columnLabel: '维修中工单数',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -1757,7 +1757,6 @@
       operatorClick (row) {
         // 找到operatorList中actualOrderCount最小值
         const minActualOrderCount = Math.min(...this.operatorList.map(item => item.actualOrderCount));
-
         if (row.actualOrderCount === minActualOrderCount) {
           // 只有actualOrderCount最小的行允许选择
           this.saveModalData.planOperator = row.adminID;

src/views/modules/eam/eamWorkOrderForMaintenance.vue

@@ -1477,8 +1477,7 @@
                   message: '操作成功',
                   type: 'success',
                   duration: 1500,
-                  onClose: () => {
-                  }
+                  onClose: () => {}
                 })
               } else {
                 this.$alert(data.msg, '错误', {

src/views/modules/reportWorkOrder/reportDefectOrder.vue

@@ -164,7 +164,7 @@
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
 
-    <el-dialog top="18vh" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="1000px">
+    <el-dialog top="18vh" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="940px">
       <template v-slot:title>
         <div style="padding-top: 5px;padding-left: 15px">
           <span :style="{ fontSize: '15px', fontWeight: 'bold' }">维修工单</span>
@@ -181,7 +181,7 @@
         </span>
         </div>
       </template>
-      <div style="margin-left: 70px">
+      <div style="margin-left: 10px">
         <el-form :inline="true" label-position="top" style="margin-top: 10px">
           <el-form-item label="工单号">
             <el-input v-model="saveData.orderNo" disabled style="width: 100px"></el-input>
@@ -511,7 +511,7 @@
 <!--          </el-tab-pane>-->
         </el-tabs>
       </div>
-      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+      <el-footer style="height:35px;margin-top: 5px;text-align:center">
         <el-button type="primary" @click="saveCheckReport">保存</el-button>
         <el-button type="primary" @click="detailModelFlag = false">关闭</el-button>
       </el-footer>
@@ -2111,8 +2111,6 @@
         if (this.tagNo === 1059) {
           this.coreComponentData.partNo = val.part_no
           this.coreComponentData.partDescription = val.part_description
-          this.coreComponentData.oldSerialNo = val.oldSerialNo
-          this.coreComponentData.newSerialNo = val.newSerialNo
         }
       },
 
@@ -2131,16 +2129,12 @@
               if (data.baseListData.length > 0) {
                 this.coreComponentData.partNo = val.part_no
                 this.coreComponentData.partDescription = val.part_description
-                this.coreComponentData.oldSerialNo = val.oldSerialNo
-                this.coreComponentData.newSerialNo = val.newSerialNo
                 return
               }
             }
           })
         }
         this.coreComponentData.partDescription = ''
-        this.coreComponentData.oldSerialNo = ''
-        this.coreComponentData.newSerialNo = ''
       },
 
       async exportExcel() {
@@ -2843,14 +2837,11 @@
         if (value && value !== '') {
           let tempData = this.corePartSpareList.filter(item => item.partNo === value)[0]
           this.coreComponentData.partDescription = tempData.partDescription
-          this.coreComponentData.oldSerialNo = tempData.oldSerialNo
-          this.coreComponentData.newSerialNo = tempData.newSerialNo
         } else {
           this.coreComponentData.partDescription = ''
-          this.coreComponentData.oldSerialNo = ''
-          this.coreComponentData.newSerialNo = ''
         }
       },
+
       // 转单方法
       transferOrderHandle () {
         if (this.dataListSelections.length === 0) {

src/views/modules/reportWorkOrder/reportDefectOrder2.vue

@@ -156,7 +156,7 @@
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
 
-    <el-dialog top="18vh" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="1000px">
+    <el-dialog top="18vh" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="940px">
       <template v-slot:title>
         <div style="padding-top: 5px;padding-left: 15px">
           <span :style="{ fontSize: '15px', fontWeight: 'bold' }">维修工单</span>
@@ -173,7 +173,7 @@
         </span>
         </div>
       </template>
-      <div style="margin-left: 70px">
+      <div style="margin-left: 10px">
         <el-form :inline="true" label-position="top" style="margin-top: 10px">
           <el-form-item label="工单号">
             <el-input v-model="saveData.orderNo" disabled style="width: 100px"></el-input>
@@ -503,7 +503,7 @@
           <!--          </el-tab-pane>-->
         </el-tabs>
       </div>
-      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+      <el-footer style="height:35px;margin-top: 5px;text-align:center">
         <el-button type="primary" @click="saveCheckReport">保存</el-button>
         <el-button type="primary" @click="detailModelFlag = false">关闭</el-button>
       </el-footer>
@@ -2099,8 +2099,6 @@ export default {
       if (this.tagNo === 1059) {
         this.coreComponentData.partNo = val.part_no
         this.coreComponentData.partDescription = val.part_description
-        this.coreComponentData.oldSerialNo = val.oldSerialNo
-        this.coreComponentData.newSerialNo = val.newSerialNo
       }
     },
 
@@ -2119,16 +2117,12 @@ export default {
             if (data.baseListData.length > 0) {
               this.coreComponentData.partNo = val.part_no
               this.coreComponentData.partDescription = val.part_description
-              this.coreComponentData.oldSerialNo = val.oldSerialNo
-              this.coreComponentData.newSerialNo = val.newSerialNo
               return
             }
           }
         })
       }
       this.coreComponentData.partDescription = ''
-      this.coreComponentData.oldSerialNo = ''
-      this.coreComponentData.newSerialNo = ''
     },
 
     async exportExcel() {
@@ -2812,12 +2806,8 @@ export default {
       if (value && value !== '') {
         let tempData = this.corePartSpareList.filter(item => item.partNo === value)[0]
         this.coreComponentData.partDescription = tempData.partDescription
-        this.coreComponentData.oldSerialNo = tempData.oldSerialNo
-        this.coreComponentData.newSerialNo = tempData.newSerialNo
       } else {
         this.coreComponentData.partDescription = ''
-        this.coreComponentData.oldSerialNo = ''
-        this.coreComponentData.newSerialNo = ''
       }
     }
   }