Commit 632d37c0 by yiyu.li

bug

parent 5de1f5cb
...@@ -199,7 +199,7 @@ export default { ...@@ -199,7 +199,7 @@ export default {
{ {
title: "任务编号", title: "任务编号",
key: "taskno", key: "taskno",
width:300 width: 300,
}, },
{ {
title: "产线层级", title: "产线层级",
...@@ -270,9 +270,9 @@ export default { ...@@ -270,9 +270,9 @@ export default {
break; break;
case 4: case 4:
str = "取消"; str = "取消";
break; break;
} }
return h('div',str) return h("div", str);
}, },
}, },
{ {
...@@ -298,14 +298,14 @@ export default { ...@@ -298,14 +298,14 @@ export default {
performType: 0, performType: 0,
startTime: "", startTime: "",
endTime: "", endTime: "",
detailobj:{} detailobj: {},
}; };
}, },
created() { created() {
this.columns1 = this.$time.initTableTitle(this.columns1); this.columns1 = this.$time.initTableTitle(this.columns1);
this.initlevel(); this.initlevel();
this.iniproducts(); this.iniproducts();
this.search(1,10); this.search(1, 10);
}, },
methods: { methods: {
search(page, pagesize) { search(page, pagesize) {
...@@ -333,14 +333,15 @@ export default { ...@@ -333,14 +333,15 @@ export default {
console.log(res.data.data); console.log(res.data.data);
this.data1 = res.data.data.data; this.data1 = res.data.data.data;
} }
this.total = res.data.data.total;
}); });
}, },
cancel() { cancel() {
if (this.detailobj.status !=1) { if (this.detailobj.status != 1) {
this.$Message.error("该任务清单状态不能取消"); this.$Message.error("该任务清单状态不能取消");
return false; return false;
} }
return return;
let data = { let data = {
section: this.sectionid, section: this.sectionid,
}; };
...@@ -361,24 +362,22 @@ export default { ...@@ -361,24 +362,22 @@ export default {
// this.$Message.error("该任务清单不能手动执行"); // this.$Message.error("该任务清单不能手动执行");
// return false; // return false;
// } // }
if (!this.detailobj.id) { if (!this.detailobj.id) {
this.$Message.error(this.$t(1043)); this.$Message.error(this.$t(1043));
return false; return false;
} }
let data = { let data = {
id: this.detailobj.id, id: this.detailobj.id,
}; };
this.request( this.request("/acc/AutomationOperate/Send", data, "get").then(
"/acc/AutomationOperate/Send", (res) => {
data, if (res.data.ret == 1) {
"get" this.$Message.success(this.$t(res.data.msg));
).then((res) => { } else {
if (res.data.ret == 1) { this.$Message.error(this.$t(res.data.msg));
this.$Message.success(this.$t(res.data.msg)); }
} else {
this.$Message.error(this.$t(res.data.msg));
} }
}); );
}, },
exportExcel() { exportExcel() {
// this.axios.request({ // this.axios.request({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment