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

src/api/drug/drug.js

@@ -745,4 +745,13 @@ export function deleteSelfWarehouseInfo(id,params){
     method:"get",
     params:params,
   })
+}
+
+export function toCheckSelfWarehousingInfo(params){
+ 
+  return request({
+    url:"/api/drug/tocheckselfwarehouseinginfo",
+    method:"get",
+    params:params,
+  })
 }

src/xt_pages/dialysis/batch_print/batch_print_order_seventyfive.vue

@@ -152,6 +152,8 @@
                   "
                 >
                 {{ record.dialysis_order.dialysis_dialyszers ?  record.dialysis_order.dialysis_dialyszers : "/"}}
+
+                <span v-if="record.dialysis_order.dialysis_strainer!=''"> /{{ record.dialysis_order.dialysis_strainer ?  record.dialysis_order.dialysis_strainer : ""}}</span>
                 </div>
               </div>
               <div class="inline_block" style="flex: 1;" >

src/xt_pages/dialysis/details/dialog/computer_dialog.vue

@@ -244,18 +244,18 @@
           ></el-input>
         </el-form-item>
 
-      <el-form-item  label="血滤器:"
-          v-if="isShowFiled('血滤器')"
-          :prop="isName('血滤器')"
-          :rules="isCheckmust('血滤器')">
-          <el-input
-            v-model="form.dialysis_strainer"
-            style="width: 200px"
-            @focus="showInnerDialog('12')"
-          ></el-input>
-      </el-form-item>
+        <el-form-item  label="血滤器:"
+            v-if="isShowFiled('血滤器')"
+            :prop="isName('血滤器')"
+            :rules="isCheckmust('血滤器')">
+            <el-input
+              v-model="form.dialysis_strainer"
+              style="width: 200px"
+              @focus="showInnerDialog('12')"
+            ></el-input>
+        </el-form-item>
+
 
-      
         <el-form-item
           label="血管通路："
           v-if="isShowFiled('血管通路')"
@@ -491,7 +491,7 @@ export default {
       infoDialogVisible:false,
       selected_date:"",
       remark:"",
-     
+
     };
   },
   props: {
@@ -522,7 +522,7 @@ export default {
     lastOrder: {
       type: Object,
     },
-    
+
   },
   mounted() {},
   created() {
@@ -929,10 +929,10 @@ export default {
           }
 
 
-         
+
           console.log("质控护士", this.form.quality_nurse_id);
           console.log("this.form.nuclein_date", this.form.nuclein_date);
-
+          console.log("dialysis_strainer------------------",this.form.dialysis_strainer)
           startDialysis(
             this.patient_id,
             this.schedule_date
@@ -1120,9 +1120,9 @@ export default {
               this.dialysisStrainerList[i].name = this.dialysisStrainerList[i].specification_name
             }
             this.InnerDialogProps.values = this.dialysisStrainerList
-            this.InnerDialogProps.titles = '滤过器'
+            this.InnerDialogProps.titles = '血滤器'
             this.InnerDialogProps.type = 'dialysis_strainer'
-            this.InnerDialogProps.selected = this.dialysisPrescription.dialysis_strainer
+            this.InnerDialogProps.selected = this.form.dialysis_strainer
             this.InnerDialogProps.isShowTextArea = false
         break
         case "13": // 穿刺方式
@@ -1151,7 +1151,7 @@ export default {
           this.form.dialysis_irrigation = val.value.join(",");
           break;
         case 'dialysis_strainer':
-            this.form.dialysis_strainer = val.value.join(',')
+          this.form.dialysis_strainer = val.value.join(",")
         break
       }
     },

src/xt_pages/dialysis/template/DialysisPrintOrderSeventy.vue

@@ -2310,8 +2310,7 @@
                         </span>
                         <img
                           :style="{'height':org_id==10597 ? '25px':'35px'}"
-                          :src="
-                            setAdminUserES(check == null ? 0 : check.modifier)
+                          :src="setAdminUserES(check == null ? 0 : check.modifier)
                           "
                           alt=""
                           srcset=""

src/xt_pages/dialysis/template/DialysisPrintOrderseventyfive.vue

@@ -135,7 +135,10 @@
                 <span v-if="dialysisOrder !=null" >
                   {{dialysisOrder.dialysis_dialyszers ? dialysisOrder.dialysis_dialyszers : "/" }}
                 </span>
-                <span v-else>/</span>
+                <span v-if="dialysisOrder !=null && dialysisOrder.dialysis_strainer!=''" >
+                   /{{dialysisOrder.dialysis_strainer ? dialysisOrder.dialysis_strainer : "" }}
+                </span>
+              
               </div>
             </div>
             <div class="inline_block" style="flex: 1;" >

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -268,7 +268,8 @@ export default {
               if(this.org_id ==10210 || this.org_id ==10215 || this.org_id == 10265){
                 list[i].stockIn = list[i].GoodStartFlowInfo.over_count
               }else{
-               
+                console.log("HHAHHAHA",list[i].id)
+                console.log("耗材id",list[i].specification_name)
                 console.log("入库",this.getAllStockIn(list[i].StWarehousingInfoTwo))
                 console.log("盘盈",this.getAllStockInFlow(list[i].WareStartInStockFlow))
                 console.log("出库",this.getAllOutStockIn(list[i].WarehouseOutInfoTenty) )
@@ -278,7 +279,7 @@ export default {
                   list[i].stockIn = list[i].GoodStartFlowInfo.over_count
                 }else{
                   list[i].stockIn = this.getAllStockIn(list[i].StWarehousingInfoTwo) + this.getAllStockInFlow(list[i].WareStartInStockFlow) - this.getAllOutStockIn(list[i].WarehouseOutInfoTenty) - this.getAllStockOutFlow(list[i].WareStartOutStockFlow)
-                  console.log("剩余库存---------------",list[i].stockIn)
+                  // console.log("剩余库存---------------",list[i].stockIn)
                   if(list[i].stockIn <0){
                     list[i].stockIn =0
                   }
@@ -300,9 +301,9 @@ export default {
               if(this.org_id == 10265){
                 list[i].overStock = list[i].GoodEndFlowInfo.over_count
               }else{
-                console.log("期初",list[i].stockIn)
-                console.log("增加",list[i].stockAdd)
-                console.log("出库",list[i].outStock)
+                // console.log("期初",list[i].stockIn)
+                // console.log("增加",list[i].stockAdd)
+                // console.log("出库",list[i].outStock)
                 if((list[i].stockIn + list[i].stockAdd - list[i].outStock)>0 ){
                   list[i].overStock = list[i].stockIn + list[i].stockAdd - list[i].outStock
                 }else{