Merge branch 'bonus-jyy-smart-canteen' of http://192.168.0.75:3000/bonus/bonus-ui into bonus-jyy-smart-canteen

src/views/canteen/healthCenter/examinationReport/index.vue

@@ -200,8 +200,8 @@
                         <td><el-input
                           v-model="itme.result"
                           placeholder="请输入结果"
-                          maxlength="5"
-                          show-word-limit
+                          maxlength="10"
+
                         /></td>
                         <td>{{itme.medicalProjectDetailUnit}}</td>
                       </tr>
@@ -229,7 +229,7 @@
                         <td style="width:12% ;">所属组织</td>
                         <td style="width:48% ;" colspan="4">{{personData.orgFullName}}</td>
                         <td style="width:12% ;">用户类别	</td>
-                        <td style="width:24% ;" colspan="2">{{personData.userType}}</td>
+                        <td style="width:24% ;" colspan="2">{{personData.userType==1?'其它':'系统'}}</td>
                       </tr>
                       <tr>
                         <td style="width:12% ;">用户手机号	</td>

src/views/canteen/healthCenter/healthRecords/index.vue

@@ -121,7 +121,7 @@
                     <tr >
                       <td  class="table-label"><i  class="text-red">*</i> <span >所属组织</span></td>
                       <td  class="table-content"><span >{{form.orgFullName}}</span></td>
-                      <td  class="table-label"><span >用户类别2</span></td>
+                      <td  class="table-label"><span >用户类别</span></td>
                       <td  class="table-content"><span >{{form.userType==1?'其它':'系统'}}</span></td>
                     </tr>
                     <tr >