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

src/components/FinancialModule/CompanyAccount.vue

@@ -251,7 +251,7 @@
                         
                         <el-col :span="4" :gutter="35" >
                             <el-form-item :label="$t('fnc.yhkahao')" prop="BackNo">
-                                <el-input v-model="addMsg.BackNo" class="" maxlength="20"></el-input>
+                                <el-input v-model="addMsg.BackNo" class="" maxlength="25"></el-input>
                             </el-form-item>                        
                         </el-col>
                 </el-row>

src/components/leaderPay2.vue

@@ -1082,8 +1082,22 @@
     methods: {
       GetDinnerPrice(item) {
         var totalPrice = 0;
-        item.data.forEach(subItem => {
-          totalPrice += subItem.TradingTotalPrice
+        var DiningID = 0;
+        var UseDinnerType = "";
+        var UseTimeStr = "";
+        item.data.forEach((subItem, subIndex) => {
+          //不相同才计算总金额
+          if (subItem.DiningID == DiningID && subItem.UseDinnerType == UseDinnerType && subItem.UseTimeStr ==
+            UseTimeStr) {
+            totalPrice += 0
+          } 
+          else
+          {
+            totalPrice += subItem.TradingTotalPrice
+          }
+          DiningID = subItem.DiningID;
+          UseDinnerType = subItem.UseDinnerType;
+          UseTimeStr = subItem.UseTimeStr;
         });
         return totalPrice.toFixed(2);
       },