This commit is contained in:
Vergil
2020-04-08 15:16:36 +08:00
parent 980a555608
commit 8eaf768150
2 changed files with 10 additions and 5 deletions

View File

@@ -118,7 +118,7 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible=false">取消</el-button> <el-button @click="dialogFormVisible=false">取消</el-button>
<el-button type="primary" @click="CHUKU()"> </el-button> <el-button :disabled="wareHousing_disable" type="primary" @click="CHUKU()"> </el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
@@ -131,6 +131,7 @@ import { initProject, searchmachine, searchgroup, searchdata, warehousing, selec
export default { export default {
data() { data() {
return { return {
wareHousing_disable: false,
entryNameValue: '', // 项目名称 entryNameValue: '', // 项目名称
entryName: [], entryName: [],
machineToolValue: '', // 机床号 machineToolValue: '', // 机床号
@@ -253,13 +254,13 @@ export default {
} }
}, // 入库 }, // 入库
wareHousing() { wareHousing() {
console.log(this.shuzu, 121212)
if (this.shuzu.length === 0) { if (this.shuzu.length === 0) {
this.$message.warning('请勾选出库物料') this.$message.warning('请勾选出库物料')
} else { } else {
this.selectDepartment() this.selectDepartment()
this.dialogFormVisible = true
this.form.leader = '' this.form.leader = ''
this.wareHousing_disable = false
this.dialogFormVisible = true
} }
}, // 多选 }, // 多选
handleSelectionChange(val) { handleSelectionChange(val) {
@@ -286,6 +287,7 @@ export default {
if (this.form.name === '') { if (this.form.name === '') {
this.$message.error('请选择领料人') this.$message.error('请选择领料人')
} else { } else {
this.wareHousing_disable = true
warehousing(this.multipleSelection, this.outgoingQuantity, this.form.name, this.remarks).then(response => { warehousing(this.multipleSelection, this.outgoingQuantity, this.form.name, this.remarks).then(response => {
if (response.data[0].result === '1') { if (response.data[0].result === '1') {
this.$message.success('出库成功') this.$message.success('出库成功')

View File

@@ -23,7 +23,7 @@
<el-button type="primary" class="el-icon-search" size="small" plain style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button> <el-button type="primary" class="el-icon-search" size="small" plain style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
<el-button type="warning" class="el-icon-download" size="small" plain style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button> <el-button type="warning" class="el-icon-download" size="small" plain style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
<!--<el-button :disabled="isDisabled" type="info" size="small" style="margin: 10px 10px;float: right" @click="EditConfirmNum">修改完成数量</el-button>--> <!--<el-button :disabled="isDisabled" type="info" size="small" style="margin: 10px 10px;float: right" @click="EditConfirmNum">修改完成数量</el-button>-->
<el-button :disabled="isDisabled" type="info" size="small" style="margin: 10px 10px;float: right" @click="EditWorkingHours">修补加工工时</el-button> <!--<el-button :disabled="isDisabled" type="info" size="small" style="margin: 10px 10px;float: right" @click="EditWorkingHours">修补加工工时</el-button>-->
</el-card> </el-card>
<el-row> <el-row>
<el-col style="width: 37%"> <el-col style="width: 37%">
@@ -253,7 +253,7 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible3=false">取消</el-button> <el-button @click="dialogFormVisible3=false">取消</el-button>
<el-button type="primary" @click="submit3('form3')" >确定</el-button> <el-button :disabled="EditWorkingHours_disable" type="primary" @click="submit3('form3')" >确定</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
@@ -265,6 +265,7 @@ import { getMachines, getGroups, getTable, gettabledata1, getTree, fn, getTable8
export default { export default {
data() { data() {
return { return {
EditWorkingHours_disable: false,
index: -1, index: -1,
Machine: '', // 机床号 Machine: '', // 机床号
Machines: [], Machines: [],
@@ -408,6 +409,7 @@ export default {
this.$refs['form3'].resetFields() this.$refs['form3'].resetFields()
} }
this.getPerson_Form3() this.getPerson_Form3()
this.EditWorkingHours_disable = false
this.dialogFormVisible3 = true this.dialogFormVisible3 = true
}, },
getPerson_Form3() { getPerson_Form3() {
@@ -424,6 +426,7 @@ export default {
}) })
}, },
submit3() { submit3() {
this.EditWorkingHours_disable = true
submitEdit3(this.processSerialNumber, this.form3.人员, this.form3.完成数量, this.form3.修补工时, this.form3.完成时间).then(response => { submitEdit3(this.processSerialNumber, this.form3.人员, this.form3.完成数量, this.form3.修补工时, this.form3.完成时间).then(response => {
if (response.data[0].result === '1') { if (response.data[0].result === '1') {
this.$message.success('补录成功') this.$message.success('补录成功')