Merge branch 'master' of ssh://192.168.0.149:29418/高精2.0

2019-03-15 09:03:29 +08:00
parent 91a2a84d9e 372dd0b0a0
commit c54df9f78f
17 changed files with 781 additions and 616 deletions
--- a/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
+++ b/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
@@ -69,3 +69,15 @@ export function getTable2(stepNumber) {
    }
  })
 }
+// 正在加工零件
+export function searchParts(stepNumber) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_加工顺序调整_查询正在加工零件工序',
+      param: '终端编号=' + stepNumber
+    }
+  })
+}
--- a/src/api/ManufacturingCenter/ProcessingStatusEdit.js
+++ b/src/api/ManufacturingCenter/ProcessingStatusEdit.js
@@ -144,3 +144,14 @@ export function getTable8(code) {
    }
  })
 }
+export function isMachining(code) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: 2,
+      name: '车间生产管理工艺_零件撤出待加工库',
+      param: '工艺计划流水号=' + code + '&结果=11111=string=output'
+    }
+  })
+}
--- a/src/api/PurchasingCenter/FundApproval.js
+++ b/src/api/PurchasingCenter/FundApproval.js
@@ -7,7 +7,7 @@ export function initApproval(pageCurrent, pageSize, state) {
    method: 'post',
    data: {
      type: '1',
-      name: '采购管理_请款表_查询数据_审批付款',
+      name: '采购管理_采购合同_审批付款_查询数据',
      param: `审批_付款状态=${state}`,
      Pagination: pageCurrent + '&' + pageSize
    }
@@ -20,8 +20,8 @@ export function execApproval(num1, num2, reason, person, state) {
    method: 'post',
    data: {
      type: '2',
-      name: '采购管理_请款表_修改数据_审批付款',
-      param: `采购请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state}`
+      name: '采购管理_采购合同_审批付款_修改数据',
+      param: `采购合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state}`
    }
  })
 }
@@ -39,7 +39,19 @@ export function initApprovalOffline(pageCurrent, pageSize, state) {
  })
 }
 // 查询离线合同请款信息明细
-export function searchRequsetFundDetail(num) {
+export function searchRequsetFundDetail1(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_采购合同_请款明细_查询数据',
+      param: `采购合同请款流水号=${num}`
+    }
+  })
+}
+// 查询离线合同请款信息明细
+export function searchRequsetFundDetail2(num) {
  return request({
    url: '',
    method: 'post',
--- a/src/api/PurchasingCenter/InvoiceSettlementApplication.js
+++ b/src/api/PurchasingCenter/InvoiceSettlementApplication.js
@@ -1,5 +1,16 @@
 import request from '@/utils/request'

+// 查询供应商
+export function searchSupplier() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_供应商_查询数据_根据条件'
+    }
+  })
+}
 // 根据条件查发票结算申请单
 export function searchTable1(...group) {
  return request({
@@ -61,51 +72,75 @@ export function searchTable2(num) {
    }
  })
 }
-// 入库单查询
-export function searchInboundCard(data1, data2) {
+// 根据供应商查询采购合同
+export function searchPurchase(data) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '1',
-      name: '库存管理_采购入库单_入库单查询',
-      param: '入库单号_check=' + data1 + '&入库单号=' + data2
+      name: '采购管理_采购合同_查询数据',
+      param: '供应商流水号_check=1&供应商流水号=' + data
    }
  })
 }
-// 入库单明细查询
-export function searchInboundCardDetail(data1) {
+// 根据供应商查询离线合同
+export function searchOffline(data) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '1',
-      name: '库存管理_采购入库单_入库单明细_查询数据',
-      param: '采购入库单流水号=' + data1
+      name: '采购管理_离线合同_查询数据',
+      param: '供应商流水号_check=1&供应商流水号=' + data
    }
  })
 }
-// 发票结算申请单明细增加
-export function addTable2(data, group) {
+// 查询采购合同明细
+export function searchPurchaseDetail(data) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_采购合同明细_查询数据',
+      param: '采购合同流水号=' + data
+    }
+  })
+}
+// 查询离线合同明细
+export function searchOfflineDetail(data) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_离线合同明细_查询数据',
+      param: '离线合同流水号=' + data
+    }
+  })
+}
+// 发票结算申请单明细增加-1采购/2离线
+export function addTable2(data, group1, group2, type) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '2',
      name: '采购管理_发票结算申请单明细_增加数据',
-      param: '发票结算申请单流水号=' + data + '&采购入库单流水号组=' + group
+      param: '发票结算申请单流水号=' + data + '&合同明细流水号组=' + group1 + '&到票数量组=' + group2 + '&合同类型=' + type
    }
  })
 }
 // 发票结算申请单明细删除
-export function deleteTable2(group) {
+export function deleteTable2(data) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '2',
      name: '采购管理_发票结算申请单明细_删除数据',
-      param: '发票结算申请单明细流水号组=' + group
+      param: '发票结算申请单明细流水号=' + data
    }
  })
 }
--- a/src/api/PurchasingCenter/PurchaseContractRequestFund.js
+++ b/src/api/PurchasingCenter/PurchaseContractRequestFund.js
@@ -11,66 +11,6 @@ export function searchTable0(check, date1, date2) {
    }
  })
 }
-// 初始化合同
-export function initContract() {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: '采购管理_采购请款表_查询数据'
-    }
-  })
-}
-// 查询表1
-export function searchTable1(...params) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: '采购管理_采购请款表_查询数据',
-      param: '采购合同流水号_check=' + params[2] + '&采购合同流水号=' + params[3] + '&供应商名称_check=' + params[4] + '&供应商名称=' + params[5],
-      Pagination: params[0] + '&' + params[1]
-    }
-  })
-}
-// 查询请款进度
-export function searchCondition(num1) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: '采购管理_采购请款表_请款进度_查询数据',
-      param: '采购合同流水号=' + num1
-    }
-  })
-}
-// 请款
-export function requestFund(num1, money, time, id) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '2',
-      name: '采购管理_采购请款表_增加数据',
-      param: `采购合同流水号=${num1}&请款金额=${money}&请款人=${id}&请款时间=${time}`
-    }
-  })
-}
-// 取消请款
-export function cancelRequestFund(num1) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: '采购管理_采购请款表_删除数据',
-      param: '采购请款流水号=' + num1
-    }
-  })
-}
 // 采购合同内容查询
 export function searchContract(num) {
  return request({
@@ -83,3 +23,75 @@ export function searchContract(num) {
    }
  })
 }
+// 查询请款表
+export function searchRequestFund(pageCurrent, pageSize, check1, start, end, check2, num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_采购合同_请款_查询数据',
+      param: `时间段_check=${check1}&开始时间=${start}&结束时间=${end}&供应商流水号_check=${check2}&供应商流水号=${num}`,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 查询供应商
+export function searchSupplier() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_供应商_查询数据_根据条件'
+    }
+  })
+}
+// 查询离线合同待请款信息
+export function submitRequestFund(contractGroup, sumGroup, supplier, money, person) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购管理_采购合同_请款_增加数据',
+      param: `采购合同流水号组=${contractGroup}&合同总额组=${sumGroup}&供应商流水号=${supplier}&请款金额=${money}&请款人=${person}`
+    }
+  })
+}
+// 查询离线合同待请款信息
+export function searchRequsetFundDetail(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_采购合同_请款明细_查询数据',
+      param: `采购合同请款流水号=${num}`
+    }
+  })
+}
+// 取消请款
+export function cancelRequestFund(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_采购合同_请款_删除数据',
+      param: `采购合同请款流水号=${num}`
+    }
+  })
+}
+// 查询离线合同待请款信息
+export function searchPurchaseContract(check, num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_采购合同_查询数据',
+      param: `供应商流水号_check=${check}&供应商流水号=${num}`
+    }
+  })
+}