Merge remote-tracking branch 'origin/master'

master
mengjiao 7 months ago
commit cec40755dc

@ -183,9 +183,10 @@ export function getMesListEquip(query) {
}); });
} }
//报工按钮 //报工按钮
export function reportSap(workorderCode) { export function reportSap(workorderCode,machineCode) {
const data = { const data = {
workorderCode workorderCode,
machineCode
} }
return request({ return request({
url: '/mes/reportWork/reportSap', url: '/mes/reportWork/reportSap',
@ -194,9 +195,10 @@ export function reportSap(workorderCode) {
}); });
} }
//报工撤销按钮 //报工撤销按钮
export function reportSapCancel(workorderCode) { export function reportSapCancel(workorderCode,machineCode) {
const data = { const data = {
workorderCode workorderCode,
machineCode
} }
return request({ return request({
url: '/mes/reportWork/reportSapCancel', url: '/mes/reportWork/reportSapCancel',

@ -1142,11 +1142,12 @@ export default {
} }
const code = sr.workorderCode; const code = sr.workorderCode;
const machineCode = sr.machineCode;
let _this = this; let _this = this;
this.$modal this.$modal
.confirm('是否确认工单"' + code + '"的数据项向sap报工') .confirm('是否确认线体'+machineCode+',工单' + code + '的数据项向sap报工')
.then(function () { .then(function () {
reportSap(code).then((response) => { reportSap(code,machineCode).then((response) => {
if (response != null && response.code == 200) { if (response != null && response.code == 200) {
_this.$modal.msgSuccess("报工成功"); _this.$modal.msgSuccess("报工成功");
} }
@ -1162,11 +1163,12 @@ export default {
this.loading = true; this.loading = true;
let sr = this.selectRow[0]; let sr = this.selectRow[0];
const code = sr.workorderCode; const code = sr.workorderCode;
const machineCode = sr.machineCode;
let _this = this; let _this = this;
this.$modal this.$modal
.confirm('是否确认工单"' + code + '"的数据项撤销sap报工') .confirm('是否确认工单"' + code + '"的数据项撤销sap报工')
.then(function () { .then(function () {
reportSapCancel(code).then((response) => { reportSapCancel(code,machineCode).then((response) => {
if (response != null && response.code == 200) { if (response != null && response.code == 200) {
_this.$modal.msgSuccess("报工撤销成功"); _this.$modal.msgSuccess("报工撤销成功");
} }
@ -1192,6 +1194,7 @@ export default {
} }
this.queryParams.workorderCode = sr.workorderCode; this.queryParams.workorderCode = sr.workorderCode;
this.queryParams.machineCode = sr.machineCode;
// //
getAllLevelReportList(this.queryParams).then((response) => { getAllLevelReportList(this.queryParams).then((response) => {
@ -1299,6 +1302,7 @@ export default {
} }
this.queryParams.workorderCode = sr.workorderCode; this.queryParams.workorderCode = sr.workorderCode;
this.queryParams.machineCode = sr.machineCode;
// //
getAllLevelConsumeList(this.queryParams).then((response) => { getAllLevelConsumeList(this.queryParams).then((response) => {
this.libConsumeTabs = response; this.libConsumeTabs = response;

Loading…
Cancel
Save