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

src/components/SalesModule/groupTourOrder.vue

@@ -1511,7 +1511,7 @@
           <th width="200">操作</th>
         </tr>
         <tr>
-          <td v-show="list.length==0" colspan="17" align="center">暂无数据</td>
+          <td v-show="list.length==0" colspan="18" align="center">暂无数据</td>
         </tr>
         <tbody v-for="(item,index) in list" :key="index">
           <tr>

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -445,7 +445,7 @@
                           <div>{{fItem.FlightArrivalTime}} {{fItem.Arrival_time}}</div>
                           <div style="margin-top:5px;">({{fItem.AIATA}}){{fItem.aName}}</div>
                         </td>
-                        <td>({{fItem.StopoverIATA}}){{fItem.StopoverName}}</td>
+                        <td><template v-if="fItem.StopoverIATA">({{fItem.StopoverIATA}})</template>{{fItem.StopoverName}}</td>
                       </tr>
                     </table>
                     <div class="FlightDiv-TCL" slot="reference">

src/components/personalCenter.vue

@@ -23,12 +23,12 @@
           <span class="k">所属部门</span>
           <span class="v">{{u.DepartName}}</span>
         </div>
-        <div class="item">
+        <!-- <div class="item">
           <span class="k">工作年限</span>
           <span class="v">
             <span style="font-size:22px">2年</span> (900天)
           </span>
-        </div>
+        </div> -->
       </div>
       <div class="n-info">
         <div class="item" @click="changeBoard(0)">

src/components/personalCenter/newpersonal.vue

 <template>
   <div class="newpersonal-c">
     <div class="item" v-for="(item, index) in users" :key="index">
-      <img :src="item.EmPhoto" :onerror='defaultHeadImg'/>
+      <img :src="item.emPhoto" :onerror="defaultHeadImg" />
       <div class="content">
         <div class="name-box">
-          {{item.EmName}}
+          {{item.emName}}
           <i class="iconfont icon-nan nan"></i>
-          <el-tag size="mini" style="margin-left:10px">{{item.PostName}}</el-tag>
+          <el-tag size="mini" style="margin-left:10px">{{item.postName}}</el-tag>
         </div>
-        <div class="last-msg">{{item.CompanyName}} · {{item.DepartmentName}} · 6月3日入职</div>
+        <div class="last-msg">{{item.companyName}} · {{item.departmentName}} · {{emEntryStr}}入职</div>
       </div>
-      <i class="iconfont icon-chat send-msg" title="认识一下"></i>
+      <i class="iconfont icon-chat send-msg" title="认识一下" @click="openChart(item)"></i>
     </div>
   </div>
 </template>
 <script>
 export default {
-  props:{
-    users:{
-      type:Array,
-      default:[]
+  props: {
+    users: {
+      type: Array,
+      default: []
     }
   },
   data() {
     return {
       defaultHeadImg:
-        'this.src="' + require("../../assets/img/default_head_img.jpg") + '"',
-    }
-  },
-  mounted() {
-    
+        'this.src="' + require("../../assets/img/default_head_img.jpg") + '"'
+    };
   },
+  mounted() {},
   methods: {
-    
-  },
+    openChart(obj) {
+      this.MsgBus.$emit("openChat", {
+        account: obj.emLoginMobile,
+        alias: obj.emName,
+        avatar: obj.emPhoto
+      });
+    }
+  }
 };
 </script>
 <style scoped>
 .newpersonal-c {
   margin-top: 0px;
   height: 204px;
-  overflow-y:auto;
+  overflow-y: auto;
 }
 .newpersonal-c .item {
   padding: 12px 30px;

src/components/visualization/dailyAnalysis.vue

@@ -76,7 +76,7 @@
           <div class="sq-block-left"></div>
           <div class="t">订单来源占比</div>
           <div class="c">
-            <pingtai :data="result.OrderJoinTypeRatioList"></pingtai>
+            <pingtai :data="result.OrderFormRatioList"></pingtai>
           </div>
         </div>
         <div class="item-box" style="width:346px;">