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

src/components/SalesModule/MyCustomer.vue

@@ -553,7 +553,7 @@
           <th v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">{{$t('salesModule.belongUnion')}}</th>
           <th v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">{{$t('salesModule.HappinessPassbook')}}</th>
           <th v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">{{$t('active.ad_yhq')}}</th>
-          <th v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">{{$t('objFill.yucunyue')}}</th>
+          <th>{{$t('objFill.yucunyue')}}</th>
           <th width="220px">{{$t('hotel.table_operat')}}</th>
         </tr>
         <tr v-for="(item,i) in dataList" :key="i">
@@ -623,7 +623,7 @@
           <td v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2"><span
               style="cursor: pointer;text-decoration: underline;"
               @click.stop="goUrC('CouponsList',item.customerAccountId)">{{item.couponNum}}</span></td>
-          <td v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">
+          <td>
             <span style="cursor: pointer;color: #2CA4F0"
               @click="seeDeta(item)">{{ item.depositMoney?item.depositMoney:0 }}</span>
           </td>

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -939,8 +939,8 @@
           <template v-if="IsHaveAuth">
             <input type="button" :value="$t('Operation.Op_visaPrice')" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="goUrlVisa" />
             <input type="button" :value="$t('objFill.tuanduizr')" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="TDZR" />
-            <!-- <input type="button" :value="$t('pub.addBtn')" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail(3)" /> -->
-            <span style="float:right">{{$t('objFill.zhuyi')}}：{{$t('objFill.feiqianzfcbzd')}} &nbsp;</span>
+            <input v-if="groupId!=2" type="button" :value="$t('pub.addBtn')" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail(3)" />
+            <span style="float:right" v-if="groupId==2">{{$t('objFill.zhuyi')}}：{{$t('objFill.feiqianzfcbzd')}} &nbsp;</span>
           </template>
         </div>
         <div class="clearfix TB_PrintDiv">
@@ -2243,7 +2243,8 @@
         },
         dataDocList: [],
         EditBtn: false,
-        ActionMenuCode: ''
+        ActionMenuCode: '',
+        groupId:2
       };
     },
     methods: {
@@ -3019,6 +3020,7 @@
         this.IsHaveAuth = false;
       }
       let userInfo = this.getLocalStorage();
+      this.groupId = userInfo.RB_Group_id;
       let ActionMenuCode = this.ActionMenuCode = userInfo.ActionMenuCode;
       // 查看团队收支明细权限
       if (ActionMenuCode.indexOf('isIncomeExpenditure') != -1) {

src/components/dmc/manager/teamRevenueExpenditure.vue

@@ -586,7 +586,7 @@
             } else if (_orderSource === 2 && _type === 2) {
               id = [54, 55, 245, 246, 255, 267]
             } else if (_orderSource === 5 && _type === 2) {
-              id = [49, 50, 57, 58, 245, 246, 255, 267]
+              id = [49, 50, 57, 58, 245, 246, 255, 267]              
             }
             // 门票
             else if (_orderSource === 3 && _type === 2) {
@@ -622,19 +622,45 @@
           this.cdState = true
           return
         }
-
-        this.$router.push({
-          name: 'ChoiceAddFinancialDocuments',
-          query: {
-            'Type': _type,
-            'path': 'teamRevenueExpenditure',
-            'companyID': this.msgList&&this.msgList.length>0&&this.msgList[0].OutBranchId!=null?this.msgList[0].OutBranchId:this.$route.query.OutBranchId,
-            'templateID': id,
-            'blank': 'y',
-            'orderObj': JSON.stringify(orderObj),
-            'OrderSource': _orderSource,
-          }
-        });
+        let userInfo = this.getLocalStorage();
+        if(userInfo.RB_Group_id==2){
+          this.$router.push({
+            name: 'ChoiceAddFinancialDocuments',
+            query: {
+              'Type': _type,
+              'path': 'teamRevenueExpenditure',
+              'companyID': this.msgList&&this.msgList.length>0&&this.msgList[0].OutBranchId!=null?this.msgList[0].OutBranchId:this.$route.query.OutBranchId,
+              'templateID': id,
+              'blank': 'y',
+              'orderObj': JSON.stringify(orderObj),
+              'OrderSource': _orderSource,
+            }
+          });
+        }else{
+          let portTypeId='';
+          //_orderSource 1 酒店   2餐厅 3 门票  5 车资
+            if (_orderSource === 1 && _type === 2) {
+              portTypeId=4;
+            } else if (_orderSource === 2 && _type === 2) {              
+              portTypeId=5;
+            } else if (_orderSource === 5 && _type === 2) {
+              portTypeId=3;
+            } else if (_orderSource === 3 && _type === 2) {
+              portTypeId=6;
+            }
+          this.$router.push({
+            name: 'ChoiceAddFinancialDocuments',
+            query: {
+              'Type': _type,
+              'portTypeId': portTypeId,
+              'path': 'teamRevenueExpenditure',
+              'companyID': this.msgList&&this.msgList.length>0&&this.msgList[0].OutBranchId!=null?this.msgList[0].OutBranchId:this.$route.query.OutBranchId,
+              'blank': 'y',
+              'orderObj': JSON.stringify(orderObj),
+              'OrderSource': _orderSource,
+            }
+          });
+        }
       },
       getTuanMsg() {
         this.apipost('dmcstatistics_post_GetTeamMoneyBaseInfo', {