Browse Source

hah阿凡达

28169 3 months ago
parent
commit
34edc42169

+ 4 - 2
src/xt_pages/role/components/AdminInfoForm.vue View File

461
         { index: 2, name: '医生' },
461
         { index: 2, name: '医生' },
462
         { index: 3, name: '护士' },
462
         { index: 3, name: '护士' },
463
         { index: 4, name: '行政' },
463
         { index: 4, name: '行政' },
464
-        { index: 5, name: '其他' }
464
+        { index: 5, name: '其他' },
465
+        { index: 6, name: '药师' }
465
       ],
466
       ],
466
       user_titles: [
467
       user_titles: [
467
         { index: 1, name: '医士' },
468
         { index: 1, name: '医士' },
476
         { index: 10, name: '副主任护师' },
477
         { index: 10, name: '副主任护师' },
477
         { index: 11, name: '主任护师' },
478
         { index: 11, name: '主任护师' },
478
         { index: 12, name: '运营专员' },
479
         { index: 12, name: '运营专员' },
479
-        { index: 13, name: '运营主管' }
480
+        { index: 13, name: '运营主管' },
481
+        { index: 14, name: '其他' }
480
       ],
482
       ],
481
       roles: [], // [{id, name, intro, status}]
483
       roles: [], // [{id, name, intro, status}]
482
       loading: true,
484
       loading: true,

+ 1 - 0
src/xt_pages/role/components/EditAdminInfo.vue View File

90
                 { index: 11, name: '主任护师' },
90
                 { index: 11, name: '主任护师' },
91
                 { index: 12, name: '运营专员' },
91
                 { index: 12, name: '运营专员' },
92
                 { index: 13, name: '运营主管' },
92
                 { index: 13, name: '运营主管' },
93
+                {  index:14, name:  "其他"}
93
             ],
94
             ],
94
             roles: [], // [{id, name, intro, status}]
95
             roles: [], // [{id, name, intro, status}]
95
             loading: true,
96
             loading: true,

+ 5 - 7
src/xt_pages/stock/drugs/drugStockFlow.vue View File

708
             }
708
             }
709
 
709
 
710
            
710
            
711
-            if(this.tableList[i].consumable_type == 2 ||this.tableList[i].consumable_type == 3 || this.tableList[i].consumable_type == 5 ||  this.tableList[i].consumable_type ==7  && (parseInt(this.tableList[i].count%this.tableList[i].BaseDrugLib.min_number) >0)){
712
-            
711
+            if((this.tableList[i].consumable_type == 2 ||this.tableList[i].consumable_type == 3 || this.tableList[i].consumable_type == 5 ||  this.tableList[i].consumable_type ==7 ) && (parseInt(this.tableList[i].count%this.tableList[i].BaseDrugLib.min_number) >0)){
712
+             
713
+              console.log("hhhhhhhhhhhhhhhhhhhhhh1111")
713
               this.tableList[i].coutn_unit = (parseInt(this.tableList[i].count%this.tableList[i].BaseDrugLib.min_number)).toString() +  this.tableList[i].BaseDrugLib.min_unit
714
               this.tableList[i].coutn_unit = (parseInt(this.tableList[i].count%this.tableList[i].BaseDrugLib.min_number)).toString() +  this.tableList[i].BaseDrugLib.min_unit
714
               
715
               
715
             }
716
             }
716
 
717
 
717
-            if(this.tableList[i].consumable_type == 2 ||this.tableList[i].consumable_type == 3 || this.tableList[i].consumable_type == 5 ||  this.tableList[i].consumable_type ==7  && (parseInt(this.tableList[i].count/this.tableList[i].BaseDrugLib.min_number) >0)){
718
-             
718
+            if((this.tableList[i].consumable_type == 2 ||this.tableList[i].consumable_type == 3 || this.tableList[i].consumable_type == 5 ||  this.tableList[i].consumable_type ==7)  && (parseInt(this.tableList[i].count/this.tableList[i].BaseDrugLib.min_number) >0)){
719
+              console.log("hhhhhhhhhhhhhhhhhhhhhh2222")
719
               this.tableList[i].coutn_unit = (parseInt(this.tableList[i].count/this.tableList[i].BaseDrugLib.min_number)).toString() +  this.tableList[i].BaseDrugLib.max_unit
720
               this.tableList[i].coutn_unit = (parseInt(this.tableList[i].count/this.tableList[i].BaseDrugLib.min_number)).toString() +  this.tableList[i].BaseDrugLib.max_unit
720
              
721
              
721
             }
722
             }
722
 
723
 
723
-            
724
-
725
-
726
 
724
 
727
             if(this.tableList[i].price>0){
725
             if(this.tableList[i].price>0){
728
               this.tableList[i].total_price = this.tableList[i].price
726
               this.tableList[i].total_price = this.tableList[i].price