hah阿凡达

src/xt_pages/role/components/AdminInfoForm.vue

@@ -461,7 +461,8 @@ export default {
         { index: 2, name: '医生' },
         { index: 3, name: '护士' },
         { index: 4, name: '行政' },
-        { index: 5, name: '其他' }
+        { index: 5, name: '其他' },
+        { index: 6, name: '药师' }
       ],
       user_titles: [
         { index: 1, name: '医士' },
@@ -476,7 +477,8 @@ export default {
         { index: 10, name: '副主任护师' },
         { index: 11, name: '主任护师' },
         { index: 12, name: '运营专员' },
-        { index: 13, name: '运营主管' }
+        { index: 13, name: '运营主管' },
+        { index: 14, name: '其他' }
       ],
       roles: [], // [{id, name, intro, status}]
       loading: true,

src/xt_pages/role/components/EditAdminInfo.vue

@@ -90,6 +90,7 @@ export default {
                 { index: 11, name: '主任护师' },
                 { index: 12, name: '运营专员' },
                 { index: 13, name: '运营主管' },
+                {  index:14, name:  "其他"}
             ],
             roles: [], // [{id, name, intro, status}]
             loading: true,

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -708,21 +708,19 @@
             }
 
            
-            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)){
-            
+            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)){
+             
+              console.log("hhhhhhhhhhhhhhhhhhhhhh1111")
               this.tableList[i].coutn_unit = (parseInt(this.tableList[i].count%this.tableList[i].BaseDrugLib.min_number)).toString() +  this.tableList[i].BaseDrugLib.min_unit
               
             }
 
-            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)){
-             
+            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)){
+              console.log("hhhhhhhhhhhhhhhhhhhhhh2222")
               this.tableList[i].coutn_unit = (parseInt(this.tableList[i].count/this.tableList[i].BaseDrugLib.min_number)).toString() +  this.tableList[i].BaseDrugLib.max_unit
              
             }
 
-            
-
-
 
             if(this.tableList[i].price>0){
               this.tableList[i].total_price = this.tableList[i].price