Merge branch 'master' of http://gitlab.oytour.com/huaguohao/crm

src/App.vue

@@ -9,9 +9,14 @@ export default {
     return {};
   },
   mounted() {
-    let getData = JSON.stringify(this.$route.query)
-    getData = JSON.parse(getData)
-    getData = getData&&JSON.parse(getData.erpOrderObj)
+    let getData
+    if(this.$route.query){
+      getData = JSON.stringify(this.$route.query)
+      getData = JSON.parse(getData)
+      if(getData.erpOrderObj){
+        getData = JSON.parse(getData.erpOrderObj)
+      }
+    }
     if (!this.getLocalStorage()&&!getData) {
       this.$router.push({
         path: "/login",

src/assets/css/login2019.css

-.newSummaryLogin .item img {
-  width: 100%;
-}
-.login_Div {
-  background: #fff;
-  padding: 60px 0 20px 0;
-  box-sizing: border-box;
-  height: 100%;
-  width: 60%;
-  margin: 0 auto;
-}
-.newSummaryLogin .error-msg{
-  color:#cccccc;
-  font-size:12px;
-  text-align: left;
-  width:300px;
-  margin:0 auto 0;
-  height:20px;
-  padding-left: 16px;
-}
-.newSummaryLogin .error-msg img{
-  position:relative;
-  top:3px;
-  margin:0 10px 0 5px;
-}
-
-.login_Div .sumMainTitle{
-   font-size:28px;
-   padding-top: 40px;
-   color:#333;
-   margin-bottom:40px;
-   font-weight:bold;
-}
-.login_Div .littTitle{
-   font-size:18px;
-   color:#333333;
-}
-.login_Div .icon-login-name, .login_Div .icon-login-password{
-  width:16px;
-  height:15px;
-  display:inline-block;
-  position:absolute;
-  top:10px;
-  color: #000000
-}
-
-.login_Div .login-commonBotm{
-   width: 100%;
-   position:relative;
-   margin:10px auto 0 0;
-}
-.login_Div .login-commonBotm img{
-   float:left;
-   margin-top:14px;
-}
-.login_Div input.input{
- width: 100%;
- height:40px;
- outline:none;
- padding-left: 30px;
- border:none;
- border-bottom: 1px solid #CCCCCC;
- color: #333333;
- caret-color:#E95252;
-}
-.login_Div input::-webkit-input-placeholder {
-  color: #999999;
-  font-size: 12px;
-}
-.newSummaryLogin .sumPhone{width:100%;text-align:center;color:#333;margin-bottom:10px;}
-
-.login_Div input:-webkit-autofill , .login_Div textarea:-webkit-autofill, .login_Div select:-webkit-autofill {  
-  -webkit-text-fill-color: #ededed !important;  
-  -webkit-box-shadow: 0 0 0px 1000px transparent  inset !important;  
-  background-color:transparent;  
-  background-image: none;  
-  transition: background-color 50000s ease-in-out 0s; 
-}  
-.login_Div .sLoginBtn{
- margin-top:30px;
- width: 100%;
- height:40px;
- background:#EE4454;
- border-radius:4px;
- outline:none;
- border:none;
- color:#fff;
- transition: all linear 0.5s;
-}
-.login_Div .sLoginBtn:hover{
- opacity:.8;
- cursor:pointer;
- background-color: #E95252;
- color: #FFFFFF
-}  
-.login_Div .validatCode{
-    color:#333333;
-}
-.newSummaryLogin .msgTips p{
-    color:#333333!important;
-}
-.newSummaryLogin .msgTips p, .newSummaryLogin .msgTips h2{
-  color:#333333!important;
-}
-.newSummaryLogin .bindTitle{margin-bottom:10px;}
-.newSummaryLogin .changeBtn{
-  margin-top:10px;
-}
-.login-box .forgetPw{
-  /* width:300px; */
-  height:40px;
-  display: flex;
-  justify-content: space-between;
-  margin:auto;
-  color:#999999;
-  font-size:12px;
-  text-align: right;
-  line-height: 40px;
-}
-.forgetPw span{
-  cursor: pointer;
-}
-.newSummaryLogin .login-box .forgetPw span:hover{
-  color: #E95252;
-}
-.newSummaryLogin .login-way{
-  width:300px;
-  height:40px;
-  margin:25px auto;
-  font-size:12px;
-  color:#CCCCCC;
-  display: none;
-  line-height:40px;
-}
-.newSummaryLogin .wayLeft{
-  float:left;
-}
-.newSummaryLogin .icon-login-qqicon{
-  width:16px;
-  height:15px;
-  display:inline-block;
-  position:relative;
-  top:3px;
-  background:url(../img/qqIco.png) no-repeat;
-}
-.newSummaryLogin .icon-login-wechaticon{
-  width:19px;
-  height:15px;
-  display:inline-block;
-  position:relative;
-  top:3px;
-  background:url(../img/wechatIco.png) no-repeat;
-}
-.newSummaryLogin .wayRight{
-  float:right;
-}
-.newSummaryLogin .validatCode{
-  position: absolute;
-  right:0;
-  top:13px;
-  padding-left:10px;
-  color:#333;
-  font-size:12px;
-  letter-spacing: 2px;
-  border-left:1px solid #cccccc;
-}
-.newSummaryLogin .validatCode span:first-child{cursor: pointer;}
-.newSummaryLogin .btValidate{
-margin-top:30px;
-}
-.newSummaryLogin .login_elephant{
-position: absolute;
-left:-15px;
-top:-80px;
-}
-.newSummaryLogin .homepage-hero-module,
-.video-container {
-  position: relative;
-  height: 100vh;
-  overflow: hidden;
-}
-.newSummaryLogin .name_bline_left{position: absolute;right: 50%;bottom: 0;width: 0;height: 2px;background-color: #E95252;transition: all linear 0.5s;}
-.newSummaryLogin .name_bline_right{position: absolute;left: 50%;bottom: 0;width: 0;height: 2px;background-color: #E95252;transition: all linear 0.5s;}
-.newSummaryLogin .pwd_bline_left{position: absolute;right: 50%;bottom: 0;width: 0;height: 2px;background-color: #E95252;transition: all linear 0.5s;}
-.newSummaryLogin .pwd_bline_right{position: absolute;left: 50%;bottom: 0;width: 0;height: 2px;background-color: #E95252;transition: all linear 0.5s;}
-.newSummaryLogin .login-Div input:-webkit-autofill , .login-Div textarea:-webkit-autofill, .login-Div select:-webkit-autofill {  
-  -webkit-text-fill-color: #ededed !important;  
-  -webkit-box-shadow: 0 0 0px 1000px transparent  inset !important;  
-  background-color:transparent;  
-  background-image: none;  
-  transition: background-color 50000s ease-in-out 0s; 
-}  
-.newSummaryLogin ._bline_w{width: 50%;}

src/components/clueManagement/clueManagement.vue

@@ -109,7 +109,7 @@
                 :height="sceneList.length > 0 ? '600' : '660'" border row-class-name="font-size-12"
                 @selection-change="handleSelectionChange">
                 <el-table-column fixed type="selection" width="40"></el-table-column>
-                <el-table-column prop="ClueState" label="线索状态" show-overflow-tooltip>
+                <el-table-column prop="ClueState" label="线索状态" show-overflow-tooltip width="80">
                     <template slot-scope="scope">
                         <template v-if="scope.row.ClueState==1">
                             正常
@@ -126,14 +126,14 @@
                     </template>
                 </el-table-column>
                 <el-table-column prop="CustomerSourceTypeStr" label="线索来源" v-if="queryType[1].show"
-                    show-overflow-tooltip>
+                    show-overflow-tooltip width="80">
                 </el-table-column>
                 <!--CustomerSource其他的来源 -->
                 <el-table-column prop="SourceAccountName" label="来源细分"
                     v-if="queryType[2].show && msg.CustomerType === 1" show-overflow-tooltip>
                 </el-table-column>
                 <el-table-column prop="ClueDemand" label="需求" v-if="queryType[3].show && msg.CustomerType === 1"
-                    show-overflow-tooltip>
+                    show-overflow-tooltip width="260">
                 </el-table-column>
                 <el-table-column prop="CustomerLevelStr" label="客户级别" sortable width="100"
                     v-if="queryType[4].show && msg.CustomerType === 0" show-overflow-tooltip>
@@ -142,7 +142,7 @@
                     show-overflow-tooltip>
                 </el-table-column>
                 <el-table-column prop="CustomerName" label="联系人" v-if="queryType[5].show&&msg.CustomerType===1"
-                    show-overflow-tooltip>
+                    show-overflow-tooltip width="100">
                 </el-table-column>
                 <el-table-column prop="ContactNumber" label="联系电话" sortable v-if="queryType[6].show"
                     show-overflow-tooltip>
@@ -152,9 +152,9 @@
                     show-overflow-tooltip>
                 </el-table-column>
                 <el-table-column prop="PersonChargeStr" label="负责人" sortable
-                    v-if="queryType[8].show && msg.CustomerType === 1" show-overflow-tooltip>
+                    v-if="queryType[8].show && msg.CustomerType === 1" show-overflow-tooltip width="90">
                 </el-table-column>
-                <el-table-column prop="CreateByStr" label="创建人" sortable v-if="queryType[9].show" show-overflow-tooltip>
+                <el-table-column prop="CreateByStr" label="创建人" sortable v-if="queryType[9].show" show-overflow-tooltip width="90">
                 </el-table-column>
                 <el-table-column prop="UpdateTime" label="上次更新时间" sortable v-if="queryType[10].show"
                     show-overflow-tooltip>

src/views/automaticLogin.vue

 <style>
-  /* @import "../assets/css/login2019.css"; */
   .Autologin{
     position: fixed;
     left: 0;