Merge remote-tracking branch 'origin/master'

portal-manager-ui/admin/src/views/dataAdmin/components/fillRecordReport/fillForm.vue

@@ -18,7 +18,7 @@
                             按材料
                         </a-select-option>
                     </a-select>
-                    <a-input style="width:74.3%" v-model="searchName" placeholder="请输入评价人姓名或窗口编号搜索">
+                    <a-input style="width:73%" v-model="searchName" placeholder="请输入评价人姓名或窗口编号搜索">
                         <a-icon slot="prefix" type="search" />
                     </a-input>
                 </a-input-group>

portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/components/workpeopleInfo.vue

@@ -15,7 +15,7 @@
               <span><i class="lable">所属部门：</i>{{ infoData.deptName || "--" }}</span>
               <span><i class="lable">政治面貌：</i>{{ $codeMap.politicalStatus[infoData.politicalstatus] || "--" }}</span>
               <span><i class="lable">电话：</i>{{ infoData.mobile || "--" }}</span>
-              <span><i class="lable">星级：</i>{{ infoData.starlevel || "--" }}</span>
+              <span><i class="lable">星级：</i>{{ infoData.starlevel +'星' || "--" }} </span>
             </div>
           </div>
         </div>

portal-manager-ui/admin/src/views/dataAdmin/components/sampleRecordReport/sampleForm.vue

@@ -18,7 +18,7 @@
                             按材料
                         </a-select-option>
                     </a-select>
-                    <a-input style="width:74.2%" v-model="searchName" placeholder="请输入评价人姓名或窗口编号搜索">
+                    <a-input style="width:73%" v-model="searchName" placeholder="请输入评价人姓名或窗口编号搜索">
                         <a-icon slot="prefix" type="search" />
                     </a-input>
                 </a-input-group>