Skip to content

S
SuperMan
Commit de136441 authored by zhengke's avatar zhengke
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 81022919 e24e27e9
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
src/components/leaderPay2.vue
View file @ de136441
...@@ -1643,8 +1643,8 @@ ...@@ -1643,8 +1643,8 @@
if (!Diningmap[ai.UseTimeStr]) { if (!Diningmap[ai.UseTimeStr]) {
Diningdest.push({ Diningdest.push({
UseTimeStr: ai.UseTimeStr, UseTimeStr: ai.UseTimeStr,
DiningID: ai.DiningID, DiningID: ai.NewDiningID,
id: ai.DiningID + ai.UseTimeStr, id: ai.NewDiningID + ai.UseTimeStr,
data: [ai] data: [ai]
}); });
Diningmap[ai.UseTimeStr] = ai; Diningmap[ai.UseTimeStr] = ai;
...@@ -1652,7 +1652,7 @@ ...@@ -1652,7 +1652,7 @@
let list = [] let list = []
for (var j = 0; j < Diningdest.length; j++) { for (var j = 0; j < Diningdest.length; j++) {
var dj = Diningdest[j]; var dj = Diningdest[j];
if (dj.UseTimeStr == ai.UseTimeStr && dj.DiningID == ai.DiningID) { if (dj.UseTimeStr == ai.UseTimeStr && dj.NewDiningID == ai.NewDiningID) {
dj.data.push(ai); dj.data.push(ai);
break; break;
} else { } else {
...@@ -1662,8 +1662,8 @@ ...@@ -1662,8 +1662,8 @@
for (let i = 0; i < list.length; i++) { for (let i = 0; i < list.length; i++) {
Diningdest.push({ Diningdest.push({
UseTimeStr: ai.UseTimeStr, UseTimeStr: ai.UseTimeStr,
DiningID: ai.DiningID, DiningID: ai.NewDiningID,
id: ai.DiningID + ai.UseTimeStr, id: ai.NewDiningID + ai.UseTimeStr,
data: [ai] data: [ai]
}); });
} }
......
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