update

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -1489,6 +1489,7 @@ export default {
         this.orderObj = this.$route.query.orderObj?JSON.parse(this.$route.query.orderObj):null;
         if(this.orderObj!=null&&this.orderObj.OrderSource===8&&this.orderObj.tipObj==1){
           that.Description="旅客名单：";
+          console.log("dfsgjosdjg p",JSON.parse(sessionStorage.getItem("TipGuestList")))
           that.describeList=JSON.parse(sessionStorage.getItem("TipGuestList"));
           if(that.describeList){
               that.describeList.forEach(item=>{

src/components/SalesModule/groupTourOrder.vue

@@ -1803,7 +1803,17 @@
 <!--                <span>暂无名单</span>-->
 <!--              </span>-->
               <span style="display: block">房间信息<span v-if="item.oneSex>0" style="color: #e95252">（{{item.oneSex==1?'单男':'单女'}}）</span>：{{item.orderGuestHouseStr}}</span>
-              <span v-if="item.tipMoney" style="color:red">（小费：{{item.tipMoney}}）</span>
+             
+              <div>
+                  <span v-if="item.opTipMoney==''&&item.tipMoney!=''" style="color:red">（小费：{{item.tipMoney}}）</span>
+                  <span v-if="item.opTipMoney!=''" style="color:red">
+                    （小费：{{item.opTipMoney}}）
+                    <span>单据：</span>
+                    <span @click="gourlTip('FinancialDocumentsDetail',id)" style="text-decoration:underline;color:blue" v-for="(id,i) in item.tipFrId" :key="i">{{id}}</span>
+
+                    </span>
+
+              </div>
             </td>
           </tr>
           <tr>
@@ -2252,6 +2262,15 @@
       }
     },
     methods: {
+      gourlTip(path,id){
+        this.$router.push({
+          name: path,
+          query: {
+            path: id,
+            blank: "y",
+          }
+        });
+      },
       goUrlHappy(item){
         this.happy=false;
         this.$router.push({

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1996,7 +1996,18 @@
                 <!--              </span>-->
                 <span style="display: block">房间信息<span v-if="item.oneSex>0"
                     style="color: #e95252">（{{item.oneSex==1?'单男':'单女'}}）</span>：{{item.orderGuestHouseStr}}</span>
-                <span v-if="item.tipMoney" style="color:red">（小费：{{item.tipMoney}}）</span>
+                <!-- <span v-if="item.tipMoney" style="color:red">（小费：{{item.tipMoney}}）</span> -->
+                <div>
+                  <span v-if="item.opTipMoney==''&&item.tipMoney!=''" style="color:red">（小费：{{item.tipMoney}}）</span>
+                  <span v-if="item.opTipMoney!=''" style="color:red">
+                    （小费：{{item.opTipMoney}}）
+                    <span>单据：</span>
+                    <span @click="gourlTip('FinancialDocumentsDetail',id)" style="text-decoration:underline;color:blue" v-for="(id,i) in item.tipFrId" :key="i">{{id}}</span>
+
+                    </span>
+
+              </div>
+
               </td>
             </tr>
             <tr>
@@ -2904,6 +2915,15 @@
       }
     },
     methods: {
+      gourlTip(path,id){
+        this.$router.push({
+          name: path,
+          query: {
+            path: id,
+            blank: "y",
+          }
+        });
+      },
        goUrlHappy(item){
         this.$router.push({
           name: "HappyPassbook",

src/components/TravelManager/TravelList/FeedbackChart.vue

@@ -326,7 +326,7 @@ export default {
 
             let option = {
                 title: {
-                    text: '本周收客排行',
+                    text: '出游目的地',
                 },
                 tooltip: {
                     // trigger: 'axis',

src/components/TravelManager/TravelList/PassengerFeedback.vue

@@ -227,7 +227,7 @@ export default {
                 });
                 this.dataList=arrays;
                 console.log("this.dataList",this.dataList)
-                this.total=this.dataList.length;
+                this.total=res.data.count;
                 } else {
                   this.Error(res.data.message)
                 }

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1743,7 +1743,7 @@
               <!--                <span>暂无名单</span>-->
               <!--              </p>-->
               <span>房间信息：{{item.OrderGuestHouseStr}}</span>
-              <span v-if="item.TipMoney" style="color:red">（小费：{{item.TipMoney}}）</span>
+              
             </td>
           </tr>
           <tr>
@@ -2033,7 +2033,15 @@
                 <!--                  <span>暂无名单</span>-->
                 <!--                </span>-->
                 <span style="display: block">房间信息：{{childItem.OrderGuestHouseStr}}</span>
-                <span v-if="childItem.TipMoney" style="color:red">（小费：{{childItem.TipMoney}}）</span>
+                <div>
+                  <span v-if="childItem.OPTipMoney==''&&childItem.TipMoney!=''" style="color:red">（小费：{{childItem.TipMoney}}）</span>
+                  <span v-if="childItem.OPTipMoney!=''" style="color:red">
+                    （小费：{{childItem.OPTipMoney}}）
+                    <span>单据：</span>
+                    <span @click="gourlTip('FinancialDocumentsDetail',id)" style="text-decoration:underline;color:blue" v-for="(id,i) in childItem.TipFrId" :key="i">{{id}}</span>
+                    </span>
+
+              </div>
               </td>
             </tr>
             <tr>
@@ -3166,6 +3174,15 @@
       commonShouSun: commonShouSun
     },
     methods: {
+      gourlTip(path,id){
+        this.$router.push({
+          name: path,
+          query: {
+            path: id,
+            blank: "y",
+          }
+        });
+      },
       goUrlHappy(item){
         this.$router.push({
           name: "HappyPassbook",

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -1374,7 +1374,7 @@
           <td>{{item.Money}}</td>
           <td>
             <span v-if="item.FinanceId==0">未录入</span>
-            <span v-else>{{item.FinanceId}}</span>
+            <span @click="gourlTip('FinancialDocumentsDetail',id)" v-else>{{item.FinanceId}}</span>
           </td>
         </tr>
         <tr v-if="tipPeopleList.length==0">
@@ -1382,8 +1382,9 @@
         </tr>
       </table>
       <div slot="footer" class="dialog-footer">
-        <button @click="SaveTip" class="normalBtn" type="primary">保存</button>
-        <button class="hollowFixedBtn">取消</button>
+        <button @click="tipdialog=false" class="hollowFixedBtn">取消</button>
+        <button @click="SaveTip" class="normalBtn" type="primary">确定</button>
+        
       </div>
     </el-dialog>
   </div>
@@ -1477,6 +1478,15 @@
       };
     },
     methods: {
+      gourlTip(path,id){
+        this.$router.push({
+          name: path,
+          query: {
+            path: id,
+            blank: "y",
+          }
+        });
+      },
       SaveTip(){
       if(this.checkList.length==0){
           this.Error("至少选择一个旅客！");
@@ -1535,6 +1545,7 @@
 
     },
       AddTipDiv(){
+        this.checkList=[];
         this.tiploading=true;
         this.apipost('sellorder_post_GetNoEntryTipMoneyGuestList', {TCID:this.TCID}, res => {
           this.tiploading=false;