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

src/api/Inventory/CreatePickingList.js

@@ -42,8 +42,8 @@ export function searchTable(...params) {
     data: {
       type: '1',
       name: '车间装配管理_领料单_三表_查询数据',
-      param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&名称_check=${params[4]}&名称=${params[5]}&型号_check=${params[6]}&型号=${params[7]}&规格_check=${params[8]}&规格=${params[9]}&领料情况_check=${params[10]}&领料情况=${params[11]}&零件类型=${params[14]}`,
-      Pagination: params[12] + '&' + params[13]
+      param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&名称_check=${params[4]}&名称=${params[5]}&领料情况_check=${params[6]}&领料情况=${params[7]}&零件类型=${params[10]}`,
+      Pagination: params[8] + '&' + params[9]
     }
   })
 }
@@ -54,20 +54,20 @@ export function searchPart(...params) {
     data: {
       type: '1',
       name: '库存管理_离线外购件_出库查询',
-      param: `物料名称_check=${params[0]}&物料名称=${params[1]}&物料规格_check=${params[2]}&物料规格=${params[3]}&物料型号_check=${params[4]}&物料型号=${params[5]}`,
-      Pagination: params[6] + '&' + params[7]
+      param: `物料名称_check=${params[0]}&物料名称=${params[1]}`,
+      Pagination: params[2] + '&' + params[3]
     }
   })
 }
 // 领料单查询
-export function searchList(pageCurrent, pageSize, listNumber_check, listNumber, isElectrical) {
+export function searchList(pageCurrent, pageSize, listPeople_check, listPeople, isElectrical, check1, time1, time2) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间装配管理_领料单_查询数据',
-      param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber + '&是否电气=' + isElectrical,
+      param: '制单人_check=' + listPeople_check + '&制单人=' + listPeople + '&是否电气=' + isElectrical + '&时间段_check=' + check1 + '&开始时间=' + time1 + '&结束时间=' + time2,
       Pagination: pageCurrent + '&' + pageSize
     }
   })

src/api/ManufacturingCenter/ContractDetailsInquiry.js

@@ -0,0 +1,40 @@
+import request from '@/utils/request'
+
+// 初始化 项目名称
+export function initProject() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_项目名称_查询数据_总计划'
+    }
+  })
+}
+
+// 查询机床
+export function initMachine(projectNum) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_机床名称_查询数据2',
+      param: `项目流水号=${projectNum}`
+    }
+  })
+}
+
+// 查询项目详情
+export function searchatabledata(projectNum, machineValue, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '项目工时统计_合同详情查询_工时综合查询',
+      param: `项目流水号=${projectNum}&机床流水号=${machineValue}`,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}

src/api/ManufacturingCenter/PartAssignment.js

@@ -11,6 +11,18 @@ export function initProject() {
     }
   })
 }
+// 三表下达时间查询
+export function DeliveryTimeSelect(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_三表下达时间_查询数据',
+      param: '组件流水号=' + num
+    }
+  })
+}
 // 组件查询
 export function searchgroup(num) {
   return request({