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

package.json

@@ -27,6 +27,7 @@
     "js-md5": "^0.7.3",
     "jspdf": "^1.4.1",
     "lrz": "^4.9.40",
+    "moment": "^2.24.0",
     "node-sass": "^4.11.0",
     "pdfjs-dist": "^2.0.489",
     "pinyin": "^2.8.3",

src/components/SalesModule/groupTourOrder.vue

@@ -1514,6 +1514,7 @@
             </el-upload>
           </td>
           <td class="groupTourOrderIcon">
+            <p v-if="item.isOrder!='1'"><span style="font-size:6px">已关订单操作、需修改请联系OP.</span></p>
             <el-button-group v-if="item.commissionSharePeople !== userId">
               <el-tooltip class="item" effect="dark" content="修改" placement="top-start">
                 <el-button v-if="item.isOrder=='1'&&item.isHaveFinance!='1'&&item.orderState!='1'&&item.orderState!='4'"

src/components/activity/LuckyDraw.vue

@@ -548,9 +548,9 @@ export default {
         newArr.push(file.file)
         let path = "/Upload/activity/"
         this.$message.info('上传中...')
-        this.uploadFile(path, newArr, x => {
+        this.UploadSelfFile(path, newArr, x => {
             let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
-            this.addMsg.image = x.res.requestUrls[0].split('?')[0]
+            this.addMsg.image = this.domainManager().ViittoFileUrl + x.data.FilePath;
             this.$message.success('上传成功');
             this.$forceUpdate();
         });

src/components/leaderPay2.vue

@@ -115,15 +115,16 @@
                             </td>
                         </tr>
                     </template>
-                    <tr v-if="dataList.ScenicList.length>0">
+                    <!-- <tr v-if="dataList.ScenicList.length>0">
                         <td class="comTotal" colspan="4">合计：{{totalScenicPrice}}</td>
-                    </tr>
+                    </tr> -->
                     <tr v-for="(item,index) in dataList.BusList">
                         <td v-if="index==0" :rowspan="dataList.BusList.length">交通</td>
                         <td>
-                            <span v-if='index==0'>接机</span>
+                            {{item.ParkExplain}}
+                            <!-- <span v-if='index==0'>接机</span>
                             <span v-if='index!=0&&index!=dataList.BusList.length-1'>{{item.AirportPickUpStr}}</span>
-                            <span v-if='index==dataList.BusList.length-1'>送机</span>
+                            <span v-if='index==dataList.BusList.length-1'>送机</span> -->
                         </td>
                         <td>
                             {{item.TotalPrice}} {{item.CurrencyStr}}
@@ -132,9 +133,9 @@
                             {{item.Remarks}}
                         </td>
                     </tr>
-                    <tr v-if="dataList.BusList.length>0">
+                    <!-- <tr v-if="dataList.BusList.length>0">
                         <td class="comTotal" colspan="4">合计：{{totalTrafficPrice}}</td>
-                    </tr>
+                    </tr> -->
                     <template v-for='(item,index) in dataList.DiningList'>
                         <tr class="splitP ScenicTr">
                             <td v-if="index==0" :rowspan="dataList.DiningList.length">餐饮</td>
@@ -155,9 +156,9 @@
                             </td>
                         </tr>
                     </template>
-                    <tr v-if="dataList.DiningList.length>0">
+                    <!-- <tr v-if="dataList.DiningList.length>0">
                         <td class="comTotal" colspan="4">合计：{{totalDinnerPrice}}</td>
-                    </tr>
+                    </tr> -->
                     <template v-for='(item,index) in dataList.HotelList'>
                         <tr>
                             <td v-if="index==0" :rowspan="dataList.HotelList.length">酒店</td>
@@ -168,14 +169,56 @@
                             <td>{{item.Remarks}}</td>
                         </tr>
                     </template>
-                    <tr v-if="dataList.HotelList.length>0">
+                    <!-- <tr v-if="dataList.HotelList.length>0">
                         <td class="comTotal" colspan="4">合计：{{totalHotelPrice}}</td>
                     </tr>
                     <tr>
                         <td colspan="4">总计：{{allTotal}}</td>
-                    </tr>
+                    </tr> -->
                 </tbody>
             </table>
+            <table border="0" cellspacing='1' class="leaderPayTable">
+                <tr>
+                    <th>类型</th>
+                    <th>金额</th>
+                </tr>
+                <tr v-show="totalList.PlanTotalPrice>0">
+                    <td>领取团款</td>
+                    <td>{{totalList.PlanTotalPrice}}</td>
+                </tr>
+                <tr v-show="totalList.SelfPayingExpendTotalPrice>0">
+                    <td>自费支出</td>
+                    <td>{{totalList.SelfPayingExpendTotalPrice}}</td>
+                </tr>
+                <tr v-show="totalList.SelfPayingIncomeTotalPrice>0">
+                    <td>自费收入</td>
+                    <td>{{totalList.SelfPayingIncomeTotalPrice}}</td>
+                </tr> 
+                 <tr v-show="totalList.IncomeTotalPrice>0">
+                    <td>消费收入</td>
+                    <td>{{totalList.IncomeTotalPrice}}</td>
+                </tr>
+                 <tr v-show="(totalList.ExpendTotalPrice-totalScenicPrice-totalTrafficPrice-totalDinnerPrice-totalHotelPrice)>0">
+                    <td>其他费用</td>
+                    <td>{{totalList.ExpendTotalPrice-totalScenicPrice-totalTrafficPrice-totalDinnerPrice-totalHotelPrice}}</td>
+                </tr>
+                <tr v-show="totalScenicPrice>0">
+                    <td>景点门票</td>
+                    <td>{{totalScenicPrice}}</td>
+                </tr>
+                <tr  v-show="totalTrafficPrice>0">
+                    <td>交通</td>
+                    <td>{{totalTrafficPrice}}</td>
+                </tr>
+                <tr  v-show="totalDinnerPrice>0">
+                    <td>餐饮</td>
+                    <td>{{totalDinnerPrice}}</td>
+                </tr>
+                <tr  v-show="totalHotelPrice>0">
+                    <td>酒店</td>
+                    <td>{{totalHotelPrice}}</td>
+                </tr>
+            </table>
             <input type="button" class="printBtn" value="打印" @click="printTable()">
         </div>
     </div>
@@ -200,8 +243,9 @@ export default {
             totalHotelPrice:0,
             //合计交通
             totalTrafficPrice:0,
-
             allTotal:0,
+
+            totalList:[],
         }
  	},
     methods: {
@@ -253,7 +297,20 @@ export default {
         //打印
         printTable(){
             window.print(); 
-        }
+        },
+        //获取总额
+        getTotalMoney(){
+            this.apipost('dmcstatistics_post_GetTotalPrice', {
+                TCIDs: this.$route.query.id
+                }, res => {
+                if (res.data.resultCode == 1) {
+                    this.totalList = res.data.data;
+                    console.log(this.totalList,'totallist');
+                } else {
+                    this.Error(res.data.message)
+                }
+            }, err => {})
+        },
     },
     created() {
     	
@@ -263,6 +320,7 @@ export default {
       this.msg.TCIDs = this.$route.query.id;
       this.getNav();
       this.getList();
+      this.getTotalMoney();
     },    
 }
 </script>