Преглед изворни кода

Merge branch '2022-10-17_vue_schedule_branch' of http://git.shengws.com/csx/Vue_New into 20220812

XMLWAN пре 2 година
родитељ
комит
6a686cf20b
2 измењених фајлова са 5 додато и 14 уклоњено
  1. 3 12
      src/xt_pages/dialysis/newDoctorAdvice.vue
  2. 2 2
      src/xt_pages/stock/drugs/drugStockOutOrder.vue

+ 3 - 12
src/xt_pages/dialysis/newDoctorAdvice.vue Прегледај датотеку

505
     </el-dialog>
505
     </el-dialog>
506
 
506
 
507
 
507
 
508
-
509
     <el-dialog
508
     <el-dialog
510
       title="药品统计表"
509
       title="药品统计表"
511
       :visible.sync="startdialogVisible"
510
       :visible.sync="startdialogVisible"
512
-      width="70%">
511
+      width="60%">
513
       <span>
512
       <span>
514
         <div class="cell clearfix" style="margin-bottom:10px">
513
         <div class="cell clearfix" style="margin-bottom:10px">
515
           <label class="title"> <span class="name">排班班次</span> : </label>
514
           <label class="title"> <span class="name">排班班次</span> : </label>
516
-           <el-select v-model="schedule_type" placeholder="请选择" @change="changeScheduleType">
515
+           <el-select v-model="schedule_type" placeholder="请选择" @change="changeScheduleType" >
517
             <el-option
516
             <el-option
518
               v-for="item in schedulArr"
517
               v-for="item in schedulArr"
519
               :key="item.value"
518
               :key="item.value"
1832
       padding: 0 2px;
1831
       padding: 0 2px;
1833
     }
1832
     }
1834
   }
1833
   }
1834
+
1835
 }
1835
 }
1836
 .el-table td,
1836
 .el-table td,
1837
 .el-table th.is-leaf,
1837
 .el-table th.is-leaf,
1853
   height: 20px;
1853
   height: 20px;
1854
 }
1854
 }
1855
 </style>
1855
 </style>
1856
-<style lang="scss" scoped>
1857
-  .page_consumables {
1858
-
1859
-  .clearfix:after {
1860
-    content: none;
1861
-  }
1862
-
1863
-  }
1864
-</style>

+ 2 - 2
src/xt_pages/stock/drugs/drugStockOutOrder.vue Прегледај датотеку

1734
       var max_str = ""
1734
       var max_str = ""
1735
       var min_str = ""
1735
       var min_str = ""
1736
       for(let j=0;j<this.outList.length;j++){
1736
       for(let j=0;j<this.outList.length;j++){
1737
-        if(this.outList[i].count_unit == max_unit){
1738
-           this.outList[i].count = this.outList[i].count * min_number
1737
+        if(this.outList[j].count_unit == max_unit){
1738
+           this.outList[j].count = this.outList[j].count * min_number
1739
         }
1739
         }
1740
         if(warehouse_info_id == this.outList[j].warehouse_info_id && drug_id == this.outList[j].drug_id){
1740
         if(warehouse_info_id == this.outList[j].warehouse_info_id && drug_id == this.outList[j].drug_id){
1741
            arr.push(this.outList[j])
1741
            arr.push(this.outList[j])