Merge remote-tracking branch 'origin/master'

王震

2023-09-14 d46f3b348ab5f913cd15be977ce16137ee4343d0

 src/assets/api/controller.js

@@ -7,6 +7,7 @@
   selectTechnologyByMaterial: "technology/select",
   selectAll:"/material/selectAll",//右侧数据
   technologyWrite:"/technology/write",//工艺路线，移开保存生产定额
   writeDevice:"/technology/writeDevice",//工艺路线，选择设备组,移开保存
   productWrite:"/product/write",//技术指标，移开保存内控值和标准值
   chooseFather: "/technology/chooseFather",//获取工序列表
   chooseDevice: "/technology/chooseDevice",//获取设备组列表
@@ -73,12 +74,17 @@
   projectListByfinishId: "/inspection-item/list_user", //根据id查询所有项目
   processInspectAddProcess: "/processInspect/addProcess",//新增检验
   inspectionItemListUser: "/inspection-item/list_user",//查询所有检验项目
   finishedInspectChooseMater: "/finished-inspect/chooseMater",//根据订单号得到信息
   finishedInspectAddFinish: "/finished-inspect/addFinish", //新增成品检验
   finishedInspectUpdateFinishInspectsById: "/finished-inspect/updateFinishInspectsById",//上报
}
// 过程检验
const processInspection = {
   selectProcessInspectsList: "/processInspect/selectProcessInspectsList", // 分页查询过程检验单列表
   chooseMaterProcessInspect: "/processInspect/chooseMater",//根据订单号选择产品和工艺

   inspectionItemUpdateDevByInsId: "/inspection-item/updateDevByInsId",//更改设备
   inspectionItemlose_focus_update: "/inspection-item/lose_focus_update",//检验值
   processInspectUpdateProcessInspectsById: "/processInspect/updateProcessInspectsById",//上报
}
// QMS实验室管理
const laboratory = {
@@ -133,7 +139,7 @@
   selectAllMbom:"/mbomModel/selectAllMbom",//物料维护--》右边
   addMbom:"/mbomModel/addMbom",//物料--->新增
   material:"/mbomModel/delMbomById",//物料清单删除
   delAllMbom:"/mbom/delAllMbom",//批量删除
   delAllMbom:"/mbomModel/delAllMbom",//批量删除

   selectAllTeque:"/techniqueModel/selectAllTeque",//生产工艺维护---。右边

@@ -156,6 +162,7 @@
   delQueById:"/techniqueModel/delQueById",//删除
   delAllQue:"/techniqueModel/delAllQue",//批量删除
   selecQueById:"/techniqueModel/selecQueById",//编辑
   writeQueById:"/techniqueModel/writeQueById",//编辑传参

}
const url = {