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

src/components/FinancialModule/BasicDocuments.vue

@@ -327,11 +327,15 @@
             <div class="_explain">
                 
                 <p>附加说明：<span class="fr" v-if="GetDetail.ComplainID > 0" @click="goUrl('ComplaintsDetail', GetDetail.ComplainID,GetDetail.OrderID)"> <span style="color:#000">投诉单号：</span> 
-                 <span class="cursorpointer text-decoration">{{GetDetail.ComplainID}}</span></span>
-                <span v-if="GetDetail.TemplateId==28 || GetDetail.TemplateId==30" @click="Gourl(GetDetail)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">提成详情</span>
-                <span v-if="CostTypeState" @click="GourlCostType('VisitRecord',1)" style="margin:0 10px;cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">拜访记录</span>
-                <span v-if="CostTypeState" @click="GourlCostType('yingyanMap',2)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">鹰眼轨迹</span>
-                 </p>
+                    <span class="cursorpointer text-decoration">{{GetDetail.ComplainID}}</span></span>
+                    <span v-if="GetDetail.TemplateId==28 || GetDetail.TemplateId==30" @click="Gourl(GetDetail)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">提成详情</span>
+                    <span v-if="CostTypeState" @click="GourlCostType('VisitRecord',1)" style="margin:0 10px;cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">拜访记录</span>
+                    <span v-if="CostTypeState" @click="GourlCostType('yingyanMap',2)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">鹰眼轨迹</span>
+                    <span v-if="GetDetail.OtherType==6" style="cursor: pointer;float: right;color: #000;font-size: 12px;">
+                        <span style="text-decoration: underline;margin-right:10px" @click="goHand(1,GetDetail)">团号：{{GetDetail.TCNUM}}</span>    
+                        <span style="text-decoration: underline;" @click="goHand(2,GetDetail)">相关单据：{{GetDetail.ReFinanceId}}</span>    
+                    </span>
+                </p>
                 <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-if="GetDetail.TCIDAndTCNUMList.length>0">
                     <tr v-for="(o,ox) in GetDetail.TCIDAndTCNUMList" class="_fujiashuoming_tr">
                         <td :colspan="3">
@@ -1485,7 +1489,8 @@ export default {
             CostTypeState:false,
             LeadState:false,
         }
-    },components:{
+    },
+    components:{
         "my-FlowChartModule": myFlowChartModule,
         "my-Bill": myBill,
         "new-Bill":newBill,
@@ -1502,6 +1507,29 @@ export default {
         'myJiPiaoBill': myJiPiaoBill
     },
     methods:{
+        goHand(type,GetDetail){
+            if(type==1){
+                this.$router.push({
+                    name: 'TeamBalancePayment',
+                    query: { 
+                        id:GetDetail.TCID,
+                        IsHaveAuth:true,
+                        blank: "y", 
+                        tab: "团队收支明细" 
+                    }
+                }); 
+            }
+            else{
+                this.$router.push({
+                    name: 'FinancialDocumentsDetail',
+                    query: { 
+                        id:GetDetail.ReFinanceId,
+                        blank: "y", 
+                        tab: "单据详情" 
+                    }
+                }); 
+            }
+        },
         GourlCostType(path,num){
             this.$router.push({
                 name: path,

src/components/FinancialModule/FinancialDocuments.vue

@@ -395,7 +395,7 @@
                     <button class="normalBtn" v-if="checkboxShow" @click="Financial_post_SetBatch">{{$t('fnc.piltijiao')}}</button>
                     <button class="normalBtn"  @click="method5()">{{$t('visa.v_daochu')}}</button>
                     <button class="hollowFixedBtn" @click="goUrl('WorkEntrustmentMy')">{{$t('fnc.gzweituo')}}</button>
-                    <button class="hollowFixedBtn" @click="Handwithfee">手配费收入</button>
+                    <button v-if="HandShow" class="hollowFixedBtn" @click="Handwithfee">手配费收入</button>
                     <button class="hollowFixedBtn" @click="BOSSBtn = !BOSSBtn, checkList = [], getPageList(1), BOSSBtn2 = false" v-if="msg.Conditon === 3 && userMenuCode">{{BOSSBtn ? '关闭一键审批' : '一键审批'}}</button>
                     <button class="hollowFixedBtn" v-if="msg.Conditon === 3 && BOSSBtn" @click="BOSSBtnClick(1)">{{$t('ios.shenpi')}}</button>
                     <button class="hollowFixedBtn" @click="BOSSBtn2 = !BOSSBtn2, checkList = [], getPageList(1), BOSSBtn = false" v-if="msg.Conditon === 3">{{BOSSBtn2 ? '关闭一键转交' : '一键转交'}}</button>
@@ -724,7 +724,7 @@
                     <el-form-item label="团号">
                         <el-input v-model="HandMsg.TCNUM" class="w200"></el-input>
                     </el-form-item>
-                    <el-form-item label="单据号">
+                    <el-form-item label="相关单据">
                         <el-input v-model="HandMsg.ReFinanceId" class="w200"></el-input>
                     </el-form-item>
                 </el-form>
@@ -881,9 +881,15 @@ export default {
             BOSSDialog: false,
             userMenuCode: false,
             BOSSDialogText: false,
+            HandShow:false,
         }
     },
     created(){
+        let userinfo = this.getLocalStorage();
+        let ActionMenuCode=userinfo.ActionMenuCode;
+        if(ActionMenuCode.indexOf('F_HandWithFee')!=-1){
+            this.HandShow=true;
+        }
         if(this.$route.query.returnCode){
             this.active = this.$route.query.returnCode;
             this.msg.Conditon = this.$route.query.returnCode;
@@ -942,7 +948,7 @@ export default {
                 return;
             }
             if(this.HandMsg.ReFinanceId==''){
-                this.Error("请输入单据号!");
+                this.Error("请输入相关单据号!");
                 return;
             }
             let msg=JSON.stringify(this.HandMsg);

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -981,7 +981,6 @@ export default {
                     }
                 }); 
             }
-             
         },
         GourlHotelZr(){
             this.$router.push({

src/components/SalesModule/advert.vue

@@ -633,8 +633,8 @@
           if (x.data.resultCode == 1) {
             let data = x.data.data
             this.dataId = data.id,
-              this.bg = data.pictureUrl + '?x-oss-process=image/resize,w_470'
-            this.st = data.samplePicturesUrl + '?x-oss-process=image/resize,w_470'
+              this.bg = data.pictureUrl + '?width=470'
+            this.st = data.samplePicturesUrl + '?width=470'
             this.templateId = data.baseAdvertisingID
             this.nodes = JSON.parse(data.content)
             this.nodes.forEach(y => {
@@ -737,8 +737,8 @@
         //this.$message.success('已自动保存数据')
       },
       chosenbg(x) {
-        this.bg = x.PictureUrl + '?x-oss-process=image/resize,w_470'
-        this.st = x.SamplePicturesUrl + '?x-oss-process=image/resize,w_470'
+        this.bg = x.PictureUrl + '?width=470'
+        this.st = x.SamplePicturesUrl + '?width=470'
         this.templateId = x.ID
         let reg = /^http(s)?:\/\/(.*?)\//
         let getBlob = this.getFileBlob(x.PictureUrl.replace(reg, ''), 'aa.jpg')

src/components/TravelContractConfirm.vue

@@ -81,7 +81,7 @@
     border-radius: 15px;
     margin-left: 10px;
 }
-.isShowSign{
+.TCdiv_content .isShowSign{
     z-index: 999;
 }
 .CisHideen{
@@ -278,27 +278,27 @@
      margin:0 auto;
      overflow: hidden;
  }
-   .bg{
+   .TCdiv_content .bg{
     display: inline-block;
     width: 25px;
     height: 25px;
  }
-   .bg1{
+   .TCdiv_content .bg1{
     background-image: url('../assets/img/dzht/bg1.png');
     background-size: 132px;
     background-position: -1px -2px;
  }
-   .bg2{
+   .TCdiv_content .bg2{
     background-image: url('../assets/img/dzht/bg1.png');
     background-size: 132px;
     background-position: 28px -2px;
  }
-  .bottom .el-col>div{
+ .TCdiv_content .bottom .el-col>div{
      display: inline-flex;
      align-items: center;
      justify-content: center;
  }
-  .signTc{
+ .TCdiv_content .signTc{
      position: fixed;
      top: 0;
      left: 0;
@@ -329,7 +329,7 @@
  .TCdiv_content h3{
      font-size:2.2rem;
  }
- .ShopDiv{
+ .TCdiv_content .ShopDiv{
      margin-bottom:1rem;
  }
  .Danxiang_Ul li{