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

src/assets/utils/AuthCode.js

@@ -11,5 +11,6 @@ var AuthCode = {
     SupperOrderEdit:"SupperOrderEdit",//获取总经理副总经理超级修改权限
     LookOrder:"LookOrder",//出纳查看订单权限
     LookAllTeam:"LookAllTeam",//查看所有团控
+    
 };
 export default AuthCode;
\ No newline at end of file

src/assets/utils/tripUtils.js

@@ -225,8 +225,8 @@ var tripUtils = {
       CurrencyId: 0, //币种id
       Money: 0.0, //费用
       PeopleNumber: 0, //人数
-      SalePrice:0,//销售价格
-      CostRemark:"",//成本备注
+      SalePrice: 0, //销售价格
+      CostRemark: "", //成本备注
     }
   },
   //地接成本报价币种
@@ -350,12 +350,12 @@ var tripUtils = {
       //行程介绍
       trafficIntroduce: {
         IntroduceTitle: "", //行程介绍标题
-        IntroduceImage: ViittoFileUrl+"/Upload/DefalutImage/DMC/defaultairline.png", //行程介绍图片
+        IntroduceImage: ViittoFileUrl + "/Upload/DefalutImage/DMC/defaultairline.png", //行程介绍图片
         IntroduceDetail: "", //行程介绍详细信息
-        TrafficType:2,//交通类型,默认为专车
-        TrafficContent:"",//交通详情
-        TrafficImage:"",//交通图片
-      
+        TrafficType: 2, //交通类型,默认为专车
+        TrafficContent: "", //交通详情
+        TrafficImage: "", //交通图片
+
       }
     };
   },
@@ -371,8 +371,8 @@ var tripUtils = {
       StartCityName: "",
       //到达城市名称
       ArrivalCityName: "",
-      StartTime:"",//出发时间
-      EndTime:"",//到达时间
+      StartTime: "", //出发时间
+      EndTime: "", //到达时间
     };
   },
   //行程-景点对象
@@ -399,16 +399,16 @@ var tripUtils = {
       QCity: '',
       NewScenicImg: '', //改版后的景点图片
       NewImaArray: [],
-      MD5Sign:"",
+      MD5Sign: "",
       //景点JSon字符串
-      ScenicJson:{
-        x:0,//初始位移x
-        y:0 //初始位移y
+      ScenicJson: {
+        x: 0, //初始位移x
+        y: 0 //初始位移y
       },
-      TrafficType:2,//交通类型(1-飞机,2-专车,3-地铁,4-步行)
-      TrafficContent:"",//交通内容
-      TrafficImage:"",//交通图片
-      TimeStr:"",//时间字符串备注
+      TrafficType: 2, //交通类型(1-飞机,2-专车,3-地铁,4-步行)
+      TrafficContent: "", //交通内容
+      TrafficImage: "", //交通图片
+      TimeStr: "", //时间字符串备注
     };
   },
   //行程-酒店对象
@@ -437,9 +437,9 @@ var tripUtils = {
       //0-不同级酒店，1同级酒店
       IsSameLevel: 0,
       //酒店类型
-      HotelType:0,
-      MD5Sign:"",
-      TimeStr:"",//时间字符串备注
+      HotelType: 0,
+      MD5Sign: "",
+      TimeStr: "", //时间字符串备注
     };
   },
   //行程-餐饮对象
@@ -467,8 +467,8 @@ var tripUtils = {
       MealName: "",
       QCity: '',
       BreakfastUseType: 2,
-      MD5Sign:"",
-      TimeStr:"",//时间字符串备注
+      MD5Sign: "",
+      TimeStr: "", //时间字符串备注
     };
   },
   //行程-自由活动对象
@@ -526,10 +526,10 @@ var tripUtils = {
       DayNum: 0,
       TitleObj: {},
       TrafficObj: {},
-      HotelChooseArray:[],
+      HotelChooseArray: [],
       HotelArray: [],
       DinnerArray: [],
-      ChooseScenicArray:[],
+      ChooseScenicArray: [],
       ScenicArray: [],
       WarmTipObj: {},
     }
@@ -539,7 +539,7 @@ var tripUtils = {
     return {
       Id: 0,
       Describe: "",
-      Sort:1
+      Sort: 1
     }
   },
   daysArrayItemObj: function () {
@@ -587,21 +587,22 @@ var tripUtils = {
   },
   CreateUUID(len, radix) {
     var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
-    var uuid = [], i;
+    var uuid = [],
+      i;
     radix = radix || chars.length;
     if (len) {
-        // Compact form
-        for (i = 0; i < len; i++) uuid[i] = chars[0 | Math.random()*radix];
+      // Compact form
+      for (i = 0; i < len; i++) uuid[i] = chars[0 | Math.random() * radix];
     } else {
-        var r;
-        uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
-        uuid[14] = '4';
-        for (i = 0; i < 36; i++) {
-            if (!uuid[i]) {
-                r = 0 | Math.random()*16;
-                uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r];
-            }
+      var r;
+      uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
+      uuid[14] = '4';
+      for (i = 0; i < 36; i++) {
+        if (!uuid[i]) {
+          r = 0 | Math.random() * 16;
+          uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r];
         }
+      }
     }
     return uuid.join('');
   },
@@ -616,8 +617,7 @@ var tripUtils = {
     if (DayList != null && DayList.length > 0) {
       DayList.forEach((dayItem, dayIndex) => {
         if (dayIndex == currentDayIndex) {
-          if(dayItem.TrafficObj!=null &&dayItem.TrafficObj.SubTraffic!=null && dayItem.TrafficObj.SubTraffic.length>0 )
-          {
+          if (dayItem.TrafficObj != null && dayItem.TrafficObj.SubTraffic != null && dayItem.TrafficObj.SubTraffic.length > 0) {
             dayItem.TrafficObj.SubTraffic.forEach(subItem => {
               cityIdStr += subItem.StartCityId + "," + subItem.ArrivalCityId + ","
             });
@@ -736,17 +736,42 @@ var tripUtils = {
     return flag;
   },
   //跳转到B2B一日游页面
-  GotoB2BOneDayPage(B2BDomain,ConfigId,tcid)
-  {
+  GotoB2BOneDayPage(B2BDomain, ConfigId, tcid) {
     if (B2BDomain) {
-     var url = "http://"+B2BDomain;
+      var url = "http://" + B2BDomain;
       window.open(
-        url+'/#/OneDayDetailTwo/' +
+        url + '/#/OneDayDetailTwo/' +
         encodeURIComponent(ConfigId) + '/' + tcid +
         '/preview',
         '_blank'
       )
     }
   },
+  //跳转到B2B页面
+  GotoB2BPage(B2BDomain, ConfigId, tcid) {
+    if (B2BDomain) {
+      var url = "http://" + B2BDomain;
+      window.open(
+        url + "/#/detailTwo/" +
+        encodeURIComponent(ConfigId) +
+        "/" +
+        tcid +
+        "/preview",
+        "_blank"
+      );
+    }
+  },
+  //跳转到B2C页面
+  GotoB2CPage(B2BDomain, ConfigId, tcid) {
+    if (B2BDomain) {
+      var url = "http://" + B2BDomain;
+      window.open(
+        url + "/#/newTrip" + '?ID=' + encodeURIComponent(ConfigId) +
+        "&" +
+        'tcid=' + tcid,
+        "_blank"
+      );
+    }
+  },
 }
 export default tripUtils;

src/components/ShoppingStore/ShoppingReimbursementDetails.vue

@@ -106,7 +106,7 @@
             </td>
             <td class="more_td" v-if="subIndex==0" :rowspan="item.ShopDetailsList.length">
               <!--汇率 DMCRate-->
-              <el-input type="number" v-model="item.ShopDetailsList[0].DMCRate"></el-input>
+              <el-input type="number" v-model="item.ShopDetailsList[0].DMCRate" disabled="true"></el-input>
             </td>
             <td @click="upIndex = outindex" v-if="subIndex==0" :rowspan="item.ShopDetailsList.length">
               <!--DMCOPCredentials (地接OP上传凭证)-->

src/components/ShoppingStore/ShoppingStore.vue

@@ -721,7 +721,7 @@
               <th width="100">{{$t('ground.ztstc')}}</th>
               <th width="80">{{$t('ground.ldtc')}}</th>
               <th width="80">{{$t('ground.dytc')}}</th>
-              <th width="80">{{$t('hotel.hotel_CurrentRate')}}</th>
+              <th width="80" style="display:none;">{{$t('hotel.hotel_CurrentRate')}}</th>
               <th width="80">{{$t('hotel.hotel_Currency')}}</th>
               <th width="80">{{$t('pub.pubRemark')}}</th>
               <th width="80">{{$t('system.table_operation')}}</th>
@@ -744,7 +744,7 @@
               <td>{{item.GroupExtract}}</td>
               <td>{{item.LeaderExtract}}</td>
               <td>{{item.GuideExtract}}</td>
-              <td>{{item.Rate}}</td>
+              <td style="display:none;">{{item.Rate}}</td>
               <td :class="{'redType':item.CurrencyExist==-1}"><span>{{item.Currency}}</span></td>
               <td>{{item.Remarks}}</td>
               <td><span class="delInfo" @click="delInfo(index)">{{$t('system.table_delete')}}</span></td>

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -972,8 +972,8 @@
                         {{$t('Operation.Op_b2bView')}}
                       </el-dropdown-item>
 
-                      <el-dropdown-item @click.native="goB2B(item.ConfigId, item.TCID , 2)"
-                        v-if="item.LineID!=2&&item.LineID!=8">
+                      <el-dropdown-item  @click.native="goB2B(item.ConfigId, item.TCID , 2)"
+                        v-if="CurrentUserInfo.B2BDomain!=''&&item.LineID!=2&&item.LineID!=8">
                         直客版预览
                       </el-dropdown-item>
 
@@ -1861,24 +1861,11 @@
         });
       },
       goB2B(ConfigId, tcid, type) {
+           var B2BDomain = this.CurrentUserInfo.B2BDomain;
         if (type == 1) {
-          var B2BDomain = this.CurrentUserInfo.B2BDomain;
-          window.open(
-            "http://www.oytour.com/#/detailTwo/" +
-            encodeURIComponent(ConfigId) +
-            "/" +
-            tcid +
-            "/preview",
-            "_blank"
-          );
+           this.$tripUtils.GotoB2BPage(B2BDomain,ConfigId,tcid);
         } else {
-          var B2BDomain = this.CurrentUserInfo.B2BDomain;
-          window.open(
-            "http://www.oytour.com/#/newTrip" + '?ID=' + encodeURIComponent(ConfigId) +
-            "&" +
-            'tcid=' + tcid,
-            "_blank"
-          );
+          this.$tripUtils.GotoB2CPage(B2BDomain,ConfigId,tcid);
         }
       },
       goTeamBalance(id, OutBranchId) {

src/components/administrative/AttendanceStatistics.vue

@@ -231,7 +231,6 @@
 			this.msg.EndTime = _year + '-' + _month + '-' + _date;
 			let userInfo = this.getLocalStorage();
 			this.departmentMsg.RB_Group_Id=this.employeeMsg.RB_Group_id=this.companyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团
-//			this.employeeMsg.RB_Branch_id=userInfo.RB_Branch_id;    //公司
 			this.getList()
 			this.getCompany()
 			this.getDepartment()

src/components/administrative/CommissionManagement.vue

 <style>
-.CM_look {
-  padding: 4px !important;
-  position: relative;
-  top: 1px;
-}
-.TCommission-finance {
-  font-size: 12px;
-  text-decoration: underline;
-  cursor: pointer;
-  margin-right: 5px;
-}
+  .CM_look {
+    padding: 4px !important;
+    position: relative;
+    top: 1px;
+  }
+
+  .TCommission-finance {
+    font-size: 12px;
+    text-decoration: underline;
+    cursor: pointer;
+    margin-right: 5px;
+  }
+
 </style>
 <template>
   <div class="flexOne">
-    <!-- <div class="query-box">
-      <ul>
-        <li>
-            <input type="button" class="normalBtn" @click="generateTable" value="生成提成报表"/>
-        </li>
-      </ul>
-    </div>-->
     <table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
       <tr>
         <th>期数</th>
@@ -32,179 +27,155 @@
       </tr>
       <tr v-for="(item,index) in dataList" :key="index">
         <td>{{item.periods}}</td>
-        <td
-          v-if="userInfo.RB_Branch_id==0 || userInfo.RB_Branch_id==49"
-        >{{item.sumPrice.toFixed(2)}}</td>
+        <td v-if="userInfo.RB_Branch_id==0 || userInfo.RB_Branch_id==49">{{item.sumPrice.toFixed(2)}}</td>
         <td>{{item.createByStr}}</td>
         <td>{{item.branchMoney.toFixed(2)}}</td>
         <td>
-          <span
-            class="TCommission-finance"
-            v-for="(fno, i) in item.financialsArray"
-            :key="i"
-            @click="goUrl2(fno)"
-          >{{fno}}</span>
+          <span class="TCommission-finance" v-for="(fno, i) in item.financialsArray" :key="i"
+            @click="goUrl2(fno)">{{fno}}</span>
         </td>
         <td>{{item.createStr}}</td>
         <td>
           <el-tooltip class="item" effect="dark" content="查看" placement="top">
-            <el-button
-              type="primary"
-              class="CM_look"
-              @click="goUrl('CommissionDetail',item.id)"
-              icon="iconfont icon-chakan"
-              title="查看"
-              circle
-            ></el-button>
+            <el-button type="primary" class="CM_look" @click="goUrl('CommissionDetail',item.id)"
+              icon="iconfont icon-chakan" title="查看" circle></el-button>
           </el-tooltip>
           <el-tooltip class="item" effect="dark" content="制单" placement="top">
-            <el-button v-if="btnShow"
-              type="primary"
-              class="CM_look"
-              @click="generalFinancacls(item)"
-              icon="el-icon-plus"
-              title="制单"
-              circle
-            ></el-button>
+            <el-button v-if="btnShow" type="primary" class="CM_look" @click="generalFinancacls(item)"
+              icon="el-icon-plus" title="制单" circle></el-button>
           </el-tooltip>
         </td>
       </tr>
     </table>
     <!-- 分页 -->
-    <el-pagination
-      background
-      @current-change="handleCurrentChange"
-      :current-page.sync="currentPage"
-      layout="total,prev, pager, next, jumper"
-      :page-size="msg.PageSize"
-      :total="total"
-    ></el-pagination>
+    <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
+      layout="total,prev, pager, next, jumper" :page-size="msg.PageSize" :total="total"></el-pagination>
   </div>
 </template>
 
 <script>
-export default {
-  data() {
-    return {
-      msg: {
-        PageIndex: 1,
-        PageSize: 20
-      },
-      loading: false,
-      //数据源
-      dataList: [],
-      total: 0,
-      currentPage: 1,
-      userInfo: {},
-      btnShow:false,
-    };
-  },
-  mounted() {
-    this.getList();
-    this.userInfo = this.getLocalStorage();
-    let userInfo = this.getLocalStorage();
-    let ActionMenuCode=userInfo.ActionMenuCode;
-      if(ActionMenuCode.indexOf('CommissionVoucher')!=-1){
-        this.btnShow=true;
-      }
-  },
-  methods: {
-    handleCurrentChange(val) {
-      this.msg.PageIndex = val;
-      this.getList();
+  export default {
+    data() {
+      return {
+        msg: {
+          PageIndex: 1,
+          PageSize: 20
+        },
+        loading: false,
+        //数据源
+        dataList: [],
+        total: 0,
+        currentPage: 1,
+        userInfo: {},
+        btnShow: false,
+      };
     },
-    goUrl(path, id) {
-      this.$router.push({
-        path: path,
-        query: {
-          ParentId: id,
-          blank: "y",
-          tab: "报价详情"
-        }
-      });
+    mounted() {
+      this.getList();
+      this.userInfo = this.getLocalStorage();
+      let userInfo = this.getLocalStorage();
+      let ActionMenuCode = userInfo.ActionMenuCode;
+      if (ActionMenuCode.indexOf('CommissionVoucher') != -1) {
+        this.btnShow = true;
+      }
     },
-    //获取数据
-    getList() {
-      this.loading = true;
-      this.apipost(
-        "sellcommission_GetPageList",
-        this.msg,
-        res => {
-          this.loading = false;
-          if (res.data.resultCode == 1) {
-            this.dataList = res.data.data.pageData;
-            this.total = res.data.data.count;
-            this.dataList.forEach(x => {
-              if (x.financials && x.financials.length > 0) {
-                x.financialsArray = x.financials.split(",");
-              }
-            });
-          } else {
-            this.Error(res.data.message);
+    methods: {
+      handleCurrentChange(val) {
+        this.msg.PageIndex = val;
+        this.getList();
+      },
+      goUrl(path, id) {
+        this.$router.push({
+          path: path,
+          query: {
+            ParentId: id,
+            blank: "y",
+            tab: "报价详情"
           }
-        },
-        null
-      );
-    },
-    goUrl2(id) {
-      this.$router.push({
-        path: "/FinancialDocumentsDetail",
-        query: {
-          id,
+        });
+      },
+      //获取数据
+      getList() {
+        this.loading = true;
+        this.apipost(
+          "sellcommission_GetPageList",
+          this.msg,
+          res => {
+            this.loading = false;
+            if (res.data.resultCode == 1) {
+              this.dataList = res.data.data.pageData;
+              this.total = res.data.data.count;
+              this.dataList.forEach(x => {
+                if (x.financials && x.financials.length > 0) {
+                  x.financialsArray = x.financials.split(",");
+                }
+              });
+            } else {
+              this.Error(res.data.message);
+            }
+          },
+          null
+        );
+      },
+      goUrl2(id) {
+        this.$router.push({
+          path: "/FinancialDocumentsDetail",
+          query: {
+            id,
+            blank: "y",
+            tab: id + "单据详情"
+          }
+        });
+      },
+      //生成提成报表
+      generateTable() {
+        let msg = {
+          UserId: 0
+        };
+        this.apipost(
+          "sellcommission_SetGenerateCommission",
+          msg,
+          res => {
+            if (res.data.resultCode == 1) {
+              this.getList();
+              this.Success("报表生成成功");
+            } else {
+              this.Error(res.data.message);
+            }
+          },
+          null
+        );
+      },
+      generalFinancacls(item) {
+        if (item.financialsArray && item.financialsArray.length > 0) {
+          this.Error("请不要多次制单！")
+          return;
+        }
+        let obj = {
+          CostType: 16,
+          Money: item.branchMoney,
+          CurrencyId: 1,
+          XSTC: 1,
+        }
+        let query = {
           blank: "y",
-          tab: id + "单据详情"
+          tab: "新增付款单据",
+          Type: 2,
+          IsUploadPic: 1,
+          orderObj: JSON.stringify(obj)
         }
-      });
-    },
-    //生成提成报表
-    generateTable() {
-      let msg = {
-        UserId: 0
-      };
-      this.apipost(
-        "sellcommission_SetGenerateCommission",
-        msg,
-        res => {
-          if (res.data.resultCode == 1) {
-            this.getList();
-            this.Success("报表生成成功");
-          } else {
-            this.Error(res.data.message);
-          }
-        },
-        null
-      );
-    },
-    generalFinancacls(item){
-      if(item.financialsArray&&item.financialsArray.length>0){
-        this.Error("请不要多次制单！")
-        return;
-      }
-      let obj = {
-        CostType: 16,
-        Money: item.branchMoney,
-        CurrencyId: 1,
-        XSTC: 1,
-      }
-      let query = {
-        blank: "y",
-        tab: "新增付款单据",
-        Type:2,
-        IsUploadPic:1,
-        orderObj: JSON.stringify(obj)
-      }
-      if(this.userInfo.RB_Branch_id==0) {
-        query.id=28
-        query.Name="总部销售提成单"
-      }else{
-        query.id=30
-        query.Name="分公司销售提成单"
+        if (this.userInfo.RB_Branch_id == 0) {
+          query.id = 28
+          query.Name = "总部销售提成单"
+        } else {
+          query.id = 30
+          query.Name = "分公司销售提成单"
+        }
+        this.$router.push({
+          path: "/addFinancialDocuments",
+          query
+        });
       }
-      this.$router.push({
-        path: "/addFinancialDocuments",
-        query
-      });
     }
-  }
-};
-</script>
+  };
+</script>
\ No newline at end of file

src/components/administrative/DjCommissionDetail.vue

@@ -286,12 +286,6 @@ export default {
         isResize: true,
         width: 80,
         componentName: "commission-table-beizhu"
-        
-        // formatter: function(rowData, rowIndex, pagingIndex, field) {
-        //   return `<span v-if="${rowData.EmployeeId==0 && oPComissionPeriods.FRID>0}">
-        //   <span>${rowData.EmployeeId}</span>
-        //   单据号：${oPComissionPeriods.FRID}</span>`;
-        // }
       };
       let opera = {
         title: "操作",

src/components/administrative/QzCommissionDetail.vue

@@ -286,12 +286,6 @@ export default {
         isResize: true,
         width: 80,
         componentName: "commission-table-beizhu"
-        
-        // formatter: function(rowData, rowIndex, pagingIndex, field) {
-        //   return `<span v-if="${rowData.EmployeeId==0 && oPComissionPeriods.FRID>0}">
-        //   <span>${rowData.EmployeeId}</span>
-        //   单据号：${oPComissionPeriods.FRID}</span>`;
-        // }
       };
       let opera = {
         title: "操作",

src/components/administrative/departmentManagement.vue

@@ -1009,7 +1009,6 @@
       },
       resetForm(formName) { //弹出框取消 初始化谈框内表单
         this.$refs[formName].resetFields();
-        // this.addMsg1.EmployeeId='0'
       },
       addData() { //新增数据
         if (this.addMsg.ManagerIdArr.length > 0) {

src/components/administrative/positionManagement.vue

@@ -287,11 +287,6 @@
         this.msg.pageIndex = val;
         this.getList();
       },
-      //			clearMessage(){
-      //				this.addMsg.RB_Branch_Id='';
-      //				this.addMsg.RB_Department_Id='';
-      //				this.addMsg.PostName='';
-      //			},
       resetPageIndex() {
         this.msg.pageIndex = 1;
         this.currentPage = 1

src/components/platformModule/companyManagement.vue

@@ -108,7 +108,7 @@
         <th>B2B是否显示</th>
         <th>公司类型</th>
         <th>是否服务费收费</th>
-        <th v-if="userInfoList.EmployeeId==1||userInfoList.EmployeeId==5||userInfoList.RB_Branch_id==49">服务费用</th>
+        <th>服务费用</th>
         <th width="200">{{$t('admin.admin_operate')}}</th>
       </tr>
       <tr v-for="(item,index) in DataList" v-loading='loading'>
@@ -120,7 +120,7 @@
         <td>{{item.B2BShow==0?'显示':'不显示'}}</td>
         <td>{{item.IsParentCompany=='1'?'总公司':'分公司'}}</td>
         <td>{{item.IsFreeFee==0?'付费':'免费'}}</td>
-        <td v-if="userInfoList.EmployeeId==1||userInfoList.EmployeeId==5||userInfoList.RB_Branch_id==49">{{item.ServiceFee}}</td>
+        <td >{{item.ServiceFee}}</td>
         <td>
           <el-row>
             <el-tooltip class="item" effect="dark" content="修改" placement="top-start">