Merge branch 'master' of http://git.shengws.com/csx/Vue_New

src/xt_pages/data/printTemplate.vue

@@ -144,26 +144,26 @@
             >
           </el-col>
 
-          <el-col :span="6" style="text-align: center">
-            <div class="demo-image__preview">
-              <el-tooltip
-                class="item"
-                effect="dark"
-                content="点击查看大图"
-                placement="top-start"
-                :hide-after="2000"
-              >
-                <el-image
-                  style="width: 200px; height: 200px;margin-left:30px"
-                  :src="require('@/assets/home/template_ten.jpg')"
-                  :preview-src-list="imgs_ten"
-                ></el-image>
-              </el-tooltip>
-            </div>
-            <el-radio v-model="radio" label="10" @change="change"
-            >模版十</el-radio
-            >
-          </el-col>
+          <!--<el-col :span="6" style="text-align: center">-->
+            <!--<div class="demo-image__preview">-->
+              <!--<el-tooltip-->
+                <!--class="item"-->
+                <!--effect="dark"-->
+                <!--content="点击查看大图"-->
+                <!--placement="top-start"-->
+                <!--:hide-after="2000"-->
+              <!--&gt;-->
+                <!--<el-image-->
+                  <!--style="width: 200px; height: 200px;margin-left:30px"-->
+                  <!--:src="require('@/assets/home/template_ten.jpg')"-->
+                  <!--:preview-src-list="imgs_ten"-->
+                <!--&gt;</el-image>-->
+              <!--</el-tooltip>-->
+            <!--</div>-->
+            <!--<el-radio v-model="radio" label="10" @change="change"-->
+            <!--&gt;模版十</el-radio-->
+            <!--&gt;-->
+          <!--</el-col>-->
         </el-row>
       </div>
     </div>

src/xt_pages/dialysis/batch_print/batch_print_order.vue

@@ -1199,18 +1199,18 @@
                       </div>
                       <div class="inline_block" style="margin-left: 40px;">
                         压迫后内瘘震颤：
-                        <label-box
-                          :isChecked="
+                        <check-box
+                          :checked="
                             record.assessment_after_dislysis.internal_fistula.indexOf(
                               '存在'
                             ) > -1
                               ? true
                               : false
                           "
-                          showValue="存在"
-                        ></label-box>
-                        <label-box
-                          :isChecked="
+                          text="存在"
+                        ></check-box>
+                        <check-box
+                          :checked="
                             record.assessment_after_dislysis.internal_fistula.indexOf(
                               '减弱'
                             ) > -1
@@ -1218,9 +1218,9 @@
                               : false
                           "
                           showValue="减弱"
-                        ></label-box>
-                        <label-box
-                          :isChecked="
+                        ></check-box>
+                        <check-box
+                          :checked="
                             record.assessment_after_dislysis.internal_fistula.indexOf(
                               '无'
                             ) > -1
@@ -1228,7 +1228,7 @@
                               : false
                           "
                           showValue="无"
-                        ></label-box>
+                        ></check-box>
                       </div>
                     </div>
                     <div class="row" style="padding: 2px 0;">

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -970,8 +970,8 @@
                   <div class="inline_block" style="flex:1;">
                     治疗医生：
                     <div class="under_line" style="width: 80px;text-align: center" >
-                      <span v-if=" setAdminUserES(prescription.prescription_doctor) == '' " >{{ getAdminUser(prescription.prescription_doctor) }}</span >
-                      <img style="height:20px;" :src="setAdminUserES(prescription.prescription_doctor)" alt="" srcset="" v-else  />
+                      <span v-if=" setAdminUserES(prescription.creater) == '' " >{{ getAdminUser(prescription.creater) }}</span >
+                      <img style="height:20px;" :src="setAdminUserES(prescription.creater)" alt="" srcset="" v-else  />
                     </div>
                   </div>
                 </div>

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

@@ -1898,16 +1898,12 @@
                 <div class="inline_block" style="flex:1;">
                   治疗医生：
                   <div
-
                     class="under_line"
                     style="width: 120px;"
                   >
                     <img style="height:20px;" src="https://images.shengws.com/FgnRnBcx1BgULJ1dn7VKzeBPEvtm" alt="" srcset="">
-
                     <span
-                        v-if="
-                          setAdminUserES(prescription.prescription_doctor) == ''
-                        "
+                        v-if="setAdminUserES(prescription.prescription_doctor) == ''"
                       >{{
                           getAdminUser(prescription.prescription_doctor)
                         }}</span
@@ -1923,15 +1919,9 @@
                 </div>
                 <div class="inline_block" style="flex:1;">
                   患者签名：
-                  <div
-                    class="under_line"
-                    style="width: 40px;text-align: center"
-                  >
-
-
+                  <div class="under_line" style="width: 70px">
                   </div>
                 </div>
-
               </div>
             </td>
           </tr>