新分支

src/xt_pages/dialysis/details/BasicInfor.vue

@@ -100,9 +100,9 @@ export default {
         return []
       }
     },
-    // dialysis_date:{
-    //   type:String
-    // }
+    dialysis_date:{
+      type:String
+    }
   },
   computed: {
     created_time: function() {
@@ -165,10 +165,19 @@ export default {
     }
   },
   created() {
+   
     // this.dialysis_time = parseTime(this.dialysis_date, '{y}-{m}-{d}')
     // this.dialysis_time = this.dialysis_date ? parseTime(this.dialysis_date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}')
-    this.dialysis_time = this.$route.query.date ? parseTime(this.$route.query.date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}')
+    // this.dialysis_time = this.$route.query.date ? parseTime(this.$route.query.date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}')
+
+    
   },
+  watch:{
+    dialysis_date:function(){
+      console.log("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh我爱中国",this.dialysis_date)
+      this.dialysis_time = this.dialysis_date
+    }
+  }
 }
 </script>
 

src/xt_pages/dialysis/details/index.vue

@@ -62,6 +62,8 @@
         <el-tab-pane label="候诊区" name="first">
           <div class="cell clearfix" style="margin-bottom:10px;">
             <el-date-picker v-model="selected_date"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
               prefix-icon="el-icon-date" @change="handleScheduleDateChange"
              :editable="false" :clearable="false"
               style="width: 45%;margin-right:10px;" type="date" placeholder="选择日期时间" align="right" >
@@ -158,7 +160,10 @@
         <!-- 透析区 -->
         <el-tab-pane label="透析区" name="second">
           <div class="cell clearfix" style="margin-bottom:10px;">
-            <el-date-picker v-model="selected_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange" :editable="false" :clearable="false" style="width: 45%;margin-right:10px;" type="date" placeholder="选择日期时间" align="right" ></el-date-picker>
+            <el-date-picker v-model="selected_date" prefix-icon="el-icon-date"  format="yyyy-MM-dd"
+             value-format="yyyy-MM-dd"
+             @change="handleScheduleDateChange" :editable="false" :clearable="false" style="width: 45%;margin-right:10px;" type="date" placeholder="选择日期时间" align="right" >
+            </el-date-picker>
             <el-input size="small" style="width:25%;" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
             <el-button size="small" class="filter-item" style="margin-right:20px;" type="primary" @click="searchAction">搜索</el-button>
           </div>
@@ -1479,7 +1484,7 @@ export default {
       lastDialysisPrescribe: { id: 0 },
       //
       activeName: 'first',
-      selected_date: new Date(),
+      selected_date:moment().format('YYYY-MM-DD'),
       // search_input 和 search_keyword，使输入关键字时不会经常刷新 filtedSchedules
       search_keyword: '', // 确定用于搜索的关键字
       search_input: '', // 输入中的关键字
@@ -1548,6 +1553,7 @@ export default {
       // end_time2:'',
       first_monitor:{},
       last_monitor:{},
+      new_date:0,
     }
   },
   created() {
@@ -1562,19 +1568,26 @@ export default {
       this.activeName = sessionStorage.getItem("nameActive")
     }
     var patient_id = this.$route.query.patient_id
-    var date = this.$route.query.date
+    var date = moment().format('YYYY-MM-DD')
+    this.new_date = (new Date(date).getTime()/1000)-28800
+    this.dialysis_date = ""
+    this.dialysis_date = (new Date(date).getTime()/1000)-28800
+    // var date = this.$route.query.date
     this.patient_id = patient_id
-    this.date = date
-    this.dialysis_date=
+    // this.date = date
+    // this.new_date = date
+    // this.dialysis_date= date
     this.getScheduleDetail()
     this.getLongAdvice()
 
-    this.selected_date = this.$route.query.date * 1000
+    // this.selected_date = this.$route.query.date * 1000
+    // this.new_date = this.$route.query.date * 1000
     var schedule_type_selected = this.$store.getters.schedule_type_selected
     var zone_selected = this.$store.getters.zone_selected
     var patient_state_selected = this.$store.getters.patient_state_selected
     var treat_state_selected = this.$store.getters.treat_state_selected
-    var selected_date = this.$store.getters.selected_date
+    // var selected_date = this.$store.getters.selected_date
+    // console.log("日志时间2222222222222222",selected_date)
     if (schedule_type_selected) {
       this.scheduleStateVal = schedule_type_selected.schedule_type_selected
     }
@@ -1587,9 +1600,9 @@ export default {
     if (treat_state_selected) {
       this.treatStateVal = treat_state_selected.treat_state_selected
     }
-    if (selected_date.selected_date) {
-      this.selected_date = selected_date.selected_date
-    }
+    // if (selected_date.selected_date) {
+    //   this.selected_date = selected_date.selected_date.format('YYYY-MM-DD')
+    // }
 
     this.initData = {
       cmd: "queue/join",
@@ -1879,7 +1892,7 @@ export default {
     getLongAdvice() {
       const params = {
         patient_id: this.patient_id,
-        schedule_date:this.$route.query.date,
+        schedule_date:this.new_date,
 
       }
       getLongAdviceTwo(params).then(rs => {
@@ -1948,14 +1961,14 @@ export default {
     },
     getScheduleDetail: function() {
       this.loading = true
-      var dateStr = parseTime(this.date, '{y}-{m}-{d}')
+      // var dateStr = parseTime(this.date, '{y}-{m}-{d}')
       if(this.$route.query.showView == true){
         this.loading = false
         return
       }
-      // console.log('kkkkkkk',dateStr);
+      console.log('kkkkkkk2222222222222222222',this.selected_date);
       this.doctor_advices = []
-      getDialysisScheduleDetail(this.patient_id, dateStr).then(rs => {
+      getDialysisScheduleDetail(this.patient_id, this.selected_date).then(rs => {
 
         var resp = rs.data
         if (resp.state == 1) {
@@ -2233,6 +2246,9 @@ export default {
       //   schedule_type: this.schedule_type_selected,
       //   schedule_date: this.selected_date,
       // })
+      console.log("index-------------",index)
+      this.new_date = (new Date(index).getTime()/1000)-28800
+      this.dialysis_date = (new Date(index).getTime()/1000)-28800
       this.selected_date = index
       this.$store.dispatch('SetSelectedDate', { selected_date: index })
       this.requestDialysisSchedules()
@@ -2331,8 +2347,9 @@ export default {
     },
     requestDialysisSchedules: function() {
 
-      var ymd = parseTime(this.selected_date, '{y}-{m}-{d}')
-      getDialysisSchedules(ymd).then(rs => {
+      // var ymd = parseTime(this.selected_date, '{y}-{m}-{d}')
+      console.log("热切吴2222222222",this.selected_date)
+      getDialysisSchedules(this.selected_date).then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
           var schedules = resp.data.schedules
@@ -2383,21 +2400,27 @@ export default {
     changePatient(schedual) {
         this.patient_id = schedual.patient_id
         this.date = schedual.schedule_date
+
+        this.new_date = schedual.schedule_date
+        this.dialysis_date = ""
+        this.dialysis_date = schedual.schedule_date
+
+        console.log("到哪去啊大大阿道夫阿道夫",this.dialysis_date)
          this.getScheduleDetail();
         console.log('schedual',schedual);
         //this.getLongAdvice();
 
         var patient_id = schedual.patient_id
-        var date = schedual.schedule_date
-        this.$router.push({
-          path: '/dialysis/details',
-          query: {
-            patient_id: patient_id,
-            date: date,
-            patient_name: schedual.patient.name,
-            mode_id:schedual.mode_id
-          }
-        })
+        // var date = schedual.schedule_date
+        // this.$router.push({
+        //   path: '/dialysis/details',
+        //   query: {
+        //     patient_id: patient_id,
+        //     date: date,
+        //     patient_name: schedual.patient.name,
+        //     mode_id:schedual.mode_id
+        //   }
+        // })
     },
     handleClick(type) {
       sessionStorage.setItem('nameActive', type.name);
@@ -2908,7 +2931,7 @@ export default {
               path: '/dialysis/details',
               query: {
                 patient_id: parseInt(res.data.data.patientInfo.patient_id),
-                date: this.$route.query.date,
+                date: this.new_date,
                 patient_name: res.data.data.patientInfo.patient_name,
                 mode_id:newArr[arr.indexOf(parseInt(res.data.data.patientInfo.patient_id))].mode_id,
                 curPatientTime:res.data.data.patientInfo.create_time,
@@ -2923,7 +2946,7 @@ export default {
               path: '/dialysis/details',
               query: {
                 patient_id: parseInt(res.data.data.patientInfo.patient_id),
-                date: this.$route.query.date,
+                date: this.new_date,
                 patient_name: res.data.data.patientInfo.patient_name,
                 mode_id:this.$route.query.mode_id,
                 curPatientTime:res.data.data.patientInfo.create_time,
@@ -2969,7 +2992,7 @@ export default {
               path: '/dialysis/details',
               query: {
                 patient_id: parseInt(res.data.data.patientInfo.patient_id),
-                date: this.$route.query.date,
+                date:this.new_date,
                 patient_name: res.data.data.patientInfo.patient_name,
                 mode_id:newArr[arr.indexOf(parseInt(res.data.data.patientInfo.patient_id))].mode_id,
                 curPatientTime:res.data.data.patientInfo.create_time,
@@ -2982,7 +3005,7 @@ export default {
               path: '/dialysis/details',
               query: {
                 patient_id: parseInt(res.data.data.patientInfo.patient_id),
-                date: this.$route.query.date,
+                date:this.new_date,
                 patient_name: res.data.data.patientInfo.patient_name,
                 mode_id:this.$route.query.mode_id,
                 curPatientTime:res.data.data.patientInfo.create_time,
@@ -3018,7 +3041,7 @@ export default {
 
        var params = {
          patient_id:this.$route.query.patient_id,
-         record_date:this.$route.query.date,
+         record_date:this.new_date,
        }
       getInitPrintData(params).then(response=>{
         if(response.data.state == 1){

src/xt_pages/workforce/components/template_table_four.vue

@@ -1830,7 +1830,9 @@ export default {
     },
     dragstartTwo(event, item) {
       console.log("start的索引", item.moveIndex);
-    },search_two: function () {
+    },
+    search_two: function () {
+      console.log("hhhhhhhhhhhhhhhhhhhhhh",this.all_patients)
       if (this.keywords.length == 0) {
         this.patients = this.all_patients;
       } else {
@@ -1838,7 +1840,8 @@ export default {
         for (let i = 0; i < this.all_patients.length; i++) {
           if (
               this.all_patients[i].name.indexOf(this.keywords) != -1 ||
-              this.all_patients[i].dialysis_no.indexOf(this.keywords) != -1
+              this.all_patients[i].dialysis_no.indexOf(this.keywords) != -1 ||
+              this.all_patients[i].first_letter.indexOf(this.keywords)!=-1
           ) {
             this.patients.push(this.all_patients[i]);
           }