11月14日 库存扣减更新

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

@@ -853,11 +853,7 @@
       'dialysis_order.id': function() {
         this.form['dialysis_order_id'] = this.dialysis_order.id
       },
-      doctor_advices: function() {
-        // this.handleSpanTempArr()
-        // this.hoverOrderArr = []
-        // this.handleStyle()
-      }
+     
     },
     methods: {
       getContent: function() {
@@ -2566,7 +2562,7 @@
       this.patientid = this.$route.query.patient_id
       this.request_record_date = this.record_date
 
-      this.getDialysisScheduleDetail()
+      // this.getDialysisScheduleDetail()
        //获取自备药
       this.getSelfMedicalList()
     },mounted(){

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

@@ -47,6 +47,7 @@
         <el-checkbox :label="replacement_total"></el-checkbox>
         <el-checkbox :label="blood_flow_volume"></el-checkbox>
         <el-checkbox :label="dialysate_flow"></el-checkbox>
+        <el-checkbox :label="displace_liqui_value"></el-checkbox>
      </el-checkbox-group>
     </el-form>
     <el-form :inline="true" class="demo-form-inline newInline" :model="doubleReview" label-width="105px">
@@ -197,10 +198,11 @@
         anticoagulant_weichi:"维持:",
         anticoagulant_zongliang:"总量:",
         displace_liqui_part:"置换液:",
-        replacement_total:"置换总量:",
+        replacement_total:"置换量:",
         blood_flow_volume:"处方血流量:",
         dialysate_flow:"透析液流量:",
-        blood_access_part_opera_id:"通路类型:"
+        blood_access_part_opera_id:"通路类型:",
+        displace_liqui_value:"置换液总量:",
       }
     }, methods: {
       
@@ -579,7 +581,7 @@
       changeBoxOne(val){
          var arr = []
          var str = val.join(';')
-         console.log("strw222222222",str)
+        
         if(str.indexOf('透析模式')!=-1 && this.prescription!=null){
             arr.push("透析模式:"+(this.getMode(this.prescription.mode_id)?this.getMode(this.prescription.mode_id):""))
         }
@@ -630,19 +632,19 @@
         }
 
        if(str.indexOf("置换液")!=-1 && this.prescription!=null){
-           arr.push("置换液:"+(this.prescription.displace_liqui_part?this.prescription.displace_liqui_part:""))
+           arr.push("置换液:"+(this.getDisplace(this.prescription.displace_liqui_part)?this.getDisplace(this.prescription.displace_liqui_part):""))
         } 
 
        if(str.indexOf("置换液")!=-1 && this.prescription==null){
            arr.push("置换液:")
         } 
       
-       if(str.indexOf("置换总量")!=-1 && this.prescription!=null){
-           arr.push("置换总量:"+(this.prescription.replacement_total?this.prescription.replacement_total:""))
+       if(str.indexOf("置换量")!=-1 && this.prescription!=null){
+           arr.push("置换量:"+(this.prescription.replacement_total?this.prescription.replacement_total:""))
         } 
 
-        if(str.indexOf("置换总量")!=-1 && this.prescription==null){
-           arr.push("置换总量:")
+        if(str.indexOf("置换量")!=-1 && this.prescription==null){
+           arr.push("置换量:")
         } 
 
        if(str.indexOf("处方血流量")!=-1 && this.prescription!=null){
@@ -660,6 +662,12 @@
        if(str.indexOf("透析液流量")!=-1 && this.prescription==null){
            arr.push("透析液流量:")
         } 
+        if(str.indexOf("置换液总量")!=-1 && this.prescription!=null){
+           arr.push("置换液总量:"+(this.prescription.displace_liqui_value?this.prescription.displace_liqui_value:""))
+        } 
+        if(str.indexOf("置换液总量")!=-1 && this.prescription == null){
+           arr.push("置换液总量:")
+        }
         console.log("arr",arr)
         this.doubleReview.dialysis_parameter_desc = arr.join(";")
         if(val.length>0){
@@ -671,8 +679,7 @@
       changeBoxTwo(val){
          var arr = []
          var str = val.join(';')
-         console.log("strw222222222",str)
- 
+         
           if(str.indexOf('通路类型')!=-1 && this.predialysis_evaluation.id!=0){
             arr.push("通路类型:"+this.getBloodAccess(this.predialysis_evaluation.blood_access_part_opera_id))
           
@@ -707,7 +714,7 @@
       changeBoxThree(val){
          var arr = []
          var str = val.join(';')
-         console.log("strw222222222",str)
+      
          if(str.indexOf('泵前补液测管未夹')!=-1){
            arr.push("泵前补液测管未夹:")
          }
@@ -864,6 +871,7 @@
        }
        return name
      },
+   
      getBloodAccess(id){
        
         let vascular_access_desc = getDataConfig(
@@ -877,7 +885,18 @@
           }
         }
         return name
-     }
+     },
+     getDisplace(id){
+       var name = ""
+       var arr = this.$store.getters.displace_liqui
+       console.log("arr233233233223",arr)
+       for(let i=0;i<arr.length;i++){
+        if(id == arr[i].id){
+          name = arr[i].name
+        }
+       }
+       return name
+     },
     },
 
     props: {
@@ -920,7 +939,7 @@
          
         if(this.prescription!=null && this.prescription.id!=0){
           if(this.prescription.dialyzer_perfusion_apparatus !="" || this.prescription.dialysis_dialyszers!="" || this.prescription.dialysis_irrigation!=""){
-            this.diazes = ""
+            this.diazes = "透析器/灌流器:"
             this.diazes = this.diazes + this.prescription.dialyzer_perfusion_apparatus
             this.diazes = this.diazes + this.prescription.dialysis_dialyszers+this.prescription.dialysis_irrigation
           }else{
@@ -929,95 +948,116 @@
           }
           
           if(this.prescription.dialysate_formulation!=""){
+            this.dialysate_formulation = "透析液配方:"
              this.dialysate_formulation = this.dialysate_formulation + this.GetDialysateFormulationById(this.prescription.dialysate_formulation)
           }else{
             this.dialysate_formulation = this.dialysate_formulation 
           }
           
           if(this.prescription.kalium!=""){
+            this.kalium = "钾:"
            this.kalium = this.kalium + (this.prescription.kalium?this.prescription.kalium:"")
           }else{
             this.kalium = this.kalium 
           }
        
           if(this.prescription.calcium!=""){
+           this.calcium = "钙:"
            this.calcium = this.calcium + (this.prescription.calcium?this.prescription.calcium:"")
           }else{
             this.calcium = this.calcium
           }
          
           if(this.prescription.mode_id > 0){
+            this.dialys_mode= "透析模式:"
             this.dialys_mode = this.dialys_mode + this.getMode(this.prescription.mode_id) 
           }else{
              this.dialys_mode = this.dialys_mode
           }
           
           if(this.prescription.dialysis_duration_hour !="" || this.prescription.dialysis_duration_minute!=""){
+            this.long_time ="透析时长:"
             this.long_time = this.long_time + (this.prescription.dialysis_duration_hour?this.prescription.dialysis_duration_hour:"") +"小时" +(this.prescription.dialysis_duration_minute?this.prescription.dialysis_duration_minute:"") +"分"
           }else{
              this.long_time = this.long_time
           }
           
           if(this.prescription.target_ultrafiltration!=""){
+           this.target_ultrafiltration = "目标超滤量:"
            this.target_ultrafiltration = this.target_ultrafiltration + (this.prescription.target_ultrafiltration?this.prescription.target_ultrafiltration:"")
           }else{
             this.target_ultrafiltration = this.target_ultrafiltration
           }
           
           if(this.prescription.anticoagulant!=""){
-            this.anticoagulant = this.anticoagulant + this.getAnticoagulant(this.prescription.anticoagulant)
+            this.anticoagulant = "抗凝剂:"
+            this.anticoagulant = this.anticoagulant + (this.getAnticoagulant(this.prescription.anticoagulant)?this.getAnticoagulant(this.prescription.anticoagulant):"")
           }else{
             this.anticoagulant = this.anticoagulant 
           }
          
           if(this.prescription.anticoagulant_shouji!=""){
+            this.anticoagulant_shouji="首剂:"
             this.anticoagulant_shouji = this.anticoagulant_shouji + (this.prescription.anticoagulant_shouji?this.prescription.anticoagulant_shouji:"")
           }else{
              this.anticoagulant_shouji = this.anticoagulant_shouji
           }
           
           if(this.prescription.anticoagulant_weichi!=""){
+             this.anticoagulant_weichi = "维持:"
              this.anticoagulant_weichi = this.anticoagulant_weichi + (this.prescription.anticoagulant_weichi?this.prescription.anticoagulant_weichi:"")
           }else{
            this.anticoagulant_weichi = this.anticoagulant_weichi 
           }
           
           if(this.prescription.anticoagulant_zongliang!=""){
+             this.anticoagulant_zongliang = "总量:"
              this.anticoagulant_zongliang = this.anticoagulant_zongliang+(this.prescription.anticoagulant_zongliang?this.prescription.anticoagulant_zongliang:"")
           }else{
              this.anticoagulant_zongliang = this.anticoagulant_zongliang
           }
        
           if(this.prescription.displace_liqui_part!=""){
-            this.displace_liqui_part = this.displace_liqui_part + (this.prescription.displace_liqui_part?this.prescription.displace_liqui_part:"")
+             this.displace_liqui_part="置换液:"
+            this.displace_liqui_part = this.displace_liqui_part + (this.getDisplace(this.prescription.displace_liqui_part)?this.getDisplace(this.prescription.displace_liqui_part):"")
           }else{
-             this.displace_liqui_part = this.displace_liqui_part
+             this.displace_liqui_part = this.getDisplace(this.displace_liqui_part)
           }
           
           if(this.prescription.replacement_total!=""){
+             this.replacement_total = "置换量:"
              this.replacement_total = this.replacement_total + (this.prescription.replacement_total?this.prescription.replacement_total:"")
           }else{
              this.replacement_total = this.replacement_total
           }
         
           if(this.prescription.dialysate_flow!=""){
+             this.dialysate_flow = "透析液流量:"
              this.dialysate_flow = this.dialysate_flow + (this.prescription.dialysate_flow?this.prescription.dialysate_flow:"")
           }else{
              this.dialysate_flow = this.dialysate_flow
           }
-
+         
+          if(this.prescription.displace_liqui_value!=""){
+            this.displace_liqui_value = "置换液总量:"
+            this.displace_liqui_value = this.displace_liqui_value + this.prescription.displace_liqui_value
+            console.log("置换液总量",this.displace_liqui_value)
+          }
+        
         }
         if(this.predialysis_evaluation!=null && this.predialysis_evaluation.id!=0){
+          this.puncture_needle = "穿刺针:"
           this.puncture_needle = this.puncture_needle + this.predialysis_evaluation.puncture_needle
           this.blood_access_part_opera_id = this.blood_access_part_opera_id + this.getBloodAccess(this.predialysis_evaluation.blood_access_part_opera_id)
         } 
         if(this.double_check !=null && this.double_check.id!=0){
-           console.log("双人核对",this.double_check)
+        
            if(this.double_check.dialysis_item_desc.indexOf("透析器/灌流器")!=-1){
              this.checkList.push("透析器/灌流器:"+this.prescription.dialyzer_perfusion_apparatus)
-             console.log("222222",this.checkList)
+            
            }
            if(this.double_check.dialysis_item_desc.indexOf("穿刺针")!=-1){
+          
               this.checkList.push("穿刺针:"+(this.predialysis_evaluation.puncture_needle?this.predialysis_evaluation.puncture_needle:""))
            }
            if(this.double_check.dialysis_item_desc.indexOf("透析液配方:")!=-1){
@@ -1030,6 +1070,7 @@
                this.checkList.push("钙:"+(this.prescription.calcium?this.prescription.calcium:""))
            }
            if(this.double_check.dialysis_parameter_desc.indexOf("透析模式:")!=-1){
+              
               this.checkListOne.push("透析模式:"+this.getMode(this.prescription.mode_id))
            }
            if(this.double_check.dialysis_parameter_desc.indexOf("透析时长")!=-1){
@@ -1039,7 +1080,7 @@
               this.checkListOne.push("目标超滤量:"+(this.prescription.target_ultrafiltration?this.prescription.target_ultrafiltration:""))
            }
            if(this.double_check.dialysis_parameter_desc.indexOf("抗凝剂")!=-1){
-              this.checkListOne.push("抗凝剂:"+this.getAnticoagulant(this.prescription.anticoagulant))
+              this.checkListOne.push("抗凝剂:"+this.getAnticoagulant(this.prescription.anticoagulant?this.prescription.anticoagulant:""))
            }
            if(this.double_check.dialysis_parameter_desc.indexOf("首剂")!=-1){
               this.checkListOne.push("首剂:"+(this.prescription.anticoagulant_shouji?this.prescription.anticoagulant_shouji:""))
@@ -1051,10 +1092,10 @@
               this.checkListOne.push("总量:"+(this.prescription.anticoagulant_zongliang?this.prescription.anticoagulant_zongliang:""))
            }
           if(this.double_check.dialysis_parameter_desc.indexOf("置换液")!=-1){
-              this.checkListOne.push("置换液:"+(this.prescription.displace_liqui_part?this.prescription.displace_liqui_part:""))
+              this.checkListOne.push("置换液:"+(this.getDisplace(this.prescription.displace_liqui_part)?this.getDisplace(this.prescription.displace_liqui_part):""))
            }
-           if(this.double_check.dialysis_parameter_desc.indexOf("置换总量")!=-1){
-             this.checkListOne.push("置换总量:"+(this.prescription.replacement_total?this.prescription.replacement_total:""))
+           if(this.double_check.dialysis_parameter_desc.indexOf("置换量")!=-1){
+             this.checkListOne.push("置换量:"+(this.prescription.replacement_total?this.prescription.replacement_total:""))
            }
            if(this.double_check.dialysis_parameter_desc.indexOf("处方血流量")!=-1){
              this.checkListOne.push("处方血流量:"+(this.prescription.blood_flow_volume?this.prescription.blood_flow_volume:""))
@@ -1062,6 +1103,10 @@
            if(this.double_check.dialysis_parameter_desc.indexOf("透析液流量")!=-1){
              this.checkListOne.push("透析液流量:"+(this.prescription.dialysate_flow?this.prescription.dialysate_flow:""))
            }
+
+           if(this.double_check.dialysis_parameter_desc.indexOf("置换液总量")!=-1){
+             this.checkListOne.push("置换液总量:"+(this.prescription.displace_liqui_value?this.prescription.displace_liqui_value:""))
+           }
            if(this.double_check.vascular_access_desc.indexOf("通路类型")!=-1){
              this.checkListTwo.push("通路类型:"+this.getBloodAccess(this.predialysis_evaluation.blood_access_part_opera_id))
            }

src/xt_pages/dialysis/details/index.vue

@@ -1207,12 +1207,12 @@ export default {
         }
        
        // 目标超滤量是否默认上次数据
-        // if (this.lastDialysisPrescribe != null) {
-        //   delete this.lastDialysisPrescribe.target_ultrafiltration
-        // }
-        // if (this.solution != null) {
-        //   delete this.solution.target_ultrafiltration
-        // }
+        if (this.lastDialysisPrescribe != null) {
+          delete this.lastDialysisPrescribe.target_ultrafiltration
+        }
+        if (this.solution != null) {
+          delete this.solution.target_ultrafiltration
+        }
         if(this.predialysis_evaluation.id > 0){
           this.newTime = parseTime(this.predialysis_evaluation.created_time, '{h}:{i}')
         }

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -560,7 +560,12 @@ export default {
                }
             }     
           }
-
+          const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
           const params = {
             cancelStock: this.recordInfo.recordData
           };
@@ -576,6 +581,7 @@ export default {
           ).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
+              loading.close()
               return false;
             } else {
              var msg =  response.data.data.msg
@@ -601,7 +607,8 @@ export default {
               });
               this.recordInfo.recordData = [];
               this.$router.back(-1);
-             }        
+             }  
+             loading.close()      
             }
           });
         } else {

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -527,7 +527,12 @@
                 }
               }     
             }
-
+            const loading = this.$loading({
+              lock: true,
+              text: 'Loading',
+              spinner: 'el-icon-loading',
+              background: 'rgba(0, 0, 0, 0.7)'
+            })
             const params = {
               'cancelStock': this.recordInfo.recordData
             }
@@ -536,6 +541,7 @@
             editCancelStockInfo(params, this.return_time, this.$route.query.id, this.$route.query.type,this.form.manufacturer,this.form.dealer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
+                loading.close()
                 return false
               } else {
                 var msg =  response.data.data.msg
@@ -561,7 +567,8 @@
                   });
                   this.recordInfo.recordData = [];
                   this.$router.back(-1);
-                }        
+                }  
+                loading.close()       
               }
             })
           } else {

src/xt_pages/stock/drugs/components/drugInOrder.vue

@@ -73,46 +73,6 @@
       </div>
     </div>
 
-    
-
-    <!-- <div class="cell clearfix">
-      <label class="title"><span class="name">单据类型</span> : </label>
-      <el-select
-        size="small"
-        v-model="order_type"
-        clearable
-        placeholder="单据类型"
-        @change="changeType"
-      >
-        <el-option
-          v-for="item in orderTypeArr"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        >
-        </el-option>
-      </el-select>
-    </div> -->
-
-    <!-- <div class="cell clearfix">
-      <label class="title"><span class="name">其它</span> : </label>
-      <el-select
-        size="small"
-        v-model="manufacturer_id"
-        clearable
-        placeholder="厂商"
-        @change="changeManufacturer"
-      >
-        <el-option
-          v-for="item in manufacturer"
-          :key="item.id"
-          :label="item.manufacturer_name"
-          :value="item.id"
-        >
-        </el-option>
-      </el-select>
-    </div> -->
-
     <el-row :gutter="12" style="margin-top: 10px">
       <el-table
         :data="cancelStockDate"

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -26,15 +26,6 @@
 
     <div class="app-container">
   
-
-      <!-- <drugs-stock-dialog
-        ref="dialog" :propForm="propForm"
-        :visibility="isVisibility"
-        v-on:dialog-comfirm="comfirm"
-        v-on:dialog-cancle="cancle"
-      ></drugs-stock-dialog> -->
-
-
       <div class="cell clearfix">
         <label class="title"><span class="name">出库时间</span> : </label>
         <el-date-picker
@@ -54,6 +45,7 @@
     
       <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
         <el-table
+           v-loading="listLoading"
           :data="recordInfo.recordData"
           :class="signAndWeighBoxPatients"
           style="width: 100%"
@@ -116,23 +108,7 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <!-- <el-table-column align="center" width="150">
-            <template slot="header" slot-scope="scope" >
-                  <span>批号</span>
-              </template>
-                <template slot-scope="scope">
-                  <el-form-item style="padding-top: 20px">
-                    <el-select v-model="scope.row.batch_number" filterable placeholder="请选择" @change="changeBatchNumber(scope.row)">
-                      <el-option
-                        v-for="(item,index) in numberList"
-                        :key="index"
-                        :label="item.batch_number"
-                        :value="item.id">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-              </template>
-          </el-table-column> -->
+          
           <el-table-column width="200" align="center">
             <template slot="header" slot-scope="scope">
               <span>出库数量<span style="color: red">*</span></span>
@@ -368,7 +344,8 @@ export default {
       drugTypeList:[],
       totalPrice:0,
       unitList:[],
-      numberList:[]
+      numberList:[],
+      listLoading: false,
     };
   },
   methods: {
@@ -575,8 +552,12 @@ export default {
           const params = {
             stockOut: this.recordInfo.recordData
           };
-          console.log("params222222",params)
-        
+          const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
           postDrugWarehouseOut(
             params,
             this.warehouse_out_time,
@@ -586,26 +567,24 @@ export default {
           ).then(response => {
             if (response.data.state == 0) {
               this.$message.error("库存不足");
+              loading.close()
               return false;
             } else {
+              this.loading = false
+              loading.close()
               var msg = response.data.data.msg
               var drug_name =  response.data.data.drug_name
-              console.log("drug_name",drug_name)
               var dose = response.data.data.dose
-              console.log("dose",dose)
               var dose_unit = response.data.data.dose_unit
-              console.log("dose_unit",dose_unit)
               var min_number = response.data.data.min_number
-              console.log("min_number",min_number)
               var min_unit =  response.data.data.min_unit
-              console.log("min_unit",min_unit)
               var max_unit =  response.data.data.max_unit
-              console.log("max_unit",max_unit)
               var str = drug_name + " " + dose + dose_unit + "*" + min_number + min_unit+"/"+max_unit
-              console.log("str22222222",str)
+      
               if(msg == 1){
                 this.$message.error(str + "库存不足")
               }else{
+                loading.close()
                 this.$message.success("出库成功");
                 this.recordInfo.recordData = [];
                 this.$router.back(-1);

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

@@ -583,6 +583,12 @@
                }
 
             }
+            const loading = this.$loading({
+              lock: true,
+              text: 'Loading',
+              spinner: 'el-icon-loading',
+              background: 'rgba(0, 0, 0, 0.7)'
+            })
             const params = {
               'stockOut': this.recordInfo.recordData
             }
@@ -591,6 +597,7 @@
             editDrugWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id, this.$route.query.type, this.form.manufacturer, this.form.dealer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
+                loading.close()
                 return false
               } else {
                 var msg = response.data.data.msg
@@ -601,13 +608,15 @@
                 var min_unit =  response.data.data.min_unit
                 var max_unit =  response.data.data.max_unit
                 var str = drug_name + " " + dose + dose_unit + "*" + min_number + min_unit+"/"+max_unit
-               
+               loading.close()  
               if(msg == 1){
                 this.$message.error(str + "库存不足,请入库")
+                loading.close()
               }else{
                 this.$message.success("出库成功");
                 this.recordInfo.recordData = [];
                 this.$router.back(-1);
+                loading.close()
               }
               }
             })

src/xt_pages/stock/stockInOrderAdd.vue

@@ -676,6 +676,12 @@
                  }
               }
             }
+            const loading = this.$loading({
+              lock: true,
+              text: 'Loading',
+              spinner: 'el-icon-loading',
+              background: 'rgba(0, 0, 0, 0.7)'
+            })
             const params = {
               'stockIn': this.recordInfo.recordData
             }
@@ -684,10 +690,11 @@
             postWarehouse(params, this.warehousing_time, this.form.manufacturer, this.form.dealer, this.type).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
+                loading.close()
                 return false
               } else {
+                loading.close()
                 this.$message.success('入库成功')
-
                 this.$router.back(-1)
               }
             })

src/xt_pages/stock/stockInOrderEdit.vue

@@ -667,7 +667,12 @@ export default {
             stockIn: this.recordInfo.recordData
           };
           console.log("params2222",params)
-          
+          const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
           EditWarehouse(
             params,
             this.warehousing_time,
@@ -678,10 +683,11 @@ export default {
           ).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
+              loading.close()
               return false;
             } else {
+              loading.close()
               this.$message.success("入库成功");
-
               this.$router.back(-1);
             }
           });

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -594,7 +594,12 @@ export default {
           const params = {
             stockOut: this.recordInfo.recordData
           };
- 
+          const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
           postWarehouseOut(
             params,
             this.warehouse_out_time,
@@ -604,6 +609,7 @@ export default {
           ).then(response => {
             if (response.data.state == 0) {
               this.$message.error("库存不足")
+              loading.close()
               return false;
             } else {
                var msg = response.data.data.msg
@@ -614,12 +620,13 @@ export default {
                if(msg == 1){
                   this.$message.error(str)
                }
+              
                if(msg == 2){
                  this.$message.success("出库成功");
                  this.recordInfo.recordData = [];
                  this.$router.back(-1);
                }
-             
+               loading.close()
              
             }
           });

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -523,10 +523,10 @@
         this.$router.go(-1)
       },
        submit() {
+       
         this.$refs['tableForm'].validate((valid) => {
           if (valid) {
             const array = this.recordInfo.recordData
-            console.log("2332232323232323",array)
             for (let i = 0; i < array.length; i++) {
               if (array[i].good_type_id == 0) {
                 this.$message.error('商品类型不能为空')
@@ -566,6 +566,12 @@
                }
              }
             }
+              const loading = this.$loading({
+                lock: true,
+                text: 'Loading',
+                spinner: 'el-icon-loading',
+                background: 'rgba(0, 0, 0, 0.7)'
+            })
             const params = {
               'warehouse_out_time':this.warehouse_out_time,
               'stockOut': this.recordInfo.recordData,
@@ -577,11 +583,13 @@
             editWarehouseoutInfo(params, this.warehouse_out_time, warehout_id, this.$route.query.type, this.form.manufacturer, this.form.dealer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
+                loading.close()
                 return false
               } else {
                 if(response.data.data.msg == 1){
                   this.$message.success('保存成功')
                   this.$router.back(-1)
+                   loading.close()
                 }
 
                 if(response.data.data.msg == 5){
@@ -600,7 +608,7 @@
                 if(response.data.data.msg == 6){
                   this.$message.error("该耗材的退库数量大于入库数量,无法出库,请新增出库另一个批次")
                 }
-                
+                loading.close()
               }
             })
           } else {

src/xt_pages/user/components/PatientDetail.vue

@@ -955,7 +955,8 @@
               <div class="proj">
                 <span class="proj_title">日期：</span>
                 <!-- {{ getTime(patientPrint.created_time) }} -->
-                {{printDate}}
+                <span v-if="org_id ==3907 || org_id == 9671">{{ getTime(patientPrint.created_time) }}</span>
+                <span v-else>{{printDate}}</span> 
               </div>
               <div class="proj"><span class="proj_title">医生签名：</span></div>
             </div>