新分支

src/xt_pages/dialysis/schedualPatient.vue

@@ -220,8 +220,9 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
             var filtedSchedules = []
             for (let s_i = 0; s_i < originSchedules.length; s_i++) {
               const schedule = originSchedules[s_i]
+              console.log("schedule.patient",schedule.patient)
               if(schedule.patient!=null){
-                if (schedule.patient.name.indexOf(search_keyword) != -1) {
+                if ((schedule.patient.name.indexOf(search_keyword) != -1) || (schedule.patient.first_letter.indexOf(search_keyword) != -1)) {
                 filtedSchedules.push(schedule)
                 // break
                }

src/xt_pages/sign/index.vue

@@ -287,7 +287,7 @@ export default {
         if (response.data.data.patientlist != null) {
           var patientlist = response.data.data.patientlist
           this.weigh_list.id = patientlist.id
-          this.weigh_list.dry_weight = patientlist.dry_weight
+          this.weigh_list.dry_weight = patientlist.dry_weight?response.data.data.dryWeight.dry_weight:0
           if (this.weigh_list.dry_weight === 0) {
             this.weigh_list.dry_weight = ''
           }

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -354,7 +354,7 @@
             <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
                   <td style="border-right: none; border-inline-end: none;text-align: center">
-                    <span v-if="org_id!=0 && org_id!=0">
+                    <span v-if="org_id!=0 && org_id!=10480">
                       <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{getTotalPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}} </span>
                     <span v-if="is_sys == 0">
                       <span v-if="scope.row.child.length == 1">{{item.retail_price}}</span>