Browse Source

新分支

28169 1 year ago
parent
commit
122eb5c378

+ 2 - 1
src/xt_pages/dialysis/schedualPatient.vue View File

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

+ 1 - 1
src/xt_pages/sign/index.vue View File

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

+ 1 - 1
src/xt_pages/stock/drugs/drugStockOutOrder.vue View File

@@ -354,7 +354,7 @@
354 354
             <template slot-scope="scope">
355 355
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
356 356
                   <td style="border-right: none; border-inline-end: none;text-align: center">
357
-                    <span v-if="org_id!=0 && org_id!=0">
357
+                    <span v-if="org_id!=0 && org_id!=10480">
358 358
                       <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>
359 359
                     <span v-if="is_sys == 0">
360 360
                       <span v-if="scope.row.child.length == 1">{{item.retail_price}}</span>