Merge remote-tracking branch 'origin/master'

public/css/list.scss

@@ -109,5 +109,5 @@
   }
 }
 .positionTop{
-  //top: 3rem;
+  top: 3rem;
 }
\ No newline at end of file

src/components/mobile/searchList.vue

@@ -48,7 +48,9 @@
             </ul>
         </mt-loadmore>
         <noData v-if="hasData" :nodata="true"></noData>
-        <selectScreen v-if="isVisible" @active="groupdata"></selectScreen>
+        <selectScreen v-if="isVisible&&$route.query.tab==2||isVisible&&isMargin" @active="groupdata"></selectScreen>
+        <selectScreenProject v-if="isVisible&&$route.query.tab==1" @active="groupdataProject"></selectScreenProject>
+
     </div>
 </template>
 
@@ -56,11 +58,13 @@
     import api from '../../views/bigbusiness/api/api';
     import noData from '../../views/mobile/searchempty';
     import selectScreen from '../../views/mobile/selectScreen'
+    import selectScreenProject from '../../views/mobile/proselectScreen'
     export default {
         name: "searchList",
         components:{
             noData,
-            selectScreen
+            selectScreen,
+            selectScreenProject
         },
         props:{
             isMargin:{
@@ -79,6 +83,7 @@
                 allLoaded:false,
                 flags:false,
                 stateData:{},
+                stateProjectData:{},
                 fullscreenLoading:false,
                 whichTab:0,
                 isSelect:false,
@@ -91,8 +96,14 @@
                 this.stateData = val;
                 this.page = 1;
                 this.fullscreenLoading = true;
-                if(this.$route.query.tab==1) this.getProjectList();
-                else if(this.$route.query.tab==2||this.isMargin) this.getInitList();
+                this.getInitList();
+            },
+
+            groupdataProject(val){
+                this.stateProjectData = val;
+                this.page = 1;
+                this.fullscreenLoading = true;
+                this.getProjectList();
             },
 
             isScreenVisible(data){
@@ -101,14 +112,14 @@
 
             getProjectList(param){
                 if(!this.isMargin){
-                    this.stateData.context = window.sessionStorage.getItem("keyword")?window.sessionStorage.getItem("keyword"):undefined;
+                    this.stateProjectData.context = window.sessionStorage.getItem("keyword")?window.sessionStorage.getItem("keyword"):undefined;
                 }
                 let params = {
                     pagination:{
                         numberOfPages:this.page,
                         number:this.pageSize
                     },
-                    search: this.stateData
+                    search: this.stateProjectData
                 };
                 this.fullscreenLoading = true;
                 api.selectProjectAxios(params).then(res => {

src/views/mobile/loginregister/emCodeCmpt.vue

@@ -26,7 +26,7 @@
             </el-form-item>
             <el-form-item v-if="showMessageInfo" class="message-item">
                 <el-tag
-                        class="tagWidth320px"
+                        class="tagWidth320px" style="white-space: unset;height: auto;line-height:.3rem;padding: .2rem 0;"
                         :type="messageObj.type"
                 >
                     {{ messageObj.message }}

src/views/mobile/loginregister/emRegister.vue

@@ -22,7 +22,7 @@
         </el-form-item>
 
         <el-form-item v-if="showMessageInfo" class="message-item" style="text-align: left;">
-            <el-tag class="tagWidth320px"
+            <el-tag class="tagWidth320px" style="white-space: unset;height: auto;line-height:.3rem;padding: .2rem 0;"
                     :type="messageObj.type"
             >
                 {{ messageObj.message }}

src/views/mobile/loginregister/phoneCodeCmpt.vue

@@ -21,7 +21,7 @@
             </el-form-item>
             <el-form-item v-if="showMessageInfo" class="message-item">
                 <el-tag
-                        class="tagWidth320px"
+                        class="tagWidth320px" style="white-space: unset;height: auto;line-height:.3rem;padding: .2rem 0;"
                         :type="messageObj.type"
                 >
                     {{ messageObj.message }}

src/views/mobile/loginregister/phoneRegister.vue

@@ -19,7 +19,7 @@
         </el-form-item>
 
         <el-form-item v-if="showMessageInfo" class="message-item" style="text-align: left;">
-            <el-tag class="tagWidth320px"
+            <el-tag class="tagWidth320px" style="white-space: unset;height: auto;line-height:.3rem;padding: .2rem 0;"
                     :type="messageObj.type"
             >
                 {{ messageObj.message }}

src/views/mobile/proselectScreen.vue

@@ -194,6 +194,7 @@
             this.projectstateSet();
             this.cooperationwaySet();
             this.selectBigBusinessLevelOneSet();
+            this.resetClik();
         }
 
     }

src/views/mobile/searchRecord.vue

@@ -12,9 +12,7 @@
                 </li>
             </ul>
         </div>
-        <div class="moreWrap">
-            <searchList :isWhich="currentIndex" :isVisible="isShow" @sendBusinessCountFunc="getBusinessCountFunc" @sendProjectCountFunc="getProjectCountFunc" ref="searchList"></searchList>
-        </div>
+        <searchList :isWhich="currentIndex" :isVisible="isShow" @sendBusinessCountFunc="getBusinessCountFunc" @sendProjectCountFunc="getProjectCountFunc" ref="searchList"></searchList>
     </div>
 </template>
 

src/views/sendMessage/pages/sendMsg.vue

@@ -42,7 +42,7 @@
                             </el-select>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="7" v-if="ruleForm.receiverType=='RT007'">
+                    <el-col :span="7" v-if="ruleForm.receiverType=='RT007'&&ruleForm.orgId">
                         <el-form-item prop="empType">
                             <el-select v-model="ruleForm.empType"
                                        :placeholder="$t('sendMessage.sendForm.placeholderType')">