XMLWAN 3 年 前
コミット
aff996a33b

+ 3 - 2
src/xt_pages/hospitalStation/components/deskPrescription.vue ファイルの表示

1607
               }
1607
               }
1608
             }
1608
             }
1609
 
1609
 
1610
-            total = Math.floor(total * 100) / 100
1610
+            total =total.toFixed(2)
1611
           }
1611
           }
1612
         }
1612
         }
1613
         return total
1613
         return total
1614
 
1614
 
1615
-      }, getTotalTwo() {
1615
+      },
1616
+       getTotalTwo() {
1616
         var total = 0
1617
         var total = 0
1617
         for (let i = 0; i < this.month_prescriptions.length; i++) {
1618
         for (let i = 0; i < this.month_prescriptions.length; i++) {
1618
 
1619
 

+ 3 - 3
src/xt_pages/workforce/components/tableWeeks.vue ファイルの表示

314
           <el-checkbox v-model="name">姓名</el-checkbox>
314
           <el-checkbox v-model="name">姓名</el-checkbox>
315
          </li>
315
          </li>
316
          <li>
316
          <li>
317
-          <el-checkbox v-model="zone">分区</el-checkbox>
317
+          <el-checkbox v-model="zone_name">分区</el-checkbox>
318
          </li>
318
          </li>
319
          <li>
319
          <li>
320
           <el-checkbox v-model="classes">班次</el-checkbox>
320
           <el-checkbox v-model="classes">班次</el-checkbox>
1322
         if (this.name == false) {
1322
         if (this.name == false) {
1323
           this.form.name = 2
1323
           this.form.name = 2
1324
         }
1324
         }
1325
-        if (this.zone == true) {
1325
+        if (this.zone_name == true) {
1326
           this.form.zone = 1
1326
           this.form.zone = 1
1327
         }
1327
         }
1328
-        if (this.zone == false) {
1328
+        if (this.zone_name == false) {
1329
           this.form.zone = 2
1329
           this.form.zone = 2
1330
         }
1330
         }
1331
         if (this.classes == true) {
1331
         if (this.classes == true) {

+ 18 - 10
src/xt_pages/workforce/remind_print_setting.vue ファイルの表示

20
           <div class="table_panel">
20
           <div class="table_panel">
21
             <div v-for="(main_collection,index) in scheduleData" :key="index" style="page-break-after: always;">
21
             <div v-for="(main_collection,index) in scheduleData" :key="index" style="page-break-after: always;">
22
               <div class="signPrint">
22
               <div class="signPrint">
23
-                <div>分区/床位号:{{main_collection.zone.name}}/{{main_collection.number.number}}</div>
23
+                <div>
24
+                 <span v-if="printObj.zone == 1">分区/</span>
25
+                 <span v-if="printObj.number == 1">床位号:</span>
26
+                 <span v-if="printObj.zone == 1">{{main_collection.zone.name}}/</span> 
27
+                 <span v-if="printObj.number == 1">{{main_collection.number.number}}</span>
28
+                </div>
24
                 <div>姓名:
29
                 <div>姓名:
25
-                  <span v-if="type ==1">{{main_collection.patient.name}} </span>
26
-                  <span v-if="type ==2">{{main_collection.patient}} </span>
30
+                  <span v-if="type ==1 && printObj.name == 1">{{main_collection.patient.name}} </span>
31
+                  <span v-if="type ==2 && printObj.name == 1">{{main_collection.patient}} </span>
27
                 </div>
32
                 </div>
28
-                <div>抗凝剂:
29
-                  <span v-if="org_id == 10138">{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name + ' 5000iu/瓶' : ''}}</span>
30
-                  <span v-else >{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name: ''}}</span>
33
+                <div v-if="printObj.anticoagulant == 1">抗凝剂:
34
+                  <span v-if="org_id == 10138 ">{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name + ' 5000iu/瓶' : ''}}</span>
35
+                  <span v-else >
36
+                   <span>{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name: ''}}</span> 
37
+                  </span>
31
                 </div>
38
                 </div>
32
                <div v-if="org_id == 10188">首剂:{{main_collection.dialysissolution.anticoagulant_shouji}}</div>
39
                <div v-if="org_id == 10188">首剂:{{main_collection.dialysissolution.anticoagulant_shouji}}</div>
33
                 <div v-if="org_id == 10188">维持:{{main_collection.dialysissolution.anticoagulant_weichi}}</div>
40
                 <div v-if="org_id == 10188">维持:{{main_collection.dialysissolution.anticoagulant_weichi}}</div>
34
-                <div>用量:
41
+                <div v-if="printObj.anticoagulant_zongliang == 1">
42
+                  用量:
35
                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
43
                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
36
                   <span v-if="main_collection.dialysissolution.anticoagulant == 2">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
44
                   <span v-if="main_collection.dialysissolution.anticoagulant == 2">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
37
                   <span v-if="main_collection.dialysissolution.anticoagulant == 3">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
45
                   <span v-if="main_collection.dialysissolution.anticoagulant == 3">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
104
      console.log("机构ID",this.org_id)
112
      console.log("机构ID",this.org_id)
105
      this.currentDate = this.getCurrentDate()
113
      this.currentDate = this.getCurrentDate()
106
 
114
 
107
-     this.modeOptions = this.$store.getters.treatment_mode
108
-     this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
115
+    this.modeOptions = this.$store.getters.treatment_mode
116
+    this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
109
     this.week_type = this.$route.query.week_type
117
     this.week_type = this.$route.query.week_type
110
     this.week_time  = this.$route.query.week_time
118
     this.week_time  = this.$route.query.week_time
111
     this.zone = this.$route.query.zone
119
     this.zone = this.$route.query.zone
321
       getPrintList().then(response=>{
329
       getPrintList().then(response=>{
322
          if(response.data.state == 1){
330
          if(response.data.state == 1){
323
            var list = response.data.data.list
331
            var list = response.data.data.list
324
-           console.log("list222222222",list)
332
+           console.log("打印设置",list)
325
            this.printObj = list
333
            this.printObj = list
326
          }
334
          }
327
       })
335
       })