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

src/components/FinancialModule/BasicDocuments.vue

@@ -328,7 +328,7 @@
                 
                 <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" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">提成详情</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>
@@ -1507,16 +1507,17 @@ export default {
             
 
             },
-        Gourl(){
+        Gourl(GetDetail){
             this.$router.push({
-                name: 'CommissionManagement',
+                name: 'CommissionDetail',
                 query: { 
+                    periods:GetDetail.Periods,
+                    companyID:GetDetail.RB_Branch_Id,
                     blank: "y", 
-                    tab: "提成管理" 
+                    tab: "提成详情" 
                 }
             });
-
-            },
+        },
         // 单选计算
         checkdIteam(item){
             if (item.checked) {

src/components/LeaderManagement/leaderStateDetails.vue

@@ -164,25 +164,24 @@
       </div>
       <input type="button" class="hollowFixedBtn backBtn" @click="goUrl('leaderManagement')" :value="$t('pub.returnBack')" />
     </div>
-    <div class="mainInfo" :class="{'hidDiv':isShow}" v-loading="loading">
-      <div class="infoTitle">
-        <span>购物店</span>
-        <span>{{$t('ground.jindianriqi')}}</span>
-        <span>{{$t('ground.guanliantuanhao')}}</span>
-        <span>提成</span>
-      </div>
-      <div class="listInfo" v-for="item in DataList" :key="item.subCode">
-        <span style="width:200px;">{{item.ShopName}}</span>
-        <span style="width:200px;">{{item.StoreTime}}</span>
-        <span style="width:200px;">{{item.TCNUM}}({{item.TCID}})</span>
-        <span class="totalPrice" style="width:200px;">
-          ￥{{item.LeaderCommission}}
-        </span>
-      </div>
-      <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
-        layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
-      </el-pagination>
-    </div>
+    
+    <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
+      <tr>
+        <th width="25%">购物店</th>
+        <th width="25%">进店日期</th>
+        <th width="25%" >关联团号</th>
+        <th width="25%">提成</th>
+      </tr>
+      <tr v-for="item in DataList" :key="item.subCode">
+        <td>{{item.ShopName}}</td>
+        <td>{{item.StoreTime}}</td>
+        <td>{{item.TCNUM}}({{item.TCID}})</td>
+        <td>￥{{item.LeaderCommission}}</td>
+      </tr>
+    </table>
+    <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
+      layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
+    </el-pagination>
     <div class="statistical" :class="{'disDiv':isShow}">
       <div class="charts">
         <el-col :span='24'>
@@ -201,7 +200,7 @@
       return {
         msg: {
           pageIndex: 1,
-          pageSize: 10,
+          pageSize: 15,
           LeaderID: "",
           Type: 0
         },

src/components/SalesModule/CustomerCertification.vue

@@ -150,8 +150,11 @@
         <th width="10%">{{$t('admin.admin_address')}}</th>
         <th width="10%">{{$t('salesModule.belongUnion')}}</th>
         <th width="10%">{{$t('salesModule.ApplyTime')}}</th>
-        <th width="10%">{{$t('salesModule.ApplyStatus')}}</th>
+        <th width="10%">{{$t('fnc.shzhuangtai')}}</th>
+         <th width="10%">{{$t('ground.glxiaoshou')}}</th>
+           <th width="10%">{{$t('pub.mbPhoneNum')}}</th>
         <th width="10%">{{$t('system.table_operation')}}</th>
+        
       </tr>
       <tr>
         <td colspan="9" align="center" v-show="list.length==0">{{$t('system.content_noData')}}</td>
@@ -169,6 +172,8 @@
           <span v-if="item.ApplyState == 1||item.ApplyState === 3" class="_status_str _status_str_g">{{$t('fnc.ytongguo')}}</span>
           <span v-if="item.ApplyState === 2" class="_status_str _status_str_r">{{$t('salesModule.HasRefused')}}</span>
         </td>
+          <td>{{item.SellName}}</td>
+        <td>{{item.SellPhone}}</td>
         <td>
           <input
             type="button"

src/components/SalesModule/customerTransfer.vue

@@ -483,6 +483,7 @@ export default {
         CreateBy: "-1",
         DepartmentId: "-1",
         Brand:-1,
+        allDepartment:0,
       },
       RecipientMsg: {
         CustomerIdArr: [],
@@ -980,6 +981,9 @@ export default {
     },
     getList() {
       this.loading = true;
+       if(this.departState){
+        this.msg.allDepartment=1
+      }
       this.apipost(
         "app_customer_GetCustomerListForCareOf",
         this.msg,
@@ -1015,6 +1019,7 @@ export default {
       let msg={};
       if(this.departState){
         msg={allDepartment:1};
+        this.msg.allDepartment=1
       }
       this.apipost(
         "Advertising_get_GetNowDepartmentAndSubordinate",msg,