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

src/components/SalesModule/Common/CustomerContactList.vue

@@ -70,18 +70,34 @@
         :label="$t('visaT.post')"
         show-overflow-tooltip>
     </el-table-column>
+    <el-table-column
+        prop=""
+        :label="$t('objFill.v102.appjihuozhuant')"
+        show-overflow-tooltip>
+        <template  slot-scope="scope">
+          <span :style="{'color':scope.row.IsActivation==1?'red':''}">
+            {{ scope.row.IsActivation==1?$t('objFill.v102.yijihuo'):$t('objFill.v102.weijihuo') }}
+          </span>
+        </template>
+      </el-table-column>
     <el-table-column
         prop=""
         :label="$t('hotel.table_operat')"
         show-overflow-tooltip>
         <template  slot-scope="scope">
-          <el-tooltip v-if="scope.row.CreateBy==EmployeeId" class="item" effect="dark" :content="$t('pub.edit')" placement="top-start">
-            <el-button @click.stop="EditContact(scope.row)" style="padding:4px" type="primary" icon="el-icon-edit" circle></el-button>
-          </el-tooltip>
-          <el-tooltip v-if="scope.row.CreateBy==EmployeeId" class="item" effect="dark" :content="$t('adm.adm_resetpd')" placement="top-start">
-            <el-button @click.stop="EditPassword(scope.row)" style="padding:4px" type="success" icon="el-icon-refresh" circle></el-button>
-          </el-tooltip>
-          <el-tooltip v-if="scope.row.IsActivation==0"  class="item" effect="dark" :content="$t('op.ShareInviteCode')" placement="top-start"  >
+          <div style="display: flex;flex-wrap: wrap;">
+            <div style="margin-right: 10px;">
+            <el-tooltip v-if="scope.row.CreateBy==EmployeeId" class="item" effect="dark" :content="$t('pub.edit')" placement="top-start">
+              <el-button @click.stop="EditContact(scope.row)" style="padding:4px" type="primary" icon="el-icon-edit" circle></el-button>
+            </el-tooltip>
+          </div>
+          <div style="margin-right: 10px;">
+            <el-tooltip v-if="scope.row.CreateBy==EmployeeId" class="item" effect="dark" :content="$t('adm.adm_resetpd')" placement="top-start">
+              <el-button @click.stop="EditPassword(scope.row)" style="padding:4px" type="success" icon="el-icon-refresh" circle></el-button>
+            </el-tooltip>
+          </div>
+          <div style="margin-right: 10px;">
+            <el-tooltip v-if="scope.row.IsActivation==0"  class="item" effect="dark" :content="$t('op.ShareInviteCode')" placement="top-start"  >
                 <el-popover width="180" trigger="click">
                   <div class="w150" v-loading="wxLoading">
                     <img style="
@@ -98,12 +114,19 @@
                       {{ $t("salesModule.XCX") }}
                     </p>
                   </div>
-                  <el-button slot="reference" type="primary" style="padding:4px " icon="iconfont icon-fenxiang" @click="getWxCode(scope.$index)" circle></el-button>
-                </el-popover>
+                  <el-button slot="reference" type="primary" style="padding:4px" icon="" @click="getWxCode(scope.$index)" circle>
+                  <i class="iconfont icon-fenxiang" style="font-size: 14px;"></i>
+                  </el-button>
+                </el-popover> 
               </el-tooltip>
-          <!-- <el-tooltip class="item" effect="dark" :content="$t('system.ph_shanchu')" placement="top-start">
+          </div>
+          <!-- <div>
+            <el-tooltip class="item" effect="dark" :content="$t('system.ph_shanchu')" placement="top-start">
             <el-button @click.stop="EditMsg(scope.row)" style="padding:4px" type="danger" icon="el-icon-delete" circle></el-button>
-          </el-tooltip> -->
+          </el-tooltip>
+          </div> -->
+          </div>
+          
         </template>
     </el-table-column>
   </el-table>

src/components/SalesModule/customerTransfer.vue

@@ -28,8 +28,8 @@
                 <!--class="h34 w150"-->
                 <el-form-item :label="$t('admin.admin_Department')">
                   <treeselect class="w200 fl" style="height:34px !important;margin-top: 5px !important"
-                    :options="departmentList" v-model="msg.RB_Department_Id" :label="$t('pub.unlimitedSel')"
-                    :normalizer="normalizer" @select="changeDepart" />
+                    :options="departmentList" v-model="msg.DepartmentId" :label="$t('pub.unlimitedSel')"
+                    :normalizer="normalizer" @select="changeDepart" placeholder="请选择部门" />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -670,6 +670,7 @@
     created() {
       this.userInfo = this.getLocalStorage();
       this.getCompanyMsg.RB_Group_Id = this.userInfo.RB_Group_id;
+      this.departmentMsg.RB_Group_Id = this.userInfo.RB_Group_id; //集团
       this.getCompanyList();
       if (this.$route.query.EnterTime) {
         this.EnterTime = this.$route.query.EnterTime
@@ -691,8 +692,10 @@
           this.msg.RB_Branch_id = Number(this.userInfo.RB_Branch_id);
         }
       }
+      this.getDepartment();
       if (this.$route.query.RB_Department_Id && Number(this.$route.query.RB_Department_Id) > 0) {
-        this.msg.RB_Department_Id = Number(this.$route.query.RB_Department_Id);
+        this.msg.DepartmentId= Number(this.$route.query.RB_Department_Id);
+        this.employeeMsg.departmentId = Number(this.$route.query.RB_Department_Id);
         this.getEmployee();
       }
       if (this.$route.query.EnterID && Number(this.$route.query.EnterID) > 0) {
@@ -705,8 +708,8 @@
         this.departState = true;
       }
       this.bossID = this.userInfo.EmployeeId;
-      this.departmentMsg.RB_Group_Id = this.userInfo.RB_Group_id; //集团
-      this.getDepartment();
+
+     
       this.getList();
       this.getCreateByInfoList();
       this.getProvince();

src/components/rank/dataCount.vue

@@ -19,7 +19,7 @@
             </el-select>
           </template>
           <treeselect style="margin-right: 20px;width:200px;" class="radius-input" :options="departmentList" v-model="parameters.RB_Department_Id"
-              :label="$t('pub.unlimitedSel')" :normalizer="normalizer"  @select="changeDepart" />
+              :label="$t('pub.unlimitedSel')" :normalizer="normalizer"  @select="changeDepart" placeholder="请选择部门" />
           <el-select
             v-model="parameters.empId"
             style="margin-right: 20px;height: 40px;"

src/components/rank/salesVolumeRank.vue

@@ -233,22 +233,23 @@
         let Time = [this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")), this.getBeforeDate(0, new Date().Format(
           "yyyy-MM-dd"))]
         let query = {};
+
         //客户总数
         if (type == 1) {
           query = {
             blank: "y",
-            RB_Branch_Id: this.msg.RB_Branch_Id,
-            RB_Department_Id: this.msg.RB_Department_Id,
-            EnterID: this.msg.EnterID,
+            RB_Branch_Id: item.BranchId,
+            RB_Department_Id: item.RB_Department_Id,
+            EnterID: item.EnterID,
           }
         }
         //今日新增 
         else if (type == 2) {
           query = {
             EnterTime: Time,
-            RB_Branch_Id: this.msg.RB_Branch_Id,
-            RB_Department_Id: this.msg.RB_Department_Id,
-            EnterID: this.msg.EnterID,
+            RB_Branch_Id: item.BranchId,
+            RB_Department_Id: item.RB_Department_Id,
+            EnterID: item.EnterID,
             blank: "y",
           }
         }
@@ -256,9 +257,9 @@
         else if (type == 3) {
           query = {
             activation: 1,
-            RB_Branch_Id: this.msg.RB_Branch_Id,
-            RB_Department_Id: this.msg.RB_Department_Id,
-            EnterID: this.msg.EnterID,
+            RB_Branch_Id: item.BranchId,
+            RB_Department_Id: item.RB_Department_Id,
+            EnterID: item.EnterID,
             blank: "y",
           }
         }
@@ -267,9 +268,9 @@
           query = {
             activationTime: Time,
             activation: 1,
-            RB_Branch_Id: this.msg.RB_Branch_Id,
-            RB_Department_Id: this.msg.RB_Department_Id,
-            EnterID: this.msg.EnterID,
+            RB_Branch_Id: item.BranchId,
+            RB_Department_Id: item.RB_Department_Id,
+            EnterID: item.EnterID,
             blank: "y",
           }
         }