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

src/assets/utils/tripUtils.js

@@ -381,7 +381,6 @@ var tripUtils = {
       CityId: "0",
       CityName: "",
       ScenicImg: "",
-      ImaArray: [],
       Rank: 0,
       //景点名称
       CouponsName: "",

src/components/FinancialModule/addFinancialDocuments.vue

@@ -521,7 +521,7 @@
                     </div>
                     <div class="_submit">
                         <div class="chosenNextBox">
-                            <div v-if='resultCode==11019'>
+                            <div v-if='resultCode==11019 || ((EmployeeId===755 || EmployeeId===400) && (msg.RB_Branch_Id&& msg.RB_Branch_Id!=0))'>
                                 <label>下一步：<span class="red">{{msg.AuditDescription}}</span></label>
                                 <el-select size="mini" style="width:300px" v-model="chosenPeople" multiple filterable remote reserve-keyword placeholder="请选择下一步审批人" :remote-method="remoteMethod" :loading="loadingPeople">
                                     <el-option v-for="item in peopleData" :key="item.empId" :label="`${item.name}`" :value="item.empId">
@@ -652,6 +652,7 @@ export default {
             timer:'',
             leaderType:1,
             resultCode:null,
+            EmployeeId:0
         }
     },methods:{
         deleteRow(i,obj){
@@ -1254,6 +1255,7 @@ export default {
     },mounted(){
         let userInfo = this.getLocalStorage();
         this.department = userInfo.DepartName;
+        this.EmployeeId=userInfo.EmployeeId;
         this.emplyeeName=userInfo.emName;
         this.DepartIDs = this.msg.RB_Depart_Id = userInfo.RB_Department_Id;
         this.RB_Branch_id = this.departmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id = userInfo.RB_Branch_id;

src/components/LeaderManagement/leaderManagement.vue

@@ -289,7 +289,7 @@
         </li>
         <li>
           <span>
-            <em>电话</em>
+            <em>境外电话</em>
             <el-input v-model="msg.SpareTel" clearable></el-input>
           </span>
         </li> 
@@ -505,7 +505,7 @@
         <el-form-item :label="$t('pub.mbPhoneNum')" prop="MobilePhone" class="other_input">
           <el-input type="text" v-model="addMsg.MobilePhone" :placeholder="$t('admin.admin_phPhone')" class="w210"></el-input>
         </el-form-item>
-        <el-form-item label="电话" prop="SpareTel" class="other_input">
+        <el-form-item label="境外电话" prop="SpareTel" class="other_input">
           <el-input type="text" v-model="addMsg.SpareTel" :placeholder="$t('admin.admin_SpareTel')" class="w210"></el-input>
         </el-form-item>
         <el-form-item :label="$t('system.table_Passport')" v-if="addMsg.LeaderGuidClass==0" prop="Passport" class="other_input">

src/components/SalesModule/SalesFinancialDetail.vue

@@ -367,7 +367,7 @@ export default {
       this.loading = true;
       this.apipost('Financial_post_GetALLPageList', this.msg, res=>{
         if (res.data.resultCode == 1) {
-          let data = res.data.data.pageData;
+          let data = res.data.data.pageData.list;
           if (type===1) {
             this.allMoney = 0;
             this.shiMoney = 0;

src/components/SalesModule/groupTourOrder.vue

@@ -1529,7 +1529,7 @@
                            icon="iconfont icon-bianji-smal" @click='getDetail(item)'></el-button>
               </el-tooltip>
               <el-tooltip class="item" effect="dark" content="修改备注" placement="top-start">
-                <el-button v-if="item.isHaveFinance=='1'||item.orderState=='1'" type="primary"
+                <el-button v-if="item.Status=='1'&&item.isHaveFinance=='1'||item.orderState=='1'" type="primary"
                            style='background:green; border-color:green' icon="iconfont icon-bianji-smal"
                            @click='getRemarks(item)'></el-button>
               </el-tooltip>
@@ -2382,6 +2382,7 @@
         this.showID = data
       },
       getRemarks (obj) {
+        console.log(obj,'ssss');
         this.isShowLayerRemarks = true
         this.isShowLayer = false
         this.$refs['addMsg'].resetFields()

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -625,7 +625,7 @@
                       </el-dropdown-item>
                       <el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)">下架
                       </el-dropdown-item>
-                      <el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)" style="display:none">结团
+                      <el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)">结团
                       </el-dropdown-item>
                       <el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1)" style="display:none">正常
                       </el-dropdown-item>

src/components/administrative/CommissionDetail.vue

@@ -54,7 +54,8 @@ export default {
       isReady: false,
       multipleSort: false,
       loading: true,
-      CompanyList:[]
+      CompanyList:[],
+      stringPerons:''
     };
   },
   methods: {
@@ -69,6 +70,9 @@ export default {
           '部门':x.departmentName,
           '员工':x.createByStr,
           '提成金额':x.commissionMoney.toFixed(2),
+          '额外奖励':x.otherMoney.toFixed(2),
+          '额外扣除':x.backMoney.toFixed(2),
+          '应发提成':x.sumMoney.toFixed(2),
           '所属期数':x.periods
         }
         data.push(obj)
@@ -170,7 +174,43 @@ export default {
         width: 80,
         orderBy: "",
         formatter: function(rowData, rowIndex, pagingIndex, field) {
-          return `<span style='color:red'>${rowData.commissionMoney.toFixed(2)}</span>`
+          return `<span>${rowData.commissionMoney.toFixed(2)}</span>`
+        }
+      };
+      let otherMoney = {
+        field: "otherMoney",
+        title: "额外奖励",
+        titleAlign: "left",
+        columnAlign: "left",
+        isResize: true,
+        width: 80,
+        orderBy: "",
+        formatter: function(rowData, rowIndex, pagingIndex, field) {
+          return `<span>${rowData.otherMoney.toFixed(2)}</span>`
+        }
+      };
+      let backMoney = {
+        field: "backMoney",
+        title: "额外扣除",
+        titleAlign: "left",
+        columnAlign: "left",
+        isResize: true,
+        width: 80,
+        orderBy: "",
+        formatter: function(rowData, rowIndex, pagingIndex, field) {
+          return `<span>${rowData.backMoney.toFixed(2)}</span>`
+        }
+      };
+      let sumMoney = {
+        title: "应发提成",
+        field: "sumMoney",
+        titleAlign: "left",
+        columnAlign: "left",
+        isResize: true,
+        width: 80,
+        orderBy: "",
+        formatter: function(rowData, rowIndex, pagingIndex, field) {
+          return `<span style='color:red'>${(rowData.otherMoney+rowData.commissionMoney-rowData.backMoney).toFixed(2)}</span>`
         }
       };
       let peopleCount = {
@@ -205,7 +245,13 @@ export default {
         titleAlign: "left",
         columnAlign: "left",
         isResize: true,
-        width: 80
+        width: 80,
+        formatter: function(rowData, rowIndex, pagingIndex, field) {
+          if(rowData.periods!=that.stringPerons)
+            return `<div style='height:40px;line-height:40px;color:#f1f1f1;background: red;margin: 0 -10px;padding-left: 10px;'>${rowData.periods}</div>`
+          else
+            return rowData.periods
+        }
       };
       let remark = {
         field: "remark",
@@ -231,6 +277,9 @@ export default {
       this.columns.push(department);
       this.columns.push(userName);
       this.columns.push(commissionMoney);
+      this.columns.push(otherMoney);
+      this.columns.push(backMoney);
+      this.columns.push(sumMoney);
       this.columns.push(peopleCount);
       this.columns.push(visaPeopleCount);
       this.columns.push(periods);
@@ -239,23 +288,29 @@ export default {
       this.isReady = true;
     },
     sortChange(param) {
-      // if (param.Royalty != "") {
-      //   this.msg.OrderBy = `Royalty ${param.Royalty}`;
-      // } else if (param.Initialbalance != "") {
-      //   this.msg.OrderBy = `Initialbalance ${param.Initialbalance}`;
-      // }
-      
-      // this.getList();
-      if(param.BName!=''){
-        this.msg.OrderStr='RB_Branch_Id '+param.bName
-      }
-      if(param.commissionMoney!=''){
-        this.msg.OrderStr='CommissionMoney '+param.commissionMoney
-      }
-       if(param.peopleCount!=''){
-        this.msg.OrderStr='PeopleCount '+param.peopleCount
+      console.log(param)
+      if(param.sumMoney==''){
+        if(param.BName!=''){
+          this.msg.OrderStr='RB_Branch_Id '+param.bName
+        }
+        if(param.commissionMoney!=''){
+          this.msg.OrderStr='CommissionMoney '+param.commissionMoney
+        }
+        if(param.peopleCount!=''){
+          this.msg.OrderStr='PeopleCount '+param.peopleCount
+        }
+        if(param.backMoney!=''){
+          this.msg.OrderStr='BackMoney '+param.backMoney
+        }
+        if(param.otherMoney!=''){
+          this.msg.OrderStr='OtherMoney '+param.otherMoney
+        }
+        //this.tableData = this.orderBy(d, ["incomeVal"], param.income).results;
+        this.getList();
+      }else{
+        let d=JSON.parse(JSON.stringify(this.dataList))
+        this.dataList = this.orderBy(d, ["sumMoney"], param.sumMoney).results;
       }
-      this.getList();
     },
     handleCurrentChange(val) {
       this.msg.pageIndex = val;
@@ -271,7 +326,9 @@ export default {
           if (res.data.resultCode == 1) {
             this.dataList = res.data.data.pageData;
             this.total = res.data.data.count;
-            console.log(this.dataList, "dataList");
+            this.dataList.forEach(x=>{
+              x.sumMoney=x.commissionMoney+x.otherMoney-x.backMoney
+            })
           } else {
             this.Error(res.data.message);
           }
@@ -317,6 +374,9 @@ export default {
   mounted() {
     this.msg.pageSize = 10000; //不分页
     this.msg.ParentId = this.$route.query.ParentId;
+    let dt=new Date()
+    this.stringPerons=(dt.getMonth()==0?(dt.getFullYear()-1):dt.getFullYear())+''+(dt.getMonth().toString().length<2?'0':'')+(dt.getMonth()==0?12:dt.getMonth());
+    console.log(this.stringPerons)
     this.getList();
     this.getCompanyList();
   },
@@ -348,4 +408,8 @@ export default {
 <style>
 
 .commissionDetails-box .el-button.is-circle{padding: 5px !important;}
+.commissionDetails-box .v-table-body-cell span {
+    display: block;
+    width: 100%;
+}
 </style>

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -299,16 +299,31 @@
         this.FeatureData.IsSave = true;
         this.submitText = "保存中";
         //团队配置
-        var basicData = this.PostConfig;
+        var basicData ={};
         basicData.PriceList = this.PostPrice;
         //配置编号
         basicData.ID = this.ConfigId;
+        basicData.LineId=this.PostConfig.LineId;
+        basicData.LineteamId=this.PostConfig.LineteamId;
+        basicData.Title=this.PostConfig.Title;
+        basicData.OpRemark=this.PostConfig.OpRemark;
+        basicData.ProductRecommend=this.PostConfig.ProductRecommend;
+        basicData.VideoStr=this.PostConfig.VideoStr;
+        basicData.PDFAlias=this.PostConfig.PDFAlias;
+        basicData.ImgCover=this.PostConfig.ImgCover;
+        basicData.PriceIsDirect=this.PostConfig.PriceIsDirect;
+        basicData.IsDirect=this.PostConfig.IsDirect;
+        basicData.RemoveChild=this.PostConfig.RemoveChild;
 
+        basicData.TeamType=this.PostConfig.TeamType;
 
         basicData.DayNum = this.PostDaysTrip.DayNum;
         basicData.NightNum = this.PostDaysTrip.NightNum;
         basicData.StartCityId = this.PostDaysTrip.StartCityId;
         basicData.ReturnArriveCityId = this.PostDaysTrip.ReturnArriveCityId;
+        basicData.SelfpayingList=this.PostConfig.SelfpayingList;
+        basicData.ShopList=this.PostConfig.ShopList;
+
         basicData.DinnerList = this.PostDaysTrip.DinnerList;
         basicData.FreedomList = this.PostDaysTrip.FreedomList;
         basicData.HotelList = this.PostDaysTrip.HotelList;
@@ -359,7 +374,6 @@
         } else {
           basicData.TeamType = 0;
         }
- 
         this.apipost(
           "travel_post_SetTravelConfigInfo",
           basicData,

src/plug/index.js

@@ -290,6 +290,80 @@ export default {
             }
           }, faildCall)
       },
+
+
+      Vue.prototype.JueryPost=function (cmd, msg, successCall, faildCall) {
+        if (msg == null || msg == "") {
+          msg = {}
+        }
+        var apiurl = this.domainManager().PostUrl;
+        var timestamp = (new Date()).valueOf();
+        this.apiurl = apiurl;
+        if (this.$route.path.toLowerCase() == "/signature") {
+          this.$router.push({
+            path: '/signature'
+          })
+        } else {
+          if (!localStorage.userInfo && localStorage.userInfo != "" && this.$route.path.toLowerCase() != "/login") {
+            this.$router.push({
+              path: '/login'
+            })
+          }
+        }
+        var token = "";
+        var key = "";
+        if (this.getLocalStorage() != null) {
+          token = this.getLocalStorage().token;
+          key = this.getLocalStorage().SecretKey;
+        }
+        var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
+        var md5Str = md5(`cmd=${cmd}&msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
+        var postData = {
+          "msg": msg,
+          "cmd": cmd,
+          "timestamp": timestamp,
+          "token": token,
+          "sign": md5Str
+        }
+
+        $.ajax({
+          url: apiurl,
+          type: "POST",
+          data:  msg,
+          datatype: "jsonP",
+          success: function (res) {
+            if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
+              this.$router.push({
+                path: '/login'
+              });
+            } else if (res.resultCode == 10005) {
+              this.$router.go(-1);
+            } else {
+              successCall(res);
+            }
+          },
+          faildCall
+        });
+
+        this.$http.post(apiurl, postData, {
+            headers: {
+              'Content-Type': 'application/json',
+              'Referer-Viitto': this.$route.path
+            }
+          })
+          .then(res => {
+            if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
+              this.$router.push({
+                path: '/login'
+              });
+            } else if (res.resultCode == 10005) {
+              this.$router.go(-1);
+            } else {
+              successCall(res);
+            }
+          }, faildCall)
+      },
+
       Vue.prototype.apiJavaPost = function(cmd, msg, successCall, faildCall) {
         if (msg == null || msg == "") {
             msg = {}