新分支

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

@@ -10,7 +10,7 @@
                 class="newDialog"
         >
             <el-button style="position: absolute;left: 12%;top: 2%" @click="handlePatientInfo(patient.id)">{{ patient.name }}</el-button>
-           
+
             <span style="position: absolute;left: 20%;top: 3%" v-if="this.$store.getters.xt_user.template_info.org_id!=0&&this.$store.getters.xt_user.template_info.org_id!=10702">
               透前称重：{{predialysis&&predialysis.weight_before?predialysis.weight_before:"" }} kg
             </span>
@@ -19,8 +19,8 @@
               透前体重：{{predialysis&&(predialysis.weight_before-predialysis.additional_weight).toFixed(2)?(predialysis.weight_before-predialysis.additional_weight).toFixed(2):"" }} kg
             </span>
 
-          
-           
+
+
             <span style="position: absolute;left: 30%;top: 3%">
               干体重：{{predialysis&&predialysis.dry_weight?predialysis.dry_weight:""}}kg
             </span>
@@ -29,8 +29,8 @@
             </span> -->
             <span style="position: absolute;left:38%;top: 3%">
               上次透后体重：
-               <span v-if="this.$store.getters.xt_user.template_info.org_id!=0 && this.$store.getters.xt_user.template_info.org_id!=10702">{{last_record&&last_record.weight_after?last_record.weight_after:""}}kg</span> 
-               <span v-if="this.$store.getters.xt_user.template_info.org_id==0 || this.$store.getters.xt_user.template_info.org_id==10702">{{last_record&&(last_record.weight_after-last_record.additional_weight).toFixed(2)?(last_record.weight_after-last_record.additional_weight).toFixed(2):""}}kg</span> 
+               <span v-if="this.$store.getters.xt_user.template_info.org_id!=0 && this.$store.getters.xt_user.template_info.org_id!=10702">{{last_record&&last_record.weight_after?last_record.weight_after:""}}kg</span>
+               <span v-if="this.$store.getters.xt_user.template_info.org_id==0 || this.$store.getters.xt_user.template_info.org_id==10702">{{last_record&&(last_record.weight_after-last_record.additional_weight).toFixed(2)?(last_record.weight_after-last_record.additional_weight).toFixed(2):""}}kg</span>
             </span>
 
             <span style="position: absolute;left:51%;top: 3%">
@@ -51,8 +51,8 @@
               <span v-if="predialysis!=null && last_record!=null">
                 {{predialysis&&last_record&&((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2)?((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2):"" }} kg
               </span>
-            
-            
+
+
             </span>
             <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>
             <el-form
@@ -560,7 +560,7 @@
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                                           v-model="dialysisPrescription.no_anticoagulant_weichi"></el-input>
                             </el-form-item>
-                            <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '" 
+                            <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '"
                             v-if="dialysisPrescription.anticoagulant != 2 && dialysisPrescription.anticoagulant != 11 && dialysisPrescription.anticoagulant != 13"
                             prop="anticoagulant_weichi" :rules="isCheckmust('维持')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
@@ -966,10 +966,10 @@
                     <el-col :span="8"
                             v-if="isShows('置换液总量') && (this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id !=24 && this.$store.getters.xt_user.template_info.template_id !=53) || this.$store.getters.xt_user.template_info.org_id  == 10249 || this.$store.getters.xt_user.template_info.org_id == 10441 "
                             v-show="totalShow">
-                        <el-form-item label="置换液总量(L)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')"  v-if="dialysisPrescription.mode_id!=26">
+                        <el-form-item label="置换液总量(L)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')"  v-if="dialysisPrescription.mode_id!=26 && this.$store.getters.xt_user.template_info.org_id !=10206">
                             <el-input  v-model="dialysisPrescription.displace_liqui_value"></el-input>
                         </el-form-item>
-                        <el-form-item label="置换液总量(L/h)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')"  v-if="dialysisPrescription.mode_id ==26">
+                        <el-form-item label="置换液总量(L/h)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')"  v-if="dialysisPrescription.mode_id ==26 || this.$store.getters.xt_user.template_info.org_id == 10206">
                             <el-input  v-model="dialysisPrescription.displace_liqui_value"></el-input>
                         </el-form-item>
                     </el-col>
@@ -1389,7 +1389,7 @@
                 <span>上次透后称重(kg)</span>
                 <span>{{ getLastAfterWeight(last_record) }}</span>
             </div>
-          
+
           <div  class="newLine"><span>近五次数据展示:</span></div>
            <div>
             <el-table
@@ -2282,7 +2282,7 @@ mu
            }else{
                this.dialysisPrescription.dialysis_remark=""
            }
-          
+
           } else {
             this.zhiShow = false
             this.huShow = false
@@ -2634,18 +2634,18 @@ mu
         }
       },
       show(pre, schedual, last, his_is_open,is_advice_open,admins) {
-      
+
         if(this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635){
           if(this.predialysis!=undefined){
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
               this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)
             }
-          
+
             if(this.dialysisPrescription.prescription_water==0 || this.dialysisPrescription.prescription_water==""){
               if((this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)>0){
                 this.dialysisPrescription.prescription_water = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)
               }
-            
+
             }
          }
         }
@@ -3200,13 +3200,10 @@ mu
         if(moment().weekday() == 0){
            total_day ="周日"
         }
-         
-        console.log("hhhhhhhhhhhhhhhhhhhhhhhhhhh",this.targetAdvices)
+
         if(this.targetAdvices!=null && this.targetAdvices.length >0){
             for (let i = 0; i < this.targetAdvices.length; i++) {
-              console.log("WOOWOWOWOWOWOW",this.targetAdvices[i].week_day.indexOf(total_day))
               if(this.targetAdvices[i].week_day.indexOf(total_day)!=-1){
-                console.log("尽力啊=--------------------")
                 this.targetAdvices[i].isCheck = 1
               }
               if(this.targetAdvices[i].frequency_type == 1){
@@ -3284,7 +3281,7 @@ mu
              return false
          }
         }
-         
+
         this.$refs[formName].validate((valid)=>{
           if(valid){
             if(!this.isLoading){
@@ -4601,8 +4598,8 @@ mu
       }else{
         this.dialysisPrescription.dialysis_remark = ""
       }
-       
-      
+
+
 
       const ParamsQuery = {}
       ParamsQuery['patient_id'] = this.$route.query.patient_id
@@ -4759,25 +4756,25 @@ mu
 
     },
     handlePatientInfo(id) {
-      
+
       getPatientRecordList(id).then(response=>{
         if(response.data.state ==1){
           this.isVisibility = false
           this.msgtip_visibility = true
 
-          
+
           var beforList = response.data.data.beforList
-       
+
           this.tableData = beforList
 
           var afterList =  response.data.data.afterList
-       
+
           this.afterList = afterList
 
           this.monitorList = response.data.data.monitorList
         }
       })
-     
+
     },
     GetLast(date){
       var weight_after = ""
@@ -4798,23 +4795,23 @@ mu
       return cruor
     },
     GetMonitorList(monitor_date){
-     
+
         var str = ""
         var newArr = []
         for(let i=0;i<this.monitorList.length;i++){
           for(let j=0;j<this.monitorList[i].child.length;j++){
             if(monitor_date == this.monitorList[i].monitoring_date){
-              newArr.push(this.monitorList[i].child[j]) 
+              newArr.push(this.monitorList[i].child[j])
             }
           }
         }
-       
+
         if(newArr!=null && newArr.length>0){
         for(let i=0;i<newArr.length;i++){
             str += newArr[i].systolic_blood_pressure +"/"+newArr[i].diastolic_blood_pressure+","
         }
         }
-      
+
         return str
     },
     handlePatientInfoOne(){
@@ -5480,18 +5477,18 @@ mu
       },
       'dialysisPrescription.prescription_water':function(){
         if(this.$store.getters.xt_user.template_info.org_id==10598){
-           
+
           if(this.dialysisPrescription.mode_id == 2 || this.dialysisPrescription.mode_id == 3){
              this.dialysisPrescription.target_ultrafiltration = parseFloat(this.dialysisPrescription.prescription_water)  + 0.3
           }else{
             if(this.dialysisPrescription.prescription_water > this.dialysisPrescription.target_ultrafiltration){
-              this.dialysisPrescription.target_ultrafiltration =  this.dialysisPrescription.prescription_water 
+              this.dialysisPrescription.target_ultrafiltration =  this.dialysisPrescription.prescription_water
             }
           }
-          
-           
+
+
         }
-        
+
       },
       stockType: function() {
         console.log('stockType', this.stockType)
@@ -5544,7 +5541,7 @@ mu
         }
         console.log(" 人员",this.adminRoles)
       },
-     
+
     },
     created() {
 

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

@@ -318,10 +318,12 @@ export default {
     changeType: function(val) {
       this.order_type = val;
       this.getlist()
+      this.getDrugOutOrderPrint()
     },
     changeManufacturer: function(val) {
       this.manufacturer_id = val;
       this.getlist()
+      this.getDrugOutOrderPrint()
     },
     getTypeName: function(row) {
       let name = "";
@@ -443,7 +445,7 @@ export default {
     PrintAction: function() {
       //  window.sessionStorage.setItem('start_out_time',this.start_time)
       //  window.sessionStorage.setItem('end_out_time',this.end_time)
-       this.$router.push("/stock/drugoutorderprint?start_time="+this.start_time+"&end_time="+this.end_time+"&order_type="+2+"&manufacturer_id="+this.manufacturer_id+"&keyword="+this.keyword+"&limit="+this.limit+"&page="+this.page)
+       this.$router.push("/stock/drugoutorderprint?start_time="+this.start_time+"&end_time="+this.end_time+"&order_type="+2+"&manufacturer_id="+this.manufacturer_id+"&keyword="+this.keyword+"&limit="+this.limit+"&page="+this.page+"&storehouse_id="+this.storehouse_id)
     },
     getlist(){
       var params = {
@@ -970,6 +972,7 @@ export default {
          start_time:this.start_time,
          end_time:this.end_time,
          order_type:2,
+         storehouse_id:this.storehouse_id,
       }
      getDrugOutOrderPrint(params).then(response=>{
         if(response.data.state == 1){
@@ -1166,6 +1169,7 @@ export default {
      changeHouseList(){
        this.houseList = []
        this.getlist()
+       this.getDrugOutOrderPrint()
      }
   }
 };

src/xt_pages/stock/drugs/drugOutOrderPrint.vue

@@ -139,6 +139,7 @@
         keyword:this.$route.query.keyword,
         limit:this.$route.query.limit,
         page:this.$route.query.page,
+        storehouse_id:this.$route.query.storehouse_id,
         cancelStockDate:[],
         drugList:[],
         org_id:0,
@@ -230,6 +231,7 @@
           start_time:this.start_time,
           end_time:this.end_time,
           order_type:parseInt(this.order_type),
+          storehouse_id:parseInt(this.storehouse_id),
         }
       
         getDrugOutOrderPrint(params).then(response=>{

src/xt_pages/workforce/appointment.vue

@@ -91,7 +91,7 @@
       </div>
     </div>
     <div>
-      
+
       <div class="app-container" style="padding: 0 20px 20px 20px;">
         <div>
           <div style="position: relative;height: 57px">
@@ -1216,7 +1216,7 @@ export default {
 
           })
           console.log("tablesit",this.tableList)
-      
+
           const filename = '排班模版'
 
           if (this.$store.getters.xt_user.org.id == 10234) {
@@ -5075,7 +5075,6 @@ export default {
           mode_name = this.mode[i].name
         }
       }
-      console.log("mode_name--",mode_name)
       return mode_name
     }
   },