diff --git a/src/api/PurchasingCenter/OfflineContract.js b/src/api/PurchasingCenter/OfflineContract.js index 59cd36e4..dfe59fe4 100644 --- a/src/api/PurchasingCenter/OfflineContract.js +++ b/src/api/PurchasingCenter/OfflineContract.js @@ -296,8 +296,7 @@ export function searchMaterial22(check1, val1, pageCurrent, pageSize) { ModularID: router.currentRoute.path, type: '1', name: '采购管理_离线采购_物料主文件_基本_查询数据', - param: `名称规格型号_check=${check1}&名称规格型号=${val1}`, - Pagination: pageCurrent + '&' + pageSize + param: `名称规格型号_check=${check1}&名称规格型号=${val1}&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output` } }) } diff --git a/src/views/Inventory/InventoryCheck/index.vue b/src/views/Inventory/InventoryCheck/index.vue index 49a8636a..760a3235 100644 --- a/src/views/Inventory/InventoryCheck/index.vue +++ b/src/views/Inventory/InventoryCheck/index.vue @@ -165,7 +165,7 @@ @@ -177,6 +177,7 @@ import request from '@/utils/request' export default { data() { return { + addMaterial_disable: false, materialName: '', materialSpec: '', materialModel: '', @@ -319,6 +320,7 @@ export default { }, // 新增物料货位数量 addMaterial() { + this.addMaterial_disable = false this.dialogVisible = true }, // 选择物料 @@ -327,6 +329,7 @@ export default { }, // 确认新增物料货位数量 submitAdd() { + this.addMaterial_disable = true const param = { url: '', method: 'post', diff --git a/src/views/Inventory/InventoryManagement/index.vue b/src/views/Inventory/InventoryManagement/index.vue index 56aa1a18..78079bc4 100644 --- a/src/views/Inventory/InventoryManagement/index.vue +++ b/src/views/Inventory/InventoryManagement/index.vue @@ -178,7 +178,7 @@ @@ -242,6 +242,7 @@ import { mapGetters } from 'vuex' export default { data() { return { + ADD_disable: false, Contactpeople: [], // 联系人 count2: 0, // 清表单验证计数器 tableData: [], @@ -372,10 +373,16 @@ export default { }, // 点击增加仓库 ADD() { - this.form = [] + this.WarehouseNumber = '' + this.WarehouseName = '' + this.WarehouseDescription = '' + this.Address = '' + this.ContactpeopleValue = '' + this.Note = '' if (this.$refs['form'] !== undefined) { this.$refs['form'].resetFields() } + this.ADD_disable = false this.dialogFormVisible = true this.temp = 1 }, @@ -383,6 +390,7 @@ export default { submit(formName) { this.$refs[formName].validate((valid) => { if (valid) { + this.ADD_disable = true if (this.temp === 1) { this.addTableData() this.form.WarehouseNumber = '' @@ -402,16 +410,9 @@ export default { // 执行增加仓库 addTableData() { addWarehouse(this.form.WarehouseNumber, this.form.WarehouseName, this.form.WarehouseDescription, this.form.Address, this.form.ContactpeopleValue, this.form.Note).then(response => { - console.log(this.form.WarehouseNumber, this.form.WarehouseName, this.form.WarehouseDescription, this.form.Address, this.form.ContactpeopleValue, this.form.Note) this.dialogFormVisible = false if (response.data[0].result === '1') { this.$message.success('添加成功') - this.form.WarehouseNumber = '' - this.form.WarehouseName = '' - this.form.WarehouseDescription = '' - this.form.Address = '' - this.form.ContactpeopleValue = '' - this.form.Note = '' } else { this.$message.error('添加失败') } @@ -432,6 +433,7 @@ export default { } this.form.Note = row.备注 this.HouseNumber = row.仓库流水号 + this.ADD_disable = false this.dialogFormVisible = true }, // 执行修改 diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue index 0edf9b84..47c53c8d 100644 --- a/src/views/MarketingCenter/ContractInformationManagement/index.vue +++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue @@ -327,7 +327,7 @@ @@ -345,7 +345,7 @@ @@ -504,12 +504,10 @@ export default { // const reg = /^\-\d\.?\d*$/ // const boolean = reg.test(value) const boolean = new RegExp(/^(\+)?\d+(\.\d+)?$/).test(value) - console.log(boolean) if (!boolean) { callback(new Error('请输入正数')) this.form.contractAmount = '' } else { - console.log(2222) callback() } } else { @@ -517,6 +515,8 @@ export default { } } return { + submitDisabled: false, + submitMachineDisabled: false, dateRange: '', check1: '', pickerOptions: { @@ -735,7 +735,6 @@ export default { }, getName() { addMarketingManager(this.peopleid, 1).then(response => { - console.log(response, 123) }) if (this.param === 1) { this.dialogFormVisiblePeople = false @@ -766,7 +765,6 @@ export default { this.ExecutionProgress = null this.listLoading = true searchTable1(this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.check1, this.check1, this.dateRange[0], this.dateRange[1], this.machine_check, this.machine, this.customerName1_check, this.customerName1).then(response => { - console.log(response.data) this.listLoading = false this.total = parseInt(response.data.output[0].ItemCount) this.tableData1 = response.data.result @@ -855,7 +853,6 @@ export default { }) }, selectMachine(row) { - console.log(row.项目流水号) if (this.a === 1) { this.expands.push(row.项目流水号) this.b = row.项目流水号 @@ -926,7 +923,6 @@ export default { }) }) selectMachine(row.项目流水号).then(response => { - console.log(response) this.tableData2 = response.data }) }, @@ -960,6 +956,7 @@ export default { this.biddingNumber = '' this.tableDataBidding = [] this.isTrue = true + this.submitDisabled = false }, addTableData1() { addList(this.form.EntryName, this.form.drawingJointSignNode, this.form.EquipmentPreAcceptanceNode, this.form.ConsignmentNode, this.form.installDebugNode, this.id1, this.form.executionProgressID, this.CustomerCode, this.form.remark, this.form.付款方式, this.form.contractSigningDate, this.biddingNumber, this.form.contractAmount).then(response => { @@ -972,6 +969,7 @@ export default { } else { this.$message.error('添加失败') } + this.submitDisabled = false }) }, // 重置表单 @@ -984,6 +982,7 @@ export default { submit(formName) { this.$refs[formName].validate((valid) => { if (valid) { + this.submitDisabled = true if (this.temp === 1) { this.addTableData1() this.temp = null @@ -995,7 +994,6 @@ export default { }) }, handleEdit(row) { - console.log(row) this.editForm(row, 'form') this.title = '编辑合同' this.dialogFormVisible1 = true @@ -1031,6 +1029,7 @@ export default { } else { this.$message.error('信息更新失败') } + this.submitDisabled = false }) this.getTable(searchTable1, [this.PageCurrent, this.PageSize, '', ''], ['tableData1', 'total', 'listLoading']) this.ExecutionProgressShow = true @@ -1158,6 +1157,7 @@ export default { this.projectNum = row.项目流水号 this.dialogFormVisible2 = true this.title1 = '新增机床' + this.submitMachineDisabled = false this.addForm('form1') }, editMachine(row) { @@ -1172,9 +1172,11 @@ export default { this.dialogFormVisible2 = false }, submitMachine() { + this.submitMachineDisabled = true function a() { selectMachine(this.projectNum).then(response => { this.tableData2 = response.data + this.submitMachineDisabled = false }) this.dialogFormVisible2 = false } diff --git a/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue b/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue index 38533a46..a3496ec8 100644 --- a/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue +++ b/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue @@ -133,10 +133,10 @@ 转为滞货数量: - + @@ -149,6 +149,7 @@ export default { name: 'BacklogGoodsAnalysis', data() { return { + turnToBacklogGoods_diaable: false, materialName: '', materialSpec: '', materialModel: '', @@ -200,13 +201,15 @@ export default { }, turnToBacklogGoods(row) { this.number = 0 - this.dialogFormVisible = true + this.turnToBacklogGoods_diaable = false this.maxNumber = row.可转滞货数量 this.materialNum = row.物料流水号 this.materialLocalNum = row.物料与货位对照流水号 this.localNum = row.货位流水号 + this.dialogFormVisible = true }, submitTurn() { + this.turnToBacklogGoods_diaable = true submitTurn(this.materialNum, this.number, this.materialLocalNum, this.localNum).then(response => { if (response.data[0].result === '1') { this.searchTable1() diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index 54b7be4b..374b5f59 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -80,7 +80,7 @@ - 调整采购任务 + 调整采购任务 取消 { if (response.data[0].result === '1') { this.$message.success('调整成功') this.searchTable11() + this.tiaozheng1_disable = false } else { this.$message.warning('调整失败') } @@ -1989,6 +1994,7 @@ export default { submitCreateInquirySheet() { // 提交创建询价单 this.$refs['form2'].validate((valid) => { if (valid) { + this.createInquirySheet_disable = true const numGroup1 = [] // 空数组,放现有的询价单号 searchCreateInquirySheet2().then(response => { // 先查询判断是否存在 for (let i = 0; i < response.data.length; i++) { @@ -1996,6 +2002,7 @@ export default { } }).then(() => { if (numGroup1.indexOf(this.form2.inquirySheetNum) !== -1) { + this.createInquirySheet_disable = false this.$message.error('该询价单号已存在') } else { createInquirySheet(this.form2.inquirySheetNum, this.id, this.form2.supplierValue, '').then(response => { @@ -2006,6 +2013,7 @@ export default { this.supplierValue = '' this.dialogVisible2 = false this.searchTable2() + this.createInquirySheet_disable = false } else { this.$message.error('操作失败') } }) } @@ -2019,6 +2027,7 @@ export default { submitCreateInquirySheet1() { // 提交创建询价单 this.$refs['form2'].validate((valid) => { if (valid) { + this.createInquirySheet_disable = true createInquirySheet(this.form2.inquirySheetNum, this.id, this.form2.supplierNameValue, '').then(response => { if (!(response.data)) { this.$message.success('创建成功') @@ -2029,7 +2038,11 @@ export default { this.dialogVisible2 = false this.inquirySheetNum = this.form2.inquirySheetNum this.searchTable2(this.inquirySheetNum) - } else { this.$message.error('操作失败!该询价单已存在,请重新输入') } + this.createInquirySheet_disable = false + } else { + this.$message.error('操作失败!该询价单已存在,请重新输入') + this.createInquirySheet_disable = false + } }) } }) @@ -2084,6 +2097,7 @@ export default { submitEditInquirySheet() { // 提交编辑询价单 this.$refs['form2'].validate((valid) => { if (valid) { + this.createInquirySheet_disable = true const numGroup1 = [] // 空数组,放现有的询价单号 const numGroup2 = [] // 空数组,放现有的询价单流水号 searchCreateInquirySheet2().then(response => { // 先查询判断是否存在 @@ -2094,6 +2108,7 @@ export default { }).then(() => { if (numGroup1.indexOf(this.form2.inquirySheetNum) !== -1 && numGroup1.indexOf(this.form2.inquirySheetNum) !== numGroup2.indexOf(parseInt(this.form2.inquirySheetNumValue))) { this.$message.error('该询价单号已存在') + this.createInquirySheet_disable = false } else { editInquirySheet(this.form2.inquirySheetNumValue, this.form2.inquirySheetNum, this.form2.supplierNameValue).then(response => { if (response.data[0].result === '1') { @@ -2103,7 +2118,11 @@ export default { this.supplierValue = '' this.dialogVisible2 = false this.searchTable2() - } else { this.$message.error('修改失败') } + this.createInquirySheet_disable = false + } else { + this.$message.error('修改失败') + this.createInquirySheet_disable = false + } }) } }) diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue index 8a06db60..5be0d365 100644 --- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue +++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue @@ -178,6 +178,7 @@ export default { inject: ['reload'], data() { return { + generateContract_disabed: true, isShowN: false, loading: false, openDeal: true, @@ -856,6 +857,7 @@ export default { // this.content = `自定义` // }, generateContract() { // 生成采购合同 + this.generateContract_disabed = true for (let i = 0; i < this.tableData1.length; i++) { if (this.tableData1[i].含税单价 === '') { console.log(this.tableData1[i].含税单价, '含税单价') @@ -863,6 +865,7 @@ export default { } } if (this.count === this.tableData1.length) { + this.generateContract_disabed = false this.$message.error('该合同未绑定物料信息') } else { this.content = this.contentNew.replace(/ /g, '') @@ -899,8 +902,10 @@ export default { this.$message.success('合同生成成功') this.openDeal = true this.reload() + this.generateContract_disabed = false } else { this.$message.error('生成合同失败') + this.generateContract_disabed = false } }) }).catch(() => { @@ -908,11 +913,14 @@ export default { type: 'info', message: '已取消操作' }) + this.generateContract_disabed = false }) } else { + this.generateContract_disabed = false this.$message.warning('请先选择模板进行预览') } } else { + this.generateContract_disabed = false this.$message.warning('请先选择合同进行编辑') } } diff --git a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue index e02092f3..7f859f71 100644 --- a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue +++ b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue @@ -278,8 +278,8 @@ @@ -400,6 +400,7 @@ export default { name: '', // 发票结算申请 data() { return { + submitAdd1_disable: false, dateRange: '', pickerOptions: { shortcuts: [{ @@ -518,6 +519,7 @@ export default { this.form1.isCost = '' this.form1.remark = '' this.title1 = '到票结算申请' + this.submitAdd1_disable = false this.dialogVisible1 = true }, searchTable1() { @@ -542,6 +544,7 @@ export default { submitAdd1() { // 提交新增 this.$refs['form1'].validate((valid) => { if (valid) { + this.submitAdd1_disable = true insertInto(this.form1.invoiceNum, this.form1.money, this.form1.supplierValue, this.form1.paid, this.form1.unpaid, this.form1.tax, this.form1.isCost, this.form1.remark).then(response => { if (response.data[0].result === '1') { this.$message.success('增加成功') diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue index 61acc24f..9e9463e7 100644 --- a/src/views/PurchasingCenter/OfflineContract/index.vue +++ b/src/views/PurchasingCenter/OfflineContract/index.vue @@ -26,7 +26,7 @@ start-placeholder="开始日期" end-placeholder="结束日期"/> 查询 - 调整采购任务 + 调整采购任务 确定 { if (response.data[0].result === '1') { this.$message.success('调整成功') this.searchTable11() + this.tiaozheng1_disable = false } else { this.$message.warning('调整失败') + this.tiaozheng1_disable = false } }) } else { @@ -1106,6 +1114,7 @@ export default { this.form2.供应商名称 = '' this.form2.规定到货时间 = '' this.form2.离线合同备注 = '付款方式:;付款时间:;到货时间:;开票信息:;其他说明:;' + this.submitAddOfflineContract_disable = false this.dialogVisible2 = true }) }, @@ -1119,9 +1128,11 @@ export default { } }) }, - submitAddOfflineContract() { // 新建离线合同 + // 新建离线合同 + submitAddOfflineContract() { this.$refs['form2'].validate((valid) => { if (valid) { + this.submitAddOfflineContract_disable = true const numGroup1 = [] // 空数组,放现有的询价单号 searchOfflineContract2().then(response => { // 先查询判断是否存在 for (let i = 0; i < response.data.length; i++) { @@ -1133,11 +1144,13 @@ export default { } else { addOfflineContract(this.form2.离线合同编号, this.form2.离线合同名称, this.form2.供应商流水号, this.id, this.form2.规定到货时间, this.form2.离线合同备注).then(response => { if (response.data[0].result === '1') { + this.dialogVisible2 = false this.$message.success('新建离线合同成功') this.offlineContract = this.form2.离线合同编号 this.searchTable2(this.offlineContract) - this.dialogVisible2 = false - } else { this.$message.error('新建离线合同失败') } + } else { + this.$message.error('新建离线合同失败') + } }) } }) @@ -1159,11 +1172,13 @@ export default { this.form2.供应商名称 = row.供应商名称 this.form2.规定到货时间 = row.规定到货时间 this.form2.离线合同备注 = row.离线合同备注 + this.submitEditOfflineContract_disable = false this.dialogVisible2 = true }, submitEditOfflineContract() { this.$refs['form2'].validate((valid) => { if (valid) { + this.submitEditOfflineContract_disable = true const numGroup1 = [] // 空数组,放现有的离线合同号 const numGroup2 = [] // 空数组,放现有的离线合同流水号 searchOfflineContract2().then(response => { // 先查询判断是否存在 @@ -1177,10 +1192,12 @@ export default { } else { editOfflineContract(this.form2.离线合同流水号, this.form2.离线合同编号, this.form2.离线合同名称, this.form2.供应商流水号, this.id, this.form2.规定到货时间, this.form2.离线合同备注).then(response => { if (response.data[0].result === '1') { + this.dialogVisible2 = false this.$message.success('修改离线合同成功') this.searchTable2() - this.dialogVisible2 = false - } else { this.$message.error('修改离线合同失败') } + } else { + this.$message.error('修改离线合同失败') + } }) } }) @@ -1680,12 +1697,12 @@ export default { this.loading2 = true searchMaterial22(check1, this.materialName, this.pageCurrent22, this.pageSize22).then(response => { console.log(response.data, 3333) - this.tableData22 = response.data.rows - this.total22 = response.data.total + this.tableData22 = response.data.result + this.total22 = parseInt(response.data.output[0].ItemCount) const supplier = [] this.remarkFilters = [] this.supplierFilters = [] - response.data.rows.map(v => { + response.data.result.map(v => { if (v.供货商 === null) { v.供货商 = '' } if (!supplier.includes(v.供货商)) { supplier.push(v.供货商) diff --git a/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue b/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue index 02fd9bd2..cc9bbb19 100644 --- a/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue +++ b/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue @@ -247,7 +247,7 @@ 合计: - 确定请款 + 确定请款 @@ -205,6 +205,7 @@ import { timeToStamp, numSubtract } from '@/utils/tool' export default { data() { return { + requestFund_disabe: false, selectContents: [], getDate: null, tableData0: [], @@ -326,11 +327,13 @@ export default { this.totalDebt = this.totalSum - this.totalPay }) }, - requestFund() { // 请款 - this.dialogVisible2 = true + // 请款 + requestFund() { this.supplierValue = '' this.fetchData() // 重新获取供应商 this.tableData01 = [] + this.requestFund_disabe = false + this.dialogVisible2 = true }, searchTable01() { // 查询待请款 if (this.supplierValue) { @@ -369,6 +372,7 @@ export default { }, submitRequestFund() { // 确认请款 if (this.supplierValue && this.contractGroup.length !== 0) { + this.requestFund_disabe = true this.SUM = 0 this.contractGroup = [] this.sumGroup = [] @@ -382,6 +386,7 @@ export default { } } if (this.SUM === 0) { + this.requestFund_disabe = false this.$message.error('请款金额不能为0') } else { submitRequestFund(this.contractGroup, this.sumGroup, this.supplierValue, this.SUM, this.id).then(response => {