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

src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js

@@ -44,7 +44,7 @@ export function initPerson() {
   })
 }
 // 查询
-export function search(pageCurrent, pageSize, check1, val1, check2, val2, check3, val3, check4, val4, check5, val5, val6) {
+export function search(pageCurrent, pageSize, check1, val1, check2, val2, check3, val3, check4, val4, check5, val5, val6, val7) {
   return request({
     url: '',
     method: 'post',
@@ -53,7 +53,7 @@ export function search(pageCurrent, pageSize, check1, val1, check2, val2, check3
       ModularID: router.currentRoute.path,
       type: '1',
       name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_按机床分组图号人员查',
-      param: `机床流水号_check=${check1}&机床流水号=${val1}&组件流水号_check=${check2}&组件流水号=${val2}&零件图号_check=${check3}&零件图号=${val3}&人员编号_check=${check4}&人员编号=${val4}&编制时间_check=${check5}&编制开始时间=${val5}&编制结束时间=${val6}&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
+      param: `机床流水号_check=${check1}&机床流水号=${val1}&组件流水号_check=${check2}&组件流水号=${val2}&零件图号_check=${check3}&零件图号=${val3}&人员编号_check=${check4}&人员编号=${val4}&编制时间_check=${check5}&编制开始时间=${val5}&编制结束时间=${val6}&排序=${val7}&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
     }
   })
 }

src/api/ManufacturingCenter/ScrappedSupplementaryInvestment.js

@@ -55,3 +55,16 @@ export function editSpare(CutCode, number, id, Unqualified, remarkGroup, people,
     }
   })
 }
+export function reSpare(CutCode) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '2',
+      name: '报废补投_撤销报废_循环执行',
+      param: '工艺计划流水号组=' + CutCode
+    }
+  })
+}

src/api/ManufacturingCenter/StatusQuery.js

@@ -2,16 +2,6 @@ import request from '@/utils/request'
 import state from '@/store'
 import router from '@/router'
 
-// export function initProject() {
-//   return request({
-//     url: '',
-//     method: 'post',
-//     data: {
-//       type: '1',
-//       name: 'PDM_项目名称_查询数据_按时间排序'
-//     }
-//   })
-// }
 export function intPartState() {
   return request({
     url: '',
@@ -62,3 +52,29 @@ export function searchTable(check1, machine, check2, groupNum, check3, partNumbe
     }
   })
 }
+export function gettabledata1(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '车间生产管理工艺_追溯加工过程_查询工序',
+      param: '工艺计划流水号=' + num + '=int'
+    }
+  })
+}
+export function getPersons(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '车间生产管理工艺_自制件状态查询_每阶段操作者查询',
+      param: '工艺计划流水号=' + num
+    }
+  })
+}