Merge branch '20230223_pad_vue_new_branch' of http://git.shengws.com/csx/Pad_New into 20230223_pad_vue_new_branch

src/pages/main/DetailsPage.vue

@@ -47,8 +47,8 @@
       <div class="Tab">
         <!-- <CaseHistory v-show="index == 0" title="病历"></CaseHistory> -->
         <!--<check-tab v-show="index==1" title="化验单"></check-tab>-->
-        <dialysis-tab v-if="index == 1" title="透析" v-on:records="jump(val)"></dialysis-tab>
-        <today-tab ref="today" v-show="index == 0 && !showView" title="今日" @show_patient_list="showPatientList"></today-tab>
+        <dialysis-tab v-if="index == 1" title="透析" v-on:records="jump(val)" @tabIndex="tabIndex" :tableIndex2="tableIndex2"></dialysis-tab>
+        <today-tab ref="today" v-show="index == 0 && !showView" title="今日" @show_patient_list="showPatientList" :index = index @tiaozhuan = 'tiaozhuan_click' :tableIndex = tableIndex @history="history_click"></today-tab>
         <!-- <div v-if="showView" style="text-align:center;font-size:0.6rem;">
           <p style="margin-top:20px;">当前叫号</p>
           <p style="margin-top:20px;">{{ $route.query.patient_name ? $route.query.patient_name : ""}}</p>
@@ -222,6 +222,8 @@ export default {
       patient_name: '',
       date: 0,
       index: 0,
+      tableIndex:0,
+      tableIndex2:0,
       patient: null,
       sqls: [
         window.matchMedia('(max-width:418px)'), // 和CSS一样，也要注意顺序！
@@ -693,6 +695,7 @@ export default {
     },
     ClickTab: function (tabIndex) {
       this.index = tabIndex
+      this.tableIndex = tabIndex
     },
     backAction () {
       // this.$router.back(-1);
@@ -1168,7 +1171,7 @@ export default {
       return (time1/1000)-28800
     },
     formatter (day) {
-     
+
       this.patientAllDayList.map(item => {
       //  console.log("itemwowowwo",item.scheudle)
        if(this.$store.getters.user.template_info.org_id == 9538 || this.$store.getters.user.template_info.org_id == 10101 || this.$store.getters.user.template_info.org_id == 10353 || this.$store.getters.user.template_info.org_id == 9946){
@@ -1198,8 +1201,8 @@ export default {
        }
 
       })
-     
-     
+
+
       return day
     },
     getPatientDialysisRecord () {
@@ -1290,6 +1293,19 @@ export default {
           }
        })
 
+    },
+    tiaozhuan_click(eve){
+      console.log('33333333322222',eve);
+      this.index = eve
+    },
+    // 自定义方法
+    tabIndex(eve){
+      console.log('eve111111',eve);
+      this.tableIndex = eve
+    },
+    history_click(eve){
+      console.log('history_click',eve);
+      this.tableIndex2 =eve
     }
 
   },
@@ -1608,7 +1624,7 @@ export default {
   .van-calendar__top-info{
     background: #f44; /* 红色背景 */
   }
- 
+
 }
 .custom-date-one{
   .van-calendar__top-info{

src/pages/main/dialysis/DialysisTab.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="newDialysisTab">
-      <van-tabs v-model="index">
+      <van-tabs v-model="index" @change="ClickTab">
         <van-tab title="医嘱">
           <advice-table v-if="index == 0"></advice-table>
         </van-tab>
@@ -19,7 +19,7 @@
         <van-tab title="血管通路">
           <pass-assessment></pass-assessment>
         </van-tab>
-        
+
         <!-- <van-tab title="检验检查">
           <inspection style="padding-top: 2.75rem;"></inspection>
         </van-tab>
@@ -66,6 +66,9 @@ export default {
       index: 0
     }
   },
+  props:{
+    tableIndex2:Number
+  },
   components: {
     LongTable,
     SchedulTable,
@@ -81,15 +84,21 @@ export default {
     TreatSummary,
     Standingorder
   },
+  created(){
+    this.index = this.tableIndex2
+  },
   methods: {
     ClickTab: function (tabIndex) {
       console.log('tabIndex',tabIndex);
       this.index = tabIndex
+      this.$emit('tabIndex',tabIndex)
     }
   },
   mounted () {
     if (this.$route.query.active2) {
       this.index = parseInt(this.$route.query.active2)
+      console.log('121212121',this.index);
+
     }
   }
 }

src/pages/main/today/TodayTab.vue

@@ -129,6 +129,7 @@
                       :dialysis_order="dialysis_order"
                       :is_advice_open="is_advice_open"
                       :prescription_prop="prescription"
+                      
                       ref="orders_dialog"></doctorAdvice>
         <!-- 双人核对 -->
         <doubleCheck v-if="barActive == 5" :patient_prop="patient" ref="doubleCheck"
@@ -214,6 +215,15 @@
       @touchcancel="end" alt="">
     </div>
 
+    <div class="checkBox4" @click="tiaozhuan" ref="moveBtn2" >
+      <img src="../../../assets/images/check2.png" @mousedown="down2" @touchstart="down2"
+      @mousemove="move2"
+      @touchmove="move2"
+      @mouseup="end2"
+      @touchend="end2"
+      @touchcancel="end2" alt="" v-if="barActive == 4">
+    </div>
+
     <div class="checkBox3"  @click="toExecution" ref="moveBtns" v-if="user_type==3 && ($store.getters.user.template_info.org_id==10340 || $store.getters.user.template_info.org_id==10489)">
         <img src="../../../assets/images/advice.png" @mousedown="downs" @touchstart="downs"
       @mousemove="moves"
@@ -224,8 +234,8 @@
         <span class="redpoints" v-if="total>0">
           {{ total }}
         </span>
-     </div>
-
+    </div>
+     
     <van-dialog v-model="dry_visibility"  width="90%"  show-cancel-button>
       <div style="margin:10px;height:100px; overflow-y: scroll;">
         <div style="">
@@ -353,6 +363,10 @@ export default {
     basicTreatmentOf
 
   },
+  props:{
+    index:Number,
+    tableIndex:Number
+  },
   inject: ['reload'],
   data () {
     return {
@@ -466,6 +480,11 @@ export default {
         x: 0,
         y: 0
       },
+      position2:{
+        x: 0,
+        y: 0
+      },
+
       active: 0,
       nx: '',
       ny: '',
@@ -480,9 +499,18 @@ export default {
       dsy: '',
       xsPum: '',
       ysPum: '',
+
+      nx2: '',
+      ny2: '',
+      dx2: '',
+      dy2: '',
+      xPum2: '',
+      yPum2: '',
+
       isShow: false,
       moveBtn: {},
       moveBtns: {},
+      moveBtn2:{},
       is_project_open: 0,
       new_dialysis_goods: [],
       list: [],
@@ -620,6 +648,15 @@ export default {
   },
 
   mounted () {
+    this.moveBtn2 = this.$refs.moveBtn2
+    if (sessionStorage.getItem('checkBtnTop2')) {
+      this.moveBtn2.style.top = sessionStorage.getItem('checkBtnTop2')
+      this.moveBtn2.style.bottom = 'initial'
+    }
+    if (sessionStorage.getItem('checkBtnLeft2')) {
+      this.moveBtn2.style.left = sessionStorage.getItem('checkBtnLeft2')
+    }
+
     this.moveBtn = this.$refs.moveBtn
     if (sessionStorage.getItem('checkBtnTop')) {
       this.moveBtn.style.top = sessionStorage.getItem('checkBtnTop')
@@ -687,6 +724,13 @@ export default {
     // $route: 'requestDialysisRecord'
   },
   methods: {
+    tiaozhuan(){
+      this.index = 1
+      this.tableIndex = 4
+      this.$emit('tiaozhuan',this.index)
+      this.$emit('history',this.tableIndex)
+      console.log('this.index',this.index);
+    },
     down (event) {
       this.flags = true
       var touch
@@ -699,6 +743,8 @@ export default {
       this.position.y = touch.clientY
       this.dx = this.moveBtn.offsetLeft
       this.dy = this.moveBtn.offsetTop
+      console.log('this.moveBtn.offsetLeft',this.moveBtn.offsetLeft);
+      
     },
     move (event) {
       if (this.flags) {
@@ -798,6 +844,65 @@ export default {
         passive: false
       })
     },
+
+    // 长期医嘱
+    down2 (event) {
+      console.log('this.moveBtn2',this.moveBtn2);
+      this.flags = true
+      var touch
+      if (event.touches) {
+        touch = event.touches[0]
+      } else {
+        touch = event
+      }
+      this.position2.x = touch.clientX
+      this.position2.y = touch.clientY
+      this.dx2 = this.moveBtn2.offsetLeft
+      this.dy2 = this.moveBtn2.offsetTop
+    },
+    move2 (event) {
+      if (this.flags) {
+        var touch
+        if (event.touches) {
+          touch = event.touches[0]
+        } else {
+          touch = event
+        }
+        this.nx2 = touch.clientX - this.position2.x
+        this.ny2 = touch.clientY - this.position2.y
+        this.xPum2 = this.dx2 + this.nx2
+        this.yPum2 = this.dy2 + this.ny2
+        var clientWidth = document.documentElement.clientWidth
+        var clientHeight = document.documentElement.clientHeight
+        if (
+          this.xPum2 > 0 &&
+          this.xPum2 < clientWidth - this.moveBtn2.offsetWidth
+        ) {
+          this.moveBtn2.style.left = this.xPum2 + 'px'
+        }
+        if (
+          this.yPum2 > 0 &&
+          this.yPum2 < clientHeight - this.moveBtn2.offsetHeight
+        ) {
+          this.moveBtn2.style.top = this.yPum2 + 'px'
+        }
+
+        // 阻止页面的滑动默认事件
+        document.addEventListener('touchmove', this.handler, {
+          passive: false
+        })
+      }
+    },
+    // 鼠标释放时候的函数
+    end2 () {
+      this.flags = false
+      sessionStorage.setItem('checkBtnTop2', this.moveBtn2.style.top)
+      sessionStorage.setItem('checkBtnLeft2', this.moveBtn2.style.left)
+      document.addEventListener('touchmove', this.handler, {
+        passive: false
+      })
+    },
+
     handler () {
       if (this.flags) {
         event.preventDefault()
@@ -3549,7 +3654,16 @@ export default {
     height: 3.5rem;
   }
 }
-
+.checkBox4 {
+  position: fixed;
+  left: 0.6rem;
+  bottom: 11rem;
+  z-index:5000;
+  img {
+    width: 3.5rem;
+    height: 3.5rem;
+  }
+}
 .contagionImg{
   width: 1rem !important;
   height: 1rem !important;

src/pages/new_Patientscheduling/new_content.vue

@@ -35,7 +35,6 @@
         border
         :fit="true"
         :data="scheduleZone"
-
         :height="tableContainHeight"
         ref="table"
         style="table-layout: fixed;"
@@ -57,7 +56,7 @@
         <el-table-column prop="Mon_M" label="上午" min-width="60" align="center">
           <template slot-scope="scope">
             <div >
-              <el-popover :ref="`popover-${scope.$index}`"
+              <el-popover ref="popover"
                 placement="top"
                 title=""
                 width=""
@@ -68,7 +67,7 @@
                   <el-button @click='patientedit(scope.row.Mon_M)'>调班</el-button>
                   <el-button @click="delete_click(scope.row.Mon_M)" v-if="scope.row.Mon_M.stage==0">删除</el-button>
                 </div>
-                <div style="text-align: center;" v-if="scope.row.Mon_M.patient_id ==''" >
+                <div style="text-align: center;" v-if="scope.row.Mon_M.patient_id == ''" >
                   <el-button @click='newappend(scope.row.Mon_M)'>新增</el-button>
                 </div>
                 <schedule-item slot="reference" :schedule-detail="scope.row.Mon_M"></schedule-item>