Merge remote-tracking branch 'origin/master'

value

2024-06-13 fd9deb7e45ff86f3570a3048a459b29f0ebbd628

 src/assets/api/controller.js

@@ -25,7 +25,12 @@
    performanceShift,
    auxiliaryWorkingHours,
    unPass,
    companies
    companies,
    auxiliaryOutputWorkingHours,
    auxiliaryWorkingHoursDay,
    auxiliaryCorrectionHours,
    insBushing,
    auxiliaryOriginalHours,
  }
}

@@ -54,6 +59,8 @@
  upUserPassword: "/user/upUserPassword", //修改用户密码
  upUserDepardLimsId: "/user/upUserDepardLimsId", //修改人员明细所在组织架构
  delUserDepardLimsId: "/user/delUserDepardLimsId", //删除人员明细所在组织架构
  upCustom: "/user/upCustom", //修改客户信息
  selectCustomEnum: "/user/selectCustomEnum", //获取客户枚举
}

const dataReporting = {
@@ -137,6 +144,8 @@
  uploadFile: "/deviceScope/uploadFile", //上传图片
  selectDevicePrincipal: "/user/getDeviceManager", //获取设备负责人
  selectDeviceByCode: "/deviceScope/selectDeviceByCode", //通过设备编号获取设备列表
  getNumberCollect: "/deviceScope/getNumberCollect", //查询数采配置
  numberCollect: "/deviceScope/numberCollect", //维护数采配置
}

const insOrder = {
@@ -153,6 +162,8 @@
  selectSampleAndProductByOrderId: "/insOrder/selectSampleAndProductByOrderId", //通过检验单查询检验数据（数据查看）
  costStatistics: "/insOrder/costStatistics", //费用统计
  selectSampleDefects: "/insOrder/selectSampleDefects", //样品缺陷指标
  updateStatus: "/insOrder/updateStatus", //将待审核更新成撤销状态
  updateInspected: "/insOrder/updateInspected", //将待检验的的撤销进行更改
}

const sampleOrder = {
@@ -168,6 +179,12 @@
  verifyPlan: "/insOrderPlan/verifyPlan", //复核检验任务
  submitPlan: "/insOrderPlan/submitPlan", //检验任务提交
  inspectionOrderDetailsTaskSwitching: "/insOrderPlan/inspectionOrderDetailsTaskSwitching", // 检验单详情-任务切换
  getInsProduct: "/insOrderPlan/getInsProduct", // 获取检验项目和模板内容
  getFileList: "/insOrderPlan/getFileList", // 查看检验单下的附件列表
  delfile: "/insOrderPlan/delfile", // 附件删除
  uploadFile: "/insOrderPlan/uploadFile", // 附件上传
  downFile: "/insOrderPlan/downFile", // 附件下载
  checkSubmitPlan: "/insOrderPlan/checkSubmitPlan", // 校验检验任务提交
}

const systemLog = {
@@ -191,6 +208,7 @@
  getStandardTree2: "/standardTree/getStandardTree2", //获取产品架构
  upStandardProducts: "/standardTree/upStandardProducts", //获取产品架构
  selectStandardProductEnumByMethodId: "/standardTree/selectStandardProductEnumByMethodId", //批量编辑查询所有检验项目和检验子项枚举
  getStandTreeBySampleType: "/standardTree/getStandTreeBySampleType", //仅获取光纤的型号
}

const standardMethod = {
@@ -243,6 +261,7 @@
  selectDepartmentLim: "/department/selectDepartmentLim", //获取部门树
  addDepartmentLims: "/department/addDepartmentLims", //添加部门
  delDepartmentLims: "/department/delDepartmentLims", //删除部门
  selectDepartmentEnum: "/department/selectDepartmentEnum", //获取组织架构枚举
}

const report = {
@@ -296,4 +315,36 @@
  selectCompaniesList: "/companies/selectCompaniesList", //获取人事系统组织
  selectSimpleList: "/companies/selectSimpleList", //获取人事系统组织下的人员
  addPersonUser: "/companies/addPersonUser", //获取人事系统组织下的人员
  selectPersonUser: "/companies/selectPersonUser", //通过员工号获取员工
}

const auxiliaryOutputWorkingHours = {
  selectAuxiliaryOutputWorkingHours: "/auxiliaryOutputWorkingHours/selectAuxiliaryOutputWorkingHours", //查询产量工时
  collectWorkingHours: "/auxiliaryOutputWorkingHours/collectWorkingHours", //统计产量工时汇总和辅助工时汇总
  exportWorkingHours: "/auxiliaryOutputWorkingHours/exportWorkingHours", //导出
}

const auxiliaryWorkingHoursDay = {
  selectAuxiliaryWorkingHoursDay: "/auxiliaryWorkingHoursDay/selectAuxiliaryWorkingHoursDay", //查询辅助工时
  deleteAuxiliaryWorkingHoursDay: "/auxiliaryWorkingHoursDay/deleteAuxiliaryWorkingHoursDay", //删除
  insertAuxiliaryWorkingHoursDay: "/auxiliaryWorkingHoursDay/insertAuxiliaryWorkingHoursDay", //新增
  selectAuxiliaryWorkingHoursByNumber: "/auxiliaryWorkingHoursDay/selectAuxiliaryWorkingHoursByNumber", //根据编号查询辅助工时配置信息
  selectshiftByUser: "/auxiliaryWorkingHoursDay/selectshiftByUser", //根据编号当前用户信息查询所在班次
  updateAuxiliaryWorkingHoursDay: "/auxiliaryWorkingHoursDay/updateAuxiliaryWorkingHoursDay", //编辑
  check: "/auxiliaryWorkingHoursDay/check", //审核
  approve: "/auxiliaryWorkingHoursDay/approve", //批准
}

const auxiliaryCorrectionHours = {
  selectAuxiliaryCorrectionHours: "/auxiliaryCorrectionHours/selectAuxiliaryCorrectionHours", //查询修正工时
  upload: "/auxiliaryCorrectionHours/upload", //导入
}

const insBushing = {
  selectBushingBySampleId: "/insBushing/selectBushingBySampleId", //通过样品id获取样品下光纤配置内容
}

const auxiliaryOriginalHours = {
  selectAuxiliaryOriginalHours: "/auxiliaryOriginalHours/selectAuxiliaryOriginalHours", //查询原始工时
  exportOriginalHours: "/auxiliaryOriginalHours/exportOriginalHours", //导出原始工时
}