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

src/components/ShoppingStore/ShoppingReimbursement.vue

@@ -71,7 +71,7 @@
         <tr v-if="shopDataList.length==0">
           <td colspan="22">暂无数据</td>
         </tr>
-        <tbody v-for="(outItem,outindex) in shopDataList" :class="{roomReservationsSplitTrCss:outindex%2!=0}">
+        <tbody v-for="(outItem,outindex) in shopDataList" :class="{roomReservationsSplitTrCss:outindex%2!=0}" v-if="outItem.PriceShopList.length>0">
           <template v-for="(item,index) in outItem.PriceShopList">
             <template v-for="(subItem,subIndex) in item.ShopDetailsList">
               <tr>
@@ -143,6 +143,34 @@
             </template>
           </template>
         </tbody>
+        <tbody v-else v-for="(outItem,outindex) in shopDataList">
+            <tr>
+                <td>
+                  {{outItem.NewCombinationNum}}
+                </td>
+                <td>
+                </td>
+                <td>
+                </td>
+                <td>
+                </td>
+                <td>
+                </td>
+                <td width="180"></td>
+                <td width="60"></td>
+                <td width="70"></td>
+                <td width="70"></td>
+                <td width="80"></td>
+                <td width="80"></td>
+                <td width="80"></td>
+                <td width="80"></td>
+                <td width="80"> </td>
+                <td width="80"> </td>
+                <td width="80"></td>
+                <td></td>
+                <td></td>
+            </tr>
+        </tbody>
       </table>
       <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage"
         layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="msg.total"></el-pagination>
@@ -165,7 +193,7 @@
           StartDate: '',
           EndDate: '',
           currentPage: 1,
-          total: 0,
+          total: 0,          
         },
         LineList: [],
         LineTeamList: [],
@@ -274,7 +302,6 @@
                   '';
               });
             });
-            console.log("shopDataList", shopDataList);
             this.shopDataList = shopDataList;
           } else {
             this.$message.error(res.data.message)
@@ -323,8 +350,8 @@
         "-" +
         myDate.getDate();
       this.msg.StartDate = nowDate;
-      this.msg.StartDate = '2019-01-01';
-      this.msg.EndDate = '2019-02-01'
+      // this.msg.StartDate = '2019-01-01';
+      // this.msg.EndDate = '2019-02-01'
       this.getLineList();
       this.getList();
     },

src/components/ShoppingStore/ShoppingReimbursement2.vue

@@ -70,7 +70,7 @@
         <tr v-if="shopDataList.length==0">
           <td colspan="22">暂无数据</td>
         </tr>
-        <tbody v-for="(outItem,outindex) in shopDataList" :class="{roomReservationsSplitTrCss:outindex%2!=0}">
+        <tbody v-for="(outItem,outindex) in shopDataList" :class="{roomReservationsSplitTrCss:outindex%2!=0}" v-if="outItem.PriceShopList.length>0">
           <template v-for="(item,index) in outItem.PriceShopList">
             <template v-for="(subItem,subIndex) in item.ShopDetailsList">
               <tr>
@@ -134,6 +134,31 @@
             </template>
           </template>
         </tbody>
+        <tbody v-else v-for="(outItem,outindex) in shopDataList">
+            <tr>
+                <td>
+                  {{outItem.NewCombinationNum}}
+                </td>
+                <td>
+                </td>
+                <td>
+                </td>
+                <td>
+                </td>
+                <td>
+                </td>
+                <td width="180"></td>
+                <td width="60"></td>
+                <td width="70"></td>
+                <td width="70"></td>
+                <td width="80"></td>
+                <td width="80"></td>
+                <td width="80"> </td>
+                <td width="80"></td>
+                <td></td>
+            </tr>
+        </tbody>
+
       </table>
       <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage"
         layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="msg.total"></el-pagination>
@@ -265,7 +290,6 @@
                   '';
               });
             });
-            console.log("shopDataList", shopDataList);
             this.shopDataList = shopDataList;
           } else {
             this.$message.error(res.data.message)
@@ -314,8 +338,8 @@
         "-" +
         myDate.getDate();
       this.msg.StartDate = nowDate;
-      this.msg.StartDate = '2019-01-01';
-      this.msg.EndDate = '2019-02-01'
+      // this.msg.StartDate = '';
+      // this.msg.EndDate = ''
       this.getLineList();
       this.getList();
     },

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -602,6 +602,7 @@
             res => {
               if (res.data.resultCode == 1) {
                 var tempData = res.data.data;
+                console.log("tempData",tempData);
                 if (tempData.Feature != null) {
                   this.FeatureData.ID = tempData.Feature.ID;
                   this.FeatureData.ConfigId = tempData.Feature.ConfigId;