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

src/components/FinancialModule/BasicDocuments.vue

@@ -290,7 +290,7 @@
                         <td v-if="OrderSource==9&&GetDetail.SourceID>0" @click="jumpPage('SettlementOrder',GetDetail.SourceID,2)"> <span class="_jump_page _font_bold">国内票务</span> </td>
                         <td v-else-if="OrderSource==10&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail.SourceID,3)"> <span class="_jump_page _font_bold">签证收支</span> </td>
                         <td v-else-if="OrderSource==4&&GetDetail.SourceID>0"@click="jumpPage('FinancialOrder',GetDetail,4)"> <span class="_jump_page _font_bold">机票收支</span> </td>
-                        <td v-if="GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td>
+                        <td v-if="GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td>
                     </tr>
                 </table>
                 <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-else-if="OrderSource==10">

src/components/LeaderManagement/leaderPay.vue

@@ -487,7 +487,8 @@
         TemporaryItem: {},
         msg: {
           TCIDs: '',
-          NewCombinationNum: ''
+          NewCombinationNum: '',
+          IsSelectAll: 1,
         },
         list: [],
         nav: [],

src/components/Restaurant/bookDinnerStatisticsDetails.vue

@@ -266,6 +266,20 @@
             })
           })
         }
+        this.list.forEach(item => {
+          item.DiningSummaryList.forEach(insideItem => {
+            if (insideItem.DiningPriceList) {
+              insideItem.DiningPriceList.forEach(subItem => {
+                if (!subItem.Discount) {
+                  subItem.Discount = 0;
+                }
+                if (!subItem.DiscountPrice) {
+                  subItem.DiscountPrice = 0;
+                }
+              });
+            }
+          })
+        })
         this.apipost('dmcstatistics_get_SetDiningOrder', this.list, res => {
           if (res.data.resultCode == 1) {
             this.$message.success(res.data.message);

src/components/leaderPay2.vue

@@ -418,7 +418,7 @@ export default {
   },
   methods: {
     goZhiDan: function(obj) {
-      let id = [3];
+      let id = [59];
       let TCIDARR = [obj.TCIDS];
       let orderObj = {
         OrderID: 0,

src/components/leaderPrint.vue

@@ -306,7 +306,8 @@
         TemporaryItem: {},
         msg: {
           TCIDs: '',
-          NewCombinationNum: ''
+          NewCombinationNum: '',
+          IsSelectAll: 1,
         },
         list: [],
         nav: [],

src/components/scenicSpot/admissionStatisticsDetails.vue

@@ -203,6 +203,10 @@
                 if (!subItem.Discount) {
                   subItem.Discount = 0;
                 }
+                 if(!subItem.UsePeopleNum)
+                {
+                  subItem.UsePeopleNum=0;
+                }
               });
             })
           })
@@ -215,6 +219,10 @@
                 if (!subItem.Discount) {
                   subItem.Discount = 0;
                 }
+                if(!subItem.UsePeopleNum)
+                {
+                  subItem.UsePeopleNum=0;
+                }
               });
             })
           })