Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/details/index.vue

@@ -17,13 +17,13 @@
           type="primary"
           @click="next"
           >下一位</el-button
-        >   
+        >
 
         <el-button
           size="small"
           type="primary"
           @click="history_click"
-          
+
           >透析历史</el-button>
 
         <el-button
@@ -43,7 +43,6 @@
 
       </div>
     </div>
-
     <div
       class="loadingBox"
       v-loading="loading"
@@ -1191,7 +1190,6 @@
 
     </div>
     </div>
-
     <!-- 透析历史 -->
     <el-dialog class="history"
       :title="'患者信息（姓名：'+patient.name+'、透析号：'+patient.dialysis_no +'）' "
@@ -1199,21 +1197,20 @@
       width="50%"
       >
       <div>
-        <!-- <div >
+         <div >
           透析频率：
           <div class="touxipl"></div>
-        </div> -->
+        </div>
         <div style="margin: 20px 0;">
           <div style="border-left: 2px solid #409eff;color: #409eff;padding: 0 10px;">
             <span>已排详情</span>
           </div>
           <div @click="viewDayWork">
-            <el-calendar v-model="time_value">  
-              
+            <el-calendar v-model="time_value">
                 <template
                   slot="dateCell"
-                  slot-scope="{date, data}">
-                    <p :class="data.isSelected ? 'is-selected' : ''" style="text-align: center;">
+                  slot-scope="{date, data}" >
+                    <p :class="data.isSelected ? 'is-selected' : ''" style="text-align: center;" >
                       {{ data.day.split('-').slice(2).join('-') }}<br/>
                       <span v-for="(item,index) in orderList" :key="index" style="background: red;color: white;text-align: center;">
                         <span v-if="data.day == item.order_date">
@@ -1225,7 +1222,6 @@
                       </span>
                     </p>
               </template>
-            
             </el-calendar>
           </div>
         </div>
@@ -1266,7 +1262,6 @@ import print from 'print-js'
 import { uParseTime } from '@/utils/tools'
 import Calendar from 'vue-calendar-component'
 import data from '../../../store/modules/data'
-import patient from '../../../router/modules/patient'
 export default {
   name: 'index',
   components: {
@@ -1414,15 +1409,14 @@ export default {
       norefresh:true,
       historyclick:false,
       time_value:new Date(),
-      
+
       start_time:moment().startOf('months').format('YYYY-MM-DD'),
       end_time:moment().endOf('months').format('YYYY-MM-DD'),
-      start_time_one:"",
       orderList:[]
     }
   },
   created() {
-    
+
    this.blood_access_part_opera = getDataConfig('hemodialysis', 'vascular_access_desc')
    this.org_id = this.$store.getters.xt_user.org.id,
    this.printDate = moment().format("YYYY-MM-DD HH:mm:ss")
@@ -1627,7 +1621,7 @@ export default {
     // this.getmonth(this.time_value)
     // this.handlePick(this.time_value)
   },
- 
+
   beforeDestroy(){
 
     let unObj = {
@@ -2105,7 +2099,7 @@ export default {
       }
     },
     requestDialysisSchedules: function() {
-     
+
       var ymd = parseTime(this.selected_date, '{y}-{m}-{d}')
       getDialysisSchedules(ymd).then(rs => {
         var resp = rs.data
@@ -2945,16 +2939,16 @@ export default {
            this.historyclick =true
            if(list!=null && list.length>0){
              for(let i=0;i<list.length;i++){
-              
+
                list[i].order_date =""
                if(this.org_id ==9538 || this.org_id ==10101||this.org_id ==10353){
-                  list[i].order_date = this.getOrderTime(list[i].dialysis_date) 
+                  list[i].order_date = this.getOrderTime(list[i].dialysis_date)
                   list[i].schedual_type_name= list[i].schedual_type
                }else{
-                 list[i].order_date = this.getOrderTime(list[i].schedule_date) 
+                 list[i].order_date = this.getOrderTime(list[i].schedule_date)
                  list[i].schedual_type_name= list[i].schedule_type
                }
-              
+
              }
            }
            console.log("list------",list)
@@ -2967,7 +2961,6 @@ export default {
     getmonth(val){
       // const months= new Date(val).getMonth()
       // let startTime =  moment().month(months).startOf('month').format('YYYY-MM-DD')
-      
       // //   //某月最后一天
       // let endTime = moment().month(months).endOf('month').format('YYYY-MM-DD')
       // this.startTime = startTime
@@ -2975,6 +2968,7 @@ export default {
       // console.log('time_value333333',this.startTime,this.endTime);
     },
     getOrderTime(val){
+      // console.log('77778888',val,this.dialysis_date=uParseTime(val, "{y}-{m}-{d}"));
       if (val < 0) {
         return "";
       }
@@ -2985,23 +2979,35 @@ export default {
       }
     },
     viewDayWork(val){
-      console.log("val33333333333333",val)
-      console.log("开始时间",)
-      var patient_id = this.$route.query.patient_id
-      var start_time = this.timestamp(moment(this.time_value).format('YYYY-MM-DD'))
-      console.log("patienet_id",patient_id)
-      console.log("start_Time",start_time)
-      this.$router.push({
-        path: "/dialysis/details",
-        query: { patient_id:patient_id , date: start_time}
-      });
-      this.history_click = false
+      const len = (val.target.innerText).split(' ')
+      console.log("val33333333333333444",len)
+      if(val.target.innerText == '下个月'){
+        this.time_value()
+      }else if(val.target.innerText == '上个月'){
+        this.time_value()
+      }else if(val.target.innerText =='今天'){
+        this.time_value()
+      }else{
+        // console.log('4444',this.orderList);
+        if(len.length>1){
+          var patient_id = this.$route.query.patient_id
+          var start_time = this.timestamp(this.start_time)
+          this.$router.push({
+            path: "/dialysis/details",
+            query: { patient_id:patient_id , date: start_time}
+          });
+          this.history_click = false
+        }else{
+          this.time_value()
+        }
+        
+      }
     },
     timestamp(start_time) {
       // 使用 Date 对象和它的 getTime 方法将日期字符串转换为时间戳
       return new Date(start_time).getTime()/1000 - 28800;
     }
-  
+
   },
   watch:{
     time_value:{
@@ -3009,15 +3015,11 @@ export default {
         console.log("newValue----------",newValue)
         // this.initData()
         this.time_value = newValue
-        this.getmonth(this.time_value)
+        // this.getmonth(this.time_value)
         console.log('yyyyyyyyyyy',moment(this.time_value).format('YYYY-MM-DD'),moment(oldValue).format('YYYY-MM-DD'))
-        this.start_time = ""
-        this.start_time = moment(this.time_value).format('YYYY-MM-DD')
-        this.start_time_one = moment(this.time_value).format('YYYY-MM-DD')
 
-        this.end_time= ""
+        this.start_time = moment(this.time_value).format('YYYY-MM-DD')
         this.end_time =   moment(oldValue).format('YYYY-MM-DD')
-
       }
     }
   }
@@ -3197,10 +3199,10 @@ export default {
       }
     }
     .el-dialog__body{
-      padding: 15px 10px 
+      padding: 15px 10px
     }
   }
-  
+
 }
 .Calendar{
     color: #000 !important;