save

src/components/FinancialModule/FinancialDocuments.vue

@@ -1308,6 +1308,7 @@ import myGZBill from "./FinancialSubmodule/GZBillModule.vue";
 export default {
   data() {
     return {
+      isTerminate:-1,
       hbMsg: {
         FrIDList: [],
         Type: 1
@@ -1501,6 +1502,7 @@ export default {
     };
   },
   created() {
+    this.isTerminate = -1
     let userinfo = this.getLocalStorage();
     let ActionMenuCode = userinfo.ActionMenuCode;
     if (ActionMenuCode.indexOf("F_AccountantFinanceMerge") != -1) {
@@ -2110,17 +2112,6 @@ export default {
     },
     // 切换table栏
     getActive(active,Conditon,BOSSBtn){
-      // if(this.loading==true){
-      //   this.Error("当前正在请求，请稍后片刻切换!");
-      //   return
-      // }else{
-      //   this.active = active
-      //   this.msg.Conditon = Conditon
-      //   if(BOSSBtn){
-      //     this.BOSSBtn = false
-      //   }
-      //   this.getPageList(0,1)
-      // }
       this.active = active
       this.msg.Conditon = Conditon
       if(BOSSBtn){
@@ -2129,6 +2120,7 @@ export default {
       this.getPageList(0,1)
     },
     getPageList(t,active) {
+      this.isTerminate++
       // 获取列表数据
       this.loading = true;
       this.checkAllList = [];
@@ -2169,6 +2161,9 @@ export default {
         "Financial_post_GetPageList",
         this.msg,
         res => {
+          if (this.msg.Conditon == 7) {
+            this.getMyRejectFinanceCount();
+          }
           if (res.data.resultCode == 1) {
             let data = [];
             if (t == 1 && this.BOSSBtn && this.msg.Conditon == 3) {
@@ -2202,11 +2197,11 @@ export default {
           }
           // this.queryInfoInit();
         },
-        err => {}
+        err => {},
+        '',
+        this.isTerminate,
       );
-      if (this.msg.Conditon == 7) {
-        this.getMyRejectFinanceCount();
-      }
+      
     },
     financeRemove(id) {
       //作废

src/components/FinancialModule/OpCommission/OPCommissionDetail.vue

@@ -375,7 +375,7 @@
                   path: path,
                   query: {
                       PeriodId: this.$route.query.PeriodId,
-                      OutBranchId: item.RB_Branch_Id,
+                    //   OutBranchId: item.RB_Branch_Id,
                       UserId: item.EmployeeId,  
                       blank: 'y',
                       tab: '同业提现详情'
@@ -405,7 +405,7 @@
               let userInfo = this.getLocalStorage();
               msg.EmployeeIdUser = userInfo.EmployeeId
               var fileName = "OP提成分组表.xls";
-              this.GetLocalFile("opcommission_GetNewOPCommissionEmpListToExcel", this.msg, fileName);
+              this.GetLocalFile("opcommission_GetNewOPCommissionEmpListToExcel", msg, fileName);
           }
 
       }

src/components/FinancialModule/OpCommission/OpComPersonDetails.vue

@@ -113,7 +113,6 @@
                 <em>提成方式</em>
                 <el-select v-model="msg.Way" class="w200 HworkInput"
                 @change="handleCurrentChange(1)">
-                  <el-option label="不限" :value="-1"></el-option>
                   <el-option v-for="item in WayTypeList" :key="item.Id" :label="item.Name" :value="item.Id"></el-option>
                 </el-select>
               </li>
@@ -181,7 +180,7 @@
           <td style="width: 100px;">{{item.PeopleCount?item.PeopleCount:'-'}}</td>
           <td>{{item.TCProfit?item.TCProfit:'-'}}</td>
           <td>{{item.Way==1?'人头奖励':'利润比例'}}</td>
-          <td>{{item.Rate&&item.Way==2?item.Rate+'%':item.Rate&&item.Way==1?item.Rate+'':'-'}}</td>
+          <td>{{item.Rate&&item.Way==2?item.Rate+'%':item.Rate&&item.Way==1?item.Rate+'/人':'-'}}</td>
           <td>{{item.CommissionMoney?item.CommissionMoney:'-'}}</td>
           <td>{{item.PeriodsReissue}}</td>
           <td>{{item.Description?item.Description:'-'}}</td>

src/components/SalesModule/productQuery.vue

@@ -1919,7 +1919,7 @@
                     >客户名称：{{ item.CustomerName }}
                   </span>
                 </p>
-                <p v-if="item.PriceOfferUrl && item.PriceOfferUrl != ''">
+                <!-- <p v-if="item.PriceOfferUrl && item.PriceOfferUrl != ''">
                   <a
                     style="color: blue"
                     :href="item.PriceOfferUrl"
@@ -1927,7 +1927,7 @@
                     target="_blank"
                     >下载报价单</a
                   >
-                </p>
+                </p> -->
               </div>
             </div>
             <div class="d2">

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -2436,10 +2436,8 @@
       }
       let userInfo = this.getLocalStorage();
       let ActionMenuCode = userInfo.ActionMenuCode;
-      if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1
-      ||ActionMenuCode.indexOf('S_CheckAllOrder') != -1
-      ||ActionMenuCode.indexOf('F_Query_SelfBranch') != -1
-      ||ActionMenuCode.indexOf('F_Query_AllIncomPay') != -1){
+      // 查看团队收支明细权限
+      if (ActionMenuCode.indexOf('isIncomeExpenditure') != -1){
         this.isIncomeExpenditure = true
       }
       this.checkHasAuth();

src/plug/index.js

@@ -4,6 +4,7 @@ import co from 'co'
 import OSS from 'ali-oss'
 import MsgBus from '../assets/utils/msgBus'
 import routerConfig from '../router/config';
+import axios from 'axios'
 export default {
   data: {
     loginUser: {},
@@ -119,8 +120,13 @@ export default {
         let crmUrl = ""; //crm API
         let locationName = window.location.hostname;
         // domainUrl = "http://192.168.10.128";
+<<<<<<< HEAD
         // domainUrl = "http://192.168.10.9:8083" // 刘东电脑
          domainUrl = "http://192.168.10.226:8015";
+=======
+        domainUrl = "http://192.168.10.9:8083" // 刘东电脑
+        //  domainUrl = "http://192.168.10.226:8015";
+>>>>>>> 0174365330048ea2c9cbfd58a13172ca717c4acf
         // domainUrl = "http://reborn.oytour.com";
         let crmLocalFileStreamDownLoadUrl = "";
         crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";
@@ -252,7 +258,7 @@ export default {
       }
 
     //HTTP提交数据
-    Vue.prototype.apipost = function (cmd, msg, successCall, faildCall, isOnline) {
+    Vue.prototype.apipost = function (cmd, msg, successCall, faildCall, isOnline,isTerminate) {
         if (this.$route.name.indexOf('login') === -1 && this.$route.name.indexOf('clientConfirm') === -1 &&
           this.$route.name.indexOf('confirmationOrderDownLoad') === -1 && this.$route.name.indexOf('PrintPage') === -1 &&
           this.$route.name.indexOf('TravelContractConfirm') === -1 && this.$route.name.indexOf('ViittoContractConfirm') === -1 &&
@@ -334,6 +340,31 @@ export default {
           "sign": md5Str,
           "languageId": tempLanguage
         }
+        let pending = []; //声明一个数组用于存储每个请求的取消函数和axios标识
+        let cancelToken = axios.CancelToken;
+        let removePending = (config) => {
+          for(let p in pending){
+            if(pending[p].u === config.url + '&' + config.method) { //当当前请求在数组中存在时执行函数体
+            pending[p].f(); //执行取消操作
+            pending.splice(p, 1); 
+            }
+          }
+        }
+        // 我的财务单防止多次请求导致数据混乱
+        if(isTerminate>0){
+          this.$http.interceptors.request.use(config => {
+              removePending(config); //在一个axios发送前执行一下取消操作
+              config.cancelToken = new cancelToken((c)=>{
+                // 这里的axios标识我是用请求地址&请求方式拼接的字符串，当然你可以选择其他的一些方式
+                pending.push({ u: config.url + '&' + config.method, f: c }); 
+              });
+              
+              return Promise.resolve(config)
+            
+           }, error => {
+            return Promise.reject(error)
+           })
+        }
         this.$http.post(apiurl, postData, {
             headers: {
               'Content-Type': 'application/json',
@@ -351,6 +382,9 @@ export default {
               successCall(res);
             }
           }, faildCall)
+          
+          
+
       },
       // CRM接口
       Vue.prototype.crmapipost = function (cmd, msg, successCall, faildCall, isOnline) {