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

@@ -1199,12 +1199,16 @@
       width="50%"
       >
       <div>
+        <div >
+          透析频率：
+          <div class="touxipl"></div>
+        </div>
         <div style="margin: 20px 0;">
           <div style="border-left: 2px solid #409eff;color: #409eff;padding: 0 10px;">
             <span>已排详情</span>
           </div>
           <div>
-            <el-calendar v-model="time_value" >  
+            <!-- <el-calendar v-model="time_value">  
               <template
                 slot="dateCell"
                 slot-scope="{date, data}">
@@ -1218,12 +1222,19 @@
                 </p>
 
               </template>
-            </el-calendar>
+            </el-calendar> -->
+            <Calendar class="Calendar"
+              v-on:choseDay="clickDay"
+              v-on:changeMonth="changeDate"
+              v-on:isToday="clickToday"
+              v-model="time_value"
+            >
+            </Calendar>
           </div>
           
         </div>
       </div>
-      <!-- <span slot="footer" class="dialog-footer">
+      <!-- <span slot="footer" class="dialog-footer" slot-scope="{date, data}" @click="diajian(data)"> 
         <el-button @click="historyclick = false">取 消</el-button>
         <el-button type="primary" @click="historyclick = false">确 定</el-button>
       </span> -->
@@ -1260,6 +1271,7 @@ import { parseTime } from '@/utils'
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import print from 'print-js'
 import { uParseTime } from '@/utils/tools'
+import Calendar from 'vue-calendar-component'
 export default {
   name: 'index',
   components: {
@@ -1277,7 +1289,8 @@ export default {
     AssessmentAfter,
     TreatmentOf,
     OperationStaff,
-    BreadCrumb
+    BreadCrumb,
+    Calendar,//日历
   },
   data() {
     return {
@@ -1405,10 +1418,14 @@ export default {
       Refresh:true,
       norefresh:true,
       historyclick:false,
-      time_value:new Date()
+      time_value:new Date(),
+      startTime:'',
+      endTime:'',
+      
     }
   },
   created() {
+    console.log('bbbbb',this.time_value);
    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")
@@ -1620,6 +1637,9 @@ export default {
     this.websocketSend(unObj)
   },
   methods: {
+    diajian(value){
+      console.log('zzzzz',value);
+    },
     // 透析次数
     chishuclick(row){
       this.cishu_dialogVisible=true
@@ -2913,25 +2933,60 @@ export default {
     // 透析历史
     history_click(){
       this.historyclick =true
+      this.getmonth(this.time_value)
+      // console.log('time_value',);
     },
-  
-
-  },
-  watch:{
-    time_value:function(){
-      console.log("timevalue",this.time_value)
-
-      var year = this.time_value.getFullYear()
-      var month = this.time_value.getMonth()+1
-      var date = this.time_value.getDate()
+    // //选中某天
+    clickDay(data) {
+      this.time_value = data
+      console.log('33333',this.time_value); 
+      // this.getmonth(data)
+    },
+    // //左右点击切换月份
+    changeDate(data) {
+      this.getmonth(data)
+      console.log('999999',data); 
+    },
+    // 跳到了本月
+    clickToday(data) {
+      console.log('444444',data); 
+    },
+    // 获取每个月的第一天和最后一天
+    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
+      this.endTime = endTime
+      console.log('time_value333333',this.startTime,this.endTime);
+      // var date =new Date(val) 
+      // console.log('66666',date);
+      // var new_year = date.getFullYear() // 取当前的年份
+      // var month = date.getMonth()
+      
+      // var new_month = month + 1 
+      // // console.log('22222',month,new_month,new_year);// 取当前的月份
+      // if (month > 12) {
+      //   console.log('111');
+      //   new_month -= 12 // 月份减
+      //   new_year++ // 年份增
+      // }
+      // console.log('new_month',new_month);
+      // var firstDay = new Date(new_year, new_month, 1) // 取当年当月中的第一天
+      // console.log('qqqqq',moment(firstDay).format("YYYY-MM-DD HH:mm:ss"));
+      // var lastDay = new Date(firstDay.getTime() - 1000 * 60 * 60 * 24).getDate() // 获取当月最后一天日期
+      // if (firstDay.getMonth() < 10) {
+        
+      //   var mon = "0" + firstDay.getMonth()
+      //   console.log('wwww',moment(firstDay).format("YYYY-MM-DD HH:mm:ss"));
+      // } else {
+      //   var mon = firstDay.getMonth()
+      // }
+      // var startDate = firstDay.getFullYear() + '-' + mon + '-' + "0" + firstDay.getDate();
+      // var endDate = firstDay.getFullYear() + '-' + mon + '-' + lastDay;
 
-      if(date>=1&&date<=9){
-        date = "0"+date
-      }
-      if(month>=1&&month<=9){
-        month ="0"+month
-      }
-      console.log("year:"+year+"month:"+month+"date:"+date)
     }
   }
 }
@@ -3113,5 +3168,67 @@ export default {
       padding: 15px 10px 
     }
   }
+  
+}
+.Calendar{
+    color: #000 !important;
+    width: 100% !important;
+    max-width: 839px !important;
+    .wh_content_all{
+      background-color: #fff;
+      .wh_top_changge{
+        .wh_jiantou1{
+          border-top: 2px solid #000;
+          border-left: 2px solid #000;
+        }
+        .wh_content_li{
+          color: #000;
+        }
+        .wh_jiantou2{
+          border-top: 2px solid #000;
+          border-right: 2px solid #000;
+        }
+      }
+      .wh_content_item{
+        text-align: center;
+        color: #000 ;
+        height: 50px;
+        .wh_top_tag{
+          width: 100%;
+          height: 50px ;
+          line-height: 50px;
+          margin: 0;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          text-align: center
+        }
+        .wh_isToday{
+          border: 1px solid #409eff;
+          background: #409eff !important;
+          color: #fff;
+          border-radius: 0;
+        }
+        .wh_chose_day{
+          border: 1px solid #409eff;
+          background: #fff !important;
+          color: #409eff;
+          border-radius: 0;
+        }
+        .wh_item_date{
+          width: 100%;
+          height: 50px;
+          line-height: 50px;
+          margin: 0;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        }
+        .wh_item_date:hover {
+            background: #fff;
+            cursor: pointer;
+        }
+      }
+    }
 }
 </style>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1912,7 +1912,7 @@ export default {
                 that.$message({ message: '挂号成功', type: 'success', duration: 5000 })
                 that.$refs.register.hide()
                 that.loadingone = false
-                this.CheckHISPatient(that.record_date,that.patientInfo.id)
+                that.CheckHISPatient(that.record_date,that.patientInfo.id)
 
               }
             }