Commit 6dd28305 authored by 仇晓婷's avatar 仇晓婷

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

parents 21a3d234 0dedb03b
...@@ -648,7 +648,7 @@ export default { ...@@ -648,7 +648,7 @@ export default {
.then(res => { .then(res => {
if (res.success && res.result.length > 1) { if (res.success && res.result.length > 1) {
res.result.forEach(data => { res.result.forEach(data => {
this.changeCountOut(data.poolType + "", data.count); this.changeCountOut(data.poolType, data.count);
}); });
} }
}) })
......
...@@ -297,7 +297,7 @@ export default { ...@@ -297,7 +297,7 @@ export default {
h( h(
"op", "op",
{ {
attrs: { oprate: "detail",title: "查看" }, attrs: { oprate: "detail", title: "查看" },
on: { click: () => this.detail(params.row) } on: { click: () => this.detail(params.row) }
}, },
"查看" "查看"
...@@ -305,7 +305,7 @@ export default { ...@@ -305,7 +305,7 @@ export default {
h( h(
"op", "op",
{ {
attrs: { oprate: "edit",title: "编辑" }, attrs: { oprate: "edit", title: "编辑" },
on: { click: () => this.edit(params.row) }, on: { click: () => this.edit(params.row) },
style: style:
(params.row.status == 1 && (params.row.status == 1 &&
...@@ -321,7 +321,7 @@ export default { ...@@ -321,7 +321,7 @@ export default {
h( h(
"op", "op",
{ {
attrs: { oprate: "remove",title: "删除" }, attrs: { oprate: "remove", title: "删除" },
on: { click: () => this.remove(params.row) }, on: { click: () => this.remove(params.row) },
style: style:
(params.row.status == 1 && (params.row.status == 1 &&
...@@ -336,7 +336,7 @@ export default { ...@@ -336,7 +336,7 @@ export default {
h( h(
"op", "op",
{ {
attrs: { oprate: "detail",title: "分解" }, attrs: { oprate: "detail", title: "分解" },
on: { click: () => this.split(params.row) }, on: { click: () => this.split(params.row) },
style: style:
(params.row.divideMark != 0 && (params.row.divideMark != 0 &&
...@@ -864,11 +864,12 @@ export default { ...@@ -864,11 +864,12 @@ export default {
sendOk() { sendOk() {
this.$refs.orderSend.$refs["formValidate"].validate(valid => { this.$refs.orderSend.$refs["formValidate"].validate(valid => {
if (valid) { if (valid) {
let ids = this.arrayIds; let ids = this.arrayIds;
let objInfoTem = this.$refs.orderSend.returnData();
let parms = []; let parms = [];
ids.forEach(e => { ids.forEach(e => {
let objInfo = this.$refs.orderSend.returnData(); let objInfo = this.$u.clone(objInfoTem);
objInfo.id = e; objInfo.id = e;
parms.push(objInfo); parms.push(objInfo);
}); });
......
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