新分支

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyTwo.vue

@@ -1358,8 +1358,8 @@
                               >* {{ advice[0].prescribing_number
                               }}{{ advice[0].prescribing_number_unit }}</span
                             >
-                            <span v-if="advice[0].single_dose != 0"
-                              >{{ advice[0].single_dose
+                            <span v-if="advice[0].single_dose != 0"> 
+                             <span v-if="advice[0].single_dose >0"> 单次用量 </span>{{ advice[0].single_dose
                               }}{{ advice[0].single_dose_unit }}</span
                             >
                             <span>{{ advice[0].delivery_way }}</span>

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyTwo.vue

@@ -1241,9 +1241,9 @@
                    {{ advice.prescribing_number
                 }}{{ advice.prescribing_number_unit }}
               </span>
-              <span v-if="advice.single_dose != 0"
-                >{{ advice.single_dose }}{{ advice.single_dose_unit }}</span
-              >
+              <span v-if="advice.single_dose != 0"> 
+               <span v-if="advice.single_dose >0">单次用量 </span>  
+                {{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
               <span v-if="advice.parent_id == 0">{{
                 advice.delivery_way
               }}</span>

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

@@ -1856,20 +1856,42 @@ export default {
       }
       return "";
     },
+    // getAge: function(val) {
+    //   if (
+    //     this.org_template_info.template_id == 2 ||
+    //     this.org_template_info.template_id == 0
+    //   ) {
+    //     if (val.age == 0) {
+    //       return jsGetAge(val.birth, "-");
+    //     } else {
+    //       return val.age;
+    //     }
+    //   } else {
+    //     return jsGetAge(val.birth, "-");
+    //   }
+    // },
     getAge: function(val) {
-      if (
-        this.org_template_info.template_id == 2 ||
-        this.org_template_info.template_id == 0
-      ) {
-        if (val.age == 0) {
-          return jsGetAge(val.birth, "-");
-        } else {
-          return val.age;
-        }
-      } else {
-        return jsGetAge(val.birth, "-");
-      }
-    },
+     
+     if (val.id_card_no) {
+       var thisLen = val.id_card_no.length
+
+       var birth = ''
+       if (thisLen == 15) {
+         birth = '19' + val.id_card_no.substr(6, 6)
+       } else {
+         birth = val.id_card_no.substr(6, 8)
+       }
+       var birthtwo =
+         birth.substr(0, 4) +
+         '-' +
+         birth.substr(4, 2) +
+         '-' +
+         birth.substr(6, 2)
+
+       var age = jsGetAge(birthtwo, '-')
+       return age
+     }
+   },
     newAdviceGroupObject: function() {
       return Object.assign(
         {},

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -304,7 +304,7 @@
                   <td style="border-right: none; border-inline-end:none;text-align: center">
                     <span v-if="is_sys==1 || is_sys == 5">{{getOutCountSix(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)}}</span>
                     <span v-if="is_sys == 12">{{getOutCountTen(item.count,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
-                    <span v-if="is_sys == 0"> {{getOutCountOne(item.batch_number,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}} </span>
+                    <span v-if="is_sys == 0"> {{getOutCountOne(item.batch_number,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)}} </span>
                   </td>
                </tr>
             </template>
@@ -1222,9 +1222,10 @@ export default {
           this.dealerList = response.data.data.dealerList;
           var drugFlowList = response.data.data.drugFlowList;
           var drugList = response.data.data.drugList
-        
+         
           this.tabList = drugList
           var drugListOne = response.data.data.drugListFlow
+          console.log("drugListOne----------",drugListOne)
           //按批号分组
           var drugListTwo=  response.data.data.drugListOne
           console.log("drugListTwo9922wo",drugListTwo)
@@ -1247,6 +1248,9 @@ export default {
                        drugFlowList[i].childOne.push(drugListOne[j])
                    }
                 }
+                if(drugFlowList[i].drug_id == 1154){
+                    console.log("drugflowlist------",drugFlowList[i].count)
+                }
               }
             }
           
@@ -1311,6 +1315,7 @@ export default {
                } 
             }
           }
+          console.log("list表格---------",list)
           this.tableList = list;
         }
         if(is_sys == 12){
@@ -1821,14 +1826,16 @@ export default {
       }
       return max_str + min_str;
     },
-    getOutCountOne(batch_number,max_unit,min_unit,min_number){
-     
+    getOutCountOne(batch_number,max_unit,min_unit,min_number,drug_id){
+      console.log("drug_id-----",drug_id)
       var arr = []
       var total = 0
       var max_str = ""
       var min_str = ""
+      console.log("tablelost----",this.tabList)
       for(let j=0;j<this.tabList.length;j++){
-        if(batch_number == this.tabList[j].batch_number){
+      
+        if(batch_number == this.tabList[j].batch_number && drug_id == this.tabList[j].drug_id){
            arr.push(this.tabList[j])
         }
       }

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

@@ -915,6 +915,7 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
+          this.recordInfo.recordData = []
           var manulist = response.data.data.manulist;
           this.manufacturerList = manulist;
           this.dealerList = response.data.data.dealerList;