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

src/api/Inventory/InboundCard.js

@@ -80,7 +80,18 @@ export function addInboundCard(data1, data2, data3, data4, data5, data6, data7,
     }
   })
 }
-
+// 入库单删除
+export function deleteInboundCard(data1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '库存管理_采购入库单_入库单删除',
+      param: '采购入库单流水号=' + data1
+    }
+  })
+}
 // 入库单修改
 export function editInboundCard(data0, data1, data2, data3, data4, data5, data6, data7, data8, data9, data10, data11) {
   return request({

src/api/Inventory/OfflinePurchase.js

@@ -20,7 +20,7 @@ export function addRequestCard(peoplenumber, housenumber) {
     method: 'post',
     data: {
       type: '2',
-      name: 'dbo.库存管理_离线请购单_请购单增加',
+      name: '库存管理_离线请购单_请购单增加',
       param: '请购人编号=' + peoplenumber + '&仓库流水号=' + housenumber
     }
   })

src/api/Inventory/PartOut.js

@@ -73,14 +73,14 @@ export function WorkShopPart(data1, data2, data3, data4, data5) {
   })
 }
 // 车间采购件零件出库
-export function ErrorOut(data1, data2, data3, data4, data5, data6, data7, data8) {
+export function ErrorOut(data1, data2, data3, data4, data5, data6, data7, data8, data9, data10, data11, data12) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '零件出库_零件出库_异常出库',
-      param: '项目流水号=' + data1 + '&机床流水号=' + data2 + '&组件流水号=' + data3 + '&采购合同明细流水号=' + data4 + '&工艺计划流水号=' + data5 + '&货位流水号=' + data6 + '&异常数量=' + data7 + '&异常原因=' + data8
+      param: '项目流水号=' + data1 + '&机床流水号=' + data2 + '&组件流水号=' + data3 + '&名称=' + data4 + '&人员编号=' + data5 + '&采购合同明细流水号=' + data6 + '&请购单明细流水号=' + data7 + '&工艺计划流水号=' + data8 + '&货位流水号=' + data9 + '&异常数量=' + data10 + '&异常原因=' + data11 + '&零件类型=' + data12
     }
   })
 }

src/api/MarketingCenter/ComprehensiveInquiryMS.js

@@ -0,0 +1,133 @@
+import request from '@/utils/request'
+
+export function initProject() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '合同信息管理_项目名称_总_查询'
+    }
+  })
+}
+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 searchTable1(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 selectMachine(code) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_机床名称_查询数据_通过项目流水号',
+      param: '项目流水号=' + code
+    }
+  })
+}
+export function searchTableDataInvoiceRecord(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '合同信息管理_开票记录_查询',
+      param: '项目流水号=' + num1 + '=int'
+    }
+  })
+}
+export function searchTableContractCapitalManagement(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '合同资金管理_资金信息_查询',
+      param: '合同ID=' + num1 + '=int'
+    }
+  })
+}
+export function searchTableSafetyMargin(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '安全保证金管理_安全保证金信息查询',
+      param: '项目流水号=' + num1 + '=int'
+    }
+  })
+}
+export function searchTableBidBond(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '营销综合查询_投标保证金_按项目查',
+      param: '项目流水号=' + num1 + '=int'
+    }
+  })
+}
+export function typeOfPerformanceBond(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '合同信息管理_履约保证金类型_查询',
+      param: '项目流水号=' + num1 + '=int'
+    }
+  })
+}
+export function searchTableDataPerformanceBond(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '合同信息管理_履约保证金_查询',
+      param: '项目流水号=' + num1 + '=int'
+    }
+  })
+}
+export function searchTableDataDeliveryManagement(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '营销综合查询_发货单_按项目查',
+      param: '项目流水号=' + num1 + '=int'
+    }
+  })
+}