Merge remote-tracking branch 'origin/master'

value

2024-05-31 620880da2e11fe0a56d24662f4736332bf08e9e5

 src/assets/api/controller.js

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

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

const sampleOrder = {
@@ -304,3 +308,28 @@
  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", //查询修正工时
}

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