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

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -391,7 +391,7 @@
                             <td :colspan="3">
                                 {{o.TCNUM}}（{{o.TCID}}）
                                 <span v-if="GetDetail.IsShowPlanUrl === 1" @click="goInves('investigationList',o.TCID)" class="FD_yijian">旅客意见 {{o.GuestSurveyNum}}/{{o.GuestTotalNum}}份</span>
-                                <span v-if="GetDetail.IsShowPlanUrl==1&&GetDetail.ClientType==7" @click="goGuideAccount('GuideAccount',GetDetail.ClientID)" class="FD_yijian">领队导游往来</span>
+                                <span v-if="(GetDetail.IsShowPlanUrl===1||GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53|| GetDetail.TemplateId === 56)&&GetDetail.ClientType===7" @click="goGuideAccount('GuideAccount',GetDetail.ClientID)" class="FD_yijian">领队导游往来</span>
                             </td>
                             <td @click="jumpPage('TravelControlList',o.TCNUM,1)"> <span class="_jump_page _font_bold">查看团队</span> </td>
                             <td @click="jumpPage('RegistrationList',o.TCID,7)"> <span class="_jump_page _font_bold">查看报名</span> </td>

src/components/Hotel/roomReservationsDetails.vue

@@ -22,7 +22,7 @@
       <ul>
         <li>
           <input v-if="IsOperation!=1" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
-          <input style="display:none;" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
+          <input  v-if="IsOperation==1&&CurrentUserInfo.EmployeeId==615" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
           <span v-if="IsOperation==1" style="color:red;font-size:14px;">已制单，不能再修改!</span>
         </li>
       </ul>
@@ -694,7 +694,6 @@
             if (this.CurrentUserInfo.EmployeeId == 615) {
               this.IsEditHotel = 1;
               this.IsEditHotelPeople = 1;
-              
             }
             let list = res.data.data.HotelOrderListReport;
             this.CreateBy = res.data.data.CreateBy;

src/components/Restaurant/bookDinnerStatisticsDetails.vue

@@ -4,13 +4,13 @@
       <ul>
         <li>
           <template v-if="IsOperation != 1">
-            <input v-if="IsOperation != 1" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
-            <input v-if="IsOperation != 1" type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)" />
+            <input type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
+            <input type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)" />
           </template>
           <template v-else>
-            <span v-if="IsOperation==1" style="color:red;font-size:14px;">已制单，不能在修改!</span>
+            <span style="color:red;font-size:14px;">已制单，不能在修改!</span>
+            <input v-if="CurrentUserInfo.EmployeeId==615" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
           </template>
-          <input type="button" class="fr normalBtn mb30" style="display:none;" value="保存" @click="saveList(1)" />
         </li>
       </ul>
     </div>
@@ -192,6 +192,8 @@
         GuestNum: 0,
         loading: false,
         IsOperation: '',
+        //当前登录人信息
+        CurrentUserInfo:{},
       };
     },
     methods: {
@@ -343,6 +345,8 @@
       },
     },
     mounted() {
+      let userInfo = this.getLocalStorage();
+      this.CurrentUserInfo = userInfo;
       this.TCNUM = this.$route.query.TCNUM;
       this.GuestNum = this.$route.query.GuestNum;
       this.getList();

src/components/TravelManager/TravelList/TravelpassengerList.vue

 <style>
-.PT_teamTable {
-  width: 800px;
-  border-collapse: collapse;
-}
-.PT_teamTable td,
-.PT_teamTable th {
-  border: 1px solid #dcdcdc;
-  padding: 5px;
-  height: 30px;
-}
-.PT_teamTable tr th {
-	background: #eee;
-  height: 30px;
-  border: 1px solid #dcdcdc;
-}
-.PT_teamTable tr td{background: #fff;}
-.travelpassengerlist{font-size: 12px; background: #dcdcdc;}
-.travelpassengerlist tr th {
-  height: 30px;
-}
-.travelpassengerlist tr td{background: #fff; text-align: center;}
-/*拒签人员*/
- .travelpassengerlist .redTr td{
+  .PT_teamTable {
+    width: 800px;
+    border-collapse: collapse;
+  }
+
+  .PT_teamTable td,
+  .PT_teamTable th {
+    border: 1px solid #dcdcdc;
+    padding: 5px;
+    height: 30px;
+  }
+
+  .PT_teamTable tr th {
+    background: #eee;
+    height: 30px;
+    border: 1px solid #dcdcdc;
+  }
+
+  .PT_teamTable tr td {
+    background: #fff;
+  }
+
+  .travelpassengerlist {
+    font-size: 12px;
+    background: #dcdcdc;
+  }
+
+  .travelpassengerlist tr th {
+    height: 30px;
+  }
+
+  .travelpassengerlist tr td {
+    background: #fff;
+    text-align: center;
+  }
+
+  /*拒签人员*/
+  .travelpassengerlist .redTr td {
     color: #E95252;
- }
+  }
+
 </style>
 
 <template>
@@ -39,7 +55,8 @@
               <th width="120">出发日期</th>
             </tr>
             <tr v-for="item in QueryMsg.TeamInfoData">
-              <td><a @click="goUrlTravelControl('团控列表','TravelControlList',item.TCID,item.TCNUM)" style="cursor:pointer;color:blue;">{{item.TCNUM}}</a></td>
+              <td><a @click="goUrlTravelControl('团控列表','TravelControlList',item.TCID,item.TCNUM)"
+                  style="cursor:pointer;color:blue;">{{item.TCNUM}}</a></td>
               <td>{{item.Title}}</td>
               <td>{{item.Inventory}}人</td>
               <td>{{item.StartDate}} {{item.WeekStr}}</td>
@@ -51,13 +68,7 @@
         </li>
       </ul>
     </div>
-    <table
-      class="travelpassengerlist"
-      border="0"
-      cellspacing="1"
-      cellpadding="0"
-      v-loading="QueryMsg.loading"
-    >
+    <table class="travelpassengerlist" border="0" cellspacing="1" cellpadding="0" v-loading="QueryMsg.loading">
       <tr>
         <th width="50">房间数</th>
         <th width="50">房号</th>
@@ -91,13 +102,13 @@
           <td>
             <!--自然单间   指定单间（单房差）-->
             <template v-if="subItem.SingleRoomType==subItem.HouseType">
-               {{getHouseTypeStr(subItem.HouseType)}} 
+              {{getHouseTypeStr(subItem.HouseType)}}
             </template>
             <template v-else>
-              {{getHouseTypeStr(subItem.SingleRoomType)}} <br/><span style="color:red;">(指定)</span>
+              {{getHouseTypeStr(subItem.SingleRoomType)}} <br /><span style="color:red;">(指定)</span>
             </template>
-            <template v-if="subItem.IsBed==0"><br/><span style="color:red;">(不占床)</span></template>
-          </td>        
+            <template v-if="subItem.IsBed==0"><br /><span style="color:red;">(不占床)</span></template>
+          </td>
           <td>{{subItem.GuestName}}</td>
           <td>{{subItem.ESurName}}</td>
           <td>{{subItem.EName}}</td>
@@ -124,128 +135,128 @@
   </div>
 </template>
 <script>
-export default {
-  data() {
-    return {
-      //请求数据
-      msg: {
-        PageIndex: 1,
-        PageSize: 100,
-        TCID: 0,
-        OrderId: 0,
-        currentPage: 1
-      },
-      IsHaveLeader:1,//1-有领队,0-无领队
-      IsLeaderGuide:0,//1-领兼导,0-领队
-      TCID: 0,
-      QueryMsg: {
-        loading: true,
-        //返回数据
-        dataList: [],
+  export default {
+    data() {
+      return {
+        //请求数据
+        msg: {
+          PageIndex: 1,
+          PageSize: 100,
+          TCID: 0,
+          OrderId: 0,
+          currentPage: 1
+        },
+        IsHaveLeader: 1, //1-有领队,0-无领队
+        IsLeaderGuide: 0, //1-领兼导,0-领队
         TCID: 0,
-        OrderId: 0,
-        //团期数据
-        TeamInfoData: []
-      }
-    };
-  },
-  methods: {
-
-   goUrlTravelControl(name, path, id, tcmun) {
-      this.$router.push({
-        name: path,
-        query: {
-          id: id,
-          tcmun: tcmun,
-          blank: "y",
-          tab: name
+        QueryMsg: {
+          loading: true,
+          //返回数据
+          dataList: [],
+          TCID: 0,
+          OrderId: 0,
+          //团期数据
+          TeamInfoData: []
         }
-      });
-    },
-    //获取性别字符串
-    getSexStr(item) {
-      var str = "";
-      if (item.Sex == 1) {
-        str = "男";
-      } else {
-        str = "女";
-      }
-      return str;
-    },
-    //获取房间类型
-    getHouseTypeStr(HouseType) {
-      var str = "";
-      if (HouseType == 1) {
-        str = "自然单间";
-      } else if (HouseType == 2) {
-        str = "标准双人间";
-      } else if (HouseType == 3) {
-        str = "大床房";
-      } 
-      else if (HouseType == 4) {
-        str = "三人间";
-      } 
-      else if (HouseType== 5) {
-        str = "拼凑双人间";
-      } 
-      else {
-        str = "未分配";
-      }
-      return str;
+      };
     },
-    //获取数据
-    getList() {
-      this.QueryMsg.loading = true;
-      this.apipost(
-        "travel_get_GetTravelGuestPageList",
-        this.msg,
-        res => {
-          this.QueryMsg.loading = false;
-          if (res.data.resultCode == 1) {
-            this.QueryMsg.dataList = res.data.data.pageData.result;
-            this.IsHaveLeader=res.data.data.pageData.IsHaveLeader;
-            this.IsLeaderGuide=res.data.data.pageData.IsLeaderGuide;
+    methods: {
+      goUrlTravelControl(name, path, id, tcmun) {
+        this.$router.push({
+          name: path,
+          query: {
+            id: id,
+            tcmun: tcmun,
+            blank: "y",
+            tab: name
           }
-        },
-        err => {}
-      );
-    },
-    exportExcel() {
-      //导出报表
-      let msg = {
-        TCID: this.msg.TCID
-      };
-      var fileName = "旅客名单.xls";
-      if (this.QueryMsg.TeamInfoData != null) {
-        fileName =
-          "【" + this.QueryMsg.TeamInfoData[0].TCNUM + "】旅客名单.xls";
+        });
+      },
+      //获取性别字符串
+      getSexStr(item) {
+        var str = "";
+        if (item.Sex == 1) {
+          str = "男";
+        } else {
+          str = "女";
+        }
+        return str;
+      },
+      //获取房间类型
+      getHouseTypeStr(HouseType) {
+        var str = "";
+        if (HouseType == 1) {
+          str = "自然单间";
+        } else if (HouseType == 2) {
+          str = "标准双人间";
+        } else if (HouseType == 3) {
+          str = "大床房";
+        } else if (HouseType == 4) {
+          str = "三人间";
+        } else if (HouseType == 5) {
+          str = "拼凑双人间";
+        } else {
+          str = "未分配";
+        }
+        return str;
+      },
+      //获取数据
+      getList() {
+        this.QueryMsg.loading = true;
+        this.apipost(
+          "travel_get_GetTravelGuestPageList",
+          this.msg,
+          res => {
+            this.QueryMsg.loading = false;
+            if (res.data.resultCode == 1) {
+              this.QueryMsg.dataList = res.data.data.pageData.result;
+              this.IsHaveLeader = res.data.data.pageData.IsHaveLeader;
+              this.IsLeaderGuide = res.data.data.pageData.IsLeaderGuide;
+            }
+          },
+          err => {}
+        );
+      },
+      exportExcel() {
+        this.QueryMsg.loading = true;
+        //导出报表
+        let msg = {
+          TCID: this.msg.TCID
+        };
+        var fileName = "旅客名单.xls";
+        if (this.QueryMsg.TeamInfoData != null) {
+          fileName =
+            "【" + this.QueryMsg.TeamInfoData[0].TCNUM + "】旅客名单.xls";
+        }
+        this.GetLocalFile("travel_get_GetTravelGuestExport", msg, fileName, res => {
+          this.QueryMsg.loading = false;
+        });
+      },
+
+      //获取团期信息
+      getTeamInfo() {
+        var qmsg = {
+          TCID: this.TCID
+        };
+        this.apipost(
+          "travel_get_GetTravelPriceReportInfo",
+          qmsg,
+          res => {
+            if (res.data.resultCode == 1) {
+              this.QueryMsg.TeamInfoData = res.data.data;
+            }
+          },
+          err => {}
+        );
       }
-      this.GetLocalFile("travel_get_GetTravelGuestExport", msg, fileName);
     },
-
-    //获取团期信息
-    getTeamInfo() {
-      var qmsg = {
-        TCID: this.TCID
-      };
-      this.apipost(
-        "travel_get_GetTravelPriceReportInfo",
-        qmsg,
-        res => {
-          if (res.data.resultCode == 1) {
-            this.QueryMsg.TeamInfoData = res.data.data;
-          }
-        },
-        err => {}
-      );
+    mounted() {
+      this.TCID = this.$route.query.id;
+      this.msg.TCID = this.TCID;
+      this.msg.OrderId = this.$route.query.OrderId;
+      this.getTeamInfo();
+      this.getList();
     }
-  },
-  mounted() {
-    this.TCID = this.$route.query.id;
-    this.msg.TCID = this.TCID;
-    this.msg.OrderId = this.$route.query.OrderId;
-    this.getTeamInfo();
-    this.getList();
-  }
-};
-</script>
+  };
+
+</script>
\ No newline at end of file

src/components/scenicSpot/admissionStatistics.vue

@@ -105,7 +105,7 @@
                       {{thirdItem.UseTimeStr}}
                     </td>
                     <td style="text-align:left;padding-left:3px;">
-                      {{thirdItem.ScenicName}}
+                      {{thirdItem.ScenicName}} 【<span style="color:red">{{getUseTypeStr(thirdItem.TicketPriceList)}}</span>】
                     </td>
                     <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
                       <div class="link">
@@ -143,6 +143,8 @@
         loading: false,
         currentPage: 1,
         total: 0,
+          //当前登录用户
+        CurrentUserInfo: {},
         msg: {
           pageIndex: 1,
           pageSize: 5,
@@ -158,6 +160,25 @@
       }
     },
     methods: {
+      getUseTypeStr(item) {
+        var str = '';
+        if (item) {
+          item.forEach(childItem => {
+            var useStr = "";
+            if (childItem.PeopleType == 1) {
+              useStr = "成人"
+            }
+            if (childItem.PeopleType == 2) {
+              useStr = "中人"
+            }
+            if (childItem.PeopleType == 3) {
+              useStr = "小人"
+            }
+            str+=useStr+":"+childItem.UsePeopleNum+"，";
+          });
+        }
+        return str.substring(0,str.lastIndexOf('，'));
+      },
       getLineList() {
         this.apipost("line_post_GetAllList", {}, res => {
           if (res.data.resultCode == 1) {
@@ -245,6 +266,8 @@
       },
     },
     mounted() {
+            let userInfo = this.getLocalStorage()
+      this.CurrentUserInfo = userInfo;
       let myDate = new Date();
       let nowDate =
         myDate.getFullYear() +
@@ -284,10 +307,12 @@
   .admissionStatisticsTalbe tr td {
     font-size: 12px;
   }
+
   .admissionStatisticsTalbe tr td .link p:hover {
     text-decoration: underline;
     cursor: pointer;
   }
+
   .admissionStatistics_tripDetails {
     padding: 0;
     box-shadow: 0px 1px 3px 0px #dedede;

src/components/scenicSpot/admissionStatisticsDetails.vue

@@ -9,8 +9,8 @@
           </template>
           <template v-else>
             <span style="color:red;font-size:14px;">已制单，不能在修改!</span>
+            <input v-if="CurrentUserInfo.EmployeeId == 615" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
           </template>
-          <input style="display:none;" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
         </li>
       </ul>
     </div>