Merge branch '20200710_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20200710_pc_vue_new_branch

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyOne.vue

@@ -179,7 +179,7 @@
                     <td width="150">
                       <div class="under-line">
                         &nbsp;
-                         <span>{{ predialysis.skin ? getHemorrhage(predialysis.skin) : '' }}</span>
+                         <span>{{ predialysis.skin_other ? predialysis.skin_other : '' }}</span>
                       </div>
                     </td>
                     <td></td>
@@ -202,9 +202,9 @@
                         &nbsp;
                         <label-box :isChecked="predialysis.is_hemorrhage == 1 && predialysis.hemorrhage.indexOf('消化道出血') > -1 ? true : false" showValue="消化道出血"></label-box>
                         &nbsp;
-                        <label-box :isChecked="predialysis.is_hemorrhage == 1 && predialysis.hemorrhage.indexOf('穿刺') > -1 ? true : false" showValue="穿刺"></label-box>
+                        <label-box :isChecked="predialysis.is_hemorrhage == 1 && predialysis.hemorrhage == '穿刺' ? true : false" showValue="穿刺"></label-box>
                         &nbsp;
-                        <label-box :isChecked="predialysis.is_hemorrhage == 1 && predialysis.hemorrhage.indexOf('渗血') > -1 ? true : false" showValue="渗血"></label-box>
+                        <label-box :isChecked="predialysis.is_hemorrhage == 1 && predialysis.hemorrhage == '渗血' ? true : false" showValue="渗血"></label-box>
                         &nbsp;
                         <label-box :isChecked="predialysis.is_hemorrhage == 1 && predialysis.hemorrhage.indexOf('女性经期') > -1 ? true : false" showValue="女性经期"></label-box>
                         
@@ -213,10 +213,10 @@
                     </td>
 
                     <td width="35">其它</td>
-                    <td width="80">
+                    <td width="200">
                       <div class="under-line">
                         &nbsp;
-                        <span v-if="predialysis.is_hemorrhage == 1">{{ predialysis.hemorrhage && ['穿刺','牙龈出血','消化道出血','女性经期','渗血'].indexOf(predialysis.hemorrhage) == -1 ? predialysis.hemorrhage : '' }}</span>
+                        <span v-if="predialysis.is_hemorrhage == 1">{{ predialysis.hemorrhage ? getHemorrhage(predialysis.hemorrhage) : '' }}</span>
                       </div>
                     </td>
                     <td></td>
@@ -1152,15 +1152,15 @@ export default {
      getHemorrhage(hemorrhage){
       if(hemorrhage.indexOf(',') == -1){
         let str = hemorrhage
-        if(['完整','干燥','瘙痒','脱屑','菲薄','水肿'].indexOf(str) == -1){
+        if(['无','牙龈出血','消化道出血','穿刺','渗血','女性经期'].indexOf(str) == -1){
           return str
         }
       }else if(hemorrhage.indexOf(',') > -1){
         let str = hemorrhage
-        if(['完整','干燥','瘙痒','脱屑','菲薄','水肿'].indexOf(str) == -1){
+        if(['无','牙龈出血','消化道出血','穿刺','渗血','女性经期'].indexOf(str) == -1){
           let newStr = ''
           str.split(',').map(item => {
-            if(['完整','干燥','瘙痒','脱屑','菲薄','水肿'].indexOf(item) == -1){
+            if(['无','牙龈出血','消化道出血','穿刺','渗血','女性经期'].indexOf(item) == -1){
               newStr += item + ','
             }
           })