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/batch_print/batch_print_order_eightythree.vue

@@ -35,7 +35,7 @@
                           性 别:{{ record.patient.gender == 1 ? "男" : "女" }}
                         </div>
                         <div style="flex: 1;">
-                          年龄:{{ record.patient.age }} 岁
+                          年龄:{{ getNewAge(record.patient.id_card_no) }} 岁
                         </div>
                         <div style="flex: 1;">
                           透析机号:
@@ -1187,6 +1187,19 @@ export default {
         return val.age
       }
     },
+    getNewAge(UUserCard) {
+      if (UUserCard != null && UUserCard != '') {
+        // 获取年龄
+        var myDate = new Date()
+        var month = myDate.getMonth() + 1
+        var day = myDate.getDate()
+        var age = myDate.getFullYear() - UUserCard.substring(6, 10) - 1
+        if (UUserCard.substring(10, 12) < month || UUserCard.substring(10, 12) == month && UUserCard.substring(12, 14) <= day) {
+          age++
+        }
+        return age
+      }
+    },
     checkIdCardNo(val) {
       var thisLen = val.length;
       var birth = "";

src/xt_pages/dialysis/template/DialysisPrintOrdereightythree.vue

@@ -25,7 +25,7 @@
                     性别:{{ patientInfo.gender ? patientInfo.gender : "/" }}
                   </div>
                   <div style="flex: 1;">
-                    年龄:{{ patientInfo.age }} 岁
+                    年龄:{{ getNewAge(patientInfo.id_card_no) }} 岁
                   </div>
                   <div style="flex: 1;">
                     透析机号:
@@ -1605,6 +1605,19 @@ export default {
         return this.getoldAge();
       }
     },
+    getNewAge(UUserCard) {
+      if (UUserCard != null && UUserCard != '') {
+        // 获取年龄
+        var myDate = new Date()
+        var month = myDate.getMonth() + 1
+        var day = myDate.getDate()
+        var age = myDate.getFullYear() - UUserCard.substring(6, 10) - 1
+        if (UUserCard.substring(10, 12) < month || UUserCard.substring(10, 12) == month && UUserCard.substring(12, 14) <= day) {
+          age++
+        }
+        return age
+      }
+    },
     checkIdCardNo(val) {
       var thisLen = val.length;
       var birth = "";

src/xt_pages/workforce/appointment.vue

@@ -392,7 +392,9 @@ export default {
       mode:[{id:1,name:'HD'},{id:2,name:'HDF'},{id:3,name:'HD+HP'},{id:4,name:'HP'},{id:5,name:'HF'},{id:6,name:'SCUF'},{id:7,name:'IUF'}
       ,{id:8,name:'HFHD'},{id:9,name:'HFHD+HP'},{id:10,name:'PHF'},{id:11,name:'HFR'},{id:12,name:'HDF+HP'},{id:13,name:'CRRT'},{id:14,name:'腹水回输'},{id:19,name:'IUF+HD'},{id:20,name:'UF'},{id:21,name:'HD+'}
       ,{id:22,name:'血浆胆红素吸附+HDF'},{id:23,name:'血浆胆红素吸附'},{id:24,name:'I-HDF'},{id:25,name:'HD高通'},{id:26,name:'CVVH'},{id:27,name:'CVVHD'},{id:28,name:'CVVHDF'}
-      ,{id:29,name:'PE'},{id:30,name:"血浆胆红素吸附+HP"},{id:31,name:"HPD"},{id:32,name:"HDP"},{id:33,name:"HFD"},{id:34,name:'HDF100'},{id:35,name:'HDF600'},{id:36,name:'HDF800'},{id:37,name:'HDF1000'}]
+      ,{id:29,name:'PE'},{id:30,name:"血浆胆红素吸附+HP"},{id:31,name:"HPD"},{id:32,name:"HDP"},{id:33,name:"HFD"},{id:34,name:'HDF100'},{id:35,name:'HDF600'},{id:36,name:'HDF800'},{id:37,name:'HDF1000'}],
+      statr_date:'',
+      end_date:'',
     }
   },
   components: {
@@ -2807,7 +2809,7 @@ export default {
         partition_id: this.partition_id,
         schedule_type: this.schedule_type
       }
-      // console.log("params32323232323223", params)
+      console.log("params32323232323223", params)
       getThreeWeekList(params).then(response => {
         if (response.data.state == 1) {
           var partitions = response.data.data.partitions
@@ -3924,8 +3926,10 @@ export default {
     //筛选导出排班数据源
     getThreeWeekList2() {
       var params = {
-        start_time: this.start_time,
-        end_time: this.end_time,
+        // start_time: this.start_time,
+        // end_time: this.end_time,
+        start_time: this.statr_date,
+        end_time: this.end_date,
         partition_id: this.partition_id,
         schedule_type: this.schedule_type
       }
@@ -3933,7 +3937,7 @@ export default {
       getThreeWeekList(params).then(response => {
         if (response.data.state == 1) {
           var partitions = response.data.data.partitions
-          console.log('yyyyyyy',response.data.data);
+          console.log('yyyyyyy222',response.data.data);
           // const merges = ['A1:A2', 'B1:B2', 'C1:E1', 'F1:H1', 'I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1', 'U1:W1', 'X1:Z1', 'AA1:AC1', 'AD1:AF1', 'AG1:AI1', 'AJ1:AL1', 'AM1:AO1', 'AP1:AR1', 'AS1:AU1', 'AV1:AX1', 'AY1:BA1', 'BB1:BD1', 'BE1:BG1', 'BH1:BJ1', 'BK1:BM1']
           const merges = ['A1:A2', 'B1:B2', 'C1:E1', 'F1:H1', 'I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1', 'U1:W1']
           var list = []
@@ -4234,17 +4238,16 @@ export default {
           var laststart = this.getTimestamp(last_start) - 28800
 
           var lastend = this.getTimestamp(last_end) - 28800
-
+          console.log("week",this.export_type)
           if (this.export_type == 0) {
             for (let i = 0; i < scheduleList.length; i++) {
               if(this.activeName=='thisWeek'){
-                // console.log("week1")
                 if (scheduleList[i].schedule_date >= start && scheduleList[i].schedule_date <= end) {
                  var weekday= this.changeWeekType(scheduleList[i].schedule_week)
                  if(this.schedule_type!=0 || this.partition_id != 0 || this.week_date !=''){
                     if(this.schedule_type==scheduleList[i].schedule_type &&
                       this.partition_id==scheduleList[i].partition_id &&weekday==this.week_date){
-
+                       
                       week.push(scheduleList[i])
                     }
 
@@ -4842,15 +4845,24 @@ export default {
     },
 
     changeWeekDay(val){
-      console.log("Val2332322323wo",val)
+      console.log("Val2332322323wo",this.days,this.end_time)
       var str = val.join(",")
-      console.log("stor233233223",str)
+      
       this.week_date = str
+      const week_arr=this.days.slice(0,7)
+      console.log("stor233233223",week_arr)
+      for(let i in this.weekType){
+        if(str==this.weekType[i].name){
+          this.statr_date= week_arr[i]
+          this.end_date= week_arr[i]
+        }
+      }
+      // this.statr_date=
+      // this.end_date=
       if(str==''){
         // console.log('llllll');
           this.getThreeWeekList()
       }else{
-        // console.log('oooooo');
         this.getThreeWeekList2()
       }
       // this.getThreeWeekList()