Merge branch 'master' of http://123.56.95.229:10010/r/高精

src/views/MarketingCenter/ContractInformationManagement/index.vue

@@ -327,7 +327,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button size="small" icon="el-icon-circle-close" @click="callOff('form')">取消</el-button>
-        <el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submit('form')">确 定</el-button>
+        <el-button :disabled="submitDisabled" type="distribution" size="small" icon="el-icon-circle-check" @click="submit('form')">确 定</el-button>
       </div>
     </el-dialog>
     <!--新增机床对话框-->
@@ -345,7 +345,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button size="small" icon="el-icon-circle-close" @click="callOff2('form1')">取消</el-button>
-        <el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submitMachine('form1')">确认</el-button>
+        <el-button :disabled="submitMachineDisabled" type="distribution" size="small" icon="el-icon-circle-check" @click="submitMachine('form1')">确认</el-button>
       </div>
     </el-dialog>
 
@@ -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
       }