新分支

src/xt_pages/dialysis/details/consumable/dialysisDrug.vue

@@ -22,9 +22,13 @@
                       value-format="yyyy-MM-dd"
                       placeholder="选择日期时间" align="right"
                      :picker-options="pickerOptions"></el-date-picker>
-      <el-input size="small" style="width: 180px;" @keyup.enter.native='searchAction' v-model.trim="search_input"
+      <el-input size="small" style="width: 100px;" @keyup.enter.native='searchAction' v-model.trim="search_input"
                 class="filter-item" v-model="query.keywords"/>
-      <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+      <el-button size="small" class="filter-item" type="primary" placeholder="请输入患者姓名" icon="el-icon-search" @click="search">搜索</el-button>&nbsp;&nbsp;
+
+      <!-- <el-input size="small" style="width: 100px;" @keyup.enter.native='searchAction' v-model.trim="search_input"
+                class="filter-item" v-model="query.keyword"/>
+      <el-button size="small" class="filter-item" type="primary" placeholder="请输入药品名称" icon="el-icon-search" @click="searchOne">搜索2</el-button> -->
     </div>
     <div class="cell clearfix" style="justify-content: space-between;">
       <div style="display:flex;">
@@ -209,6 +213,7 @@
           page:1,
           limit:10,
           keywords:"",
+          keyword:"",
           good_type:0,
           ids:"",
         },
@@ -593,6 +598,9 @@
         this.query.page = 1
         this.getlist()
       },
+      searchOne() {
+        this.getlist()
+      },
 
       exportList(){
         import('@/vendor/Export2Excel').then(excel => { 
@@ -812,7 +820,7 @@
         return week;
       },
       toBiaoqian(){
-        this.$router.push({path:"/dialysis/hisLongSignPrint?selected_date="+this.selected_date+"&schedule_type="+this.query.schedule_type+"&partition_id="+this.query.partition_id})
+        this.$router.push({path:"/dialysis/hisLongSignPrint?selected_date="+this.selected_date+"&schedule_type="+this.query.schedule_type+"&partition_id="+this.query.partition_id+"&ids="+this.ids+"&keywords="+this.query.keywords})
       }
     }
   }

src/xt_pages/dialysis/details/consumable/dialysisDrugPrint.vue

@@ -120,6 +120,7 @@
           partition_id:this.$route.query.partition_id,
           ids:this.$route.query.ids,
          }
+         console.log("HHAHDHAHHDAH",params)
         getDialysisAdviceTemplateList(params).then(response=>{
           if(response.data.state == 1){
           

src/xt_pages/dialysis/details/consumable/dialysisGood.vue

@@ -98,10 +98,10 @@
           :label="item.filed_name_cn"
         >
           <template slot-scope="scope">
-            <span v-if="org_id !=10599">
+            <!-- <span v-if="org_id !=10599 && org_id!=10138 && org_id!=10278">
               {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_solution)}}
-            </span>
-            <span v-if="org_id==10599">
+            </span> -->
+            <span>
               <span v-if="scope.row.dialysis_prescription==null"> {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_solution)}}</span>
               <span v-if="scope.row.dialysis_prescription!=null"> {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_prescription)}}</span>
             </span>
@@ -179,7 +179,9 @@
           :label="item.type_name"
         >
           <template slot-scope="scope">
-             {{getStr(scope.row.typeList[index].id,scope.row.projectList,scope.row.patient_id)}}
+            <span v-if="scope.row.his_prescription_project.length>0"> {{getStr(scope.row.typeList[index].id,scope.row.his_prescription_project,scope.row.patient_id)}}</span>
+            <span v-if="scope.row.his_prescription_project.length==0">  {{getStr(scope.row.typeList[index].id,scope.row.projectList,scope.row.patient_id)}}</span>
+           
           </template>
 
         </el-table-column>
@@ -609,7 +611,13 @@
             this.list[i].name3 = this.list[i].patient.dialysis_no
             if(this.typeList!=null && this.typeList.length > 0){
               for(let j=0;j<this.typeList.length;j++){
-                this.list[i]['name'+(j+4)] = this.getStr(this.list[i].typeList[j].id,this.list[i].projectList,this.list[i].patient_id)
+                if(this.list[i].his_prescription_project.length>0){
+                  this.list[i]['name'+(j+4)] = this.getStr(this.list[i].typeList[j].id,this.list[i].his_prescription_project,this.list[i].patient_id)
+                }
+                if(this.list[i].his_prescription_project.length == 0){
+                  this.list[i]['name'+(j+4)] = this.getStr(this.list[i].typeList[j].id,this.list[i].projectList,this.list[i].patient_id)
+                }
+              
               }
             }
 

src/xt_pages/dialysis/details/consumable/dialysisGoodPrint.vue

@@ -74,7 +74,9 @@
                  <td>{{item.patient.name}}</td>
                 <td>{{item.patient.dialysis_no}}</td>
                 <td v-for="(it,index) in typeList" :key="index">
-                  {{getStr(item.typeList[index].id,item.projectList,item.patient_id)}}
+                  <span v-if="item.his_prescription_project.length>0"> {{getStr(item.typeList[index].id,item.his_prescription_project,item.patient_id)}}</span>
+                  <span v-if="item.his_prescription_project.length==0">{{getStr(item.typeList[index].id,item.projectList,item.patient_id)}}</span>
+                 
                 </td>
                </tr>
               </tbody>

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

@@ -515,18 +515,9 @@ export default {
     this.org_id = this.$store.getters.xt_user.template_info.org_id;
     this.patient_id = this.$route.query.patient_id;
     this.schedule_date = this.$route.query.date;
-    this.form.nurse_id =
-      this.dialysis_order.id == 0
-        ? this.$store.getters.xt_user.user.id
-        : this.dialysis_order.start_nurse;
-    this.form.puncture_nurse_id =
-      this.dialysis_order.id == 0
-        ? this.$store.getters.xt_user.user.id
-        : this.dialysis_order.puncture_nurse;
-    this.form.washpipe_nurse =
-      this.dialysis_order.id == 0
-        ? this.$store.getters.xt_user.user.id
-        : this.dialysis_order.washpipe_nurse;
+    this.form.nurse_id =this.dialysis_order.id == 0? this.$store.getters.xt_user.user.id: this.dialysis_order.start_nurse;
+    this.form.puncture_nurse_id =this.dialysis_order.id == 0? this.$store.getters.xt_user.user.id: this.dialysis_order.puncture_nurse;
+    this.form.washpipe_nurse =this.dialysis_order.id == 0? this.$store.getters.xt_user.user.id: this.dialysis_order.washpipe_nurse;
 
     if (this.form.puncture_nurse_id == 0) {
       this.form.puncture_nurse_id = this.$store.getters.xt_user.user.id;
@@ -902,7 +893,14 @@ export default {
           console.log(this.dialysis_order);
           this.loading = true;
           let mode = "1";
-          var blood_drawing = this.form.blood_drawing.toString();
+          if(this.form.blood_drawing!=undefined){
+            var blood_drawing = this.form.blood_drawing.toString();
+          }else{
+            blood_drawing = ""
+          }
+
+
+         
           console.log("质控护士", this.form.quality_nurse_id);
           console.log("this.form.nuclein_date", this.form.nuclein_date);
 

src/xt_pages/dialysis/hisLongSignPrint.vue

@@ -177,8 +177,9 @@ export default {
           page:this.$route.query.page,
           limit:1000,
           keywords:"",
+          keyword:this.$route.query.keywords,
           good_type:0,
-          ids:"",
+          ids:this.$route.query.ids,
           
 
       }
@@ -198,8 +199,6 @@ export default {
         var adviceList = response.data.data.adviceList
         this.adviceList = adviceList
 
-        var longHisAdviceList = response.data.data.longHisAdviceList
-
 
         var tablelist = response.data.data.tablelist
         console.log("tablelsit",tablelist)
@@ -240,7 +239,29 @@ export default {
                     }
                 }
              }
+             console.log("寄哪里地方5555",this.$route.query.keywords)
+             if(this.$route.query.keywords!=""){
+                console.log("寄哪里地方",this.$route.query.keywords)
+               for(let i=0;i<list.length;i++){
+                 list[i].new_arr = []
+                 for(let j=0;j<list[i].his_advice_list.length;j++){
+                    console.log("iiiiii",list[i].his_advice_list[j].advice_name.indexOf(this.$route.query.keywords))
+                    if(list[i].his_advice_list[j].advice_name.indexOf(this.$route.query.keywords)!=-1){
+                       list[i].new_arr.push(list[i].his_advice_list[j])
+                    }
+                 }
+               }
+          }
+          if(list!=null && list.length>0){
+            for(let i=0;i<list.length;i++){
+                list[i].his_advice_list =[]
+                list[i].his_advice_list = list[i].new_arr 
+            }
+         }
         }
+        
+       
+      
        
         console.log("list-------------",list)
         this.list = list