Skip to content

M
mes-ui
Commit 01c2b987 authored by 仇晓婷's avatar 仇晓婷
Browse files
Options

Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

parents cc68263f cdd0179a
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 13 deletions
pages/mesPlan/index.vue
View file @ 01c2b987
...@@ -366,20 +366,22 @@ export default { ...@@ -366,20 +366,22 @@ export default {
on: { click: () => this.edit(params.row) }, on: { click: () => this.edit(params.row) },
style: style:
this.wfstatu == 1 this.wfstatu == 1
? (params.row.status == 1 && ? (
(params.row.status == 1 &&
params.row.id == params.row.rootId && params.row.id == params.row.rootId &&
params.row.divideMark != 0) || params.row.divideMark != 0) ||
params.row.id != params.row.rootId || params.row.id != params.row.rootId ||
params.row.status != 1 params.row.status != 1
? "display:none" ? "display:none"
: "" : "")
: (params.row.status == 3 && : (
(params.row.status == 3 &&
params.row.id == params.row.rootId && params.row.id == params.row.rootId &&
params.row.divideMark != 0) || params.row.divideMark != 0) ||
params.row.id != params.row.rootId || params.row.id != params.row.rootId ||
params.row.status != 3 params.row.status != 3
? "display:none" ? "display:none"
: "" : "")
}, },
"编辑" "编辑"
), ),
...@@ -390,20 +392,22 @@ export default { ...@@ -390,20 +392,22 @@ export default {
on: { click: () => this.remove(params.row) }, on: { click: () => this.remove(params.row) },
style: style:
this.wfstatu == 1 this.wfstatu == 1
? (params.row.status == 1 && ? (
(params.row.status == 1 &&
params.row.id == params.row.rootId && params.row.id == params.row.rootId &&
params.row.divideMark != 0) || params.row.divideMark != 0) ||
params.row.id != params.row.rootId || params.row.id != params.row.rootId ||
params.row.status != 1 params.row.status != 1
? "display:none" ? "display:none"
: "" : "")
: (params.row.status == 3 && : (
(params.row.status == 3 &&
params.row.id == params.row.rootId && params.row.id == params.row.rootId &&
params.row.divideMark != 0) || params.row.divideMark != 0) ||
params.row.id != params.row.rootId || params.row.id != params.row.rootId ||
params.row.status != 3 params.row.status != 3
? "display:none" ? "display:none"
: "" : "")
}, },
"删除" "删除"
), ),
...@@ -414,18 +418,20 @@ export default { ...@@ -414,18 +418,20 @@ export default {
on: { click: () => this.split(params.row) }, on: { click: () => this.split(params.row) },
style: style:
this.wfstatu == 1 this.wfstatu == 1
? (params.row.divideMark != 0 && ? (
(params.row.divideMark != 0 &&
params.row.id == params.row.rootId) || params.row.id == params.row.rootId) ||
params.row.status != 1 || params.row.status != 1 ||
params.row.quantity <= 1 params.row.quantity <= 1
? "display:none" ? "display:none"
: "" : "")
: (params.row.divideMark != 0 && : (
(params.row.divideMark != 0 &&
params.row.id == params.row.rootId) || params.row.id == params.row.rootId) ||
params.row.status != 3 || params.row.status != 3 ||
params.row.quantity <= 1 params.row.quantity <= 1
? "display:none" ? "display:none"
: "" : "")
}, },
"分解" "分解"
) )
...@@ -747,7 +753,7 @@ export default { ...@@ -747,7 +753,7 @@ export default {
let ues = this.$refs.userProcess; let ues = this.$refs.userProcess;
this.dataListRetrunNew.operatorIdList = this.$refs.orderSendView.getUsers(); this.dataListRetrunNew.operatorIdList = this.$refs.orderSendView.getUsers();
//返回审批数据 //返回审批数据
//alert(JSON.stringify(this.dataListRetrunNew));
this.$http.order.batchstart(this.dataListRetrunNew).then(res => { this.$http.order.batchstart(this.dataListRetrunNew).then(res => {
if (res.success) { if (res.success) {
this.$Message.success("订单送审成功!"); this.$Message.success("订单送审成功!");
......
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