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

src/views/Inventory/MaterialOut/index.vue

@@ -224,7 +224,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible3=false">取消</el-button>
-        <el-button type="primary" @click="pickConfirm1()">确 定</el-button>
+        <el-button :disabled="dialogFormVisible3" type="primary" @click="pickConfirm1()">确 定</el-button>
       </div>
     </el-dialog>
 
@@ -268,6 +268,7 @@ export default {
   name: 'MaterialOut',
   data() {
     return {
+      buttonDisable: false,
       dateRange: '',
       multipleSelection1: [],
       multipleSelection: [],
@@ -447,7 +448,6 @@ export default {
     // 提交归还
     submitSendBack() {
       sendBack(this.form4.货位流水号, this.物料流水号, this.form4.归还数量, this.id, this.基本件流水号, this.标准件和外购件流水号, this.请购单明细流水号, this.form4.仓库流水号, this.领料单流水号).then(res => {
-        console.log(res)
         if (res.data[0].result === '1') {
           this.$message.success('操作成功')
           this.dialogFormVisible4 = false
@@ -493,10 +493,10 @@ export default {
       this.form3.password = ''
       this.selectDepartment()
       this.departments = []
+      this.buttonDisable = false
       this.dialogFormVisible3 = true
     },
     selectable(row, index) { // 控制某行是否可选
-      console.log(row)
       return ((Number(row.总数量) <= Number(row.出库数量1))) === false
     },
     // 初始化数据
@@ -608,6 +608,7 @@ export default {
     },
     // 提交领料确认
     pickConfirm1() {
+      this.buttonDisable = true
       for (let i = 0; i < this.pickListTable2.length; i++) {
         if (this.pickListTable2[i].出库数量 !== 0) {
           this.multipleSelection.push(this.pickListTable2[i].领料单明细流水号)