diff --git a/src/api/ManufacturingCenter/PartAssignment.js b/src/api/ManufacturingCenter/PartAssignment.js index 77beb855..fcce2694 100644 --- a/src/api/ManufacturingCenter/PartAssignment.js +++ b/src/api/ManufacturingCenter/PartAssignment.js @@ -263,14 +263,14 @@ export function Delete1(num) { } }) } -export function editStock(num, num1, num2) { +export function editStock(num, num1, num2, num3, num4) { return request({ url: '', method: 'post', data: { type: '2', name: '零件分配_标准件和外购件_使用库存', - param: '标准件和外购件流水号=' + num + '&数量=' + num1 + '&零件数量=' + num2 + param: '标准件和外购件流水号=' + num + '&数量=' + num1 + '&零件数量=' + num2 + '&物料流水号=' + num3 + '&安全库存量=' + num4 } }) } diff --git a/src/api/WorkshopProcurement/FundApproval.js b/src/api/WorkshopProcurement/FundApproval.js index 2fd88aaa..341493e6 100644 --- a/src/api/WorkshopProcurement/FundApproval.js +++ b/src/api/WorkshopProcurement/FundApproval.js @@ -50,15 +50,15 @@ export function execApproval1(num1, num2, reason, person, state) { } }) } -// 查询离线合同审核/审批/付款 +// 查询离线合同审批/付款 export function initApprovalOffline(pageCurrent, pageSize, state) { return request({ url: '', method: 'post', data: { type: '1', - name: '采购管理_离线合同_审核审批付款_查询数据', - param: `审核_审批_付款状态=${state}`, + name: '车间采购管理_离线合同_审批付款_查询数据', + param: `审批_付款状态=${state}`, Pagination: pageCurrent + '&' + pageSize } }) @@ -70,20 +70,20 @@ export function searchRequsetFundDetail(num) { method: 'post', data: { type: '1', - name: '采购管理_离线合同_请款明细_查询数据', + name: '车间采购管理_离线合同_请款明细_查询数据', param: `离线合同请款流水号=${num}` } }) } -// 执行审核/审批/付款（离线合同） +// 执行审批/付款（离线合同） export function execApprovalOffline(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}` } }) } diff --git a/src/api/WorkshopProcurement/PurchaseInvoiceDelivery.js b/src/api/WorkshopProcurement/PurchaseInvoiceDelivery.js new file mode 100644 index 00000000..f4ce8c71 --- /dev/null +++ b/src/api/WorkshopProcurement/PurchaseInvoiceDelivery.js @@ -0,0 +1,109 @@ +import request from '@/utils/request' + +// 发票查询 +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 addInvoice(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间采购管理_采购发票_增加数据', + param: `采购合同流水号=${params[0]}&开票金额=${params[1]}&传送人流水号=${params[2]}&备注=${params[3]}` + } + }) +} +// 发票编辑 +export function editInvoice(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间采购管理_采购发票_修改数据', + param: `发票交接流水号=${params[0]}&发票号=${params[1]}&开户行=${params[2]}&开票时间=${params[3]}&接收人流水号=${params[4]}` + } + }) +} +// 发票删除 +export function deleteInvoice(num1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间采购管理_采购发票_删除数据', + param: '发票交接流水号=' + num1 + } + }) +} +// 传送人初始化 +export function initSender() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '人事档案管理_人员与角色_查询数据_采购员' + } + }) +} +// 初始化供应商 +export function initSupplier() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_供应商_查询数据_根据条件' + } + }) +} +// 根据供应商查合同 +export function searchContract(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间采购管理_采购合同_查询数据_根据供应商', + param: `供应商流水号=${num}` + } + }) +} +// 根据供应商查合同 +export function searchOffline(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间采购管理_离线合同_查询数据_根据供应商', + param: `供应商流水号=${num}` + } + }) +} +// 根据供应商查合同 +export function invoiceDetail(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间采购管理_采购发票明细_查询数据', + param: `发票交接流水号=${num}` + } + }) +} diff --git a/src/api/WorkshopProcurement/PurchasingQualityInspection.js b/src/api/WorkshopProcurement/PurchasingQualityInspection.js index f368dd00..91957d6b 100644 --- a/src/api/WorkshopProcurement/PurchasingQualityInspection.js +++ b/src/api/WorkshopProcurement/PurchasingQualityInspection.js @@ -25,14 +25,14 @@ export function searchParts(pageCurrent, pageSize, check1, num, check2, name) { }) } // 编辑数据 -export function update(id, time, number, time1, reason, remarks) { +export function update(id, time, number1, number, time1, reason, remarks) { return request({ url: '', method: 'post', data: { type: '2', name: '车间管理_基本件外购质检_编辑数据', - param: `ID=${id}&交检日期=${time}&废品数量=${number}&检查日期=${time1}&报废原因=${reason}&备注=${remarks}` + param: `ID=${id}&交检日期=${time}&检验数量=${number1}&废品数量=${number}&检查日期=${time1}&报废原因=${reason}&备注=${remarks}` } }) } diff --git a/src/utils/request.js b/src/utils/request.js index 554b1f2b..38aeec07 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -15,7 +15,6 @@ export const upload3 = `192.168.1.231:8411/submit/upload3.ashx` // performancebo export const uploadInvoiceScan = `192.168.1.231:8411/submit/uploadInvoiceScan.ashx` // invoice export const download = `192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement const service = axios.create({ - // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue index 742bc5ff..140c71a6 100644 --- a/src/views/ManufacturingCenter/PartAssignment/index.vue +++ b/src/views/ManufacturingCenter/PartAssignment/index.vue @@ -603,6 +603,8 @@ export default { StandardAndOutsourcing: '', PartNum: '', DetailedNum: '', + stockNum: '', + MaterialNumber: '', PurchaseOrder: '', PartType: '基本件', tableData: [], @@ -1033,12 +1035,14 @@ export default { } this.dialogFormVisible4 = true this.StandardAndOutsourcing = row.标准件和外购件流水号 + this.MaterialNumber = row.物料流水号 this.PartNum = row.零件数量 + this.stockNum = row.安全库存量 }, submitEdit2(formName) { // 提交使用库存数量 this.$refs[formName].validate((valid) => { if (valid) { - editStock(this.RequisitionList, this.form4.数量, this.PartNum).then(response => { + editStock(this.StandardAndOutsourcing, this.form4.数量, this.PartNum, this.MaterialNumber, this.stockNum).then(response => { if (response.data[0].result === '1') { this.$message.success('编辑成功') this.dialogFormVisible4 = false diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue index 63e0e470..cc878508 100644 --- a/src/views/MarketingCenter/ContractInformationManagement/index.vue +++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue @@ -883,7 +883,7 @@ export default { this.$message.success('添加成功') this.peopleid = '' this.title = '' - this.getTable(searchTable1, [this.PageCurrent, this.PageSize, '', ''], ['tableData1', 'total', 'listLoading']) + this.fetchTableData1() } else { this.$message.error('添加失败') } @@ -928,7 +928,7 @@ export default { this.form.remark = row.合同信息备注 this.CustomerCode = row.客户流水号 this.form.付款方式 = parseInt(row.付款方式代码) - this.biddingNumber = parseInt(row.招标保证金流水号) + this.biddingNumber = row.招标保证金流水号 this.form.bidding = row.招标企业 this.disabled = true this.temp = 2 diff --git a/src/views/PurchasingCenter/SupplierManagement/index.vue b/src/views/PurchasingCenter/SupplierManagement/index.vue index 141c9da5..c3c3b96e 100644 --- a/src/views/PurchasingCenter/SupplierManagement/index.vue +++ b/src/views/PurchasingCenter/SupplierManagement/index.vue @@ -77,12 +77,17 @@
供应商列表
- - + + + + + + + +