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

src/api/MarketingCenter/CRM.js

@@ -149,14 +149,14 @@ export function editMarketingManager(MarketingManagerId, AdressID) {
     }
   })
 }
-export function addCustomer(AdressID, CustomerName, CallNumber, Fax, Adress, People, Email, BankAccount, DutyParagraph, Assessment, Remark) {
+export function addCustomer(AdressID, CustomerName, CallNumber, Fax, Adress, People, Email, BankAccount, DutyParagraph, Assessment, Remark, OpeningBank) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '客户关系管理系统_客户_增加数据_MESWORK',
-      param: '省份流水号=' + AdressID + '&客户名称=' + CustomerName + '&电话=' + CallNumber + '&传真=' + Fax + '&地址=' + Adress + '&联系人=' + People + '&电子邮箱=' + Email + '&银行账号=' + BankAccount + '&税号=' + DutyParagraph + '&价值评估流水号=' + Assessment + '&备注=' + Remark
+      param: '省份流水号=' + AdressID + '&客户名称=' + CustomerName + '&电话=' + CallNumber + '&传真=' + Fax + '&地址=' + Adress + '&联系人=' + People + '&电子邮箱=' + Email + '&银行账号=' + BankAccount + '&税号=' + DutyParagraph + '&价值评估流水号=' + Assessment + '&备注=' + Remark + '&开户行=' + OpeningBank
     }
   })
 }
@@ -171,14 +171,14 @@ export function selectAdressOfID(AdressID) {
     }
   })
 }
-export function editCustomer(AdressID, CustomerName, CallNumber, Fax, Adress, People, Email, BankAccount, DutyParagraph, Assessment, Remark, ID) {
+export function editCustomer(AdressID, CustomerName, CallNumber, Fax, Adress, People, Email, BankAccount, DutyParagraph, Assessment, Remark, ID, OpeningBank) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '客户关系管理系统_客户_修改数据_MESWORK',
-      param: '省份流水号=' + AdressID + '&客户名称=' + CustomerName + '&电话=' + CallNumber + '&传真=' + Fax + '&地址=' + Adress + '&联系人=' + People + '&电子邮箱=' + Email + '&银行账号=' + BankAccount + '&税号=' + DutyParagraph + '&价值评估流水号=' + Assessment + '&备注=' + Remark + '&客户流水号=' + ID
+      param: '省份流水号=' + AdressID + '&客户名称=' + CustomerName + '&电话=' + CallNumber + '&传真=' + Fax + '&地址=' + Adress + '&联系人=' + People + '&电子邮箱=' + Email + '&银行账号=' + BankAccount + '&税号=' + DutyParagraph + '&价值评估流水号=' + Assessment + '&备注=' + Remark + '&客户流水号=' + ID + '&开户行=' + OpeningBank
     }
   })
 }

src/api/MarketingCenter/InvoiceRecord.js

@@ -0,0 +1,112 @@
+import request from '@/utils/request'
+
+export function initProject() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '合同信息管理_项目名称_总_查询'
+    }
+  })
+}
+export function searchTableData1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '合同资金管理_开票记录_合同信息统计_查询',
+      param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date',
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+export function searchTableData2(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '合同信息管理_开票记录_查询',
+      param: '项目流水号=' + num1 + '=int'
+    }
+  })
+}
+export function revisionOfTaxRate(num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '合同信息管理_开票记录_税率修改',
+      param: '项目流水号=' + num1 + '=int&税率=' + num2 + '=float'
+    }
+  })
+}
+export function selectProvince() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '发货管理_省份查询'
+    }
+  })
+}
+export function SelectMarketingManager(code) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '客户关系管理系统_按地区查询_营销经理',
+      param: '省份流水号=' + code
+    }
+  })
+}
+export function fetchCustomerData(PageCurrent, PageSize, name) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: 1,
+      name: '创建合同_客户信息查询',
+      param: '客户名称=' + name + '=string',
+      Pagination: PageCurrent + '&' + PageSize
+    }
+  })
+}
+export function addSubmit(num1, num2, num3, num4, num5) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '合同信息管理_开票记录_增加',
+      param: '项目流水号=' + num1 + '=int&客户流水号=' + num2 + '=int&开票金额=' + num3 + '=float&开票时间=' + num4 + '=string&备注=' + num5 + '=string'
+    }
+  })
+}
+export function editSubmit(num2, num3, num4, num5, num6) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '合同信息管理_开票记录_修改',
+      param: '客户流水号=' + num2 + '=int&开票金额=' + num3 + '=float&开票时间=' + num4 + '=string&备注=' + num5 + '=string&开票记录流水号=' + num6 + '=string'
+    }
+  })
+}
+export function delSubmit(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '合同信息管理_开票记录_删除',
+      param: '开票记录流水号=' + num1 + '=int'
+    }
+  })
+}

src/api/PurchasingCenter/CreatePurchaseContract.js

@@ -24,3 +24,15 @@ export function searchSheetContract(num1) {
     }
   })
 }
+// 生成采购合同
+export function doneContract(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购管理_采购合同_增加数据',
+      param: `采购合同编号=${params[0]}&采购合同名称=${params[1]}&交货日期=${params[2]}&支付日期=${params[3]}&支付方式=${params[4]}&开票信息=${params[5]}&其他说明=${params[6]}&合同总额=${params[7]}&采购员流水号=${params[8]}&供应商流水号=${params[9]}&单价是否含税=${params[10]}&组件零件流水号组=${params[11]}&组件零件基本件流水号组=${params[12]}&数量组=${params[13]}&单价组=${params[14]}&交货期组=${params[15]}&合同内容\\=${params[16]}`
+    }
+  })
+}

src/api/PurchasingCenter/FundApproval.js

@@ -1,27 +1,27 @@
 import request from '@/utils/request'
 
-// 查询审核/审批/付款
+// 查询审批/付款
 export function initApproval(pageCurrent, pageSize, state) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '采购管理_请款表_查询数据_审核审批',
-      param: `审核_审批_付款状态=${state}`,
+      name: '采购管理_请款表_查询数据_审批付款',
+      param: `审批_付款状态=${state}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
 }
-// 执行审核/审批/付款
+// 执行审批/付款
 export function execApproval(num1, num2, reason, person, state) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
-      name: '采购管理_请款表_修改数据_审核审批',
-      param: `采购科请款流水号=${num1}&审核_审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审核_审批_付款状态=${state}`
+      name: '采购管理_请款表_修改数据_审批付款',
+      param: `采购请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state}`
     }
   })
 }

src/api/PurchasingCenter/PurchaseContractApproval.js

@@ -55,7 +55,7 @@ export function searchTable2(num) {
     method: 'post',
     data: {
       type: '1',
-      name: '采购管理_采购合同明细_查询数据',
+      name: '采购管理_采购合同内容_查询数据',
       param: '采购合同流水号=' + num
     }
   })
@@ -67,7 +67,7 @@ export function submitApproval(num, num1, num2) {
     method: 'post',
     data: {
       type: '2',
-      name: '采购管理_合同审批_修改数据',
+      name: '采购管理_合同审批_采购部_修改数据',
       param: '采购合同流水号=' + num + '&审批情况流水号=' + num1 + '&未通过原因=' + num2
     }
   })

src/api/PurchasingCenter/PurchaseContractRequestFund.js

@@ -0,0 +1,73 @@
+import request from '@/utils/request'
+// 初始化合同
+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: '2',
+      name: '采购管理_采购请款表_删除数据',
+      param: '采购请款流水号=' + num1
+    }
+  })
+}
+// 采购合同内容查询
+export function searchContract(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_采购合同内容_查询数据',
+      param: '采购合同流水号=' + num
+    }
+  })
+}

src/api/PurchasingCenter/PurchaseContractSearch.js

@@ -48,14 +48,14 @@ export function searchTable1(pageCurrent, pageSize, check1, start, end, check2,
     }
   })
 }
-// 采购合同明细查询
+// 采购合同内容查询
 export function searchTable2(num) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '采购管理_采购合同明细_查询数据',
+      name: '采购管理_采购合同内容_查询数据',
       param: '采购合同流水号=' + num
     }
   })

src/api/PurchasingCenter/PurchaseInvoiceDelivery.js

@@ -0,0 +1,98 @@
+import request from '@/utils/request'
+
+// 初始化项目
+export function initProject() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_项目名称_采购部采购_查询数据'
+    }
+  })
+}
+// 初始化合同号
+export function initContract() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_付款情况_查询数据'
+    }
+  })
+}
+// 发票查询
+export function searchInvoice(...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 searchInvoiceDetail(...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 addInvoice(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购管理_采购发票_增加数据',
+      param: `采购合同流水号=${params[0]}&开票金额=${params[1]}&传送人流水号=${params[2]}`
+    }
+  })
+}
+// 发票编辑
+export function editInvoice(num1, num2, num3, time1, money, send, receive, remark) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购管理_发票_修改数据',
+      param: '发票流水号=' + num1 + '&采购合同流水号=' + num2 + '&发票号=' + num3 + '&开票时间=' + time1 + '&开票金额=' + money + '&传送人=' + send + '&接收人=' + receive + '&备注=' + remark
+    }
+  })
+}
+// 发票删除
+export function deleteInvoice(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购管理_发票_删除数据',
+      param: '发票流水号=' + num1
+    }
+  })
+}
+// 传送人初始化 采购科改16
+export function initSender() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
+      param: '考核部门编号=16'
+    }
+  })
+}