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

src/xt_pages/data/druguseTemplate.vue

               border
               fit
               :row-style="{ color: '#303133' }"
-          :header-cell-style="{
+              :header-cell-style="{
             backgroundColor: 'rgb(245, 247, 250)',
             color: '#606266'
           }"
                 prop="amount1"
                 align="center"
                 label="药品规格">
-                  <!-- {{drugDesc(scope.row)}} -->
-                  <template slot-scope="scope">
-                    <span v-if="scope.row.advice_desc">{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
-                  </template>
+                <!-- {{drugDesc(scope.row)}} -->
+                <template slot-scope="scope">
+                  <span v-if="scope.row.advice_desc">{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
+                </template>
               </el-table-column>
 
 
                     </template>
                   </el-table-column>
                   <el-table-column align="center" label="药品规格">
-                      <template slot-scope="scope">
-                        <span v-if="scope.row.advice_desc">{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
-                      </template>
+                    <template slot-scope="scope">
+                      <span v-if="scope.row.advice_desc">{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
+                    </template>
                   </el-table-column>
                   <el-table-column prop="prescribing_number" align="center" label="开药数量">
                     <template slot-scope="scope" v-if="scope.row.prescribing_number != ''">
                   </el-col>
                   <el-col :span="12">
 
-                  <el-form-item label="药品规格 :" prop="advice_desc">
+                    <el-form-item label="药品规格 :" prop="advice_desc">
                       <el-col :span="8">
                         <el-input v-model="templateFormEdit.advice_desc"></el-input>
                       </el-col>
                     </template>
                   </el-table-column>
                   <el-table-column align="center" label="药品规格">
-                      <!-- {{drugDesc(scope.row)}} -->
-                      <template slot-scope="scope">
-                        <span v-if="scope.row.advice_desc">{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
-                      </template>
+                    <!-- {{drugDesc(scope.row)}} -->
+                    <template slot-scope="scope">
+                      <span v-if="scope.row.advice_desc">{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
+                    </template>
                   </el-table-column>
                   <el-table-column prop="prescribing_number" align="center" label="开药数量">
                     <template slot-scope="scope" v-if="scope.row.prescribing_number != ''">
                   </el-col>
                   <el-col :span="12">
 
-                <el-form-item label="药品规格 :" prop="advice_desc">
+                    <el-form-item label="药品规格 :" prop="advice_desc">
                       <el-col :span="9">
                         <el-input v-model="templateForm.advice_desc"></el-input>
                       </el-col>
               border
               fit
               :row-style="{ color: '#303133' }"
-          :header-cell-style="{
+              :header-cell-style="{
             backgroundColor: 'rgb(245, 247, 250)',
             color: '#606266'
           }"
               border
               fit
               :row-style="{ color: '#303133' }"
-          :header-cell-style="{
+              :header-cell-style="{
             backgroundColor: 'rgb(245, 247, 250)',
             color: '#606266'
           }"
           this.loading = true
           PostInitAdviceTemplate(params).then(response => {
             if (response.data.state == 1) {
-                this.is_init = response.data.data.init_config.is_init
+              this.is_init = response.data.data.init_config.is_init
               this.getAdviceConfig()
               this.loading = false
 
     text-align: left;
   }
   .el-table td,
-.el-table th.is-leaf,
-.el-table--border,
-.el-table--group {
-  border-color: #d0d3da;
-}
-.el-table--border::after,
-.el-table--group::after,
-.el-table::before {
-  background-color: #d0d3da;
-}
+  .el-table th.is-leaf,
+  .el-table--border,
+  .el-table--group {
+    border-color: #d0d3da;
+  }
+  .el-table--border::after,
+  .el-table--group::after,
+  .el-table::before {
+    background-color: #d0d3da;
+  }
 </style>
 

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFive.vue

   <div id="dialysis-print-box">
     <div class="dialysis-print-order">
       <div class="order-yy-name">{{ orgname }}</div>
-      <div class="order-title">血液净化治疗记录单99999</div>
+      <div class="order-title">血液净化治疗记录单</div>
       <table class="table-box" style="margin-top: 10px;">
         <tbody>
         <tr>
         <tbody>
         <tr>
           <td width="40">诊 断:</td>
-          <td width="">
-            <div class="under-line" style="text-align:left">
+          <td width="300">
+            <div class="under-line">
               &nbsp;{{ patientInfo.diagnose }}
             </div>
           </td>
+           <td width="80">透析频率:</td>
+            <td width="70">
+                <div class="under-line">&nbsp;{{ predialysis.dialysis_count ? predialysis.dialysis_count : "" }}</div>
+            </td>
+            <td width="60">次/周</td>
+            <td width="10">第</td>
+            <td width="50">
+                <div class="under-line">
+                {{ patientInfo.total_dialysis + patientInfo.user_sys_before_count }}
+                </div>
+            </td>
+            <td width="80">次透析</td>
+            <td width="80">透析机号:</td>
+            <td width="40">
+                <div class="under-line"> {{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0 ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}</div>
+            </td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
         </tr>
         </tbody>
       </table>
-      <table class="table-box" style="margin-top: 10px;">
+      <!-- <table class="table-box" style="margin-top: 10px;">
         <tbody>
           <tr>
             <td width="80">透析频率:</td>
         
           </tr>
         </tbody>
-      </table>
+      </table> -->
       <table class="print-table" border="1">
         <tbody>
         <tr>