Merge branch 'master' of http://123.56.95.229:10010/r/高精

src/api/Inventory/PurchaseInRecord.js

@@ -11,7 +11,7 @@ export function initMachineProject() {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: 'PDM_项目名称_查询数据'
+      name: '采购管理_仓库采购_入库记录_机床图号_查询'
     }
   })
 }
@@ -24,7 +24,7 @@ export function searchGroup(num) {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: 'PDM_组件名称_查询数据',
+      name: '采购管理_仓库采购_入库记录_组件名称_查询',
       param: '机床流水号=' + num
     }
   })

src/api/Inventory/PurchaseOutRecord.js

@@ -11,7 +11,8 @@ export function initMachineProject() {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: 'PDM_项目名称_查询数据'
+      // name: 'PDM_项目名称_查询数据'
+      name: '采购管理_仓库采购_出库记录_机床图号_查询'
     }
   })
 }
@@ -24,7 +25,8 @@ export function searchGroup(num) {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: 'PDM_组件名称_查询数据',
+      // name: 'PDM_组件名称_查询数据',
+      name: '采购管理_仓库采购_出库记录_组件名称_查询',
       param: '机床流水号=' + num
     }
   })

src/api/ManufacturingCenter/PartAssignment.js

@@ -11,7 +11,8 @@ export function initProject() {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: 'PDM_项目名称_查询数据'
+      // name: 'PDM_项目名称_查询数据'
+      name: '制造中心_制造_零件分配_机床编号_查询'
     }
   })
 }
@@ -38,7 +39,7 @@ export function searchgroup(num) {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: 'PDM_组件名称_查询数据',
+      name: '制造中心_制造_零件分配_组号_查询',
       param: '机床流水号=' + num
     }
   })

src/api/ManufacturingCenter/ProcessingStatusNew.js

@@ -176,3 +176,28 @@ export function submit2(num, num1, num2) {
     }
   })
 }
+export function submitEdit3(num, num1, num2, num3, num4) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '2',
+      name: '车间生产管理工艺_修补完成数量_增加数据',
+      param: `工序流水号=${num}&操作者编号=${num1}&完成数量=${num2}&修补工时=${num3}&完成时间=${num4}`
+    }
+  })
+}
+export function getPerson_Form3() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '车间生产管理工艺_追溯加工过程_操作者查询'
+    }
+  })
+}

src/api/WorkshopProcurement/RequestOutsourcingMaterials.js

@@ -87,3 +87,4 @@ export function cancelRequestFund(num) {
     }
   })
 }
+