diff --git a/src/api/WorkshopProcurement/AccountingPrice.js b/src/api/WorkshopProcurement/AccountingPrice.js index 2f1c25a8..4a53883d 100644 --- a/src/api/WorkshopProcurement/AccountingPrice.js +++ b/src/api/WorkshopProcurement/AccountingPrice.js @@ -7,19 +7,19 @@ export function initPayState() { method: 'post', data: { type: '1', - name: '车间管理_基本件外购质检_合同查询' + name: '车间采购管理_采购合同_查询' } }) } // 查询表1 -export function searchParts(pageCurrent, pageSize, check1, num, check2, name) { +export function searchParts(pageCurrent, pageSize, check1, num) { return request({ url: '', method: 'post', data: { type: '1', name: '车间管理_核算价格_查询数据', - param: `采购合同流水号_check=${check1}&采购合同流水号=${num}&供应商名称_check=${check2}&供应商名称=${name}`, + param: `采购合同流水号_check=${check1}&采购合同流水号=${num}`, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/WorkshopProcurement/ProcurementContractApproval.js b/src/api/WorkshopProcurement/ProcurementContractApproval.js index ae79da7d..0116c33e 100644 --- a/src/api/WorkshopProcurement/ProcurementContractApproval.js +++ b/src/api/WorkshopProcurement/ProcurementContractApproval.js @@ -7,7 +7,7 @@ export function initContract() { method: 'post', data: { type: '1', - name: '车间采购管理_采购合同_查询_cjn' + name: '车间采购管理_采购合同_未审批查询' } }) } diff --git a/src/api/WorkshopProcurement/PurchaseContractChange.js b/src/api/WorkshopProcurement/PurchaseContractChange.js index a802ba6a..124734fd 100644 --- a/src/api/WorkshopProcurement/PurchaseContractChange.js +++ b/src/api/WorkshopProcurement/PurchaseContractChange.js @@ -7,7 +7,7 @@ export function initContract() { method: 'post', data: { type: '1', - name: '车间采购管理_采购合同_查询_cjn' + name: '车间采购管理_采购合同_查询' } }) } diff --git a/src/api/WorkshopProcurement/PurchasingQualityInspection.js b/src/api/WorkshopProcurement/PurchasingQualityInspection.js index 4bc6c826..f368dd00 100644 --- a/src/api/WorkshopProcurement/PurchasingQualityInspection.js +++ b/src/api/WorkshopProcurement/PurchasingQualityInspection.js @@ -7,7 +7,7 @@ export function initPayState() { method: 'post', data: { type: '1', - name: '车间管理_基本件外购质检_合同查询' + name: '车间采购管理_采购合同_查询' } }) } diff --git a/src/api/WorkshopProcurement/QualityInspectionQuery.js b/src/api/WorkshopProcurement/QualityInspectionQuery.js index 8be8d887..d2d5e9ab 100644 --- a/src/api/WorkshopProcurement/QualityInspectionQuery.js +++ b/src/api/WorkshopProcurement/QualityInspectionQuery.js @@ -7,30 +7,19 @@ export function initPayState() { method: 'post', data: { type: '1', - name: '车间管理_基本件外购质检_合同查询' - } - }) -} -// 初始化零件 -export function initParts() { - return request({ - url: '', - method: 'post', - data: { - type: '1', - name: '车间管理_基本件外购质检_零件查询' + name: '车间采购管理_采购合同_查询' } }) } // 查询表1 -export function searchParts(pageCurrent, pageSize, check1, num, check2, name, check3, num1) { +export function searchParts(pageCurrent, pageSize, check1, num, check2, name) { return request({ url: '', method: 'post', data: { type: '1', name: '车间管理_质检情况_查询数据', - param: `采购合同流水号_check=${check1}&采购合同流水号=${num}&供应商名称_check=${check2}&供应商名称=${name}&物料流水号_check=${check3}&物料流水号=${num1}`, + param: `采购合同流水号_check=${check1}&采购合同流水号=${num}&供应商名称_check=${check2}&供应商名称=${name}`, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/views/TechnologyCenter/CreatePackingList/index.vue b/src/views/TechnologyCenter/CreatePackingList/index.vue index 64c1a7f4..5b683f91 100644 --- a/src/views/TechnologyCenter/CreatePackingList/index.vue +++ b/src/views/TechnologyCenter/CreatePackingList/index.vue @@ -606,7 +606,6 @@ export default { console.log(resp) const groupData = resp.data.map(item => { item.类别 = '机床所属部件' - item.代号 = data[i].代号 + '-' + item.代号 + '组' return item }) console.log(groupData) diff --git a/src/views/TechnologyCenter/ImportParts/index.vue b/src/views/TechnologyCenter/ImportParts/index.vue index c3f40d9e..3d830dee 100644 --- a/src/views/TechnologyCenter/ImportParts/index.vue +++ b/src/views/TechnologyCenter/ImportParts/index.vue @@ -168,6 +168,7 @@ export default { this.disabled = false return } else { + console.log(this.worksheet[j], 111111111) if (this.worksheet[j].M2.v.substring(0, 1) !== '9') { this.worksheet[j].G1 ? establishment = this.worksheet[j].G1.v : establishment = '' this.worksheet[j].I1 ? proofread = this.worksheet[j].I1.v : proofread = '' diff --git a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue index 961ce743..6c5ecb89 100644 --- a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue +++ b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue @@ -543,6 +543,11 @@ export default { this.fax ? this.supplierCheck11 = 1 : (this.supplierCheck11 = 0, this.fax = '') this.goodTime ? this.supplierCheck12 = 1 : (this.supplierCheck12 = 0, this.goodTime = '') searchSupplier(this.supplierCheck1, this.supplierName, this.supplierCheck2, this.enterpriseNature, this.supplierCheck3, this.createDate, this.supplierCheck4, this.registeredCapital, this.supplierCheck5, this.taxNum, this.supplierCheck6, this.EMail, this.supplierCheck7, this.address, this.supplierCheck8, this.account, this.supplierCheck9, this.openingBank, this.supplierCheck10, this.phone, this.supplierCheck11, this.fax, this.supplierCheck12, this.goodTime).then(response => { + for (let i = 0; i < response.data.length; i++) { + if (response.data[i].创立日期 !== '' && response.data[i].创立日期 !== null) { + response.data[i].创立日期 = response.data[i].创立日期.split(' ')[0] + } + } this.tableData01 = response.data }) }, diff --git a/src/views/WorkshopProcurement/QualityInspectionQuery/index.vue b/src/views/WorkshopProcurement/QualityInspectionQuery/index.vue index 0b9a71e2..107e8184 100644 --- a/src/views/WorkshopProcurement/QualityInspectionQuery/index.vue +++ b/src/views/WorkshopProcurement/QualityInspectionQuery/index.vue @@ -15,14 +15,6 @@ 供应商: - 零件名称: - - - 查询 @@ -102,7 +94,7 @@