This commit is contained in:
zhangdingyu
2019-09-18 10:15:45 +08:00
61 changed files with 7778 additions and 24 deletions

View File

@@ -557,6 +557,10 @@
<script>
import { initProject, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed, searchDetailed1, purchaseRequisition, purchaseRequisition1, purchaseRequisition2, MoveOut, MoveOut1, PurchasingDepartment, Production, PartCallbackInformation, PartCallbackInformation1, submit, submit1, Delete, Delete1, editStock, editNum } from '@/api/ManufacturingCenter/PartAssignment'
import { mapGetters } from 'vuex'
<<<<<<< HEAD
=======
import Cookie from 'js-cookie'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
export default {
inject: ['reload'],
data() {
@@ -646,11 +650,26 @@ export default {
'id'
])
},
<<<<<<< HEAD
=======
watch: {
// 如果路由有变化,会再次执行该方法
'$route': {
handler(route) {
const _this = this
if (route.name === 'PartAssignment') {
_this.fetchData()
}
}
}
},
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
created() {
this.fetchData()
},
methods: {
fetchData() {
<<<<<<< HEAD
initProject().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.machineNumber.push({
@@ -682,6 +701,63 @@ export default {
}
this.tableData10 = response.data
})
=======
if (Cookie.get('machineValue') !== undefined) {
this.machineNumber = []
initProject().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.machineNumber.push({
label: response.data[i].机床图号,
name: response.data[i].项目名称,
value: response.data[i].机床流水号
})
}
}).then(() => {
this.machineNumberValue = parseInt(Cookie.get('machineValue'))
this.machineChange()
this.groupNumberValue = parseInt(Cookie.get('group'))
this.searchTable()
Cookie.remove('machineValue')
Cookie.remove('group')
})
} else {
this.machineNumberValue = ''
this.groupNumberValue = ''
this.tableData = []
this.machineNumber = []
initProject().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.machineNumber.push({
label: response.data[i].机床图号,
name: response.data[i].项目名称,
value: response.data[i].机床流水号
})
}
})
PartCallbackInformation().then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].退回时间 !== '') {
response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0]
}
if (response.data[i].是否确认 === 0) {
this.value += 1
}
}
this.tableData9 = response.data
})
PartCallbackInformation1().then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].退回时间 !== '') {
response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0]
}
if (response.data[i].是否确认 === 0) {
this.value1 += 1
}
}
this.tableData10 = response.data
})
}
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
},
PartCallbackInformation() {
this.dialogFormVisible1 = true