This commit is contained in:
liushuai
2020-05-07 18:18:07 +08:00
parent 29ea4df094
commit 6a042c61bc
11 changed files with 403 additions and 203 deletions

View File

@@ -19,14 +19,15 @@
:label="item.label"
:value="item.value"/>
</el-select>
<el-checkbox v-model="checked" @change="searchTable">禁用件</el-checkbox>
<span style="margin-left: 20px;font-size: 14px;">任务下达时间:&nbsp;&nbsp;{{ DeliveryTime }}</span>
<!-- <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable()">查询</el-button>-->
<!-- <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchPart()">查询1</el-button>-->
<el-badge :value="value1" :max="99" class="item">
<el-button size="small" type="text" @click="PartCallbackInformation1">外购件和标准件打回信息</el-button>
<el-button size="small" type="text" @click="PartCallbackInformation1;dialogFormVisible2 = true">外购件和标准件打回信息</el-button>
</el-badge>
<el-badge :value="value" :max="99" class="item">
<el-button size="small" type="text" @click="PartCallbackInformation">基本件打回信息</el-button>
<el-button size="small" type="text" @click="PartCallbackInformation;dialogFormVisible1 = true">基本件打回信息</el-button>
</el-badge>
</el-row>
</el-card>
@@ -81,7 +82,8 @@
</el-table-column>
<el-table-column label="操作" align="center" width="100px">
<template slot-scope="scope">
<el-button type="text" size="mini" icon="el-icon-right" plain @click="OutParts(scope.row)">移出</el-button>
<el-button v-if="checked" type="text" size="mini" icon="el-icon-right" plain @click="inParts(scope.row)">解除禁用</el-button>
<el-button v-else type="text" size="mini" icon="el-icon-right" plain @click="OutParts(scope.row)">移出</el-button>
</template>
</el-table-column>
</el-table>
@@ -550,7 +552,7 @@
</template>
<script>
import { searchBillNumber, DeliveryTimeSelect, initProject, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed1, purchaseRequisition, purchaseRequisition1, purchaseRequisition2, MoveOut, MoveOut1, PurchasingDepartment, Production, PartCallbackInformation, PartCallbackInformation1, Delete, Delete1, editStock, editNum, OutPart, PurchasingDepartmentBack, purchaseRequisition2Back } from '@/api/ManufacturingCenter/PartAssignment'
import { inPart, searchBillNumber, DeliveryTimeSelect, initProject, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed1, purchaseRequisition, purchaseRequisition1, purchaseRequisition2, MoveOut, MoveOut1, PurchasingDepartment, Production, PartCallbackInformation, PartCallbackInformation1, Delete, Delete1, editStock, editNum, OutPart, PurchasingDepartmentBack, purchaseRequisition2Back } from '@/api/ManufacturingCenter/PartAssignment'
import { mapGetters } from 'vuex'
import { getNowShotTime } from '@/utils/tool'
import Cookie from 'js-cookie'
@@ -649,7 +651,8 @@ export default {
dialogFormVisible1: false,
dialogFormVisible2: false,
dialogFormVisible3: false,
dialogFormVisible4: false
dialogFormVisible4: false,
checked: false
}
},
computed: {
@@ -678,6 +681,8 @@ export default {
created() {
this.DeliveryTime = ''
this.fetchData()
this.PartCallbackInformation()
this.PartCallbackInformation1()
},
methods: {
// EXCEL 导出
@@ -727,7 +732,6 @@ export default {
},
PartCallbackInformation() {
let check, check1
this.dialogFormVisible1 = true
this.tableData9 = []
this.partNumber ? check = 1 : check = 0
this.dateRange ? check1 = 1 : (check1 = 0, this.dateRange = '')
@@ -744,7 +748,6 @@ export default {
})
},
PartCallbackInformation1() {
this.dialogFormVisible2 = true
let check, check1
this.tableData10 = []
this.partNumber1 ? check = 1 : check = 0
@@ -995,6 +998,7 @@ export default {
}
},
searchPart() {
let num
this.tableData1 = []
this.tableData2 = []
this.tableData3 = []
@@ -1004,16 +1008,17 @@ export default {
// this.machineFloatValue = row.机床流水号
// this.groupName = row.组号
// this.groupFloatValue = row.组件流水号
this.checked ? num = 1 : num = 0
if (this.PartType === '基本件') {
searchPart(this.groupFloatValue).then(response => {
searchPart(this.groupFloatValue, num).then(response => {
this.tableData1 = response.data
})
} else if (this.PartType === '外购件') {
searchPart1(this.groupFloatValue, 2).then(response => {
searchPart1(this.groupFloatValue, 2, num).then(response => {
this.tableData2 = response.data
})
} else if (this.PartType === '标准件') {
searchPart1(this.groupFloatValue, 1).then(response => {
searchPart1(this.groupFloatValue, 1, num).then(response => {
this.tableData3 = response.data
})
}
@@ -1126,9 +1131,10 @@ export default {
OutPart(row.基本件流水号).then(response => {
if (response.data[0].result === '1') {
this.$message.success('移出成功')
searchPart(this.groupFloatValue).then(response => {
this.tableData1 = response.data
})
// searchPart(this.groupFloatValue).then(response => {
// this.tableData1 = response.data
// })
this.searchPart()
} else { this.$message.error('移出失败') }
})
}).catch(() => {
@@ -1138,6 +1144,28 @@ export default {
})
})
},
inParts(row) { // 解除禁用
this.$confirm('解除禁用后,该零件将参与考核', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
inPart(row.基本件流水号).then(response => {
if (response.data[0].result === '1') {
this.$message.success('解禁成功')
// searchPart(this.groupFloatValue).then(response => {
// this.tableData1 = response.data
// })
this.searchPart()
} else { this.$message.error('解禁失败') }
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
})
})
},
cancel(formName) {
this.form = {}
this.dialogFormVisible = false