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

src/api/Outsourcing/OutFactoryMaintenance.js

@@ -21,7 +21,7 @@ export function edittype(ManufacturerNumber, ManufacturerName, ManufacturerAbbre
     data: {
       type: '2',
       name: '车间生产管理工艺_基础表_外协厂家_增加数据',
-      param: '序号=' + ManufacturerNumber + '&外协厂家名称=' + ManufacturerName + '&外协厂家简称=' + ManufacturerAbbreviation + '&地址=' + address + '&联系人=' + roleName + '&电话=' + phNumber + '&传真=' + Fax + '&备注=' + Remarks + '&类别=' + category + '&关注=' + attention + '&设备情况=' + EquipmentCondition
+      param: '序号=' + ManufacturerNumber + '&外协厂家名称=' + ManufacturerName + '&外协厂家简称=' + ManufacturerAbbreviation + '&地址=' + address + '&联系人=' + roleName + '&电话=' + phNumber + '&银行=' + Fax + '&备注=' + Remarks + '&类别=' + category + '&关注=' + attention + '&设备情况=' + EquipmentCondition
     }
   })
 }
@@ -33,7 +33,7 @@ export function handlechange(CoManufacturerFlowNumber, ManufacturerNumber, Manuf
     data: {
       type: '2',
       name: '车间生产管理工艺_基础表_外协厂家_修改数据',
-      param: '外协厂家流水号=' + CoManufacturerFlowNumber + '&序号=' + ManufacturerNumber + '&外协厂家名称=' + ManufacturerName + '&外协厂家简称=' + ManufacturerAbbreviation + '&地址=' + address + '&联系人=' + roleName + '&电话=' + phNumber + '&传真=' + Fax + '&备注=' + Remarks + '&类别=' + category + '&关注=' + attention + '&设备情况=' + EquipmentCondition
+      param: '外协厂家流水号=' + CoManufacturerFlowNumber + '&序号=' + ManufacturerNumber + '&外协厂家名称=' + ManufacturerName + '&外协厂家简称=' + ManufacturerAbbreviation + '&地址=' + address + '&联系人=' + roleName + '&电话=' + phNumber + '&银行=' + Fax + '&备注=' + Remarks + '&类别=' + category + '&关注=' + attention + '&设备情况=' + EquipmentCondition
     }
   })
 }

src/api/Outsourcing/OutsourcingPaymentPlanManagement.js

@@ -61,14 +61,14 @@ export function payment(num) {
   })
 }
 // 查询零件信息
-export function getParts(Number, pageCurrent, pageSize) {
+export function getParts(check, Number, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间生产管理工艺_外协发票管理_查询数据',
-      param: '外协厂家流水号=' + Number + '=int',
+      param: '外协厂家流水号_check=' + check + '&外协厂家流水号=' + Number + '=int',
       Pagination: pageCurrent + '&' + pageSize
     }
   })
@@ -81,7 +81,7 @@ export function edittype(num1, num2, num3, num4, num5, num6, num7, num8) {
     data: {
       type: '2',
       name: '车间生产管理工艺_外协发票管理_增加数据',
-      param: '外协加工任务单流水号=' + num1 + '&发票号=' + num2 + '&开户行=' + num3 + '&开票时间=' + num4 + '&开票金额=' + num5 + '&接收人=' + num6 + '&接收时间=' + num7 + '&备注=' + num8
+      param: '外协厂家流水号=' + num1 + '&发票号=' + num2 + '&开户行=' + num3 + '&开票时间=' + num4 + '&开票金额=' + num5 + '&接收人=' + num6 + '&接收时间=' + num7 + '&备注=' + num8
     }
   })
 }

src/api/Outsourcing/OutsourcingTaskExecution.js

@@ -1,5 +1,16 @@
 import request from '@/utils/request'
 
+// 初始化 外协厂商
+export function initOutHelp() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_基础表_外协厂家_查询数据'
+    }
+  })
+}
 // 初始化获取已生成的外协加工任务单
 export function getTable(checked, contractNumber, checked1, manufacturers, checked2, time1, time2, num, pageCurrent, pageSize, documentStatus, num3) {
   return request({

src/api/Outsourcing/PreorderAssociation.js

@@ -80,3 +80,15 @@ export function edit2(num1, num2, num3) {
     }
   })
 }
+// 保存每行价格
+export function saveRowPrice(num1, price1, num2, price2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_零件工序_修改数据_序间外协预算价格_系数',
+      param: '工序流水号=' + num1 + '&外协预算价格=' + price1 + '&工艺计划流水号=' + num2 + '&材料费=' + price2
+    }
+  })
+}