Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/role/admin.vue

@@ -24,15 +24,15 @@
         @click="BatchDelete"
         >医药师登记</el-button>
 
-
-       <!-- <el-button
+<!-- 
+        <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toJiaBan">首拼</el-button> 
+          @click="toJiaBan">首拼</el-button>  -->
 
-           -->
+          
 
 
           <!-- <el-button

src/xt_pages/stock/stockOutOrder.vue

@@ -296,7 +296,7 @@
             <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.childOne" :key="index">
                   <td style="border-right: none; border-inline-end: none;text-align: center">
-                     {{getAllStockCount(scope.row.child,item.warehousing_id) - getCancelInfo(item.warehousing_id,item.good_id)}}
+                     {{getAllStockCount(scope.row.child,item.warehousing_id,item.good_id) - getCancelInfo(item.warehousing_id,item.good_id)}}
                   </td>
                </tr>
              
@@ -349,7 +349,7 @@
                <tr style="background: none" v-for="(item,index) in scope.row.childOne" :key="index">
                   <td style="border-right: none; border-inline-end: none;text-align: center">
                       <!-- {{(getAllStockCount(scope.row.child,item.warehousing_id) * getAllStockCountPrice(scope.row.child,item.warehousing_id)).toFixed(2)}} -->
-                       {{((getAllStockCount(scope.row.child,item.warehousing_id) - getCancelInfo(item.warehousing_id,item.good_id)) *  getAllStockCountPrice(scope.row.child,item.warehousing_id)).toFixed(2)}}
+                       {{((getAllStockCount(scope.row.child,item.warehousing_id,item.good_id) - getCancelInfo(item.warehousing_id,item.good_id)) *  getAllStockCountPrice(scope.row.child,item.warehousing_id)).toFixed(2)}}
                   </td>
                </tr>
             </template>
@@ -2257,7 +2257,7 @@ export default {
     changeCheckType(){
       this.GetWarehouseOut()
     },
-    getAllStockCount(val,warehousing_id){
+    getAllStockCount(val,warehousing_id,good_id){
       var arr=[]
       var total_count = 0
      if(val!=null&&val.length > 0){
@@ -2273,10 +2273,13 @@ export default {
        }
      }
      if(total_count > 0){
+    
         return total_count
      }else{
+     
       return total_count
      }
+     
     },
     getAllStockCountPrice(val,warehousing_id){
      var price = 0
@@ -2422,6 +2425,8 @@ export default {
       }
      }
      if(count > 0){
+      console.log("good_id",good_id)
+      console.log("数量我哦哦我",count)
       return count
      }else{
       return 0 

src/xt_pages/workforce/remind_print_setting_one.vue

@@ -42,13 +42,13 @@
                     <span>{{getModeId(main_collection.mode_id)}}</span>
                   
                 </div>
-                <div class="printCell" v-if="org_id!=10375">
+                <div class="printCell" v-if="org_id!=9671">
                   <span>抗凝剂：{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name : ''}}</span>
                 </div>
-                <div class="printCell" v-if="org_id==10375">
+                <div class="printCell" v-if="org_id==9671">
                   <span>抗凝剂：{{ main_collection.prescription.anticoagulant ? anticoagulants_confit[main_collection.prescription.anticoagulant].name : ''}}</span>
                 </div>
-                <div class="printCell" v-if="org_id!=10375">
+                <div class="printCell" v-if="org_id!=9671">
                  首剂：<span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_shouji}} mg</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 2">
                     {{main_collection.dialysissolution.anticoagulant_shouji}}mg
@@ -82,7 +82,7 @@
                    </span>
                  
                 </div>
-                <div class="printCell" v-if="org_id ==10375">
+                <div class="printCell" v-if="org_id ==9671">
                  首剂：<span v-if="main_collection.prescription.anticoagulant == 1">{{main_collection.prescription.anticoagulant_shouji}} mg</span>
                   <span v-if="main_collection.prescription.anticoagulant == 2">
                     {{main_collection.prescription.anticoagulant_shouji}}mg
@@ -116,7 +116,7 @@
                    </span>
                  
                 </div>
-                <div class="printCell" v-if="org_id!=10375">
+                <div class="printCell" v-if="org_id!=9671">
                   维持：{{main_collection.dialysissolution.anticoagulant_weichi}}
                    <span v-if="main_collection.dialysissolution.anticoagulant == 1">
                     mg/h
@@ -154,7 +154,7 @@
               
                 </div>
 
-                <div class="printCell" v-if="org_id!=10375">
+                <div class="printCell" v-if="org_id!=9671">
                   维持：{{main_collection.prescription.anticoagulant_weichi}}
                    <span v-if="main_collection.prescription.anticoagulant == 1">
                     mg/h
@@ -192,7 +192,7 @@
               
                 </div>
                
-                <div class="printCell" v-if="org_id!=10375">
+                <div class="printCell" v-if="org_id!=9671">
                   总量：{{main_collection.dialysissolution.anticoagulant_zongliang}}
                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">
                     mg
@@ -230,7 +230,7 @@
           
                 </div>
 
-                <div class="printCell" v-if="org_id==10375">
+                <div class="printCell" v-if="org_id==9671">
                   总量：{{main_collection.prescription.anticoagulant_zongliang}}
                   <span v-if="main_collection.prescription.anticoagulant == 1">
                     mg
@@ -332,7 +332,7 @@
                 </div>
 
                 <div class="printCell">
-                  <span v-if="org_id!=0&&org_id!=10375">
+                  <span v-if="org_id!=0&&org_id!=9671">
                     排班备注：
                     <span  style="width:auto;">
                      <span>
@@ -341,7 +341,7 @@
                     </span>
                   
                   </span>
-                  <span v-if="org_id == 0 || org_id ==10375">
+                  <span v-if="org_id == 0 || org_id ==9671">
                     排班备注：
                     <sapn v-if="main_collection.schedule_type ==1">上午</sapn>
                     <sapn v-if="main_collection.schedule_type ==2">下午</sapn>