Merge remote-tracking branch 'origin/master'

value

2024-05-31 620880da2e11fe0a56d24662f4736332bf08e9e5

 src/assets/api/controller.js

@@ -29,6 +29,7 @@
    auxiliaryOutputWorkingHours,
    auxiliaryWorkingHoursDay,
    auxiliaryCorrectionHours,
    insBushing
  }
}

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

const dataReporting = {
@@ -156,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 = {
@@ -249,6 +252,7 @@
  selectDepartmentLim: "/department/selectDepartmentLim", //获取部门树
  addDepartmentLims: "/department/addDepartmentLims", //添加部门
  delDepartmentLims: "/department/delDepartmentLims", //删除部门
  selectDepartmentEnum: "/department/selectDepartmentEnum", //获取组织架构枚举
}

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

const auxiliaryOutputWorkingHours = {
@@ -324,3 +329,7 @@
const auxiliaryCorrectionHours = {
  selectAuxiliaryCorrectionHours: "/auxiliaryCorrectionHours/selectAuxiliaryCorrectionHours", //查询修正工时
}

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