ソースを参照

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

See999 4 年 前
コミット
797af7c771
共有2 個のファイルを変更した53 個の追加32 個の削除を含む
  1. 27 27
      src/xt_pages/data/druguseTemplate.vue
  2. 26 5
      src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFive.vue

+ 27 - 27
src/xt_pages/data/druguseTemplate.vue ファイルの表示

@@ -50,7 +50,7 @@
50 50
               border
51 51
               fit
52 52
               :row-style="{ color: '#303133' }"
53
-          :header-cell-style="{
53
+              :header-cell-style="{
54 54
             backgroundColor: 'rgb(245, 247, 250)',
55 55
             color: '#606266'
56 56
           }"
@@ -126,10 +126,10 @@
126 126
                 prop="amount1"
127 127
                 align="center"
128 128
                 label="药品规格">
129
-                  <!-- {{drugDesc(scope.row)}} -->
130
-                  <template slot-scope="scope">
131
-                    <span v-if="scope.row.advice_desc">{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
132
-                  </template>
129
+                <!-- {{drugDesc(scope.row)}} -->
130
+                <template slot-scope="scope">
131
+                  <span v-if="scope.row.advice_desc">{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
132
+                </template>
133 133
               </el-table-column>
134 134
 
135 135
 
@@ -254,9 +254,9 @@
254 254
                     </template>
255 255
                   </el-table-column>
256 256
                   <el-table-column align="center" label="药品规格">
257
-                      <template slot-scope="scope">
258
-                        <span v-if="scope.row.advice_desc">{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
259
-                      </template>
257
+                    <template slot-scope="scope">
258
+                      <span v-if="scope.row.advice_desc">{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
259
+                    </template>
260 260
                   </el-table-column>
261 261
                   <el-table-column prop="prescribing_number" align="center" label="开药数量">
262 262
                     <template slot-scope="scope" v-if="scope.row.prescribing_number != ''">
@@ -483,7 +483,7 @@
483 483
                   </el-col>
484 484
                   <el-col :span="12">
485 485
 
486
-                  <el-form-item label="药品规格 :" prop="advice_desc">
486
+                    <el-form-item label="药品规格 :" prop="advice_desc">
487 487
                       <el-col :span="8">
488 488
                         <el-input v-model="templateFormEdit.advice_desc"></el-input>
489 489
                       </el-col>
@@ -664,10 +664,10 @@
664 664
                     </template>
665 665
                   </el-table-column>
666 666
                   <el-table-column align="center" label="药品规格">
667
-                      <!-- {{drugDesc(scope.row)}} -->
668
-                      <template slot-scope="scope">
669
-                        <span v-if="scope.row.advice_desc">{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
670
-                      </template>
667
+                    <!-- {{drugDesc(scope.row)}} -->
668
+                    <template slot-scope="scope">
669
+                      <span v-if="scope.row.advice_desc">{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
670
+                    </template>
671 671
                   </el-table-column>
672 672
                   <el-table-column prop="prescribing_number" align="center" label="开药数量">
673 673
                     <template slot-scope="scope" v-if="scope.row.prescribing_number != ''">
@@ -723,7 +723,7 @@
723 723
                   </el-col>
724 724
                   <el-col :span="12">
725 725
 
726
-                <el-form-item label="药品规格 :" prop="advice_desc">
726
+                    <el-form-item label="药品规格 :" prop="advice_desc">
727 727
                       <el-col :span="9">
728 728
                         <el-input v-model="templateForm.advice_desc"></el-input>
729 729
                       </el-col>
@@ -1030,7 +1030,7 @@
1030 1030
               border
1031 1031
               fit
1032 1032
               :row-style="{ color: '#303133' }"
1033
-          :header-cell-style="{
1033
+              :header-cell-style="{
1034 1034
             backgroundColor: 'rgb(245, 247, 250)',
1035 1035
             color: '#606266'
1036 1036
           }"
@@ -1106,7 +1106,7 @@
1106 1106
               border
1107 1107
               fit
1108 1108
               :row-style="{ color: '#303133' }"
1109
-          :header-cell-style="{
1109
+              :header-cell-style="{
1110 1110
             backgroundColor: 'rgb(245, 247, 250)',
1111 1111
             color: '#606266'
1112 1112
           }"
@@ -1376,7 +1376,7 @@
1376 1376
           this.loading = true
1377 1377
           PostInitAdviceTemplate(params).then(response => {
1378 1378
             if (response.data.state == 1) {
1379
-                this.is_init = response.data.data.init_config.is_init
1379
+              this.is_init = response.data.data.init_config.is_init
1380 1380
               this.getAdviceConfig()
1381 1381
               this.loading = false
1382 1382
 
@@ -2547,15 +2547,15 @@
2547 2547
     text-align: left;
2548 2548
   }
2549 2549
   .el-table td,
2550
-.el-table th.is-leaf,
2551
-.el-table--border,
2552
-.el-table--group {
2553
-  border-color: #d0d3da;
2554
-}
2555
-.el-table--border::after,
2556
-.el-table--group::after,
2557
-.el-table::before {
2558
-  background-color: #d0d3da;
2559
-}
2550
+  .el-table th.is-leaf,
2551
+  .el-table--border,
2552
+  .el-table--group {
2553
+    border-color: #d0d3da;
2554
+  }
2555
+  .el-table--border::after,
2556
+  .el-table--group::after,
2557
+  .el-table::before {
2558
+    background-color: #d0d3da;
2559
+  }
2560 2560
 </style>
2561 2561
 

+ 26 - 5
src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFive.vue ファイルの表示

@@ -2,7 +2,7 @@
2 2
   <div id="dialysis-print-box">
3 3
     <div class="dialysis-print-order">
4 4
       <div class="order-yy-name">{{ orgname }}</div>
5
-      <div class="order-title">血液净化治疗记录单99999</div>
5
+      <div class="order-title">血液净化治疗记录单</div>
6 6
       <table class="table-box" style="margin-top: 10px;">
7 7
         <tbody>
8 8
         <tr>
@@ -43,15 +43,36 @@
43 43
         <tbody>
44 44
         <tr>
45 45
           <td width="40">诊 断:</td>
46
-          <td width="">
47
-            <div class="under-line" style="text-align:left">
46
+          <td width="300">
47
+            <div class="under-line">
48 48
               &nbsp;{{ patientInfo.diagnose }}
49 49
             </div>
50 50
           </td>
51
+           <td width="80">透析频率:</td>
52
+            <td width="70">
53
+                <div class="under-line">&nbsp;{{ predialysis.dialysis_count ? predialysis.dialysis_count : "" }}</div>
54
+            </td>
55
+            <td width="60">次/周</td>
56
+            <td width="10">第</td>
57
+            <td width="50">
58
+                <div class="under-line">
59
+                {{ patientInfo.total_dialysis + patientInfo.user_sys_before_count }}
60
+                </div>
61
+            </td>
62
+            <td width="80">次透析</td>
63
+            <td width="80">透析机号:</td>
64
+            <td width="40">
65
+                <div class="under-line"> {{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0 ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}</div>
66
+            </td>
67
+            <td></td>
68
+            <td></td>
69
+            <td></td>
70
+            <td></td>
71
+            <td></td>
51 72
         </tr>
52 73
         </tbody>
53 74
       </table>
54
-      <table class="table-box" style="margin-top: 10px;">
75
+      <!-- <table class="table-box" style="margin-top: 10px;">
55 76
         <tbody>
56 77
           <tr>
57 78
             <td width="80">透析频率:</td>
@@ -78,7 +99,7 @@
78 99
         
79 100
           </tr>
80 101
         </tbody>
81
-      </table>
102
+      </table> -->
82 103
       <table class="print-table" border="1">
83 104
         <tbody>
84 105
         <tr>