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

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -505,15 +505,14 @@
     </el-dialog>
 
 
-
     <el-dialog
       title="药品统计表"
       :visible.sync="startdialogVisible"
-      width="70%">
+      width="60%">
       <span>
         <div class="cell clearfix" style="margin-bottom:10px">
           <label class="title"> <span class="name">排班班次</span> : </label>
-           <el-select v-model="schedule_type" placeholder="请选择" @change="changeScheduleType">
+           <el-select v-model="schedule_type" placeholder="请选择" @change="changeScheduleType" >
             <el-option
               v-for="item in schedulArr"
               :key="item.value"
@@ -1832,6 +1831,7 @@ export default {
       padding: 0 2px;
     }
   }
+
 }
 .el-table td,
 .el-table th.is-leaf,
@@ -1853,12 +1853,3 @@ export default {
   height: 20px;
 }
 </style>
-<style lang="scss" scoped>
-  .page_consumables {
-
-  .clearfix:after {
-    content: none;
-  }
-
-  }
-</style>

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -1734,8 +1734,8 @@ export default {
       var max_str = ""
       var min_str = ""
       for(let j=0;j<this.outList.length;j++){
-        if(this.outList[i].count_unit == max_unit){
-           this.outList[i].count = this.outList[i].count * min_number
+        if(this.outList[j].count_unit == max_unit){
+           this.outList[j].count = this.outList[j].count * min_number
         }
         if(warehouse_info_id == this.outList[j].warehouse_info_id && drug_id == this.outList[j].drug_id){
            arr.push(this.outList[j])