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

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -1607,12 +1607,13 @@
               }
             }
 
-            total = Math.floor(total * 100) / 100
+            total =total.toFixed(2)
           }
         }
         return total
 
-      }, getTotalTwo() {
+      },
+       getTotalTwo() {
         var total = 0
         for (let i = 0; i < this.month_prescriptions.length; i++) {
 

src/xt_pages/workforce/components/tableWeeks.vue

@@ -314,7 +314,7 @@
           <el-checkbox v-model="name">姓名</el-checkbox>
          </li>
          <li>
-          <el-checkbox v-model="zone">分区</el-checkbox>
+          <el-checkbox v-model="zone_name">分区</el-checkbox>
          </li>
          <li>
           <el-checkbox v-model="classes">班次</el-checkbox>
@@ -1322,10 +1322,10 @@
         if (this.name == false) {
           this.form.name = 2
         }
-        if (this.zone == true) {
+        if (this.zone_name == true) {
           this.form.zone = 1
         }
-        if (this.zone == false) {
+        if (this.zone_name == false) {
           this.form.zone = 2
         }
         if (this.classes == true) {

src/xt_pages/workforce/remind_print_setting.vue

@@ -20,18 +20,26 @@
           <div class="table_panel">
             <div v-for="(main_collection,index) in scheduleData" :key="index" style="page-break-after: always;">
               <div class="signPrint">
-                <div>分区/床位号:{{main_collection.zone.name}}/{{main_collection.number.number}}</div>
+                <div>
+                 <span v-if="printObj.zone == 1">分区/</span>
+                 <span v-if="printObj.number == 1">床位号:</span>
+                 <span v-if="printObj.zone == 1">{{main_collection.zone.name}}/</span> 
+                 <span v-if="printObj.number == 1">{{main_collection.number.number}}</span>
+                </div>
                 <div>姓名:
-                  <span v-if="type ==1">{{main_collection.patient.name}} </span>
-                  <span v-if="type ==2">{{main_collection.patient}} </span>
+                  <span v-if="type ==1 && printObj.name == 1">{{main_collection.patient.name}} </span>
+                  <span v-if="type ==2 && printObj.name == 1">{{main_collection.patient}} </span>
                 </div>
-                <div>抗凝剂:
-                  <span v-if="org_id == 10138">{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name + ' 5000iu/瓶' : ''}}</span>
-                  <span v-else >{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name: ''}}</span>
+                <div v-if="printObj.anticoagulant == 1">抗凝剂:
+                  <span v-if="org_id == 10138 ">{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name + ' 5000iu/瓶' : ''}}</span>
+                  <span v-else >
+                   <span>{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name: ''}}</span> 
+                  </span>
                 </div>
                <div v-if="org_id == 10188">首剂:{{main_collection.dialysissolution.anticoagulant_shouji}}</div>
                 <div v-if="org_id == 10188">维持:{{main_collection.dialysissolution.anticoagulant_weichi}}</div>
-                <div>用量:
+                <div v-if="printObj.anticoagulant_zongliang == 1">
+                  用量:
                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 2">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 3">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
@@ -104,8 +112,8 @@
      console.log("机构ID",this.org_id)
      this.currentDate = this.getCurrentDate()
 
-     this.modeOptions = this.$store.getters.treatment_mode
-     this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
+    this.modeOptions = this.$store.getters.treatment_mode
+    this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
     this.week_type = this.$route.query.week_type
     this.week_time  = this.$route.query.week_time
     this.zone = this.$route.query.zone
@@ -321,7 +329,7 @@
       getPrintList().then(response=>{
          if(response.data.state == 1){
            var list = response.data.data.list
-           console.log("list222222222",list)
+           console.log("打印设置",list)
            this.printObj = list
          }
       })