新分支

src/xt_pages/dialysis/batch_print/batch_print_order_fiftyOne.vue

@@ -876,10 +876,10 @@
                             >iu</span
                           >
                           <span v-if="record.prescription.anticoagulant == 2"
-                            >iu</span
+                            >mg</span
                           >
                           <span v-if="record.prescription.anticoagulant == 1"
-                            >mg</span
+                            ></span
                           >
                         </div>
                         <div class="inline_block" style="margin-left: 20px">
@@ -920,14 +920,14 @@
                           <span v-if="record.prescription.anticoagulant == 4"
                             >mg/h</span
                           >
-                          <span v-if="record.prescription.anticoagulant == 3"
+                          <span v-if="record.prescription.anticoagulant == 3 || record.prescription.anticoagulant == 6 || record.prescription.anticoagulant == 7"
                             >iu/h</span
                           >
                           <span v-if="record.prescription.anticoagulant == 2"
-                            >iu/h</span
+                            >mg/h</span
                           >
                           <span v-if="record.prescription.anticoagulant == 1"
-                            >mg/h</span
+                            ></span
                           >
                         </div>
                         <div class="inline_block" style="margin-left: 20px">
@@ -946,14 +946,14 @@
                           <span v-if="record.prescription.anticoagulant == 4"
                             >mg</span
                           >
-                          <span v-if="record.prescription.anticoagulant == 3"
+                          <span v-if="record.prescription.anticoagulant == 3 || record.prescription.anticoagulant == 6 || record.prescription.anticoagulant == 7"
                             >iu</span
                           >
                           <span v-if="record.prescription.anticoagulant == 2"
-                            >iu</span
+                            >mg</span
                           >
                           <span v-if="record.prescription.anticoagulant == 1"
-                            >mg</span
+                            ></span
                           >
                         </div>
                         <div class="inline_block" style="margin-left: 20px">

src/xt_pages/workforce/components/tableData.vue

@@ -74,7 +74,7 @@
           v-model="value1"
           active-text="显示灌流器"
           @change="switchThis(value1)">
-          
+
         </el-switch>
       </div>
     </div>
@@ -282,7 +282,7 @@
         </el-table-column>
         <el-table-column
           :label="'周四 (' + weekTitle[3] + ')'"
-         
+
           align="center"
           v-if="isShowFour"
 
@@ -314,7 +314,7 @@
         </el-table-column>
         <el-table-column
           :label="'周五 (' + weekTitle[4] + ')'"
-          
+
           align="center"
           v-if="isShowFive"
 
@@ -346,7 +346,7 @@
         </el-table-column>
         <el-table-column
           :label="'周六 (' + weekTitle[5] + ')'"
-          
+
           align="center"
           v-if="isShowSix"
 
@@ -378,7 +378,7 @@
         </el-table-column>
         <el-table-column
           :label="'周日 (' + weekTitle[6] + ')'"
-          
+
           align="center"
           v-if="isShowSeven"
 
@@ -434,7 +434,7 @@
                 placeholder="请选择"
                 style="width: 100%"
             >
-            
+
               <el-option
                   :disabled="item.id == currentData.mode_id"
                   v-for="item in modeOptions"
@@ -502,10 +502,10 @@
                 @change="changePartition"
             >
               <el-option
-                  v-for="item in zone_names"
-                  :key="item"
-                  :label="item"
-                  :value="item"
+                v-for="(item, index) in zones"
+                :key="index"
+                :label="item.name"
+                :value="item.id"
               >
               </el-option>
             </el-select>
@@ -1329,7 +1329,7 @@ export default {
         this.$refs.table.doLayout();
       });
     if(this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 0 || this.$store.getters.xt_user.template_info.org_id == 3877 || this.$store.getters.xt_user.template_info.org_id == 10340){
-      
+
       //表格某列全部数据
         var Mon_M = []
         var Mon_A = []
@@ -1406,7 +1406,7 @@ export default {
         Mon_A_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Mon_A_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Mon_A_One.length; i < len; i+=29) {
           var strObjcet = Mon_A_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
@@ -1433,14 +1433,14 @@ export default {
         Mon_M_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Mon_M_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Mon_M_One.length; i < len; i+=29) {
           var strObjcet = Mon_M_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
           result.push(str);
       }
       sums[2]="总人数:"+ sums[2] +"\n"+result
-      
+
       for(let j in data){
         if(data[j].hasOwnProperty ('Mon_N') == true){
           Mon_N.push(data[j].Mon_N.mode_name)
@@ -1456,11 +1456,11 @@ export default {
         }
       }
       for(let x in countNum){
-        
+
         Mon_N_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Mon_N_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Mon_N_One.length; i < len; i+=29) {
           var strObjcet = Mon_N_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
@@ -1486,7 +1486,7 @@ export default {
         Tue_M_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Tue_M_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Tue_M_One.length; i < len; i+=29) {
           var strObjcet = Tue_M_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
@@ -1512,14 +1512,14 @@ export default {
         Tue_A_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Tue_A_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Tue_A_One.length; i < len; i+=29) {
           var strObjcet = Tue_A_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
           result.push(str);
       }
       sums[6]="总人数:"+ sums[6] +"\n"+result
-      
+
       for(let j in data){
         if(data[j].hasOwnProperty ('Tue_N') == true){
           Tue_N.push(data[j].Tue_N.mode_name)
@@ -1538,7 +1538,7 @@ export default {
         Tue_N_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Tue_N_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Tue_N_One.length; i < len; i+=29) {
           var strObjcet = Tue_N_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
@@ -1564,7 +1564,7 @@ export default {
         Wed_M_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Wed_M_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Wed_M_One.length; i < len; i+=29) {
           var strObjcet = Wed_M_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
@@ -1587,18 +1587,18 @@ export default {
         }
       }
       for(let x in countNum){
-        
+
         Wed_A_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Wed_A_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Wed_A_One.length; i < len; i+=29) {
           var strObjcet = Wed_A_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
           result.push(str);
       }
       sums[9]="总人数:"+ sums[9]  +"\n"+result
-      
+
       for(let j in data){
         if(data[j].hasOwnProperty ('Wed_N') == true){
           Wed_N.push(data[j].Wed_N.mode_name)
@@ -1614,11 +1614,11 @@ export default {
         }
       }
       for(let x in countNum){
-        
+
         Wed_N_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Wed_N_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Wed_N_One.length; i < len; i+=29) {
           var strObjcet = Wed_N_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
@@ -1644,7 +1644,7 @@ export default {
         Thurs_M_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Thurs_M_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Thurs_M_One.length; i < len; i+=29) {
           var strObjcet = Thurs_M_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
@@ -1670,14 +1670,14 @@ export default {
         Thurs_A_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Thurs_A_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Thurs_A_One.length; i < len; i+=29) {
           var strObjcet = Thurs_A_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
           result.push(str);
       }
       sums[12]="总人数:"+ sums[12] +"\n"+result
-      
+
       for(let j in data){
         if(data[j].hasOwnProperty ('Thurs_N') == true){
           Thurs_N.push(data[j].Thurs_N.mode_name)
@@ -1693,11 +1693,11 @@ export default {
         }
       }
       for(let x in countNum){
-        
+
         Thurs_N_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Thurs_N_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Thurs_N_One.length; i < len; i+=29) {
           var strObjcet = Thurs_N_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
@@ -1723,7 +1723,7 @@ export default {
         Fri_M_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Fri_M_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Fri_M_One.length; i < len; i+=29) {
           var strObjcet = Fri_M_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
@@ -1746,18 +1746,18 @@ export default {
         }
       }
       for(let x in countNum){
-        
+
         Fri_A_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Fri_A_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Fri_A_One.length; i < len; i+=29) {
           var strObjcet = Fri_A_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
           result.push(str);
       }
       sums[15]="总人数:"+ sums[15] +"\n"+result
-      
+
       for(let j in data){
         if(data[j].hasOwnProperty ('Fri_N') == true){
           Fri_N.push(data[j].Fri_N.mode_name)
@@ -1773,11 +1773,11 @@ export default {
         }
       }
       for(let x in countNum){
-       
+
         Fri_N_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Fri_N_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Fri_N_One.length; i < len; i+=29) {
           var strObjcet = Fri_N_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
@@ -1803,7 +1803,7 @@ export default {
         Sat_M_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Sat_M_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Sat_M_One.length; i < len; i+=29) {
           var strObjcet = Sat_M_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
@@ -1826,18 +1826,18 @@ export default {
         }
       }
       for(let x in countNum){
-       
+
         Sat_A_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Sat_A_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Sat_A_One.length; i < len; i+=29) {
           var strObjcet = Sat_A_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
           result.push(str);
       }
       sums[18]="总人数:"+ sums[18] +"\n"+result
-      
+
       for(let j in data){
         if(data[j].hasOwnProperty ('Sat_N') == true){
           Sat_N.push(data[j].Sat_N.mode_name)
@@ -1853,11 +1853,11 @@ export default {
         }
       }
       for(let x in countNum){
-        
+
         Sat_N_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Sat_N_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Sat_N_One.length; i < len; i+=29) {
           var strObjcet = Sat_N_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
@@ -1883,7 +1883,7 @@ export default {
         Sun_M_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Sun_M_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Sun_M_One.length; i < len; i+=29) {
           var strObjcet = Sun_M_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
@@ -1906,18 +1906,18 @@ export default {
         }
       }
       for(let x in countNum){
-       
+
         Sun_A_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Sun_A_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Sun_A_One.length; i < len; i+=29) {
           var strObjcet = Sun_A_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
           result.push(str);
       }
       sums[21]="总人数:"+ sums[21] +"\n"+result
-      
+
       for(let j in data){
         if(data[j].hasOwnProperty ('Sun_N') == true){
           Sun_N.push(data[j].Sun_N.mode_name)
@@ -1933,11 +1933,11 @@ export default {
         }
       }
       for(let x in countNum){
-        
+
         Sun_N_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Sun_N_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Sun_N_One.length; i < len; i+=29) {
           var strObjcet = Sun_N_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
@@ -2872,14 +2872,14 @@ export default {
                   //   zone_device_map[device_number.zone.name].push(device_number)
                   // }
                   // this.zone_device_map = zone_device_map
-                  
+
                   // this.zone_names = Object.keys(this.zone_device_map)
                   // if (this.zone_names.length > 0) {
                   //   this.zone_name = this.zone_names[0]
                   //   this.current_devices = this.zone_device_map[this.zone_name]
                   //   this.device_id = this.current_devices[0].id
                   // }
-                  
+
                   // this.zone_device_options = [
                   //   { values: this.zone_names },
                   //   // { values: this.getDeviceNumberNames(this.current_devices) },
@@ -3167,6 +3167,7 @@ export default {
         schedule_date:  this.currentData.schedule_date,
         patient_id: this.currentData.patient_id,
       };
+
       //进行网络请求，获取空排班机位
       getSmartDevices(params).then((response) => {
         if (response.data.state == 0) {
@@ -3181,13 +3182,11 @@ export default {
           //   for(let i=0;i<devices.length;i++){
           //     this.zone_names.push(devices[0])
           //   }
-            
+
           // }
           // this.zone_names=devices[0];
           this.zone_name = (devices[0].zone_name)
-          console.log("hhahhahah",this.zone_name)
           this.device_id = devices[0].id
-          console.log('zone_namess的数据',this.zone_names);
         }
       });
 

src/xt_pages/workforce/components/template_table.vue

@@ -3800,7 +3800,7 @@ export default {
     position: absolute;
     right: 0px;
     top: -3px;
-    // visibility: hidden;
+    visibility: hidden;
     .el-button {
       width: 15px;
       height: 15px;