Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/xt_pages/dialysis/batch_print/batch_print_order_other.vue

@@ -527,7 +527,7 @@
                     </div>
 
 
-                    <div class="inline_block" style="float: left;">
+                    <div class="inline_block" >
                       &emsp;核对人：
                       <div class="under_line" style="width: 100px;">
                         <span v-if="setAdminUserES(record.check, 'modifier') == ''">{{getAdminUser(record.check, 'modifier')}}</span>
@@ -539,13 +539,13 @@
 
                     <div class="inline_block">
                       &emsp;核对时间：
-                      <div class="under_line" style="width: 200px;">
+                      <div class="under_line" style="width: 150px;">
                         {{record.check?getTime(record.check.updated_time,'{y}年{m}月{d}日 {h}时'):''}}
                       </div>
                     </div>
 
 
-                    <div class="inline_block" style="float: left;">
+                    <div class="inline_block" >
                       &emsp;收针者：
                       <div class="under_line" style="width: 100px;">
                         <span v-if="setAdminUserES(record.dialysis_order, 'start_nurse') == ''">{{getAdminUser(record.dialysis_order, 'start_nurse')}}</span>
@@ -555,11 +555,7 @@
                     </div>
 
 
-                  </div>
-
-                  <div class="row" style="padding: 2px 0;">
-
-                    <div class="inline_block">
+                    <div class="inline_block" >
                       血透室护士签名：
                       <div class="under_line" style="width: 100px;">
                         <span v-if="setAdminUserES(record.dialysis_order, 'start_nurse') == ''">{{getAdminUser(record.dialysis_order, 'start_nurse')}}</span>
@@ -569,19 +565,21 @@
                     </div>
 
 
-                    <div class="inline_block">
-                      病区护士签名：
-                      <div class="under_line" style="width: 100px;">
-                      </div>
-                    </div>
 
                     <div class="inline_block">
                       &emsp;时间：
                       <div class="under_line" style="width: 200px;">
-                        {{record.dialysis_order?getTime(record.dialysis_order.end_time,'{y}年{m}月{d}日 {h}时'):''}}
+                        {{record.check?getTime(record.dialysis_order.end_time,'{y}年{m}月{d}日 {h}时'):''}}
+                      </div>
+                    </div>
+
+                    <div class="inline_block" >
+                      &emsp;病区护士签名：
+                      <div class="under_line" style="width: 100px;">
                       </div>
                     </div>
                   </div>
+
                 </td>
               </tr>
               </tbody>
@@ -870,12 +868,12 @@
               <template v-for="(group, group_index) in record.advices">
 
                   <tr v-for="(advice, advice_index) in group.advices"
-                      :key="advice.id">
+                      >
 
                       <td height="60px" v-if="advice_index == 0"
                           :rowspan="group.advices.length">
                                     <span v-if="advice.start_time">
-                                      {{getTime(advice.start_time,'{y}-{m}-{d} {h}:{i}')}}
+                                      {{getTime(advice.start_time,'{h}:{i}')}}
                                     </span>
                         <span v-else>&nbsp;<br/>&nbsp;</span>
                       </td>
@@ -888,11 +886,15 @@
                         <span v-if="advice.parent_id == 0  &&advice.children && advice.children.length == 0">{{advice.delivery_way}}</span>
                         <span
                           v-if="advice.parent_id == 0  &&advice.children&& advice.children.length == 0">{{advice.execution_frequency}}</span>
+                        <span v-if="advice.parent_id == 0 && advice.remark.length > 0" >({{advice.remark}})</span>
+
                       </td>
 
                       <td  height="60px" style="text-align: center"v-else >
                         <span>{{advice.delivery_way}}</span>
                         <span>{{advice.execution_frequency}}</span>
+                        <span v-if="advice.remark.length > 0" >({{advice.remark}})</span>
+
                       </td>
 
 
@@ -903,21 +905,23 @@
                            style="height: 20px;">
                     </td>
 
-
                     <td height="60px">
-                      <span v-if="setAdminUserES(advice, 'execution_staff') == ''">{{getAdminUser(advice, 'execution_staff')}}</span>
-                      <img class="es-img" :src="setAdminUserES(advice[1], 'execution_staff')" alt="" srcset="" v-else
+                        <span
+                          v-if="setAdminUserES(advice, 'checker') == ''">{{getAdminUser(advice, 'checker')}}</span>
+                      <img class="es-img" :src="setAdminUserES(advice, 'checker')" alt="" srcset="" v-else
                            style="height: 20px;">
                     </td>
 
+
                     <td height="60px">
-                        <span
-                          v-if="setAdminUserES(advice, 'checker') == ''">{{getAdminUser(advice, 'checker')}}</span>
-                      <img class="es-img" :src="setAdminUserES(advice, 'checker')" alt="" srcset="" v-else
+                      <span v-if="setAdminUserES(advice, 'execution_staff') == ''">{{getAdminUser(advice, 'execution_staff')}}</span>
+                      <img class="es-img" :src="setAdminUserES(advice, 'execution_staff')" alt="" srcset="" v-else
                            style="height: 20px;">
                     </td>
 
 
+
+
                     <td height="60px"><span v-if="advice.execution_time">
                     {{getTime(advice.execution_time,'{h}:{i}')}}
                   </span>
@@ -1086,7 +1090,9 @@
                     groupno: this.doctor_advices[index].groupno,
                     id: this.doctor_advices[index].id,
                     parent_id: this.doctor_advices[index].parent_id,
-                    children: this.doctor_advices[index].children
+                    children: this.doctor_advices[index].children,
+                    remark:this.doctor_advices[index].remark,
+
                   }
                   doctor_advice['isShow'] = 1
                   this.doctor_advices.splice(new_advice_index, 0, doctor_advice)
@@ -1166,7 +1172,12 @@
     },
     methods: {
       printAction: function() {
-        const style = '@media print { .option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 0 0; page-break-after: always; } .print_page_main_content .order-yy-name { margin: auto; text-align: center; font-size: 20px; letter-spacing: 5px;} .print_page_main_content .order_title { text-align: center; font-size: 23px; line-height: 46px; font-weight: 500; } .row { font-size: 14px; line-height: 20px; padding: 5px 0; } .inline_block { display: inline-block; } .under_line { display: inline-block; border-bottom: 1px solid #999; text-align: center; white-space: nowrap; } .under_line::before { content: "\\00A0"; } .under_line::after { content: "\\00A0"; } .flex { display: -webkit-box; display: -moz-box; display: -ms-flexbox; display: -webkit-flex; display: flex; align-items: center; -webkit-align-items: center; box-align: center; -moz-box-align: center; -webkit-box-align: center; text-align: center; -webkit-justify-content: space-between; justify-content: space-between; -moz-box-pack: space-between; -webkit--moz-box-pack: space-between; box-pack: space-between; } .print_page_main_content .proj_table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } .print_page_main_content .proj_table tbody tr td { border: 1px solid; font-size: 16px; padding: 10px 8px; line-height: 30px; } .print_page_main_content .proj_table .inside_table { width: 100%; border: hidden; border-collapse: collapse; } .print_page_main_content .proj_table .inside_table tr td { border: 1px solid; text-align: center; font-size: 14px; padding: 8px 5px; line-height: 20px; } }.es-img{height: 20px; }.advice-name{text-align: left !important;line-height: 16px !important;}.advice-children{display:flex;}'
+        const style = '@media print { .option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 0 0; page-break-after: always; } .print_page_main_content .order-yy-name { margin: auto; text-align: center; font-size: 20px; letter-spacing: 5px;} .print_page_main_content .order_title { text-align: center; font-size: 23px; line-height: 46px; font-weight: 500; } .row { font-size: 14px; line-height: 20px; padding: 5px 0; } .inline_block { display: inline-block; } .under_line { display: inline-block; border-bottom: 1px solid #999; text-align: center; white-space: nowrap; } .under_line::before { content: "\\00A0"; } .under_line::after { content: "\\00A0"; } .flex { display: -webkit-box; display: -moz-box; display: -ms-flexbox; display: -webkit-flex; display: flex; align-items: center; -webkit-align-items: center; box-align: center; -moz-box-align: center; -webkit-box-align: center; text-align: center; -webkit-justify-content: space-between; justify-content: space-between; -moz-box-pack: space-between; -webkit--moz-box-pack: space-between; box-pack: space-between; } .print_page_main_content .proj_table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } .print_page_main_content .proj_table tbody tr td { border: 1px solid; font-size: 16px; padding: 10px 8px; line-height: 30px; } .print_page_main_content .proj_table .inside_table { width: 100%; border: hidden; border-collapse: collapse; } .print_page_main_content .proj_table .inside_table tr td { border: 1px solid; text-align: center; font-size: 14px; padding: 8px 5px; line-height: 20px; } }.es-img{height: 20px; }.advice-name{text-align: left !important;line-height: 16px !important;}.advice-children{display:flex;}.print-table-no {\n' +
+          '    width: 100%;\n' +
+          '    text-align: center;\n' +
+          '    border-collapse: collapse;\n' +
+          '    font-size: 14px;\n' +
+          '  }'
 
         printJS({
           printable: 'print_content',

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -2274,11 +2274,15 @@
                 <span v-if="advice.parent_id == 0  && advice.children.length == 0">{{advice.delivery_way}}</span>
                 <span v-if="advice.parent_id == 0  && advice.children.length == 0">{{advice.execution_frequency}}</span>
                 <span v-if="advice.children && advice.children.length > 0 || advice.parent_id > 0" style="float:right;width: 1px;height:30px; background: darkgray;"></span>
+                <span v-if="advice.parent_id == 0 && advice.remark.length > 0" >({{advice.remark}})</span>
+
               </td>
 
               <td class="advice-name" v-else style="text-align: center">
                 <span>{{advice.delivery_way}}</span>
                 <span>{{advice.execution_frequency}}</span>
+                <span v-if="advice.remark.length > 0">({{advice.remark}})</span>
+
               </td>
 
 
@@ -2682,10 +2686,8 @@
               var initGroupBlock = function(group, advice) {
                 group.group_no = advice.groupno;
               };
-                console.log(this.doctor_advices)
                 for (let index = this.doctor_advices.length-1; index >= 0; index--) {
                 var new_advice_index = 0;
-                  console.log(this.doctor_advices[index])
 
                   if('children' in this.doctor_advices[index]  && this.doctor_advices[index].children.length > 0){
                   new_advice_index = index+this.doctor_advices[index].children.length+1
@@ -2697,6 +2699,7 @@
                     id:this.doctor_advices[index].id,
                     parent_id:this.doctor_advices[index].parent_id,
                     children:this.doctor_advices[index].children,
+                    remark:this.doctor_advices[index].remark,
 
                   }
                   doctor_advice['isShow'] =1