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

src/components/busManagement/busUsePrice.vue

@@ -389,7 +389,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="5">
-            <el-form-item :label="$t('ground.songjiBj')" prop="SendPrice" style="display:none;">
+            <el-form-item :label="$t('ground.songjiBj')"   style="display:none;">
               <el-input v-model="addMsg.SendPrice" @keyup.native="checkPrice(addMsg,'SendPrice')"></el-input>
             </el-form-item>
           </el-col>
@@ -404,7 +404,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="5" style="display:none;">
-            <el-form-item label="小时报价" prop="HourPrice">
+            <el-form-item label="小时报价" >
               <el-input v-model="addMsg.HourPrice" @keyup.native="checkPrice(addMsg,'HourPrice')"></el-input>
             </el-form-item>
           </el-col>

src/components/leaderPay2.vue

@@ -1652,21 +1652,22 @@
                 let list = []
                 for (var j = 0; j < Diningdest.length; j++) {
                   var dj = Diningdest[j];
-                  if (dj.UseTimeStr == ai.UseTimeStr && dj.NewDiningID == ai.NewDiningID) {
+                  if  (dj.id == (ai.NewDiningID + ai.UseTimeStr + ai.UseDinnerTypeStr)) {
                     dj.data.push(ai);
                     break;
-                  } else {
-                    list.push(ai)
-                  }
-                }
-                for (let i = 0; i < list.length; i++) {
-                  Diningdest.push({
-                    UseTimeStr: ai.UseTimeStr,
-                    DiningID: ai.NewDiningID,
-                    id: ai.NewDiningID + ai.UseTimeStr  + ai.UseDinnerTypeStr,
-                    data: [ai]
-                  });
                   } 
+                  // else {
+                  //   list.push(ai)
+                  // }
+                }
+                // for (let i = 0; i < list.length; i++) {
+                //   Diningdest.push({
+                //     UseTimeStr: ai.UseTimeStr,
+                //     DiningID: ai.NewDiningID,
+                //     id: ai.NewDiningID + ai.UseTimeStr  + ai.UseDinnerTypeStr,
+                //     data: [ai]
+                //   });
+                // }
               }
             }
             for (var i = 0; i < Diningdest.length; i++) {