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

src/App.vue

@@ -228,7 +228,7 @@
 
 </script>
 <style>
-  @import "//at.alicdn.com/t/c/font_635492_z2m4iopdl1a.css";
+  @import "//at.alicdn.com/t/c/font_2077629_fcjjwy7e29k.css";
   @import "./assets/css/Semibold.css";
   @import "./assets/css/global/config.css";
   /* @import "./assets/css/fileIcon.css"; */

src/components/FinancialModule/addFinancialDocuments.vue

@@ -748,7 +748,7 @@
                   </el-select>
                 </span>
 
-                
+
               </p>
 
               <p v-if="StoredCustomerList&&StoredCustomerList.length" style="margin-left: 15px;">{{$t('objFill.yushoudiyong')}}：<span>
@@ -767,7 +767,7 @@
                     <el-checkbox v-model="KingdeeClientIDCheck"  @change="changeKingdeeClientID" :style="{'margin-top':KingdeeClientIDCheck?'0px':'6px'}">垫付对象</el-checkbox>
                   </el-tooltip>
                     <template v-if="KingdeeClientIDCheck">
-                  <el-select 
+                  <el-select
     v-model="msg.KingdeeClientID"  class="w135 _border_b_1"
     filterable
     remote
@@ -787,7 +787,7 @@
                                       </span>
                                     </div>
                                 </el-option>
-                              
+
   </el-select></template>
                 </span>
               </p>
@@ -811,7 +811,7 @@
               </div>
               <!-- <p v-if="GetDetail.OrderSource==4&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail.SourceID,4)" class="_jump_page _font_bold">机票收支</p> -->
             </template>
-            <template v-if="isHandFee"> 
+            <template v-if="isHandFee">
                <el-tooltip :content="$t('objFill.peizhishoupeifei')" placement="top">
               <el-switch v-model="is_HandFee" @change="getHandFee" >
               </el-switch>
@@ -926,7 +926,7 @@
         <div>
           <div v-if="IsUploadPic===1">
             <p>{{$t('fnc.scfujian')}}<span class="_addUpload_tips">{{$t('tips.wjdxbncgsz')}}</span></p>
- 
+
             <div class="_addUpload_box clearfix">
               <template v-for="(file,fIndex) in saveMsg">
                 <div v-if="file.Type==3">
@@ -961,7 +961,7 @@
 
           <div v-if="$route.query.Type==2||msg.Type==2">
             <p>{{$t('objFill.shangchuanfapiaofj')}}<span class="_addUpload_tips">{{$t('tips.wjdxbncgsz')}}</span><span class="_addUpload_tips" style="color:red;">{{$t('objFill.fapiaofujiants')}}</span></p>
- 
+
             <div class="_addUpload_box clearfix">
               <template v-for="(file,fIndex) in saveMsgInvoice">
                 <div v-if="file.Type==3">
@@ -2446,9 +2446,10 @@
 
             if (this.orderObj && this.orderObj.companyIDList && this.orderObj.companyIDList.length > 0) {
               this.msg.RB_Branch_Id = this.orderObj.companyIDList[0];
-            } else if (this.orderObj && (this.orderObj.RB_Branch_Id != '' && this.orderObj.RB_Branch_Id != null &&
-                this.orderObj.RB_Branch_Id != undefined)) {
-              this.msg.RB_Branch_Id = this.orderObj.RB_Branch_Id
+            } else if ((this.orderObj && (this.orderObj.RB_Branch_Id != '' && this.orderObj.RB_Branch_Id != null &&
+                this.orderObj.RB_Branch_Id != undefined))||(this.crmOrderObj && (this.crmOrderObj.RB_Branch_Id != '' && this.crmOrderObj.RB_Branch_Id != null &&
+                this.crmOrderObj.RB_Branch_Id != undefined))) {
+              this.msg.RB_Branch_Id = this.orderObj&&this.orderObj.RB_Branch_Id>=0?this.orderObj.RB_Branch_Id:this.crmOrderObj.RB_Branch_Id
             } else if (this.$route.query.companyID) {
               this.msg.RB_Branch_Id = parseInt(this.$route.query.companyID);
             }
@@ -2730,15 +2731,16 @@
                       if (x.Id == y) {
                         x.disabled = false;
                         if (num < 1 && !this.$route.query.edit) {
-                          if (this.orderObj && this.orderObj.RB_Branch_Id) {
-                            this.msg.RB_Branch_Id = this.orderObj.RB_Branch_Id
-                          } else {
+                          if ((this.orderObj && this.orderObj.RB_Branch_Id)||(this.crmOrderObj && this.crmOrderObj.RB_Branch_Id)) {
+                            this.msg.RB_Branch_Id = this.orderObj&&this.orderObj.RB_Branch_Id>=0?this.orderObj.RB_Branch_Id:this.crmOrderObj.RB_Branch_Id
+                          }else {
                             this.msg.RB_Branch_Id = x.Id
                           }
+
                         }
                         if (Id === x.Id && !this.$route.query.edit) {
-                          if (this.orderObj && this.orderObj.RB_Branch_Id) {
-                            this.msg.RB_Branch_Id = this.orderObj.RB_Branch_Id
+                          if ((this.orderObj && this.orderObj.RB_Branch_Id)||(this.crmOrderObj && this.crmOrderObj.RB_Branch_Id)) {
+                            this.msg.RB_Branch_Id = this.orderObj&&this.orderObj.RB_Branch_Id>=0?this.orderObj.RB_Branch_Id:this.crmOrderObj.RB_Branch_Id
                           } else {
                             this.msg.RB_Branch_Id = x.Id
                           }
@@ -2871,6 +2873,7 @@
       // crm自动登陆传过来的参数
       if (this.$route.query.crmOrderObj) {
         this.crmOrderObj = JSON.parse(this.$route.query.crmOrderObj);
+        if(this.crmOrderObj.id>=0)this.msg.TemplateId = this.crmOrderObj.id;
       } else if (this.$route.query.commissionObj) { //印象提成参数
         this.commissionObj = JSON.parse(this.$route.query.commissionObj);
       } else if (this.$route.query.tradeObj) { //同业参数
@@ -2950,9 +2953,10 @@
        this.msg.HelpBranchId=1218;
 
       }
-      if (this.orderObj && this.orderObj.RB_Branch_Id != '' && this.orderObj.RB_Branch_Id != null && this.orderObj
-        .RB_Branch_Id != undefined) {
-        this.RB_Branch_id = this.departmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id = this.orderObj.RB_Branch_Id;
+      if ((this.orderObj && this.orderObj.RB_Branch_Id != '' && this.orderObj.RB_Branch_Id != null && this.orderObj
+        .RB_Branch_Id != undefined)||(this.crmOrderObj && this.crmOrderObj.RB_Branch_Id != '' && this.crmOrderObj.RB_Branch_Id != null && this.crmOrderObj
+        .RB_Branch_Id != undefined)) {
+        this.RB_Branch_id = this.departmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id = this.orderObj&&this.orderObj.RB_Branch_Id>=0?this.orderObj.RB_Branch_Id:this.crmOrderObj.RB_Branch_Id;
       } else {
         this.RB_Branch_id = this.departmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id = userInfo.RB_Branch_id;
       }
@@ -2980,15 +2984,15 @@
             this.czmsgState = true;
           }
         }
-        this.msg.TemplateId = this.$route.query.id;
-        if (this.$route.query.id == 90 || this.$route.query.id == 91) {
+        if(this.$route.query.id>=0)this.msg.TemplateId = this.$route.query.id;
+        if (this.msg.TemplateId == 90 || this.msg.TemplateId == 91) {
           this.msg.IsPublic = 10;
         }
-        this.Financial_post_GetCostTypeList(this.$route.query.id);
+        this.Financial_post_GetCostTypeList(this.msg.TemplateId);
         this.BillName = userInfo.GroupName;
         this.BillSonName = this.$route.query.Name;
-        this.FinancialFlowTemplate_post_GetProcessList(this.$route.query.id);
-        this.Financial_post_Get(0, parseInt(this.$route.query.id));
+        this.FinancialFlowTemplate_post_GetProcessList(this.msg.TemplateId);
+        this.Financial_post_Get(0, parseInt(this.msg.TemplateId));
       }
       if (this.$route.query.Conditon) {
         this.returnCode = this.$route.query.Conditon;

src/components/dmc/manager/GroundSupplier/index.vue

@@ -558,7 +558,7 @@
         this.currentPage = 1;
         this.getPageList()
       },
-      handleCurrentChanges(){
+      handleCurrentChanges(val){
         this.msg.pageIndex = val;
         this.getPageList()
       },

src/components/sale/sale.vue

 <style lang="less" scoped>
   @import "../../assets/css/main.less";
   @import "../../assets/css/home/Saleshomepage_1920.css";
-
+  .HiddenNum{
+    position: relative;
+    top: 13px;
+  }
   .saleChartCont {
     width: 100%;
     height: 95%;
@@ -74,12 +77,19 @@
                         <div class="tc">
                           <p>
                             <span>￥</span>
-                            <span>{{data.totalCommission}}</span>
+                            <span :class="[isView?'':'HiddenNum']">{{isView?data.totalCommission:'***'}}</span>
+                            <div style="width: 20px;height: auto; position: absolute;right: -30px;top: 15px; cursor: pointer;color: #232323;"
+                            @click.stop="isView=!isView">
+                              <el-icon class="iconfont"
+                              :class="[isView?'icon-view':'icon-yincang']"
+                              ></el-icon>
+                            </div>
                           </p>
                           <p style="color: #BDBDBD;font-size: 13px;padding: 0 0 5px 0;">{{data.periodsName}}期<el-tag
                               v-if="data.peopelBonus" size="mini" type="danger" effect="dark"
-                              style="color: #ffff;position: absolute;left: 70px;bottom: 23px;font-size: 11px;">
-                              奖+{{data.peopelBonus}}</el-tag>
+                              style="color: #ffff;position: absolute;left: 70px;bottom: 23px;font-size: 11px;"
+                              :class="[isView?'':'HiddenNum']">
+                              奖+{{isView?data.peopelBonus:'***'}}</el-tag>
                           </p>
                         </div>
                         <div stye="font-size: 16px;color: #666666;display: block;display: inline-block;">
@@ -96,7 +106,7 @@
                         <div class="tc">
                           <p>
                             <span>￥</span>
-                            <span>{{data.gnSaleCommission}}</span>
+                            <span :class="[isView?'':'HiddenNum']">{{isView?data.gnSaleCommission:'***'}}</span>
                           </p>
                           <p style="color: #BDBDBD;font-size: 13px;padding: 0 0 5px 0;">{{data.gnPeriodsName}}期</p>
                         </div>
@@ -109,7 +119,7 @@
                         <div class="tc">
                           <p>
                             <span>￥</span>
-                            <span>{{data.dxSaleCommission}}</span>
+                            <span :class="[isView?'':'HiddenNum']">{{isView?data.dxSaleCommission:'***'}}</span>
                           </p>
                           <p style="color: #BDBDBD;font-size: 13px;padding: 0 0 5px 0;">{{data.dxPeriodsName}}期</p>
                         </div>
@@ -117,7 +127,6 @@
                           <span>历史单项提成</span>
                         </div>
                       </div>
-
                       <el-tooltip class="item" effect="dark" content="预期提成" placement="top">
                         <img src="../../assets/img/xiaosouYQ.png" @click="goAnticipate(4)"
                           style="width: 20px;height: auto; position: absolute;right: -0;top: -13px;cursor: pointer;color: #33B3FF;"></img>
@@ -590,6 +599,7 @@
   export default {
     data() {
       return {
+        isView: false,
         tichengDialog: false,
         PMMsg: {
           RB_Branch_Id: -1,
@@ -1031,4 +1041,4 @@
       this.Financial_post_GetNotDealCount(); //待处理财务单据的个数
     },
   }
-</script>
+</script>
\ No newline at end of file

src/components/temp/operation.vue

@@ -2,7 +2,10 @@
   @import "../../assets/css/main.less";
   /* @import "../../assets/css/cssReset.css"; */
   @import "../../assets/css/home/Saleshomepage_1920.css";
-
+  .HiddenNum{
+    position: relative;
+    top: 13px;
+  }
   .saleChartCont {
     width: 100%;
     height: 95%;
@@ -279,12 +282,19 @@
                         <div class="tc">
                           <p>
                             <span>￥</span>
-                            <span>{{data.OPCommission}}</span>
+                            <span :class="[isView?'':'HiddenNum']">{{isView?data.OPCommission:'***'}}</span>
+                            <div style="width: 20px;height: auto; position: absolute;right: -30px;top: 15px; cursor: pointer;color: #232323;"
+                            @click.stop="isView=!isView">
+                              <el-icon class="iconfont"
+                              :class="[isView?'icon-view':'icon-yincang']"
+                              ></el-icon>
+                            </div>
                           </p>
                           <p style="color: #BDBDBD;font-size: 13px;padding: 0 0 5px 0;">{{data.PeriodsName}}期<el-tag
                               v-if="data.PeopelBonus" size="mini" type="danger" effect="dark"
-                              style="color: #ffff;position: absolute;left: 70px;bottom: 23px;font-size: 11px;">
-                              奖+{{data.PeopelBonus}}</el-tag>
+                              style="color: #ffff;position: absolute;left: 70px;bottom: 23px;font-size: 11px;"
+                              :class="[isView?'':'HiddenNum']">
+                              奖+{{isView?data.PeopelBonus:'***'}}</el-tag>
                           </p>
                         </div>
                         <div stye="font-size: 16px;color: #666666;display: block;display: inline-block;">
@@ -296,7 +306,7 @@
                         <div class="tc">
                           <p>
                             <span>￥</span>
-                            <span>{{data.GNOPCommission}}</span>
+                            <span :class="[isView?'':'HiddenNum']">{{isView?data.GNOPCommission:'***'}}</span>
                           </p>
                           <p style="color: #BDBDBD;font-size: 13px;padding: 0 0 5px 0;">{{data.GNPeriodsName}}期</p>
                         </div>
@@ -309,7 +319,7 @@
                         <div class="tc">
                           <p>
                             <span>￥</span>
-                            <span>{{data.DXOPCommission}}</span>
+                            <span :class="[isView?'':'HiddenNum']">{{isView?data.DXOPCommission:'***'}}</span>
                           </p>
                           <p style="color: #BDBDBD;font-size: 13px;padding: 0 0 5px 0;">{{data.DXPeriodsName}}期</p>
                         </div>
@@ -609,6 +619,7 @@
   export default {
     data() {
       return {
+        isView: false,
         userInfo: {},
         isBranchCompany: false,
         isVisa: false,