离线采购冲突

src/api/PurchasingCenter/CreateInquirySheet.js

@@ -353,7 +353,7 @@ export function searchMerge(num) {
     }
   })
 }
-export function getPerson(num) {
+export function getPerson() {
   return request({
     url: '',
     method: 'post',
@@ -387,3 +387,38 @@ export function tiaozheng2(num1, num2) {
     }
   })
 }
+// 查询时间@change修改
+export function timeChange1(num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购管理_创建询价单_外购件时间修改',
+      param: '外购件开始时间=' + num1 + '&外购件结束时间=' + num2
+    }
+  })
+}
+// 查询时间@change修改
+export function timeChange2(num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购管理_创建询价单_基本件时间修改',
+      param: '基本件开始时间=' + num1 + '&基本件结束时间=' + num2
+    }
+  })
+}
+// 查询时间初始化查询
+export function timeSearch() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_创建询价单_时间查询'
+    }
+  })
+}

src/api/WorkshopProcurement/CreatingPurchasingMaterials.js

@@ -52,27 +52,26 @@ export function initPartDrawing(check1, name) {
   })
 }
 // 查询外购备料
-export function searchPurchasedMaterials(pageCurrent, pageSize, check1, name) {
+export function searchPurchasedMaterials(check1, name) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '备料管理_外购备料_查询数据',
-      param: `零件图号_check=${check1}&零件图号=${name}`,
-      Pagination: pageCurrent + '&' + pageSize
+      param: `零件图号_check=${check1}&零件图号=${name}`
     }
   })
 }
 // 查询采购单
-export function searchPurchaseOrder(pageCurrent, pageSize, check1, num, check2, name) {
+export function searchPurchaseOrder(pageCurrent, pageSize, check1, num, check2, name, check3, name2) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '备料管理_采购计划_查询数据',
-      param: `采购单号_check=${check1}&采购单号=${num}&供应商名称_check=${check2}&供应商名称=${name}`,
+      param: `采购单号_check=${check1}&采购单号=${num}&供应商名称_check=${check2}&供应商名称=${name}&供应商流水号_check=${check3}&供应商流水号=${name2}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })

src/api/WorkshopProcurement/NewArrivalList.js

@@ -37,14 +37,14 @@ export function searchMateriel(num, num1) {
   })
 }
 // 查询到货单
-export function searchArriveOrder(num, num1, num2, num3, num5, num6, num7, pageCurrent, pageSize) {
+export function searchArriveOrder(num, num1, num8, num9, num2, num3, num5, num6, num7, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '备料管理_到货单查询_新',
-      param: `供应商名称_check=${num}&供应商名称=${num1}&开始日期_check=${num2}&开始日期=${num3}&结束日期=${num5}&是否关联_check=${num6}&是否关联=${num7}`,
+      param: `供应商名称_check=${num}&供应商名称=${num1}&供应商名称_check=${num8}&供应商名称=${num9}&开始日期_check=${num2}&开始日期=${num3}&结束日期=${num5}&是否关联_check=${num6}&是否关联=${num7}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })