diff --git a/src/api/ManufacturingCenter/ProductionCapacityBalance.js b/src/api/ManufacturingCenter/ProductionCapacityBalance.js index 2b415313..560946b5 100644 --- a/src/api/ManufacturingCenter/ProductionCapacityBalance.js +++ b/src/api/ManufacturingCenter/ProductionCapacityBalance.js @@ -235,7 +235,7 @@ export function updateDate(num1, num2, date) { method: 'post', data: { type: '2', - name: '车间生产管理工艺_新排产算法_制定计划_调整计划_增加数据New', + name: '车间生产管理工艺_新排产算法_制定计划_调整计划_增加数据New1', param: '工序流水号=' + num1 + '&调整人编号=' + num2 + '&调整计划完成日期=' + date } }) diff --git a/src/api/WorkshopProcurement/DepartmentBuyerRequestFund.js b/src/api/WorkshopProcurement/DepartmentBuyerRequestFund.js index bae165af..a72528d8 100644 --- a/src/api/WorkshopProcurement/DepartmentBuyerRequestFund.js +++ b/src/api/WorkshopProcurement/DepartmentBuyerRequestFund.js @@ -8,7 +8,7 @@ export function searchTable1(pageCurrent, pageSize, check1, start, end, check2, data: { type: '1', name: '车间采购管理_请款表_查询数据', - param: '时间段_check=' + check1 + '&开始时间=' + start + '&结束时间=' + end + '&合同号_check=' + check2 + '&采购合同编号=' + num1 + '&采购员_check=' + check3 + '&采购员姓名=' + name1 + '&供应商_check=' + check4 + '&供应商名称=' + name2, + param: '时间段_check=' + check1 + '&开始时间=' + start + '&结束时间=' + end + '&合同号_check=' + check2 + '&采购合同编号=' + num1 + '&采购员_check=' + check3 + '&采购员流水号=' + name1 + '&供应商_check=' + check4 + '&供应商名称=' + name2, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/views/Assembly/AssemblyInformationInput/index.vue b/src/views/Assembly/AssemblyInformationInput/index.vue index 4f0d9cf5..3d00b82c 100644 --- a/src/views/Assembly/AssemblyInformationInput/index.vue +++ b/src/views/Assembly/AssemblyInformationInput/index.vue @@ -137,7 +137,7 @@ 取消 - 确认 + 确认 diff --git a/src/views/Assembly/AssemblyProcessPlanning/index.vue b/src/views/Assembly/AssemblyProcessPlanning/index.vue index 643b9306..92e53c03 100644 --- a/src/views/Assembly/AssemblyProcessPlanning/index.vue +++ b/src/views/Assembly/AssemblyProcessPlanning/index.vue @@ -206,7 +206,7 @@ - + 车间请购 - 采购部门采购 - 车间生产 + 采购部门采购 + 车间生产 diff --git a/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue b/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue index ab86dbdb..768cc19b 100644 --- a/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue +++ b/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue @@ -20,15 +20,20 @@ 合同号: 采购员: + + + + 供应商: - 供应商: - + style="width:180px"/> - - + + + + + - + - + - + @@ -69,7 +83,7 @@ {{ scope.row.付款方式内容 }} - + @@ -84,9 +98,18 @@ - + - - -
- 请款开始时间: + 请款时间区间: - 请款结束时间: + placeholder="开始日期"/> + ～ + placeholder="结束日期"/> 导出Excel + style="margin-left:10px" + >导出Excel @@ -207,10 +213,10 @@ - + @@ -242,46 +248,11 @@ - - - - - - - - - - - - - - - - -
- 确定 -
-
@@ -292,8 +263,8 @@ import { mapGetters } from 'vuex' export default { data() { return { - tableData02: [], - dialogVisible2: false, + personValue: '', + person: [], loading2: false, tableData2: [], tableData11: [], @@ -303,37 +274,10 @@ export default { startDate: '', endDate: '', contractNum: '', - buyerName: '', - dialogVisible1: false, submitDisable: true, form1: {}, - supplierValue: '', supplierName: '', - enterpriseNature: '', - createDate: '', - registeredCapital: '', - taxNum: '', - EMail: '', - address: '', - account: '', - openingBank: '', - phone: '', - fax: '', - goodTime: '', - supplierCheck1: 0, - supplierCheck2: 0, - supplierCheck3: 0, - supplierCheck4: 0, - supplierCheck5: 0, - supplierCheck6: 0, - supplierCheck7: 0, - supplierCheck8: 0, - supplierCheck9: 0, - supplierCheck10: 0, - supplierCheck11: 0, - supplierCheck12: 0, tableData01: [], - loading1: false, tableData1: [], check1: 0, check2: 0, @@ -352,45 +296,43 @@ export default { 'id' ]) }, + created() { + this.initBuyer() + }, methods: { - submitSelectBuyer() { // 确定 - this.dialogVisible2 = false - }, - clickBuyer(row) { // 点击采购员表某一行 - this.submitDisable = false - this.buyerName = row.姓名 - }, initBuyer() { // 初始化采购人员 initBuyer().then(response => { - this.tableData02 = response.data + for (let i = 0; i < response.data.length; i++) { + this.person.push({ + text: response.data[i].姓名, + label: response.data[i].姓名, + value: response.data[i].人员编号 + }) + } }) }, searchTable1() { - this.loading1 = true this.tableData1 = [] this.startDate && this.endDate ? this.check1 = 1 : this.check1 = 0 this.contractNum ? this.check2 = 1 : this.check2 = 0 - this.buyerName ? this.check3 = 1 : this.check3 = 0 + this.personValue ? this.check3 = 1 : this.check3 = 0 this.supplierName ? this.check4 = 1 : this.check4 = 0 - searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.startDate, this.endDate, this.check2, this.contractNum, this.check3, this.buyerName, this.check4, this.supplierName).then(response => { + searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.startDate, this.endDate, this.check2, this.contractNum, this.check3, this.personValue, this.check4, this.supplierName).then(response => { for (let j = 0; j < response.data.rows.length; j++) { - if (response.data.rows[j].规定到货时间 !== null) { - response.data.rows[j].规定到货时间 = response.data.rows[j].规定到货时间.substring(0, response.data.rows[j].规定到货时间.indexOf(' ')) - } this.tableData11[j] = [] searchCondition(response.data.rows[j].采购合同流水号).then(response0 => { - this.tableData1 = response.data.rows - this.total1 = response.data.total - for (let i = 0; i < response0.data.length; i++) { - if (response0.data[i].请款时间 !== null) { - response0.data[i].请款时间 = response0.data[i].请款时间.substring(0, response0.data[i].请款时间.indexOf(' ')) + if (response0.data.length === 0) { + this.tableData11[j].push(response0.data) + document.getElementById(j).setAttribute('style', 'display:none') + } else { + for (let i = 0; i < response0.data.length; i++) { + this.tableData11[j].push(response0.data[i]) } - this.tableData11[j].push(response0.data[i]) } }) } - }).then(() => { - this.loading1 = false + this.tableData1 = response.data.rows + this.total1 = response.data.total }) }, handleSizeChange1(val) { @@ -416,6 +358,7 @@ export default { }) }, cancelRequestFund(row) { // 取消请款 + console.log(row) this.$confirm('确认取消请款吗?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', @@ -443,14 +386,17 @@ export default { }, searchRequestTable() { // 查询请款表 this.loading2 = true - if (this.startRequestDate === '' || this.startRequestDate === null || this.endRequestDate === '' || this.endRequestDate === null) { + if ((this.startRequestDate === '' || this.startRequestDate === null) && (this.endRequestDate === '' || this.endRequestDate === null)) { this.checkRequest = 0 - } else { this.checkRequest = 1 } + } else if (this.startRequestDate !== '' && this.startRequestDate !== null && this.endRequestDate !== '' && this.endRequestDate !== null) { + this.checkRequest = 1 + } else { + this.$message.error('请款时间区间有误') + this.loading2 = false + return + } searchRequestTable(this.checkRequest, this.startRequestDate, this.endRequestDate).then(response => { for (let j = 0; j < response.data.length; j++) { - if (response.data[j].规定到货时间 !== null) { - response.data[j].规定到货时间 = response.data[j].规定到货时间.substring(0, response.data[j].规定到货时间.indexOf(' ')) - } if (response.data[j].请款时间 !== null) { response.data[j].请款时间 = response.data[j].请款时间.substring(0, response.data[j].请款时间.indexOf(' ')) } diff --git a/src/views/WorkshopProcurement/PurchaseContractChange/index.vue b/src/views/WorkshopProcurement/PurchaseContractChange/index.vue index 21828f71..fceff486 100644 --- a/src/views/WorkshopProcurement/PurchaseContractChange/index.vue +++ b/src/views/WorkshopProcurement/PurchaseContractChange/index.vue @@ -25,7 +25,7 @@ 采购员: - + 供应商: