update

src/components/SalesModule/CustomerAnalysis.vue

@@ -137,7 +137,7 @@
                     <div v-for="(item,index) in datainfo.LineIdList" :key="index+100" class="circleItem">
                         <div style="height:126px;position:relative">
                             <div class="Linetext">
-                                <p style="font-size:34px">{{Number(item.Total)}}<span style="font-size:14px">‰</span></p>
+                                <p style="font-size:34px">{{Number(item.Total)}}<span style="font-size:14px">%</span></p>
                                 <p style="font-size:14px">{{item.TypeName}}</p>
                             </div>
                             <el-progress :color="item.color" :show-text="false" type="circle" :stroke-width="16" :percentage="Number(item.Total)"></el-progress>

src/components/SalesModule/HappyPassbook.vue

@@ -108,7 +108,7 @@
                     <el-select filterable  v-model='msg.Type' placeholder="请选择">
                     <el-option label="不限" value='0'></el-option>
                     <el-option label='收入' value='1'></el-option>
-                    <el-option label='折扣' value='2'></el-option>
+                    <el-option label='抵扣' value='2'></el-option>
                 </el-select>
             </span>
         </li>
@@ -123,7 +123,6 @@
         <li>
             <span><em>公司</em>
                     <el-select filterable  v-model='msg.RB_Branch_Id' placeholder="请选择">
-                      <el-option label="不限" value=""></el-option>
                     <el-option
                       v-for="item in companyList"
                       :label="item.BName"
@@ -175,7 +174,7 @@
         <td>{{item.CustomerName}}({{item.Contact}})</td>
         
         <td>
-            <span>{{item.Type==1?"收入":"折扣"}}</span>
+            <span>{{item.Type==1?"收入":"抵扣"}}</span>
         </td>
         <td>{{item.Money}}</td>
         <td><span style="cursor:pointer" @click="Gourl(item)">{{item.TCNUM}}</span></td>
@@ -185,7 +184,7 @@
         
       </tr>
       <tr v-if='DataList.length==0'>
-          <td colspan="6" align="center">暂无数据</td>
+          <td colspan="7" align="center" style="text-align: center">暂无数据</td>
       </tr>
     </table>
     <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
@@ -239,10 +238,36 @@
 
       this.getList();
       this.getLineList();
-      this.getCompany();
+      this.getCompanyList();
       this.getEmployee();
     },
     methods: {
+      getCompanyList() {
+        let userInfo = this.getLocalStorage();
+        let RB_Group_id = userInfo.RB_Group_id;
+        let msg = {
+          Status: 0,
+          is_show: 0,
+          RB_Group_Id: RB_Group_id
+        }
+        this.apipost('admin_get_BranchGetList', msg, res => {
+          if (res.data.resultCode == 1) {
+            this.companyList = [{
+              Id: '-1',
+              BName: '不限'
+            }];
+            res.data.data.forEach(x => {
+              var obj = {
+                Id: '',
+                BName: ''
+              }
+              obj.Id = x.Id.toString();
+              obj.BName = x.BName;
+              this.companyList.push(obj);
+            })
+          }
+        }, err => {})
+      },
       Gourl(item){
      	   this.$router.push({ name:"groupTourOrderByTuan",query:{"id":item.TCID,"tcmun":item.TCNUM,blank: 'y'} })
       },
@@ -255,27 +280,14 @@
             }
                 }, null);
 			},
-      getCompany() {
-      this.apipost(
-        "admin_get_BranchGetList",
-        this.getCompanyMsg,
-        res => {
-          if (res.data.resultCode == 1) {
-              this.companyList = res.data.data;
-          } else {
-          }
-        },
-        err => {}
-      );
-    },
-      //获取线路列表
       getLineList() {
-        this.apipost("line_post_GetLineListExt", {}, res => {
+        this.apipost("line_post_GetAllList_V2", {LineDirection: 0}, res => {
           if (res.data.resultCode == 1) {
             this.LineList = res.data.data;
           }
         });
       },
+      
       getList() { //获取数据
       if(this.dateList){
           this.msg.StartTime=this.dateList[0];

src/components/SalesModule/MyCustomer.vue

@@ -7,7 +7,7 @@
      z-index: 50; bottom:0;left: 0;border-top:3px solid #38425d;background-color:#f9f9f9; padding: 10px;width: 100%;min-width: 1146px;}
     .page_MyCustomer .edHeightOne{display: block!important;height: 450px;}
     .page_MyCustomer ._mc_list{overflow-x: auto; background: #fff; padding-top: 20px; padding-left: 15px;}
-    .page_MyCustomer ._mc_list>ul>li{padding: 20px 20px 0 20px;width: 260px;box-sizing: border-box; height:370px;
+    .page_MyCustomer ._mc_list>ul>li{padding: 20px 20px 0 20px;width: 260px;box-sizing: border-box; height:386px;
     float: left;border: 1px solid #F1F2F5;background: #fff; margin-right:10px;margin-bottom: 20px; border-radius: 10px;  position: relative; cursor: pointer;}
     .page_MyCustomer ._mc_list>ul>li:hover{box-shadow:0px 0px 10px rgba(191,191,191,1);transition: all linear 0.3s;}
     .page_MyCustomer ._mc_list>ul>li .iconDelete{cursor: pointer; display: none; position: absolute; top: -4px; right: 0; color: #E95252; z-index: 5; }
@@ -77,8 +77,8 @@
 	display: inline-block;
 	border-radius: 4px;
 	font-size: 14px;
-	height: 23px;
-	line-height: 23px;
+	height: 38px;
+	line-height: 38px;
 	text-align: center;
 }
 </style>
@@ -136,19 +136,20 @@
                        <p class="_other" v-if="item.customerVisitList[1]">最近拜访：{{item.customerVisitList[1].visitDateTime}}</p>
                        <p class="_other" v-else>最近拜访：暂无</p>
                        <p class="_other">累计拜访：{{item.visiteCount}}</p>
+					   <p class="_fist_n">幸福存折 <span> {{item.cL_Balance}}</span></p>
                    </div>
                    <div class="_record" v-else>
                         <p class="_fist_n" v-if="item.customerVisitList.length>0">近期约访：{{item.customerVisitList[0].visitDateTime}}</p>
                         <p class="_fist_n" v-else>近期约访：暂无</p>
                         <p class="_other_n" v-if="item.customerVisitList[1]">最近拜访：{{item.customerVisitList[1].visitDateTime}}</p>
                         <p class="_other_n" v-else>最近拜访：暂无</p>
+						<p class="_fist_n">幸福存折 <span> {{item.cL_Balance}}</span></p>
                    </div>
                    <div class="_bt">
 					   <el-row :gutter="24">
 						   <el-col :span="18">
 							   <p>累计交易额度 <span> {{item.tradeTotal}}</span></p>
                         		<p>询价与需求 <span> {{item.inquireCount}}</span></p>
-                        		<p>幸福存折 <span> {{item.cL_Balance}}</span></p>
 						   </el-col>
 						   <el-col :span="6" style="text-align:right;padding:0">
 							   <span class="xqBtn" @click.stop="goUrC('CustomerAnalysis',item.customerId)">详情</span>