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

src/xt_pages/dialysis/batch_print/batch_print_order_thirtyNine.vue

                             <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{ advice.remark }})</span>
                         </td>
                         <td>
-                            <span v-if="setAdminUserES(advice.advice_doctor) == ''">
-                            {{
-                            getAdminUser(advice.advice_doctor)
-                            }}
+                            <span v-if="setAdminUserES(advice[0], 'advice_doctor') == ''">
+                                {{getAdminUser(advice[0], 'advice_doctor')}}
                             </span>
-                            <span
-                            v-else
-                            style="display:flex;align-items:center;justify-content:space-around;height:36px;"
-                            >
-                            <img style="height:30px;" :src="setAdminUserES(advice.advice_doctor)" alt srcset />
+                            <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
+                                <img style="height:30px;" :src="setAdminUserES(advice[0], 'advice_doctor')" alt srcset />
                             </span>
                         </td>
                         <td>
-                            <span v-if="setAdminUserES(advice.execution_staff) == ''">
-                            {{
-                            getAdminUser(advice.execution_staff)
-                            }}
+                            <span v-if="setAdminUserES(advice[0], 'execution_staff') == ''">
+                                {{getAdminUser(advice[0], 'execution_staff')}}
                             </span>
-                            <span
-                            v-else
-                            style="display:flex;align-items:center;justify-content:space-around;height:36px;"
-                            >
-                            <img style="height:30px;" :src="setAdminUserES(advice.execution_staff)" alt srcset />
+                            <span v-else>
+                                <img style="height:30px;" :src="setAdminUserES(advice[0], 'execution_staff')" alt srcset />
                             </span>
                         </td>
                         <td>{{ getTime(advice.execution_time, "{h}:{i}") }}</td>

src/xt_pages/dialysis/dialysisPrintOrder.vue

           >打印</el-button
         >
       </template>
+      <template v-if="org_template_info.template_id == 40">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container" style="min-height:0;">
       <!--<div class="order-print-btn"-->
             v-if="org_template_info.template_id == 39"
           >
           </DialysisPrintOrderThirtyNine>
+          <DialysisPrintOrderForty
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 40"
+          >
+          </DialysisPrintOrderForty>
         </div>
       </el-container>
     </div>
 import DialysisPrintOrderThirtySeven from "./template/DialysisPrintOrderThirtySeven";
 import DialysisPrintOrderThirtyEight from "./template/DialysisPrintOrderThirtyEight";
 import DialysisPrintOrderThirtyNine from "./template/DialysisPrintOrderThirtyNine";
+import DialysisPrintOrderForty from "./template/DialysisPrintOrderForty";
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderForty,
     DialysisPrintOrderThirtyNine,
     DialysisPrintOrderThirtyEight,
     DialysisPrintOrderThirtySeven,
           style: style3,
           scanStyles: false
         });
+      } else if (this.org_template_info.template_id == 40) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style5,
+          scanStyles: false
+        });
       }
     },
     printThisOnePage() {

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

                   </div>
                   kg
                 </div>
+                <div class="inline_block" v-if="orgid == 9566">
+                  碳酸氢根：
+                  <div class="under_line" style="width: 50px;text-align: left">
+                    {{ prescription.bicarbonate ? prescription.bicarbonate : '' }}
+                  </div>
+                  mmol/L
+                </div>
                 <div class="inline_block" v-if="orgid == 9566">
                   医生签名：
                   <div class="under_line" style="width: 70px;text-align: left">