更新
This commit is contained in:
@@ -50,50 +50,50 @@ export function getTable(num, pageList, pageSize) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
// 投产
|
// 投产
|
||||||
export function production(num, a, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w) {
|
export function production(num, a, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w, UrgentItem) {
|
||||||
return request({
|
return request({
|
||||||
url: '',
|
url: '',
|
||||||
method: 'post',
|
method: 'post',
|
||||||
data: {
|
data: {
|
||||||
type: '2',
|
type: '2',
|
||||||
name: '设备管理_可安排生产计划零件排序_制定组时间_同时传递',
|
name: '设备管理_可安排生产计划零件排序_制定组时间_同时传递',
|
||||||
param: '组件零件基本件流水号=' + num + '=int&投产类型流水号=' + a + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int'
|
param: '组件零件基本件流水号=' + num + '=int&投产类型流水号=' + a + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int&是否加急=' + UrgentItem + '=int'
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
// 合并投产
|
// 合并投产
|
||||||
export function production2(num1, num2, num, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w) {
|
export function production2(num1, num2, num, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w, UrgentItem) {
|
||||||
return request({
|
return request({
|
||||||
url: '',
|
url: '',
|
||||||
method: 'post',
|
method: 'post',
|
||||||
data: {
|
data: {
|
||||||
type: '2',
|
type: '2',
|
||||||
name: '设备管理_可安排生产计划零件排序_制定组时间_同时传递_合并投产',
|
name: '设备管理_可安排生产计划零件排序_制定组时间_同时传递_合并投产',
|
||||||
param: '零件图号=' + num1 + '&规格=' + num2 + '&机床流水号=' + num + '&投产类型流水号=' + 1 + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int'
|
param: '零件图号=' + num1 + '&规格=' + num2 + '&机床流水号=' + num + '&投产类型流水号=' + 1 + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int&是否加急=' + UrgentItem + '=int'
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
// 备料投产
|
// 备料投产
|
||||||
export function production10(num, a, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w) {
|
export function production10(num, a, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w, UrgentItem) {
|
||||||
return request({
|
return request({
|
||||||
url: '',
|
url: '',
|
||||||
method: 'post',
|
method: 'post',
|
||||||
data: {
|
data: {
|
||||||
type: '2',
|
type: '2',
|
||||||
name: '设备管理_可安排生产计划零件排序_制定组时间_同时传递_备料',
|
name: '设备管理_可安排生产计划零件排序_制定组时间_同时传递_备料',
|
||||||
param: '组件零件基本件流水号=' + num + '=int&投产类型流水号=' + a + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int'
|
param: '组件零件基本件流水号=' + num + '=int&投产类型流水号=' + a + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int&是否加急=' + UrgentItem + '=int'
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
// 合并备料投产
|
// 合并备料投产
|
||||||
export function production20(num1, num2, num, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w) {
|
export function production20(num1, num2, num, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w, UrgentItem) {
|
||||||
return request({
|
return request({
|
||||||
url: '',
|
url: '',
|
||||||
method: 'post',
|
method: 'post',
|
||||||
data: {
|
data: {
|
||||||
type: '2',
|
type: '2',
|
||||||
name: '设备管理_可安排生产计划零件排序_制定组时间_同时传递_合并投产_备料',
|
name: '设备管理_可安排生产计划零件排序_制定组时间_同时传递_合并投产_备料',
|
||||||
param: '零件图号=' + num1 + '&规格=' + num2 + '&机床流水号=' + num + '&投产类型流水号=' + 1 + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int'
|
param: '零件图号=' + num1 + '&规格=' + num2 + '&机床流水号=' + num + '&投产类型流水号=' + 1 + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int&是否加急=' + UrgentItem + '=int'
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -91,3 +91,14 @@ export function getFileData(MachineDrawValue) {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
export function addUrgentItem(groupValue, partValue, partName, partMumber, basic, ID) {
|
||||||
|
return request({
|
||||||
|
url: '',
|
||||||
|
method: 'post',
|
||||||
|
data: {
|
||||||
|
type: '2',
|
||||||
|
name: 'PDM_零件明细表_加急件_增加',
|
||||||
|
param: `图号或者型号=${partValue}&零件名称=${partName}&零件数量=${partMumber}&零件备注=${basic}&组件流水号=${groupValue}&加件人流水号=${ID}`
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|||||||
@@ -183,6 +183,9 @@
|
|||||||
<el-tooltip :open-delay="1200" effect="dark" content="选中零件进行备料投产" placement="top">
|
<el-tooltip :open-delay="1200" effect="dark" content="选中零件进行备料投产" placement="top">
|
||||||
<el-button :loading="listLoading3" type="success" size="small" style="float:right;" @click="production10">备料投产</el-button>
|
<el-button :loading="listLoading3" type="success" size="small" style="float:right;" @click="production10">备料投产</el-button>
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
|
<el-tooltip :open-delay="1200" effect="dark" content="将零件加急处理" placement="top">
|
||||||
|
<el-checkbox v-model="checked_UrgentItem" style="float:right;margin-top:10px;margin-right:10px">是否加急</el-checkbox>
|
||||||
|
</el-tooltip>
|
||||||
<el-tooltip :open-delay="1200" effect="dark" content="将不同组号中相同图号的零件合并" placement="top">
|
<el-tooltip :open-delay="1200" effect="dark" content="将不同组号中相同图号的零件合并" placement="top">
|
||||||
<el-checkbox v-model="checked_hebing" style="float:right;margin-top:10px;margin-right:10px">合并生产</el-checkbox>
|
<el-checkbox v-model="checked_hebing" style="float:right;margin-top:10px;margin-right:10px">合并生产</el-checkbox>
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
@@ -351,6 +354,8 @@ export default {
|
|||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
checked_hebing: true,
|
checked_hebing: true,
|
||||||
|
checked_UrgentItem: false,
|
||||||
|
UrgentItem: 0,
|
||||||
maxmax: '',
|
maxmax: '',
|
||||||
clearTable: 0,
|
clearTable: 0,
|
||||||
readonly: true,
|
readonly: true,
|
||||||
@@ -874,6 +879,7 @@ export default {
|
|||||||
// 投产
|
// 投产
|
||||||
production() {
|
production() {
|
||||||
this.result = 0
|
this.result = 0
|
||||||
|
this.UrgentItem = 0
|
||||||
if (this.time_machiningFinish === '' || this.time_machiningFinish === null) {
|
if (this.time_machiningFinish === '' || this.time_machiningFinish === null) {
|
||||||
this.$message.error('请输入加工结束时间')
|
this.$message.error('请输入加工结束时间')
|
||||||
} else {
|
} else {
|
||||||
@@ -886,6 +892,9 @@ export default {
|
|||||||
if (this.multipleSelection.length === 0) {
|
if (this.multipleSelection.length === 0) {
|
||||||
this.$message.error('请至少选择一个零件')
|
this.$message.error('请至少选择一个零件')
|
||||||
} else {
|
} else {
|
||||||
|
if (this.checked_UrgentItem === true) {
|
||||||
|
this.UrgentItem = 1
|
||||||
|
}
|
||||||
if (this.checked_hebing === true) {
|
if (this.checked_hebing === true) {
|
||||||
this.listLoading3 = true
|
this.listLoading3 = true
|
||||||
for (let i = 0; i < this.multipleSelection.length; i++) {
|
for (let i = 0; i < this.multipleSelection.length; i++) {
|
||||||
@@ -914,7 +923,7 @@ export default {
|
|||||||
} else {
|
} else {
|
||||||
this.checked_baitu = 1
|
this.checked_baitu = 1
|
||||||
}
|
}
|
||||||
production2(this.multipleSelection[i].零件图号, this.multipleSelection[i].规格, this.toolNumValue, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu).then(response => {
|
production2(this.multipleSelection[i].零件图号, this.multipleSelection[i].规格, this.toolNumValue, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu, this.UrgentItem).then(response => {
|
||||||
this.result += parseInt(response.data[0].result)
|
this.result += parseInt(response.data[0].result)
|
||||||
if (this.result === this.multipleSelection.length) {
|
if (this.result === this.multipleSelection.length) {
|
||||||
this.$message.success('投产成功')
|
this.$message.success('投产成功')
|
||||||
@@ -962,7 +971,7 @@ export default {
|
|||||||
} else {
|
} else {
|
||||||
this.checked_baitu = 1
|
this.checked_baitu = 1
|
||||||
}
|
}
|
||||||
production(this.multipleSelection[i].组件零件基本件流水号, this.multipleSelection[i].投产类型流水号, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu).then(response => {
|
production(this.multipleSelection[i].组件零件基本件流水号, this.multipleSelection[i].投产类型流水号, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu, this.UrgentItem).then(response => {
|
||||||
this.result += parseInt(response.data[0].result)
|
this.result += parseInt(response.data[0].result)
|
||||||
if (this.result === this.multipleSelection.length) {
|
if (this.result === this.multipleSelection.length) {
|
||||||
this.$message.success('投产成功')
|
this.$message.success('投产成功')
|
||||||
@@ -990,6 +999,7 @@ export default {
|
|||||||
// 备料投产
|
// 备料投产
|
||||||
production10() {
|
production10() {
|
||||||
this.result = 0
|
this.result = 0
|
||||||
|
this.UrgentItem = 0
|
||||||
if (this.time_machiningFinish === '' || this.time_machiningFinish === null) {
|
if (this.time_machiningFinish === '' || this.time_machiningFinish === null) {
|
||||||
this.$message.error('请输入加工结束时间')
|
this.$message.error('请输入加工结束时间')
|
||||||
} else {
|
} else {
|
||||||
@@ -1002,6 +1012,9 @@ export default {
|
|||||||
if (this.multipleSelection.length === 0) {
|
if (this.multipleSelection.length === 0) {
|
||||||
this.$message.error('请至少选择一个零件')
|
this.$message.error('请至少选择一个零件')
|
||||||
} else {
|
} else {
|
||||||
|
if (this.checked_UrgentItem === true) {
|
||||||
|
this.UrgentItem = 1
|
||||||
|
}
|
||||||
if (this.checked_hebing === true) {
|
if (this.checked_hebing === true) {
|
||||||
this.listLoading3 = true
|
this.listLoading3 = true
|
||||||
for (let i = 0; i < this.multipleSelection.length; i++) {
|
for (let i = 0; i < this.multipleSelection.length; i++) {
|
||||||
@@ -1030,7 +1043,7 @@ export default {
|
|||||||
} else {
|
} else {
|
||||||
this.checked_baitu = 1
|
this.checked_baitu = 1
|
||||||
}
|
}
|
||||||
production20(this.multipleSelection[i].零件图号, this.multipleSelection[i].规格, this.toolNumValue, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu).then(response => {
|
production20(this.multipleSelection[i].零件图号, this.multipleSelection[i].规格, this.toolNumValue, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu, this.UrgentItem).then(response => {
|
||||||
this.result += parseInt(response.data[0].result)
|
this.result += parseInt(response.data[0].result)
|
||||||
if (this.result === this.multipleSelection.length) {
|
if (this.result === this.multipleSelection.length) {
|
||||||
this.$message.success('投产成功')
|
this.$message.success('投产成功')
|
||||||
@@ -1078,7 +1091,7 @@ export default {
|
|||||||
} else {
|
} else {
|
||||||
this.checked_baitu = 1
|
this.checked_baitu = 1
|
||||||
}
|
}
|
||||||
production10(this.multipleSelection[i].组件零件基本件流水号, this.multipleSelection[i].投产类型流水号, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu).then(response => {
|
production10(this.multipleSelection[i].组件零件基本件流水号, this.multipleSelection[i].投产类型流水号, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu, this.UrgentItem).then(response => {
|
||||||
this.result += parseInt(response.data[0].result)
|
this.result += parseInt(response.data[0].result)
|
||||||
if (this.result === this.multipleSelection.length) {
|
if (this.result === this.multipleSelection.length) {
|
||||||
this.$message.success('投产成功')
|
this.$message.success('投产成功')
|
||||||
|
|||||||
@@ -30,6 +30,7 @@
|
|||||||
<el-table
|
<el-table
|
||||||
ref="multipleTable"
|
ref="multipleTable"
|
||||||
:data="tableData"
|
:data="tableData"
|
||||||
|
:row-class-name="tableRowClassName"
|
||||||
style="width: 1000px;"
|
style="width: 1000px;"
|
||||||
size="mini"
|
size="mini"
|
||||||
height="750"
|
height="750"
|
||||||
@@ -300,6 +301,7 @@ export default {
|
|||||||
数量: response.data.rows[i].批次数量,
|
数量: response.data.rows[i].批次数量,
|
||||||
投产时间: response.data.rows[i].操作时间,
|
投产时间: response.data.rows[i].操作时间,
|
||||||
规格: response.data.rows[i].规格,
|
规格: response.data.rows[i].规格,
|
||||||
|
是否加急: response.data.rows[i].是否加急,
|
||||||
工艺员: '',
|
工艺员: '',
|
||||||
人员编号: '',
|
人员编号: '',
|
||||||
工艺计划流水号: response.data.rows[i].工艺计划流水号
|
工艺计划流水号: response.data.rows[i].工艺计划流水号
|
||||||
@@ -318,6 +320,8 @@ export default {
|
|||||||
工艺结束时间: response.data.rows[i].工艺计划结束时间,
|
工艺结束时间: response.data.rows[i].工艺计划结束时间,
|
||||||
数量: response.data.rows[i].批次数量,
|
数量: response.data.rows[i].批次数量,
|
||||||
投产时间: response.data.rows[i].操作时间,
|
投产时间: response.data.rows[i].操作时间,
|
||||||
|
规格: response.data.rows[i].规格,
|
||||||
|
是否加急: response.data.rows[i].是否加急,
|
||||||
工艺员: '',
|
工艺员: '',
|
||||||
人员编号: '',
|
人员编号: '',
|
||||||
工艺计划流水号: response.data.rows[i].工艺计划流水号
|
工艺计划流水号: response.data.rows[i].工艺计划流水号
|
||||||
@@ -384,6 +388,12 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
tableRowClassName({ row }) {
|
||||||
|
console.log(row.是否加急)
|
||||||
|
if (row.是否加急 === '1') {
|
||||||
|
return 'UrgentItem'
|
||||||
|
}
|
||||||
|
},
|
||||||
// 直接保存工艺
|
// 直接保存工艺
|
||||||
currency() {
|
currency() {
|
||||||
if (this.multipleSelection.length === 0) {
|
if (this.multipleSelection.length === 0) {
|
||||||
@@ -433,3 +443,8 @@ export default {
|
|||||||
margin-right: 10px;
|
margin-right: 10px;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
<style>
|
||||||
|
.el-table .UrgentItem{
|
||||||
|
background: #ff7575;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|||||||
@@ -26,6 +26,7 @@
|
|||||||
:value="item.value"/>
|
:value="item.value"/>
|
||||||
</el-select>
|
</el-select>
|
||||||
<el-button icon="el-icon-search" type="success" size="small" @click="pageCurrentWB = 1;pageSizeWB = 1000;pageCurrent = 1;pageSize = 1000;getTableData()">查询</el-button>
|
<el-button icon="el-icon-search" type="success" size="small" @click="pageCurrentWB = 1;pageSizeWB = 1000;pageCurrent = 1;pageSize = 1000;getTableData()">查询</el-button>
|
||||||
|
<el-button icon="el-icon-circle-plus-outline" type="primary" size="small" @click="openUrgentItem()">加急件</el-button>
|
||||||
</el-card>
|
</el-card>
|
||||||
<el-card>
|
<el-card>
|
||||||
<div v-for="(file, key) in hadFile" :key="key">
|
<div v-for="(file, key) in hadFile" :key="key">
|
||||||
@@ -262,11 +263,49 @@
|
|||||||
@current-change="handleCurrentChangeWB"/>
|
@current-change="handleCurrentChangeWB"/>
|
||||||
</div>
|
</div>
|
||||||
</el-card>
|
</el-card>
|
||||||
|
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="添加加急件" center style="min-height: 300px" width="500px">
|
||||||
|
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="100px" class="demo-ruleForm">
|
||||||
|
<el-form-item label="机床号" prop="机床号" style="margin-left: 70px">
|
||||||
|
<el-select v-model="form.机床号" placeholder="选择机床" filterable clearable size="small" style="width:200px" @change="getGroupSelect1">
|
||||||
|
<el-option
|
||||||
|
v-for="item in machine"
|
||||||
|
:key="item.value"
|
||||||
|
:label="item.label"
|
||||||
|
:value="item.value"/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="组号" prop="组号" style="margin-left: 70px">
|
||||||
|
<el-select v-model="form.组号" placeholder="选择组号" filterable clearable size="small" style="width:200px">
|
||||||
|
<el-option
|
||||||
|
v-for="item in group1"
|
||||||
|
:key="item.value"
|
||||||
|
:label="item.label"
|
||||||
|
:value="item.value"/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="零件图号" prop="零件图号" style="margin-left: 70px">
|
||||||
|
<el-input v-model="form.零件图号" placeholder="零件图号" size="small" style="width:200px" clearable/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="零件名称" prop="零件名称" style="margin-left: 70px">
|
||||||
|
<el-input v-model="form.零件名称" placeholder="零件名称" size="small" style="width:200px" clearable/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="零件数量" prop="零件数量" style="margin-left: 70px">
|
||||||
|
<el-input v-model="form.零件数量" placeholder="零件数量" size="small" style="width:200px" clearable/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="零件备注" prop="零件备注" style="margin-left: 70px">
|
||||||
|
<el-input v-model="form.零件备注" placeholder="零件备注" size="small" style="width:200px" clearable/>
|
||||||
|
</el-form-item>
|
||||||
|
</el-form>
|
||||||
|
<div slot="footer" class="dialog-footer">
|
||||||
|
<el-button @click="callOff('form')">取消</el-button>
|
||||||
|
<el-button type="primary" @click="submit('form')">确定</el-button>
|
||||||
|
</div>
|
||||||
|
</el-dialog>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { machineSelect, groupSelect, basicPartsData, deleteBasicParts, purchasePartsData, deletePurchaseData, getFileData } from '@/api/TechnologyCenter/QueryParts'
|
import { machineSelect, groupSelect, basicPartsData, deleteBasicParts, purchasePartsData, deletePurchaseData, getFileData, addUrgentItem } from '@/api/TechnologyCenter/QueryParts'
|
||||||
import { mapGetters } from 'vuex'
|
import { mapGetters } from 'vuex'
|
||||||
import { ServerIP } from '@/utils/request'
|
import { ServerIP } from '@/utils/request'
|
||||||
export default {
|
export default {
|
||||||
@@ -277,8 +316,10 @@ export default {
|
|||||||
machine: [],
|
machine: [],
|
||||||
groupValue: '',
|
groupValue: '',
|
||||||
group: [],
|
group: [],
|
||||||
|
group1: [],
|
||||||
loading: false,
|
loading: false,
|
||||||
loadingWB: false,
|
loadingWB: false,
|
||||||
|
dialogFormVisible: false,
|
||||||
total: 0,
|
total: 0,
|
||||||
tableData: [],
|
tableData: [],
|
||||||
tableDataWB: [],
|
tableDataWB: [],
|
||||||
@@ -287,6 +328,21 @@ export default {
|
|||||||
pageCurrentWB: 1,
|
pageCurrentWB: 1,
|
||||||
pageSizeWB: 1000,
|
pageSizeWB: 1000,
|
||||||
totalWB: 0,
|
totalWB: 0,
|
||||||
|
form: {
|
||||||
|
机床号: '',
|
||||||
|
组号: '',
|
||||||
|
零件图号: '',
|
||||||
|
零件名称: '',
|
||||||
|
零件数量: '',
|
||||||
|
零件备注: ''
|
||||||
|
},
|
||||||
|
rules: {
|
||||||
|
机床号: [{ required: true, message: '请选择机床', trigger: 'change' }],
|
||||||
|
组号: [{ required: true, message: '请选择组号', trigger: 'change' }],
|
||||||
|
零件图号: [{ required: true, message: '请输入零件图号', trigger: 'blur' }],
|
||||||
|
零件名称: [{ required: true, message: '请输入零件名称', trigger: 'blur' }],
|
||||||
|
零件数量: [{ required: true, message: '请输入零件数量', trigger: 'blur' }]
|
||||||
|
},
|
||||||
hadFile: []
|
hadFile: []
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -357,6 +413,29 @@ export default {
|
|||||||
getGroupSelect(val) {
|
getGroupSelect(val) {
|
||||||
this.getSelect(groupSelect, ['组号', '组件流水号'], 'group', val)
|
this.getSelect(groupSelect, ['组号', '组件流水号'], 'group', val)
|
||||||
},
|
},
|
||||||
|
getGroupSelect1() {
|
||||||
|
this.form.组号 = ''
|
||||||
|
this.getSelect(groupSelect, ['组号', '组件流水号'], 'group1', this.form.机床号)
|
||||||
|
},
|
||||||
|
callOff(formName) {
|
||||||
|
this.dialogFormVisible = false
|
||||||
|
this.$refs[formName].resetFields()
|
||||||
|
},
|
||||||
|
submit(formName) {
|
||||||
|
this.$refs[formName].validate((valid) => {
|
||||||
|
if (valid) {
|
||||||
|
addUrgentItem(this.form.组号, this.form.零件图号, this.form.零件名称, this.form.零件数量, this.form.零件备注, this.id).then(response => {
|
||||||
|
if (response.data[0].result === '1') {
|
||||||
|
this.$message.success('添加成功')
|
||||||
|
this.getTableData()
|
||||||
|
this.dialogFormVisible = false
|
||||||
|
} else {
|
||||||
|
this.$message.error('添加成功')
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
getTableData() {
|
getTableData() {
|
||||||
this.getFileData(this.machineValue)
|
this.getFileData(this.machineValue)
|
||||||
console.log(this.hadFile, 88899)
|
console.log(this.hadFile, 88899)
|
||||||
@@ -398,6 +477,12 @@ export default {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
openUrgentItem() {
|
||||||
|
if (this.$refs['form'] !== undefined) {
|
||||||
|
this.$refs['form'].resetFields()
|
||||||
|
}
|
||||||
|
this.dialogFormVisible = true
|
||||||
|
},
|
||||||
handleDelete(row) {
|
handleDelete(row) {
|
||||||
if (row.基本件流水号) {
|
if (row.基本件流水号) {
|
||||||
this.deleteRow(deleteBasicParts, row.基本件流水号, function() {
|
this.deleteRow(deleteBasicParts, row.基本件流水号, function() {
|
||||||
|
|||||||
Reference in New Issue
Block a user