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

src/components/FinancialModule/ImpressionTicketing/ImpressionTicketDetails.vue

@@ -56,7 +56,7 @@
             </li>
             <li>
               <em>人员</em>
-              <el-select v-model="msg.EmpId" size="mini" @change="handleCurrentChange(1)" filterable>
+              <el-select v-model="msg.EmpId" size="mini" @change="handleCurrentChange(1)" filterable :disabled="disabled">
                   <el-option label="不限" :value="-1"></el-option>
                   <el-option label="微途" :value="-2"></el-option>
                   <el-option v-for="(item,index) in searchList" :key="item.index" :label="item.name"
@@ -118,14 +118,16 @@
           <!-- <td></td> -->
           <td>{{item.PostName?item.PostName:'-'}}</td>
           <td>{{item.EmName}}</td>
-          <td><span class="cursor-p" @click="clickUrl(item,1)">{{item.OrderId}}</span></td>
+          <td><span class="cursor-p" @click="!disabled?clickUrl(item,1):''">{{item.OrderId}}</span></td>
           <td>{{item.OrderTypeName}}</td>
-          <td style="font-size: 12px;" :style="{'cursor':item.TCID?'pointer':''}" @click="item.TCID?goTravel(item.TCID):''">{{item.TCNUM?item.TCNUM:'-'}}
+          <td style="font-size: 12px;" :style="{'cursor':item.TCID?'pointer':''}"
+          @click="!disabled&&item.TCID?goTravel(item.TCID):''">
+          {{item.TCNUM?item.TCNUM:'-'}}
             <p v-if="item.OutBranchName">{{item.OutBranchName?item.OutBranchName:'-'}}</p>
           </td>
           <td>{{item.LineName?item.LineName:'-'}}</td>
           <td>{{item.PeopleNum?item.PeopleNum:''}}
-            <template v-if="item.PeopleNum>0">/</template>
+            <template v-if="item.TCID>0">/</template>
             <template v-if="item.TCID>0">{{item.TCGuestNum}}</template></td>
           <td><template v-if="item.TCID>0">{{item.TCProfit?item.TCProfit:'-'}}</template>
               <template v-else>-</template>
@@ -196,13 +198,14 @@
           searchList: [],
           TotalMoney: 0,
           TotalNum: 0,
-          disabled: true,
           titleList:[
               {name:'不限',id:'-1'},
               {name:'引流',id:'2'},
               {name:'销售',id:'1'}
           ],
-
+          S_CheckBranchOrder:false,
+          S_CheckAllOrder:false,
+          disabled: true,
         }
       },
       mounted() {
@@ -219,6 +222,20 @@
             this.msg.EmpType = this.$route.query.EmpType
           }
         }
+        // 判断是否销售
+        if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1) {
+          this.S_CheckBranchOrder = true
+        }
+        if (ActionMenuCode.indexOf('S_CheckAllOrder') != -1) {
+          this.S_CheckAllOrder = true
+        }
+        if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1
+            ||ActionMenuCode.indexOf('S_CheckAllOrder')!=-1
+            ||ActionMenuCode.indexOf('F_Query_AllIncomPay')!=-1) {//是否有看所有人的权限
+                this.disabled = false;
+        }else{
+          this.disabled = true;
+        }
       },
       methods: {
         GetOrderTypeEnumList() {
@@ -230,12 +247,20 @@
             }
           });
         },
-        clickUrl(item,type){
-            if(type==2){//线索
 
-            }else{
-                this.OrderStatistics(item)
+        clickUrl(item,type){
+          this.$router.push({
+              name: 'erpCustomerOrderDay',
+              query: {
+                blank: 'y',
+                OrderId: item.OrderId
               }
+            });
+            // if(type==2){//线索
+
+            // }else{
+            //     this.OrderStatistics(item)
+            // }
         },
         // 订单统计
         OrderStatistics(item){

src/components/FinancialModule/OPExtraReward/CommissionRule.vue

@@ -5,7 +5,7 @@
           <li style="color: red;"></li>
           <li>
             <input type="button" class="hollowFixedBtn" value="新增" @click="AddMsg"/>
-            <input type="button" class="normalBtn" style="position: absolute; right: 90px;t" value="查询" @click="getList"/>
+            <input type="button" class="normalBtn" style="position: absolute; right: 90px;" value="查询" @click="getList"/>
           </li>
       </ul>
     </div>
@@ -62,7 +62,7 @@
           >
             <tr>
               <td :rowspan="item.FProfitList&&item.FProfitList.length>0?4:2" width="150" style="min-width: 150px;">当月负责线路毛利金额<p>当月提成比例</p> </td>
-              <th v-if="item.FProfitList.length>0" width="80" style="min-width:80px;" rowspan="2">总公司OP</th>
+              <th v-if="item.FProfitList&&item.FProfitList.length>0" width="80" class="opTitle" rowspan="2">总公司OP</th>
               <th style="min-width: 220px;"
                 v-for="( son , sIndex ) in item.ProfitList"
                 :key="sIndex"
@@ -75,7 +75,7 @@
             </tr>
             <template v-if="item.FProfitList&&item.FProfitList.length>0">
               <tr>
-                <th width="80" style="min-width:80px;" rowspan="2">分公司OP</th>
+                <th width="80" class="opTitle" rowspan="2">分公司OP</th>
                 <th style="min-width: 220px;"
                   v-for="( son , sIndex ) in item.FProfitList"
                   :key="sIndex"
@@ -96,7 +96,7 @@
         >
           <tr>
             <td :rowspan="item.FExtraList&&item.FExtraList.length>0?4:2" width="150" style="min-width: 150px;">当月负责团数<p>当月奖励</p> </td>
-            <th v-if="item.FExtraList&&item.FExtraList.length>0" width="80" style="min-width:80px;" rowspan="2">总公司OP</th>
+            <th v-if="item.FExtraList&&item.FExtraList.length>0" width="80" class="opTitle" rowspan="2">总公司OP</th>
             <th style="min-width: 220px;"
               v-for="( son , sIndex ) in item.ExtraList"
               :key="sIndex"
@@ -109,7 +109,7 @@
           </tr>
           <template v-if="item.FExtraList&&item.FExtraList.length>0">
             <tr>
-              <th width="80" style="min-width:80px;" rowspan="2">分公司OP</th>
+              <th width="80" class="opTitle" rowspan="2">分公司OP</th>
               <th style="min-width: 220px;"
                 v-for="( son , sIndex ) in item.FExtraList"
                 :key="sIndex"
@@ -285,8 +285,8 @@
           <el-switch
             v-model="form.IsEnableFBranch"
             @change="isSwitch"
-            active-value="1"
-            inactive-value="0">
+            active-value=1
+            inactive-value=0>
           </el-switch>
         </div>
         <div>
@@ -553,7 +553,7 @@
               Rate:null
             }
           ],
-          IsEnableFBranch: false,
+          IsEnableFBranch: 0,
           FSingleVisaMoney: 0,
           FTravelVisaMoney: 0
         },
@@ -583,13 +583,13 @@
       addRule(row,index,type,num){
        if(type==2){
         if(num){
-          this.form.FProfitList.push(JSON.parse(JSON.stringify(this.ProfitList)))
+          this.form.FProfitList.push(JSON.parse(JSON.stringify(this.FProfitList)))
         }else{
           this.form.ProfitList.push(JSON.parse(JSON.stringify(this.ProfitList)))
         }
         }else if(type==3){
           if(num){
-            this.form.FExtraList.push(JSON.parse(JSON.stringify(this.ExtraList)))
+            this.form.FExtraList.push(JSON.parse(JSON.stringify(this.FExtraList)))
           }else{
             this.form.ExtraList.push(JSON.parse(JSON.stringify(this.ExtraList)))
           }
@@ -614,7 +614,7 @@
       AddMsg(){//新增
         this.ruleVisible = true
         this.titleName = '提成规则'
-        this.form.FExtraList.push(JSON.parse(JSON.stringify(this.FExtraList)))
+        this.form.FExtraList = [JSON.parse(JSON.stringify(this.FExtraList))]
       },
       SetRules(item){//编辑
         this.titleName = '编辑规则'
@@ -637,7 +637,7 @@
           CountryId: item.CountryId>0||item.CountryId==0?item.CountryId:null,
           ProfitList: item.ProfitList,
           ExtraList: item.ExtraList,
-          IsEnableFBranch: item.IsEnableFBranch,
+          IsEnableFBranch: String(item.IsEnableFBranch),
           FProfitList: item.FProfitList&&item.FProfitList.length>0?item.FProfitList:item.IsEnableFBranch>0?[this.FProfitList]:[],
           FExtraList: item.FExtraList&&item.FExtraList.length>0?item.FExtraList:[this.FExtraList],
           FSingleVisaMoney: item.FSingleVisaMoney,
@@ -843,4 +843,7 @@
     padding: 0 0 10px 0;
     font-weight: bold;
   }
+  .opTitle{
+    min-width:80px;background: #fff;border-top: 1px solid #E6E6E6;border-right: 1px solid #E6E6E6;
+  }
 </style>

src/components/FinancialModule/OpCommission/OpComPersonDetails.vue

@@ -353,7 +353,7 @@
         clickUrl(row){
           let name = ''
           if (row.OrderType == 5) {//签证
-            if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
+            if (this.S_CheckBranchOrder || this.S_CheckAllOrder) {
               name = 'VisaProductEditOrderOP'
             } else {
               name = 'VisaProductEditOrder'
@@ -362,7 +362,7 @@
               name: name,
             });
           } else if (row.OrderType == 1||row.OrderType == 6) { //跟团 一日游 团签
-            if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
+            if (this.S_CheckBranchOrder || this.S_CheckAllOrder) {
               name = 'enrollTotal'
             }else{
               if (row.TravelType == 0) {//正规团
@@ -374,13 +374,13 @@
               }
             }
           } else if (row.OrderType == 2) { //酒店
-            if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
+            if (this.S_CheckBranchOrder || this.S_CheckAllOrder) {
               name = 'singleProductHotelOrderOP'
             } else {
               name = 'singleProductHotelOrder'
             }
           } else if (row.OrderType == 3) { //门票
-            if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
+            if (this.S_CheckBranchOrder || this.S_CheckAllOrder) {
               name = 'SingleticketOrderListOP'
             } else {
               name = 'SingleticketOrderList'
@@ -437,7 +437,7 @@
             if (pageData && pageData.length > 0) {
               OrderType = pageData[0].OrderType
             }
-            if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
+            if (this.S_CheckBranchOrder || this.S_CheckAllOrder) {
               name = 'CharterOrderListOP'
             } else {
               name = 'CharterOrderList'
@@ -552,4 +552,3 @@
     }
 
   </script>
-  
\ No newline at end of file

src/components/FinancialModule/TradeCommission/TicketDetails.vue

@@ -356,7 +356,7 @@
 
         if (row.OrderType == 1) {
 
-          if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
+          if (this.S_CheckBranchOrder || this.S_CheckAllOrder) {
             data[0].path = 'customerOrderAllType'
           } else {
             data[0].path = 'myCustomerOrderAllType'
@@ -367,7 +367,7 @@
         } else {
           let name = ''
           if (row.OrderType == 6) {
-            if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
+            if (this.S_CheckBranchOrder || this.S_CheckAllOrder) {
               name = 'VisaProductEditOrderOP'
             } else {
               name = 'VisaProductEditOrder'
@@ -376,7 +376,7 @@
               name: name,
             });
           } else if (row.OrderType == 2) { //跟团 一日游
-            if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
+            if (this.S_CheckBranchOrder || this.S_CheckAllOrder) {
               name = 'enrollTotal'
             } else {
               if (row.TravelType == 1) {
@@ -386,13 +386,13 @@
               }
             }
           } else if (row.OrderType == 3) { //酒店
-            if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
+            if (this.S_CheckBranchOrder || this.S_CheckAllOrder) {
               name = 'singleProductHotelOrderOP'
             } else {
               name = 'singleProductHotelOrder'
             }
           } else if (row.OrderType == 4) { //门票
-            if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
+            if (this.S_CheckBranchOrder || this.S_CheckAllOrder) {
               name = 'SingleticketOrderListOP'
             } else {
               name = 'SingleticketOrderList'
@@ -456,7 +456,7 @@
             if (pageData && pageData.length > 0) {
               OrderType = pageData[0].OrderType
             }
-            if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
+            if (this.S_CheckBranchOrder || this.S_CheckAllOrder) {
               name = 'CharterOrderListOP'
             } else {
               name = 'CharterOrderList'

src/components/SalesModule/productOrderList.vue

@@ -533,7 +533,7 @@
       this.userInfo = this.getLocalStorage();
       this.CurrentUserInfo = this.userInfo ;
       this.userId = this.userInfo.EmployeeId;
-      this.msg.BranchId = this.userInfo.RB_Branch_id.toString();
+      this.msg.BranchId = '-1'//this.userInfo.RB_Branch_id.toString();
       if (this.$route.query.id) {
         this.msg.BranchId = "-1";
         this.msg.TCID = this.$route.query.id;

src/components/myOrdersAllType/components/allList.vue

@@ -612,21 +612,20 @@
           },
         },
         created() {
-          if(this.$route.query.OrderId){
-            this.msg.OrderId=this.$route.query.OrderId
-          }
+
           let userInfo=this.getLocalStorage();
           this.employeeMsg.GroupId = userInfo.RB_Group_id;    //集团ID
           // this.msg.EnterID = userInfo.EmployeeId;
-        },
-        mounted() {
-          this.Title = this.pagesTitle
-          if(this.Title!='销售'){
-            this.getEmployee()
-          }
           this.msg.StartTime = this.getBeforeDate(0, new Date())
           this.msg.EndTime = this.getBeforeDate(0, new Date())
           this.DatelistBM = [new Date(this.msg.StartTime),new Date()]
+          if(this.$route.query.OrderId){
+            this.msg.OrderId=this.$route.query.OrderId
+            this.msg.StartTime = ''
+            this.msg.EndTime = ''
+            this.DatelistBM = []
+            this.msg.OrderState = '0'
+          }
           if(this.$route.query.DepartSTime){
             this.msg.DepartSTime=this.$route.query.DepartSTime
             this.msg.DepartETime=this.$route.query.DepartETime
@@ -635,6 +634,13 @@
             this.msg.EndTime = ''
             this.DatelistBM = []
             this.DatelistUse = [this.msg.DepartSTime,this.msg.DepartETime]
+            this.msg.OrderState = '0'
+          }
+        },
+        mounted() {
+          this.Title = this.pagesTitle
+          if(this.Title!='销售'){
+            this.getEmployee()
           }
           // this.GetOrderStatusEnumList()//订单状态
           // this.GetTicketStatusEnumList()//出票状态