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 @@