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/batch_print/batch_print_order.vue

                       </div>
                       <div class="inline_block">
                         穿刺方法：
-                        <div class="under_line" style="width: 300px;">
+                        <!-- <div class="under_line" style="width: 300px;">
                           {{
                             record.assessment_before_dislysis
                               ? record.assessment_before_dislysis
                                   .puncture_method
                               : ""
                           }}
+                        </div> -->
+                        <div class="under_line" style="width: 300px;">
+                          {{
+                            record.assessment_before_dislysis
+                              ? record.assessment_before_dislysis
+                                  .puncture_way
+                              : ""
+                          }}
                         </div>
                       </div>
                     </div>

src/xt_pages/dialysis/batch_print/batch_print_order_eight.vue

                <tr>
                 <td style="text-align:left;" colspan="8">
                 <span style="display:inline-block;margin-left:15px;">皮肤:</span>
-                 <label-box
+                 <!-- <label-box
                       showValue="完整"
                       :isChecked="record.assessment_before_dislysis.skin == 1 ? true : false"
                     ></label-box>
                     <label-box
                       showValue="皮下淤血"
                       :isChecked="record.assessment_before_dislysis.skin == 9 ? true : false"
+                    ></label-box> -->
+                    <label-box
+                      showValue="完整"
+                      :isChecked="record.assessment_before_dislysis.skin.indexOf('完整') >-1 ? true : false"
+                    ></label-box>
+                    <label-box
+                      showValue="干燥"
+                      :isChecked="record.assessment_before_dislysis.skin.indexOf('干燥') >-1 ? true : false"
+                    ></label-box>
+                    <label-box
+                      showValue="瘙痒"
+                      :isChecked="record.assessment_before_dislysis.skin.indexOf('瘙痒') >-1 ? true : false"
+                    ></label-box>
+                    <label-box
+                      showValue="菲薄"
+                      :isChecked="record.assessment_before_dislysis.skin.indexOf('菲薄') >-1 ? true : false"
+                    ></label-box
+                    >/
+                    <label-box
+                      showValue="水肿"
+                      :isChecked="record.assessment_before_dislysis.skin.indexOf('水肿') >-1 ? true : false"
+                    ></label-box>
+                    <label-box
+                      showValue="皮疹"
+                      :isChecked="record.assessment_before_dislysis.skin.indexOf('皮疹') >-1 ? true : false"
+                    ></label-box>
+                    <label-box
+                      showValue="出血点"
+                      :isChecked="record.assessment_before_dislysis.skin.indexOf('出血点') >-1 ? true : false"
+                    ></label-box>
+                    <label-box
+                      showValue="压疮"
+                      :isChecked="record.assessment_before_dislysis.skin.indexOf('压疮') >-1 ? true : false"
+                    ></label-box>
+                    <label-box
+                      showValue="皮下淤血"
+                      :isChecked="record.assessment_before_dislysis.skin.indexOf('皮下淤血') >-1 ? true : false"
                     ></label-box>
                </td>
             </tr>

src/xt_pages/dialysis/batch_print/batch_print_order_five_one.vue

                   <div class="row" style="padding: 2px 0;line-height:19px;">
                     <div class="inline_block">
                       &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;穿刺方式:
-                      <check-box text="绳梯" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'puncture_way', 1)"></check-box>
+                      <!-- <check-box text="绳梯" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'puncture_way', 1)"></check-box>
                       <check-box text="扣眼" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'puncture_way', 2)"></check-box>
-                      <check-box text="区域" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'puncture_way', 3)"></check-box>
+                      <check-box text="区域" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'puncture_way', 3)"></check-box> -->
+                      <check-box text="绳梯" :checked="isValueIndexOfCheck(record.assessment_before_dislysis,'puncture_way', '绳梯')"></check-box>
+                      <check-box text="扣眼" :checked="isValueIndexOfCheck(record.assessment_before_dislysis,'puncture_way', '扣眼')"></check-box>
+                      <check-box text="区域" :checked="isValueIndexOfCheck(record.assessment_before_dislysis,'puncture_way', '区域')"></check-box>
                     </div>
                     <div class="inline_block" style="margin-left: 30px;">
                       感染：
                   <div class="row" style="padding: 2px 0;line-height:19px;">
                     <div class="inline_block">
                       皮肤：
-                      <check-box text="完整" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'skin', 1)"></check-box>
+                      <!-- <check-box text="完整" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'skin', 1)"></check-box>
                       <check-box text="干燥" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'skin', 2)"></check-box>
                       <check-box text="瘙痒" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'skin', 3)"></check-box>
                       <check-box text="菲薄" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'skin', 4)"></check-box>/
                       <check-box text="皮疹" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'skin', 6)"></check-box>
                       <check-box text="出血点" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'skin', 7)"></check-box>
                       <check-box text="压疮" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'skin', 8)"></check-box>
-                      <check-box text="皮下淤血" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'skin', 9)"></check-box>
+                      <check-box text="皮下淤血" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'skin', 9)"></check-box> -->
+                      <check-box text="完整" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'skin', '完整')"></check-box>
+                      <check-box text="干燥" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'skin', '干燥')"></check-box>
+                      <check-box text="瘙痒" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'skin', '瘙痒')"></check-box>
+                      <check-box text="菲薄" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'skin', '菲薄')"></check-box>/
+                      <check-box text="水肿" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'skin', '水肿')"></check-box>
+                      <check-box text="皮疹" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'skin', '皮疹')"></check-box>
+                      <check-box text="出血点" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'skin', '出血点')"></check-box>
+                      <check-box text="压疮" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'skin', '压疮')"></check-box>
+                      <check-box text="皮下淤血" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'skin', '皮下淤血')"></check-box>
                       <div class="inline_block">
                         其它：
                         <div class="under_line" style="width: 150px;text-align: left">

src/xt_pages/dialysis/batch_print/batch_print_order_other.vue

                           "
                         ></check-box
                         >&emsp;穿刺方式:
-                        <check-box
+                          <check_box
+                           text="绳梯"
+                            :checked="record.assessment_before_dislysis.puncture_way.indexOf('绳梯')>-1?true:false"
+                          >
+                          </check_box>
+                           <check_box
+                           text="扣眼"
+                            :checked="record.assessment_before_dislysis.puncture_way.indexOf('扣眼')>-1?true:false"
+                          >
+                          </check_box>
+                           <check_box
+                           text="区域"
+                            :checked="record.assessment_before_dislysis.puncture_way.indexOf('区域')>-1?true:false"
+                          >
+                          </check_box>
+                        <!-- <check-box
                           text="绳梯"
                           :checked="
                             isCheckBoxChecked(
                               3
                             )
                           "
-                        ></check-box>
+                        ></check-box> -->
                       </div>
                     </div>
                     <div class="row" style="padding: 2px 0;line-height:19px;">

src/xt_pages/dialysis/batch_print/batch_print_order_other_one.vue

                             )
                           "
                         ></check-box>
+
                         &emsp;穿刺方式:
                         <check-box
+                           text="绳梯"
+                            :checked="record.assessment_before_dislysis.puncture_way.indexOf('绳梯')>-1?true:false"
+                          >
+                          </check-box>
+                           <check-box
+                           text="扣眼"
+                            :checked="record.assessment_before_dislysis.puncture_way.indexOf('扣眼')>-1?true:false"
+                          >
+                          </check-box>
+                           <check-box
+                           text="区域"
+                            :checked="record.assessment_before_dislysis.puncture_way.indexOf('区域')>-1?true:false"
+                          >
+                          </check-box>
+                        
+                        <!-- <check-box
                           text="绳梯"
                           :checked="
                             isCheckBoxChecked(
                               3
                             )
                           "
-                        ></check-box>
+                        ></check-box> -->
                       </div>
                     </div>
                     <div class="row" style="padding: 2px 0;line-height:19px;">

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

                           v-if="record.assessment_before_dislysis"
                           style="display: inline-block;"
                         >
-                          <div
+                          <!-- <div
                             class="under_line"
                             style="width: 100px;text-align: center"
                             v-if="
                             "
                           >
                             区域
+                          </div> -->
+
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center"
+                            v-if="
+                              record.assessment_before_dislysis.puncture_way == ''
+                                
+                            "
+                          ></div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center"
+                            v-if="
+                              record.assessment_before_dislysis.puncture_way.indexOf('绳梯')>-1
+                            "
+                          >
+                            绳梯
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center"
+                            v-if="
+                              record.assessment_before_dislysis.puncture_way.indexOf('扣眼')>-1
+                               
+                            "
+                          >
+                            扣眼
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center"
+                            v-if="
+                              record.assessment_before_dislysis.puncture_way.indexOf('区域')>-1
+                                
+                            "
+                          >
+                            区域
                           </div>
                         </div>
                       </div>

src/xt_pages/dialysis/template/DialysisPrintOrderEight.vue

         <tr>
           <td style="text-align:left;" colspan="8">
             <span style="display:inline-block;margin-left:15px;">皮肤:</span>
-            <label-box showValue="完整" :isChecked="predialysis.skin == 1 ? true : false"></label-box>
+            <!-- <label-box showValue="完整" :isChecked="predialysis.skin == 1 ? true : false"></label-box>
             <label-box showValue="干燥" :isChecked="predialysis.skin == 2 ? true : false"></label-box>
             <label-box showValue="瘙痒" :isChecked="predialysis.skin == 3 ? true : false"></label-box>
             <label-box showValue="菲薄" :isChecked="predialysis.skin == 4 ? true : false"></label-box>/
             <label-box showValue="皮疹" :isChecked="predialysis.skin == 6 ? true : false"></label-box>
             <label-box showValue="出血点" :isChecked="predialysis.skin == 7 ? true : false"></label-box>
             <label-box showValue="压疮" :isChecked="predialysis.skin == 8 ? true : false"></label-box>
-            <label-box showValue="皮下淤血" :isChecked="predialysis.skin == 9 ? true : false"></label-box>
+            <label-box showValue="皮下淤血" :isChecked="predialysis.skin == 9 ? true : false"></label-box> -->
+
+            <label-box showValue="完整" :isChecked="predialysis.skin.indexOf('完整') >-1 ? true : false"></label-box>
+            <label-box showValue="干燥" :isChecked="predialysis.skin.indexOf('干燥') >-1? true : false"></label-box>
+            <label-box showValue="瘙痒" :isChecked="predialysis.skin.indexOf('瘙痒') >-1 ? true : false"></label-box>
+            <label-box showValue="菲薄" :isChecked="predialysis.skin.indexOf('菲薄') >-1 ? true : false"></label-box>/
+            <label-box showValue="水肿" :isChecked="predialysis.skin.indexOf('水肿') >-1? true : false"></label-box>
+            <label-box showValue="皮疹" :isChecked="predialysis.skin.indexOf('皮疹') >-1? true : false"></label-box>
+            <label-box showValue="出血点" :isChecked="predialysis.skin.indexOf('出血点') >-1 ? true : false"></label-box>
+            <label-box showValue="压疮" :isChecked="predialysis.skin.indexOf('压疮') >-1 ? true : false"></label-box>
+            <label-box showValue="皮下淤血" :isChecked="predialysis.skin.indexOf('皮下淤血') >-1 ? true : false"></label-box>
           </td>
         </tr>
         <tr>

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

                     <td width="100">
                       <div class="under-line">
                         &nbsp;
-                        <span v-if="predialysis.puncture_method">{{ predialysis.puncture_method }}</span>
+                        <!-- <span v-if="predialysis.puncture_method">{{ predialysis.puncture_method }}</span> -->
+                        <span v-if="predialysis.puncture_way">{{ predialysis.puncture_way }}</span>
                       </div>
                     </td>
 

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

                   </div>
                   <div class="inline_block" style="margin-left:10px;flex:1;">
                     穿刺方式：
-                    <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 0">
+                    <!-- <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 0">
                       /
                     </div>
                     <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 1">
                     </div>
                     <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 3">
                       区域
+                    </div> -->
+                    <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == ''">
+                      /
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way.indexOf('绳梯')>-1">
+                      绳梯
                     </div>
+                    <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way.indexOf('扣眼')>-1">
+                      扣眼
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way.indexOf('区域')>-1">
+                      区域
+                    </div> 
                   </div>
                   <div class="inline_block" style="margin-left:10px;flex:1;">
                     穿刺针：

src/xt_pages/dialysis/template/dialysisPrintOrderFive.vue

                 </div>  
                 <div class="row" style="padding: 2px 0;line-height:19px;">
                   <div class="inline_block">
-                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;穿刺方式:
-                    <check-box text="绳梯" :checked="predialysis.puncture_way == 1 ? true : false"></check-box>
+                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                    穿刺方式:
+                    <!-- <check-box text="绳梯" :checked="predialysis.puncture_way == 1 ? true : false"></check-box>
                     <check-box text="扣眼" :checked="predialysis.puncture_way == 2 ? true : false"></check-box>
-                    <check-box text="区域" :checked="predialysis.puncture_way == 3 ? true : false"></check-box>
+                    <check-box text="区域" :checked="predialysis.puncture_way == 3 ? true : false"></check-box> -->
+
+                    <check-box text="绳梯" :checked="predialysis.puncture_way.indexOf('绳梯')>-1 ? true : false"></check-box>
+                    <check-box text="扣眼" :checked="predialysis.puncture_way.indexOf('扣眼')>-1 ? true : false"></check-box>
+                    <check-box text="区域" :checked="predialysis.puncture_way.indexOf('区域')>-1 ? true : false"></check-box>
                   </div>
 
                   <div class="inline_block" style="margin-left: 30px;">
                 <div class="row" style="padding: 2px 0;line-height:19px;">
                   <div class="inline_block">
                     皮肤：
-                    <check-box text="完整" :checked="predialysis.skin == 1 ? true : false"></check-box>
+                    <!-- <check-box text="完整" :checked="predialysis.skin == 1 ? true : false"></check-box>
                     <check-box text="干燥" :checked="predialysis.skin == 2 ? true : false"></check-box>
                     <check-box text="瘙痒" :checked="predialysis.skin == 3 ? true : false"></check-box>
                     <check-box text="菲薄" :checked="predialysis.skin == 4 ? true : false"></check-box>
                     <check-box text="皮疹" :checked="predialysis.skin == 6 ? true : false"></check-box>
                     <check-box text="出血点" :checked="predialysis.skin == 7 ? true : false"></check-box>
                     <check-box text="压疮" :checked="predialysis.skin == 8 ? true : false"></check-box>
-                    <check-box text="皮下淤血" :checked="predialysis.skin == 9 ? true : false"></check-box>
+                    <check-box text="皮下淤血" :checked="predialysis.skin == 9 ? true : false"></check-box> -->
+
+                    <check-box text="完整" :checked="predialysis.skin.indexOf('完整')>-1 ? true : false"></check-box>
+                    <check-box text="干燥" :checked="predialysis.skin.indexOf('干燥')>-1 ? true : false"></check-box>
+                    <check-box text="瘙痒" :checked="predialysis.skin.indexOf('瘙痒')>-1 ? true : false"></check-box>
+                    <check-box text="菲薄" :checked="predialysis.skin.indexOf('菲薄')>-1 ? true : false"></check-box>
+                     /
+                    <check-box text="水肿" :checked="predialysis.skin.indexOf('水肿')>-1 ? true : false"></check-box>
+                    <check-box text="皮疹" :checked="predialysis.skin.indexOf('皮疹')>-1 ? true : false"></check-box>
+                    <check-box text="出血点" :checked="predialysis.skin.indexOf('出血点')>-1 ? true : false"></check-box>
+                    <check-box text="压疮" :checked="predialysis.skin.indexOf('压疮')>-1? true : false"></check-box>
+                    <check-box text="皮下淤血" :checked="predialysis.skin.indexOf('皮下淤血')>-1? true : false"></check-box>
                     <div class="inline_block">
                       其它：
                       <div class="under_line" style="width: 200px;text-align: left">

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

                     <check-box text="不存在" :checked="predialysis.blood_access_noise == 2 ? true : false"></check-box>
                     <check-box text="减弱" :checked="predialysis.blood_access_noise == 3 ? true : false"></check-box>&emsp;
                     穿刺方式:
-                    <check-box text="绳梯" :checked="predialysis.puncture_way == 1 ? true : false"></check-box>
+                    <!-- <check-box text="绳梯" :checked="predialysis.puncture_way == 1 ? true : false"></check-box>
                     <check-box text="扣眼" :checked="predialysis.puncture_way == 2 ? true : false"></check-box>
-                    <check-box text="区域" :checked="predialysis.puncture_way == 3 ? true : false"></check-box>
+                    <check-box text="区域" :checked="predialysis.puncture_way == 3 ? true : false"></check-box> -->
+                    <check-box text="绳梯" :checked="predialysis.puncture_way.indexOf('绳梯')>-1? true : false"></check-box>
+                    <check-box text="扣眼" :checked="predialysis.puncture_way.indexOf('扣眼')>-1 ? true : false"></check-box>
+                    <check-box text="区域" :checked="predialysis.puncture_way.indexOf('区域')>-1 ? true : false"></check-box>
                   </div>
                 </div>
                 <div class="row" style="padding: 2px 0;line-height:19px;">
         }
         this.check = response.data.data.check;
         this.predialysis = response.data.data.PredialysisEvaluation;
-        // console.log("透前数据", this.predialysis);
+         console.log("透前数据", this.predialysis);
         this.predialysis.blood_access_part_opera_name = this.bloodAccessParOperaName(
           this.predialysis.blood_access_part_opera_id
         );