diff --git a/dist.zip b/dist.zip deleted file mode 100644 index b5a1d8a0..00000000 Binary files a/dist.zip and /dev/null differ diff --git a/src/api/Outsourcing/PreorderAssociation.js b/src/api/Outsourcing/PreorderAssociation.js index eabfa6ff..273dbc85 100644 --- a/src/api/Outsourcing/PreorderAssociation.js +++ b/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 + } + }) +} diff --git a/src/utils/request.js b/src/utils/request.js index 2cb92ad8..0ca6cf77 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -18,7 +18,7 @@ export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx` export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx` export const url = `http://192.168.1.231:8411/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 -export const ExcelDownLoad = 'http://192.168.1.231:8411/submit/downloadFile.ashx' // 导出excel +export const ExcelDownLoad = 'http://192.168.0.110:8002/submit/downloadFile.ashx' // 导出excel // 技术中心程序发布时要更改下面所有的IP到0段 export const ServerIP = `http://192.168.1.231:8411/webpage/file/` export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231 diff --git a/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue b/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue index 4529970a..a4a40f3d 100644 --- a/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue +++ b/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue @@ -529,7 +529,8 @@ import { TableAddLi, getPartnames3, getPartnames4, - modifyRemark + modifyRemark, + detailInfo } from '@/api/ManufacturingCenter/ProcessPlanningNew' import elInput from 'element-ui/packages/input' import { mapGetters } from 'vuex' @@ -1192,6 +1193,21 @@ export default { searchDetail() { if (this.partNumValue !== '' && this.partNumValue !== null) { this.loading0 = true + detailInfo(this.partNumValue).then(response => { + if (response.data.length !== 0) { + this.typeValue = response.data[0].零件类型名称 + this.partName = response.data[0].零件名称 + this.batchNum = response.data[0].批次数量 + this.material = response.data[0].材料流水号 + this.materialName = response.data[0].材料 + this.spec = response.data[0].原材料规格 + if (response.data[0].重量 === null) { + this.weight = '' + } else { + this.weight = response.data[0].重量 + } + } + }) mainTable(this.partNumValue).then(response => { this.tableData = [] for (let i = 0; i < response.data.length; i++) { diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue index 8368823e..361a99eb 100644 --- a/src/views/Outsourcing/PreorderAssociation/index.vue +++ b/src/views/Outsourcing/PreorderAssociation/index.vue @@ -68,7 +68,8 @@ - + 保存 +