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

src/api/doctorSchedule.js

@@ -60,3 +60,11 @@ export function getScheduleList(params) {
     params: params
   })
 }
+
+export function addSchedule(params) {
+  return request({
+    url: '/api/schedule/addschedule',
+    methods: 'get',
+    params: params
+  })
+}

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -322,6 +322,12 @@
           align="center"
           width="100"
         ></el-table-column>
+        <el-table-column
+          prop="target_ultrafiltration"
+          label="目标超滤量"
+          align="center"
+          width="100"
+        ></el-table-column>
 
         <el-table-column
           prop="dialysis_before_weight"
@@ -598,6 +604,8 @@ export default {
                 response.data.data.schedule[i].patient_id;
               SchedualPatientsTable["mode_name"] =
                 response.data.data.schedule[i].treatment_mode.name;
+              SchedualPatientsTable["target_ultrafiltration"] =
+                response.data.data.schedule[i].prescription.target_ultrafiltration;
               if (
                 response.data.data.schedule[i].assessment_before_dislysis.id > 0
               ) {

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -141,7 +141,13 @@
           </el-col>
 
           <el-col :span="8" v-if="anticoagulant.shouji != -1 && isShows('首剂')">
-            <el-form-item :label="'首剂(' + anticoagulant.shouji_unit + ') : '">
+            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id != 21' :label="'首剂(' + anticoagulant.shouji_unit + ') : '">
+              <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
+                        v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
+              <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
+                        v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
+            </el-form-item>
+            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id == 21' :label="'首剂(mg) : '">
               <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                         v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
               <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
@@ -151,7 +157,13 @@
 
 
           <el-col :span="8" v-if="anticoagulant.weichi != -1 && isShows('维持')">
-            <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '" v-if="anticoagulant.weichi != -1">
+            <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '" v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id != 21">
+              <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
+                        v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
+              <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
+                        v-model="dialysisPrescription.no_anticoagulant_weichi"></el-input>
+            </el-form-item>
+            <el-form-item :label="'维持(mg/h) : '" v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id == 21">
               <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                         v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
               <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
@@ -160,7 +172,13 @@
           </el-col>
 
           <el-col :span="8" v-if="anticoagulant.zongliang != -1 && isShows('总量')">
-            <el-form-item :label="'总量(' + anticoagulant.zongliang_unit + ') : '">
+            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id != 21' :label="'总量(' + anticoagulant.zongliang_unit + ') : '">
+              <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
+                        v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
+              <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
+                        v-model="dialysisPrescription.no_anticoagulant_zongliang"></el-input>
+            </el-form-item>
+            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id == 21' :label="'总量(mg) : '">
               <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                         v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
               <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"

src/xt_pages/medicalScheduling/index.vue

@@ -33,30 +33,28 @@
                         :value="item.value">
                     </el-option>
                 </el-select>
-                <el-button type="text" style="margin:0 10px;">&lt;上一周(22)</el-button>
-                <div class="dateBox">2019.11.25-2019.12.01(47)</div>
-                <el-button type="text" style="margin:0 10px;">下一周(24)&gt;</el-button>
+               <el-button @click="lastclick" type="text" style="margin:0 10px;">&lt;上一周({{ weekNum - 1 }})</el-button>
+                <div class="dateBox">{{ weekDayArr[0] }}-{{ weekDayArr[6] }}({{ weekNum }})</div>
+                <el-button @click="nextclick" type="text" style="margin:0 10px;">下一周({{ weekNum + 1 }})&gt;</el-button>
             </div>
             <div style="display:flex;justify-content: space-between;">
                 <div style="width: 70%">
                     <el-table :data="tableData" border :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}" :row-style="{ color: '#303133' }">
-                        <el-table-column prop="name" label="医护姓名" style="width:16%" align="center">
-                            <template slot-scope="scope">
-                                 {{scope.row.user_name}}
-                            </template>
-                        </el-table-column>
+                        <el-table-column prop="name" label="医护姓名" style="width:16%" align="center"></el-table-column>
                         <el-table-column label="周一" style="width:14%" align="center">
                             <template slot-scope="scope">
                                 <div @click="hangdleClick(scope.row,scope.$index)">
-                                    <el-dropdown trigger="click" @command="changeSchedule(scope.row)">
+                                    <el-dropdown trigger="click" @command="changeSchedule">
                                         <span class="el-dropdown-link">
-                                        aaa<i class="el-icon-arrow-down el-icon--right"></i>
+                                        {{scope.row.class_name}}<i class="el-icon-arrow-down el-icon--right"></i>
                                         </span>
                                         <el-dropdown-menu slot="dropdown" >
-                                            <el-dropdown-item  :command="item.class_name" icon="el-icon-plus" v-for="(item,index) in schedulelist" :key="index">{{item.class_name}}</el-dropdown-item>
+                                            <el-dropdown-item  :command="item.id" icon="el-icon-plus" v-for="(item,index) in schedulelist" :key="index">{{item.class_name}}</el-dropdown-item>
                                         </el-dropdown-menu>
                                     </el-dropdown>
                                 </div>
+
+
                             </template>
                         </el-table-column>
                         <el-table-column prop="name" label="周二" style="width:14%" align="center"></el-table-column>
@@ -70,11 +68,13 @@
                 <div class="classBox">
                     <div class="classTitle">班种</div>
                     <div class="classMain">
-                        <div v-for="(item,index) in schedulelist" :key="index">
-                           <p>
-                            {{item.class_name}}&nbsp;({{item.timeone_start}}~{{item.timeone_type}}{{item.timeone_end}} <span v-if="item.timetwo_start!=''">{{item.timetwo_start}}~{{item.timetwo_type}}{{item.timetwo_end}}</span> )
-                           </p>
+                        <div>
+                            <p>早班(08:00~12:00)</p>
+                            <p>中班(12:00~18:00)</p>
+                            <p>晚班(18:00~24:00)</p>
+                            <p>全班(08:00~18:00)</p>
                         </div>
+                        
                         <el-checkbox style="text-align:center" v-model="isChecked">连续排班</el-checkbox>
                     </div>
                 </div>
@@ -86,7 +86,7 @@
 
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
-import { getDoctorList,getScheduleList } from '@/api/doctorSchedule'
+import { getDoctorList,getScheduleList,addSchedule } from '@/api/doctorSchedule'
 export default {
     components:{
         BreadCrumb
@@ -109,12 +109,49 @@ export default {
                 label: '护士'
             }],
             typeValue:'1',
-            tableData: [],
+            tableData: [{
+                date: '2016-05-02',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1518 弄'
+            }, {
+                date: '2016-05-04',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1517 弄'
+            }, {
+                date: '2016-05-01',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1519 弄'
+            }, {
+                date: '2016-05-03',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1516 弄'
+            }],
             isChecked:true,
-            schedulelist:[],
-
+            weekNum:'',
+            weekDayArr:[],
+            todayDate:'',
+            clen:7,
+            nowYear: new Date().getFullYear()
+            weekNum:'',
+            weekDayArr:[],
+            todayDate:'',
+            clen:7,
+            nowYear: new Date().getFullYear(),
+            schedule_week:0,
+            docobj:{},
+            class_name:""
         }
     },
+    created(){
+        let year = new Date().getFullYear()
+        let month = new Date().getMonth() + 1
+        let date = new Date().getDate()
+        this.weekNum = this.getYearWeek(year,month,date)
+
+        this.todayDate=this.formatDate(new Date())
+        this.setDate(new Date())
+        
+    },
     methods:{
         search(){},
         toPrint(){
@@ -127,8 +164,33 @@ export default {
         getDoctorList().then(response=>{
             if(response.data.state == 1){
                 var list =  response.data.data.list
-                console.log("list",list)
                 this.tableData = list
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
             }
         })
      },
@@ -151,30 +213,132 @@ export default {
                 }
              }
              this.schedulelist = schedulelist
-             console.log("schedulelist",schedulelist)
           }
        }) 
      },
-     changeSchedule(command){
-       console.log("val",command)
+     hangdleClick(val,index){
+      this.schedule_week = index
+      this.docobj = val
+     },
+     changeSchedule(id){
+         var class_name = ""
+        for(let i=0;i<this.schedulelist.length;i++){
+           if(id == this.schedulelist[i].id){
+             class_name = this.schedulelist[i].class_name
+           }
+        }
+        let arr = [...this.tableData]
+        for(let i=0;i<arr.length;i++){
+           if(this.docobj.id == arr[i].id){
+              arr[i].class_name = class_name
+           }
+        }
+        this.tableData = arr
+        const params = {
+          doctor_id:this.docobj.admin_user_id,
+          doctor_type:this.docobj.user_type,
+          schedule_type:id,
+          schedule_week:this.schedule_week,
+          start_time:this.getTimestamp(this.weekDayArr[0]),
+          end_time:this.getTimestamp(this.weekDayArr[6])
+        }
+        console.log("params",params)
+        
+       addSchedule(params).then(response=>{
+         if(response.data.state == 1){
+             var schedule = response.data.data.schedule
+             console.log("schedule",schedule)
+           }
+       })
+     },
+ 
+     formatDate(date){      
+          var year = date.getFullYear()+'.'       
+          var month = (date.getMonth()+1)+'.';
+          var day = date.getDate();
+          return year+month+day
+        }, 
+    formatDateTwo(date){      
+          var year = date.getFullYear()+'.'       
+          var month = (date.getMonth()+1)+'.';
+          var day = date.getDate();
+          return year+month+day
+       }, 
+     addDate(date,n){        
+        date.setDate(date.getDate()+n);        
+        return date;
+      },  
+        //
+      setDate(date){           
+        var week = date.getDay()-1;
+        date = this.addDate(date,week*-1);
+        this.currentFirstDate = new Date(date);
+        for(var i = 0;i<this.clen; i++){     
+            this.weekDayArr.push(this.formatDate(i==0 ? date : this.addDate(date,1)))
+            
+         }         
+     },
+        //上一周 
+     lastclick(){
+        this.weekDayArr=[]
+        this.setDate(this.addDate(this.currentFirstDate,-7));   
+        this.weekNum = this.weekNum - 1
+       if(this.weekNum - 1 == 0){
+         let year = this.nowYear - 1
+         let month = 12
+         let date = 31
+         this.weekNum = this.getYearWeek(year,month,date)
+         this.nowYear = this.nowYear - 1
+        }
+      },
+        //下一周
+     nextclick(){ 
+        this.weekDayArr=[]                
+        this.setDate(this.addDate(this.currentFirstDate,7));
+        this.weekNum = this.weekNum + 1
+        if(this.weekNum + 1 == 54){
+         let year = this.nowYear + 1
+         let month = 1
+         let date = 1
+         this.weekNum = this.getYearWeek(year,month,date)
+         this.nowYear = this.nowYear + 1
+       }
+     },
+
+    getYearWeek(year,month,date){
+       /*  
+        dateNow是当前日期 
+        dateFirst是当年第一天  
+        dataNumber是当前日期是今年第多少天  
+        用dataNumber + 当前年的第一天的周差距的和在除以7就是本年第几周  
+      */      
+      let dateNow = new Date(year, parseInt(month) - 1, date);
+      let dateFirst = new Date(year, 0, 1);
+      let dataNumber = Math.round((dateNow.valueOf() - dateFirst.valueOf()) / 86400000);
+      return Math.ceil((dataNumber + ((dateFirst.getDay() + 1) - 1)) / 7);        
+     },
+     getTimestamp(time) { //把时间日期转成时间戳
+        return (new Date(time)).getTime() / 1000
      },
      beforeHandleCommand(item,row){
         return {
-          'command': item,
-          'row': row
+            'command': item,
+            'row': row
         }
-     },
-     hangdleClick(val,index){
-      console.log("点击",val)
-      console.log("index",index)
-      this.index =index
-     }
-    },
+    }  
+   },
    created(){
     //获取医护人员
     this.getDoctorList()
     //获取班种
     this.getScheduleList()
+
+    let year = new Date().getFullYear()
+    let month = new Date().getMonth() + 1
+    let date = new Date().getDate()
+    this.weekNum = this.getYearWeek(year,month,date)
+    this.todayDate=this.formatDate(new Date())
+    this.setDate(new Date())
   }
 }
 </script>